diff options
author | 2017-06-26 10:06:30 +0000 | |
---|---|---|
committer | 2017-06-26 10:06:30 +0000 | |
commit | c8d5216c01c42f0e090f9b441985f8ebc3eca0ed (patch) | |
tree | 04368bda549260970c7b07f12ac09e722b15c1ef /functest/utils/openstack_snapshot.py | |
parent | a0902eb46edae259f4c0bd0c0209678d989e904b (diff) | |
parent | 971a0c33c0ad2625dc28ab4b81f588ac0a4faaa4 (diff) |
Merge "Change floating ips management from nova to neutron"
Diffstat (limited to 'functest/utils/openstack_snapshot.py')
-rwxr-xr-x | functest/utils/openstack_snapshot.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/functest/utils/openstack_snapshot.py b/functest/utils/openstack_snapshot.py index 233c316a..a03c5032 100755 --- a/functest/utils/openstack_snapshot.py +++ b/functest/utils/openstack_snapshot.py @@ -98,13 +98,14 @@ def get_security_groups(neutron_client): return {'secgroups': dic_secgroups} -def get_floatinips(nova_client): +def get_floatingips(neutron_client): logger.debug("Getting Floating IPs...") dic_floatingips = {} - floatingips = os_utils.get_floating_ips(nova_client) + floatingips = os_utils.get_floating_ips(neutron_client) if not (floatingips is None or len(floatingips) == 0): for floatingip in floatingips: - dic_floatingips.update({floatingip.id: floatingip.ip}) + dic_floatingips.update({floatingip['id']: + floatingip['floating_ip_address']}) return {'floatingips': dic_floatingips} @@ -149,7 +150,7 @@ def main(): snapshot.update(get_networks(neutron_client)) snapshot.update(get_routers(neutron_client)) snapshot.update(get_security_groups(neutron_client)) - snapshot.update(get_floatinips(nova_client)) + snapshot.update(get_floatingips(neutron_client)) snapshot.update(get_users(keystone_client)) snapshot.update(get_tenants(keystone_client)) |