diff options
| author | Sergey Kraynev <skraynev@mirantis.com> | 2015-08-07 04:42:33 -0400 |
|---|---|---|
| committer | Sergey Kraynev <skraynev@mirantis.com> | 2015-08-07 04:42:33 -0400 |
| commit | d204c979b864dbe82e1ee269e2243775175b5749 (patch) | |
| tree | 2e70231fe1df1b9b87a5a90b11a5ae0edfb9131f /heat/engine/resources/openstack/manila | |
| parent | 2a6987ea2dd898ce411019e6b82603a6c06fb2bc (diff) | |
| download | heat-d204c979b864dbe82e1ee269e2243775175b5749.tar.gz | |
Don't use default None for params in handle_update
The main "update" function in resource.py call custom handle_update
methods of resources. handle_update method always get not None
parameters: after, tmpl_diff, prop_diff. Where:
- 'after' is not None snippet of resource
- tmpl_diff and prop_diff - values calculated corresponding functions,
which return only dictionary (empty or not empty).
This patch removes default None values from handle_update method of some
resources to make all interfaces similar.
Change-Id: Id62201e3a26b557a941bbd904a947f064df4aeb3
Diffstat (limited to 'heat/engine/resources/openstack/manila')
| -rw-r--r-- | heat/engine/resources/openstack/manila/security_service.py | 2 | ||||
| -rw-r--r-- | heat/engine/resources/openstack/manila/share_network.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/heat/engine/resources/openstack/manila/security_service.py b/heat/engine/resources/openstack/manila/security_service.py index 235d8c809..7e58be997 100644 --- a/heat/engine/resources/openstack/manila/security_service.py +++ b/heat/engine/resources/openstack/manila/security_service.py @@ -92,7 +92,7 @@ class SecurityService(resource.Resource): security_service = self.client().security_services.create(**args) self.resource_id_set(security_service.id) - def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None): + def handle_update(self, json_snippet, tmpl_diff, prop_diff): if prop_diff: self.client().security_services.update(self.resource_id, **prop_diff) diff --git a/heat/engine/resources/openstack/manila/share_network.py b/heat/engine/resources/openstack/manila/share_network.py index c4210361e..1e5b91868 100644 --- a/heat/engine/resources/openstack/manila/share_network.py +++ b/heat/engine/resources/openstack/manila/share_network.py @@ -140,7 +140,7 @@ class ManilaShareNetwork(resource.Resource): self.resource_id, self.client_plugin().get_security_service(service).id) - def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None): + def handle_update(self, json_snippet, tmpl_diff, prop_diff): if self.SECURITY_SERVICES in prop_diff: services = prop_diff.pop(self.SECURITY_SERVICES) s_curr = set([self.client_plugin().get_security_service(s).id |