openstack
/
heat
Code Issues Proposed changes

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
This commit is contained in:
Sergey Kraynev 2015-08-07 04:42:33 -04:00
parent 2a6987ea2d
commit d204c979b8
11 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/engine/resources/openstack/designate/domain.py
View File

@ -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):

5
heat/engine/resources/openstack/designate/record.py
View File

@ -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):

5
heat/engine/resources/openstack/keystone/endpoint.py
View File

@ -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)

2
heat/engine/resources/openstack/keystone/group.py
View File

@ -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

5
heat/engine/resources/openstack/keystone/project.py
View File

@ -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)

16
heat/engine/resources/openstack/keystone/role.py
View File

@ -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:

5
heat/engine/resources/openstack/keystone/service.py
View File

@ -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

2
heat/engine/resources/openstack/keystone/user.py
View File

@ -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)

2
heat/engine/resources/openstack/manila/security_service.py
View File

@ -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)

2
heat/engine/resources/openstack/manila/share_network.py
View File

@ -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

2
heat/engine/resources/openstack/mistral/workflow.py
View File

@ -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: