commit 2cf69c05d81703898e044b1de35ddc98c4b22c9d
author Zuul <zuul@review.openstack.org> Sat Jul 21 03:05:10 2018 +0000
committer Gerrit Code Review <review@openstack.org> Sat Jul 21 03:05:10 2018 +0000
tree 18d037bb4bcc262c4a27c50bf423ea2c24f76557
parent 99eda5b9e42cff885f8d6865cd0aca08af3c8768
parent 95a3169e1782f31c794e56cb836c1d9476a0adf8

Merge "Correct the usage on listing neutron ports"

tempest/scenario/manager.py

diff --git a/tempest/scenario/manager.py b/tempest/scenario/manager.py
index 145dcf1..c5d41a0 100644
--- a/tempest/scenario/manager.py
+++ b/tempest/scenario/manager.py
@@ -809,8 +809,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