Merge "Correct the usage on listing neutron ports" into mcp/queens
diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 8d25bff..2b174db 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -770,8 +770,13 @@
return subnet
def _get_server_port_id_and_ip4(self, server, ip_addr=None):
- ports = self.os_admin.ports_client.list_ports(
- device_id=server['id'], fixed_ip=ip_addr)['ports']
+ if ip_addr:
+ ports = self.os_admin.ports_client.list_ports(
+ device_id=server['id'],
+ fixed_ips='ip_address=%s' % ip_addr)['ports']
+ else:
+ ports = self.os_admin.ports_client.list_ports(
+ device_id=server['id'])['ports']
# A port can have more than one IP address in some cases.
# If the network is dual-stack (IPv4 + IPv6), this port
# is associated with 2 subnets