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 | |
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')
11 files changed, 17 insertions, 34 deletions
diff --git a/heat/engine/resources/openstack/designate/domain.py b/heat/engine/resources/openstack/designate/domain.py index 895a625d2..36244e468 100644 --- a/heat/engine/resources/openstack/designate/domain.py +++ b/heat/engine/resources/openstack/designate/domain.py @@ -89,10 +89,7 @@ class DesignateDomain(resource.Resource): self.resource_id_set(domain.id) - def handle_update(self, - json_snippet=None, - tmpl_diff=None, - prop_diff=None): + def handle_update(self, json_snippet, tmpl_diff, prop_diff): args = dict() if prop_diff.get(self.EMAIL): diff --git a/heat/engine/resources/openstack/designate/record.py b/heat/engine/resources/openstack/designate/record.py index 26369cacb..96a7403d0 100644 --- a/heat/engine/resources/openstack/designate/record.py +++ b/heat/engine/resources/openstack/designate/record.py @@ -115,10 +115,7 @@ class DesignateRecord(resource.Resource): self.resource_id_set(domain.id) - def handle_update(self, - json_snippet=None, - tmpl_diff=None, - prop_diff=None): + def handle_update(self, json_snippet, tmpl_diff, prop_diff): args = dict() if prop_diff.get(self.TTL): diff --git a/heat/engine/resources/openstack/keystone/endpoint.py b/heat/engine/resources/openstack/keystone/endpoint.py index 51ecfbb8d..5211edfce 100644 --- a/heat/engine/resources/openstack/keystone/endpoint.py +++ b/heat/engine/resources/openstack/keystone/endpoint.py @@ -117,10 +117,7 @@ class KeystoneEndpoint(resource.Resource): self.resource_id_set(endpoint.id) - def handle_update(self, - json_snippet=None, - tmpl_diff=None, - prop_diff=None): + def handle_update(self, json_snippet, tmpl_diff, prop_diff): region = prop_diff.get(self.REGION) service = prop_diff.get(self.SERVICE) interface = prop_diff.get(self.INTERFACE) diff --git a/heat/engine/resources/openstack/keystone/group.py b/heat/engine/resources/openstack/keystone/group.py index f49c94524..fb568619f 100644 --- a/heat/engine/resources/openstack/keystone/group.py +++ b/heat/engine/resources/openstack/keystone/group.py @@ -105,7 +105,7 @@ class KeystoneGroup(role_assignments.KeystoneRoleAssignment): super(KeystoneGroup, self).handle_create(user_id=None, group_id=group.id) - def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None): + def handle_update(self, json_snippet, tmpl_diff, prop_diff): name = prop_diff.get(self.NAME) or self.physical_resource_name() description = prop_diff.get(self.DESCRIPTION) domain = (prop_diff.get(self.DOMAIN) or diff --git a/heat/engine/resources/openstack/keystone/project.py b/heat/engine/resources/openstack/keystone/project.py index 8c68c321d..8ec0d2ccd 100644 --- a/heat/engine/resources/openstack/keystone/project.py +++ b/heat/engine/resources/openstack/keystone/project.py @@ -114,10 +114,7 @@ class KeystoneProject(resource.Resource): self.resource_id_set(project.id) - def handle_update(self, - json_snippet=None, - tmpl_diff=None, - prop_diff=None): + def handle_update(self, json_snippet, tmpl_diff, prop_diff): name = prop_diff.get(self.NAME) or self.physical_resource_name() description = prop_diff.get(self.DESCRIPTION) enabled = prop_diff.get(self.ENABLED) diff --git a/heat/engine/resources/openstack/keystone/role.py b/heat/engine/resources/openstack/keystone/role.py index c9a4b3928..966bc9891 100644 --- a/heat/engine/resources/openstack/keystone/role.py +++ b/heat/engine/resources/openstack/keystone/role.py @@ -60,15 +60,13 @@ class KeystoneRole(resource.Resource): self.resource_id_set(role.id) - def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None): - if prop_diff is None: - return - - name = prop_diff.get(self.NAME) or self.physical_resource_name() - self._update_role( - role_id=self.resource_id, - new_name=name - ) + def handle_update(self, json_snippet, tmpl_diff, prop_diff): + if self.NAME in prop_diff: + name = prop_diff.get(self.NAME) or self.physical_resource_name() + self._update_role( + role_id=self.resource_id, + new_name=name + ) def handle_delete(self): if self.resource_id is not None: diff --git a/heat/engine/resources/openstack/keystone/service.py b/heat/engine/resources/openstack/keystone/service.py index 308e751b9..7eb666786 100644 --- a/heat/engine/resources/openstack/keystone/service.py +++ b/heat/engine/resources/openstack/keystone/service.py @@ -88,10 +88,7 @@ class KeystoneService(resource.Resource): self.resource_id_set(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): name = None if self.NAME in prop_diff: name = (prop_diff.get(self.NAME) or diff --git a/heat/engine/resources/openstack/keystone/user.py b/heat/engine/resources/openstack/keystone/user.py index 9def6effc..3b57ad0fc 100644 --- a/heat/engine/resources/openstack/keystone/user.py +++ b/heat/engine/resources/openstack/keystone/user.py @@ -206,7 +206,7 @@ class KeystoneUser(role_assignments.KeystoneRoleAssignment): super(KeystoneUser, self).handle_create(user_id=user.id, group_id=None) - def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None): + def handle_update(self, json_snippet, tmpl_diff, prop_diff): name = prop_diff.get(self.NAME) or self.physical_resource_name() description = prop_diff.get(self.DESCRIPTION) enabled = prop_diff.get(self.ENABLED) 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 diff --git a/heat/engine/resources/openstack/mistral/workflow.py b/heat/engine/resources/openstack/mistral/workflow.py index 51935ff17..2005cbbad 100644 --- a/heat/engine/resources/openstack/mistral/workflow.py +++ b/heat/engine/resources/openstack/mistral/workflow.py @@ -350,7 +350,7 @@ class Workflow(signal_responder.SignalResponder, executions.extend(self.data().get(self.EXECUTIONS).split(',')) self.data_set(self.EXECUTIONS, ','.join(executions)) - def handle_update(self, json_snippet=None, tmpl_diff=None, prop_diff=None): + def handle_update(self, json_snippet, tmpl_diff, prop_diff): update_allowed = [self.INPUT, self.PARAMS, self.DESCRIPTION] for prop in update_allowed: if prop in prop_diff: |