for network, netInsts in networks.items():
for inst in netInsts:
if project_name:
- project = keystone_utils.get_project_by_id(
- keystone, inst['project_id'])
+ if 'project_id' in inst.keys():
+ project = keystone_utils.get_project_by_id(
+ keystone, inst['project_id'])
+ else:
+ project = keystone_utils.get_project_by_id(
+ keystone, inst['tenant_id'])
if project and project.name == project_name:
return __map_network(neutron, inst)
else:
os_routers = neutron.list_routers(**router_filter)
for os_router in os_routers['routers']:
if project_name:
- project = keystone_utils.get_project_by_id(
- keystone, os_router['project_id'])
+ if 'project_id' in os_router.keys():
+ project = keystone_utils.get_project_by_id(
+ keystone, os_router['project_id'])
+ else:
+ project = keystone_utils.get_project_by_id(
+ keystone, os_router['tenant_id'])
if project and project.name == project_name:
return __map_router(neutron, os_router)
ports = neutron.list_ports(**port_filter)
for port in ports['ports']:
if project_name:
- project = keystone_utils.get_project_by_id(
- keystone, port['project_id'])
+ if 'project_id' in port.keys():
+ project = keystone_utils.get_project_by_id(
+ keystone, port['project_id'])
+ else:
+ project = keystone_utils.get_project_by_id(
+ keystone, port['tenant_id'])
if project and project.name == project_name:
return Port(**port)
else:
group = None
for group in groups['security_groups']:
if project_name:
- project = keystone_utils.get_project_by_id(
- keystone, group['tenant_id'])
+ if 'project_id' in group.keys():
+ project = keystone_utils.get_project_by_id(
+ keystone, group['project_id'])
+ else:
+ project = keystone_utils.get_project_by_id(
+ keystone, group['tenant_id'])
if project and project_name == project.name:
break
else: