diff options
author | spisarski <s.pisarski@cablelabs.com> | 2017-08-02 13:19:58 -0600 |
---|---|---|
committer | spisarski <s.pisarski@cablelabs.com> | 2017-08-02 14:19:04 -0600 |
commit | 652da5487159d5ee94fe2f8e62c34fdb0d26f4e5 (patch) | |
tree | 2391e24e8bab3c92711fa96f6401b6e1b8c731ef /snaps/openstack/create_router.py | |
parent | 84d902632f1dd77f891c49cfb1d58af5ae051d1a (diff) |
Refactor network retrieval API calls.
Refactored neutron_utils#get_network() to also accept a
NetworkSettings object for more robust queries in addition to
the old network_name parameter. Also refactored neutron_utils#
get_network_by_id to add in the ID to list_networks((**{'id': id)
and returning the first item contains the expected ID value.
JIRA: SNAPS-161
Change-Id: Ie670a442dd70633bbef7a1233e630672ebac6b0c
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/create_router.py')
-rw-r--r-- | snaps/openstack/create_router.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/snaps/openstack/create_router.py b/snaps/openstack/create_router.py index 209f9d2..3e0d904 100644 --- a/snaps/openstack/create_router.py +++ b/snaps/openstack/create_router.py @@ -233,8 +233,6 @@ class RouterSettings: out = dict() ext_gw = dict() - project_id = None - if self.name: out['name'] = self.name if self.project_name: @@ -253,7 +251,8 @@ class RouterSettings: if self.admin_state_up is not None: out['admin_state_up'] = self.admin_state_up if self.external_gateway: - ext_net = neutron_utils.get_network(neutron, self.external_gateway) + ext_net = neutron_utils.get_network( + neutron, network_name=self.external_gateway) if ext_net: ext_gw['network_id'] = ext_net.id out['external_gateway_info'] = ext_gw |