Merge "[Fullstack] Wait 10 seconds to ensure that MAC address is configured" into stable/yoga

Author: Zuul

neutron/tests/common/net_helpers.py

@@ -784,6 +784,19 @@ def get(cls, bridge, namespace=None, mac=None, port_id=None,
             return VethPortFixture(bridge, namespace)
         tools.fail('Unexpected bridge type: %s' % type(bridge))
 
+    def set_port_mac_address(self):
+
+        def set_mac_address():
+            self.port.link.set_address(self.mac)
+            return self.port.link.address.lower() == self.mac.lower()
+
+        try:
+            common_utils.wait_until_true(set_mac_address, timeout=10)
+        except common_utils.WaitTimeout:
+            LOG.error("MAC address of the port %s not set properly. "
+                      "Requested MAC: %s; Actual MAC: %s",
+                      self.port, self.mac, self.port.link.address)
+
 
 class OVSBridgeFixture(fixtures.Fixture):
     """Create an OVS bridge.
@@ -899,7 +912,7 @@ def hybrid_plug_port(self, port_name):
         bridge_port.link.set_up()
         self.qbr.addif(bridge_port.name)
 
-        self.port.link.set_address(self.mac)
+        self.set_port_mac_address()
         self.port.link.set_up()
 
     # NOTE(jlibosva): Methods below are taken from nova.virt.libvirt.vif
@@ -990,8 +1003,7 @@ def _setUp(self):
             self.veth_fixture = self.useFixture(VethFixture())
         self.br_port, self.port = self.veth_fixture.ports
 
-        if self.mac:
-            self.port.link.set_address(self.mac)
+        self.set_port_mac_address()
 
         # bridge side
         br_ip_wrapper = ip_lib.IPWrapper(self.bridge.namespace)