Use VIF details dictionary to get physical_network

Modify mlnx_direct plug and unplug to retrieve physical_network
from VIF details dictionary if network meta dictionary does not contain
physical_network. This will serve ML2 case following the guidelines to
populate vif_details dictionary with attributes required for port plugging.

Change-Id: I0d97bc875be2fff18087c78accef3ec81c059c4b
Closes-Bug: 1304872

nova/exception.py

@@ -634,6 +634,10 @@ class ExternalNetworkAttachForbidden(Forbidden):
                 "external network %(network_uuid)s")
 
 
+class NetworkMissingPhysicalNetwork(NovaException):
+    msg_fmt = _("Physical network is missing for network %(network_uuid)s")
+
+
 class DatastoreNotFound(NotFound):
     msg_fmt = _("Could not find the datastore reference(s) which the VM uses.")
 

nova/network/model.py

@@ -43,6 +43,7 @@ VIF_TYPE_OTHER = 'other'
 # class
 VIF_DETAIL_PORT_FILTER = 'port_filter'
 VIF_DETAIL_OVS_HYBRID_PLUG = 'ovs_hybrid_plug'
+VIF_DETAILS_PHYSICAL_NETWORK = 'physical_network'
 
 # Constants for the 'vif_model' values
 VIF_MODEL_VIRTIO = 'virtio'
@@ -344,6 +345,12 @@ class VIF(Model):
     def is_neutron_filtering_enabled(self):
         return self['details'].get(VIF_DETAIL_PORT_FILTER, False)
 
+    def get_physical_network(self):
+        phy_network = self['network']['meta'].get('physical_network')
+        if not phy_network:
+            phy_network = self['details'].get(VIF_DETAILS_PHYSICAL_NETWORK)
+        return phy_network
+
     @classmethod
     def hydrate(cls, vif):
         vif = cls(**ensure_string_keys(vif))

nova/tests/virt/libvirt/test_vif.py

@@ -195,6 +195,14 @@ class LibvirtVifTestCase(test.TestCase):
                                  type=network_model.VIF_TYPE_MLNX_DIRECT,
                                  devname='tap-xxx-yyy-zzz')
 
+    vif_mlnx_net = network_model.VIF(id='vif-xxx-yyy-zzz',
+                                     address='ca:fe:de:ad:be:ef',
+                                     network=network_mlnx,
+                                     type=network_model.VIF_TYPE_MLNX_DIRECT,
+                                     details={'physical_network':
+                                              'fake_phy_network'},
+                                     devname='tap-xxx-yyy-zzz')
+
     vif_midonet = network_model.VIF(id='vif-xxx-yyy-zzz',
                                     address='ca:fe:de:ad:be:ef',
                                     network=network_midonet,
@@ -665,6 +673,37 @@ class LibvirtVifTestCase(test.TestCase):
             }
             d.plug_iovisor(instance, self.vif_ivs)
 
+    def test_unplug_mlnx_with_details(self):
+        d = vif.LibvirtGenericVIFDriver(self._get_conn(ver=9010))
+        with mock.patch.object(utils, 'execute') as execute:
+            execute.side_effect = processutils.ProcessExecutionError
+            d.unplug_mlnx_direct(None, self.vif_mlnx_net)
+            execute.assert_called_once_with('ebrctl', 'del-port',
+                                            'fake_phy_network',
+                                            'ca:fe:de:ad:be:ef',
+                                             run_as_root=True)
+
+    def test_plug_mlnx_with_details(self):
+        d = vif.LibvirtGenericVIFDriver(self._get_conn(ver=9010))
+        with mock.patch.object(utils, 'execute') as execute:
+            d.plug_mlnx_direct(self.instance, self.vif_mlnx_net)
+            execute.assert_called_once_with('ebrctl', 'add-port',
+                                            'ca:fe:de:ad:be:ef',
+                                            'instance-uuid',
+                                            'fake_phy_network',
+                                            'mlnx_direct',
+                                            'eth-xxx-yyy-zzz',
+                                            run_as_root=True)
+
+    def test_plug_mlnx_no_physical_network(self):
+        d = vif.LibvirtGenericVIFDriver(self._get_conn(ver=9010))
+        with mock.patch.object(utils, 'execute') as execute:
+            self.assertRaises(exception.NovaException,
+                              d.plug_mlnx_direct,
+                              self.instance,
+                              self.vif_mlnx)
+            self.assertEqual(0, execute.call_count)
+
     def test_ivs_ethernet_driver(self):
         d = vif.LibvirtGenericVIFDriver(self._get_conn(ver=9010))
         self._check_ivs_ethernet_driver(d,

nova/virt/libvirt/vif.py

@@ -534,11 +534,12 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
         super(LibvirtGenericVIFDriver,
               self).plug(instance, vif)
 
-        network = vif['network']
         vnic_mac = vif['address']
         device_id = instance['uuid']
-        fabric = network['meta']['physical_network']
-
+        fabric = vif.get_physical_network()
+        if not fabric:
+            raise exception.NetworkMissingPhysicalNetwork(
+                network_uuid=vif['network']['id'])
         dev_name = self.get_vif_devname_with_prefix(vif, DEV_PREFIX_ETH)
         try:
             utils.execute('ebrctl', 'add-port', vnic_mac, device_id, fabric,
@@ -723,9 +724,11 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
         super(LibvirtGenericVIFDriver,
               self).unplug(instance, vif)
 
-        network = vif['network']
         vnic_mac = vif['address']
-        fabric = network['meta']['physical_network']
+        fabric = vif.get_physical_network()
+        if not fabric:
+            raise exception.NetworkMissingPhysicalNetwork(
+                network_uuid=vif['network']['id'])
         try:
             utils.execute('ebrctl', 'del-port', fabric,
                           vnic_mac, run_as_root=True)