openstack/deb-heat
Code Issues Proposed changes

Re-factoring os/neutron resolve methods

Browse Source 
This patch re-factor resolve_subnet and resolve_network
methods and adds resolve_router method for improving
resources, which use property 'router_id'.

Change-Id: I769c0a286d54e4db2bba1a8b0ac0edf1b2024e16
This commit is contained in:
Peter Razumovsky
2014-12-05 13:03:17 +03:00
parent a3f8c810b1
commit 7469a929c1
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
heat/engine/clients/os/neutron.py
View File

@@ -67,19 +67,21 @@ class NeutronClientPlugin(client_plugin.ClientPlugin):
return neutronV20.find_resourceid_by_name_or_id(
self.client(), key_type, props.get(key))
def _resolve(self, props, key, id_key, key_type):
if props.get(key):
props[id_key] = self.find_neutron_resource(
props, key, key_type)
props.pop(key)
return props[id_key]
def resolve_network(self, props, net_key, net_id_key):
if props.get(net_key):
props[net_id_key] = self.find_neutron_resource(
props, net_key, 'network')
props.pop(net_key)
return props[net_id_key]
return self._resolve(props, net_key, net_id_key, 'network')
def resolve_subnet(self, props, subnet_key, subnet_id_key):
if props.get(subnet_key):
props[subnet_id_key] = self.find_neutron_resource(
props, subnet_key, 'subnet')
props.pop(subnet_key)
return props[subnet_id_key]
return self._resolve(props, subnet_key, subnet_id_key, 'subnet')
def resolve_router(self, props, router_key, router_id_key):
return self._resolve(props, router_key, router_id_key, 'router')
def network_id_from_subnet_id(self, subnet_id):
subnet_info = self.client().show_subnet(subnet_id)