Merge "Remove some redundant resolve_* functions"
This commit is contained in:
commit
d688e65b50
|
@ -100,12 +100,6 @@ class NeutronClientPlugin(client_plugin.ClientPlugin):
|
||||||
props.pop(key))
|
props.pop(key))
|
||||||
return props[id_key]
|
return props[id_key]
|
||||||
|
|
||||||
def resolve_loadbalancer(self, props, lb_key, lb_id_key):
|
|
||||||
return self._resolve(props, lb_key, lb_id_key, 'loadbalancer')
|
|
||||||
|
|
||||||
def resolve_listener(self, props, listener_key, listener_id_key):
|
|
||||||
return self._resolve(props, listener_key, listener_id_key, 'listener')
|
|
||||||
|
|
||||||
def resolve_pool(self, props, pool_key, pool_id_key):
|
def resolve_pool(self, props, pool_key, pool_id_key):
|
||||||
if props.get(pool_key):
|
if props.get(pool_key):
|
||||||
props[pool_id_key] = self.find_resourceid_by_name_or_id(
|
props[pool_id_key] = self.find_resourceid_by_name_or_id(
|
||||||
|
@ -113,15 +107,9 @@ class NeutronClientPlugin(client_plugin.ClientPlugin):
|
||||||
props.pop(pool_key)
|
props.pop(pool_key)
|
||||||
return props[pool_id_key]
|
return props[pool_id_key]
|
||||||
|
|
||||||
def resolve_subnet(self, props, subnet_key, subnet_id_key):
|
|
||||||
return self._resolve(props, subnet_key, subnet_id_key, 'subnet')
|
|
||||||
|
|
||||||
def resolve_router(self, props, router_key, router_id_key):
|
def resolve_router(self, props, router_key, router_id_key):
|
||||||
return self._resolve(props, router_key, router_id_key, 'router')
|
return self._resolve(props, router_key, router_id_key, 'router')
|
||||||
|
|
||||||
def resolve_port(self, props, port_key, port_id_key):
|
|
||||||
return self._resolve(props, port_key, port_id_key, 'port')
|
|
||||||
|
|
||||||
def network_id_from_subnet_id(self, subnet_id):
|
def network_id_from_subnet_id(self, subnet_id):
|
||||||
subnet_info = self.client().show_subnet(subnet_id)
|
subnet_info = self.client().show_subnet(subnet_id)
|
||||||
return subnet_info['subnet']['network_id']
|
return subnet_info['subnet']['network_id']
|
||||||
|
|
|
@ -42,24 +42,6 @@ class NeutronClientPluginTest(NeutronClientPluginTestCase):
|
||||||
'find_resourceid_by_name_or_id')
|
'find_resourceid_by_name_or_id')
|
||||||
self.mock_find.return_value = 42
|
self.mock_find.return_value = 42
|
||||||
|
|
||||||
def test_resolve_subnet(self):
|
|
||||||
props = {'snet': 'test_subnet'}
|
|
||||||
|
|
||||||
res = self.neutron_plugin.resolve_subnet(props, 'snet', 'snet_id')
|
|
||||||
self.assertEqual(42, res)
|
|
||||||
self.mock_find.assert_called_once_with(self.neutron_client, 'subnet',
|
|
||||||
'test_subnet',
|
|
||||||
cmd_resource=None)
|
|
||||||
|
|
||||||
# check resolve if was send id instead of name
|
|
||||||
props = {'snet_id': 77}
|
|
||||||
res = self.neutron_plugin.resolve_subnet(props, 'snet', 'snet_id')
|
|
||||||
self.assertEqual(77, res)
|
|
||||||
# in this case find_resourceid_by_name_or_id is not called
|
|
||||||
self.mock_find.assert_called_once_with(self.neutron_client, 'subnet',
|
|
||||||
'test_subnet',
|
|
||||||
cmd_resource=None)
|
|
||||||
|
|
||||||
def test_get_secgroup_uuids(self):
|
def test_get_secgroup_uuids(self):
|
||||||
# test get from uuids
|
# test get from uuids
|
||||||
sgs_uuid = ['b62c3079-6946-44f5-a67b-6b9091884d4f',
|
sgs_uuid = ['b62c3079-6946-44f5-a67b-6b9091884d4f',
|
||||||
|
|
Loading…
Reference in New Issue