import logging
import yaml
-import sys
import functest.utils.openstack_utils as os_utils
from functest.utils.constants import CONST
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}
def main():
+ logging.basicConfig()
logger.info("Generating OpenStack snapshot...")
nova_client = os_utils.get_nova_client()
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))
logger.debug("NOTE: These objects will NOT be deleted after " +
"running the test.")
return 0
-
-
-if __name__ == '__main__':
- logging.basicConfig()
- sys.exit(main())