Merge "VIF model removal from nfvi"

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py

@@ -5,7 +5,6 @@
 #
 import collections
 import json
-import six
 from six.moves import http_client as httplib
 import socket
 import uuid
@@ -21,6 +20,7 @@ from nfv_vim.nfvi.objects import v1 as nfvi_objs
 
 from nfv_plugins.nfvi_plugins import config
 from nfv_plugins.nfvi_plugins.openstack import exceptions
+from nfv_plugins.nfvi_plugins.openstack import neutron
 from nfv_plugins.nfvi_plugins.openstack import nova
 from nfv_plugins.nfvi_plugins.openstack import openstack
 from nfv_plugins.nfvi_plugins.openstack import rest_api
@@ -288,18 +288,17 @@ def instance_get_action_type(vm_action, vm_data=None):
     return action_type, parameters
 
 
-def instance_supports_live_migration(instance_data):
+def instance_supports_live_migration(instance_data, ports_data):
     """
     Determine if the instance supports live-migration
     """
 
     # Live migration is not supported if there is a pci-passthrough or
     # pci-sriov NIC.
-    nics = instance_data.get('wrs-if:nics', [])
-    for nic in nics:
-        nic_name, nic_data = six.next(six.iteritems(nic))
-        vif_model = nic_data.get('vif_model', '')
-        if vif_model in ['pci-passthrough', 'pci-sriov']:
+    for port in ports_data:
+        vnic_type = port.get('binding:vnic_type', '')
+        if (vnic_type in [neutron.VNIC_TYPE.DIRECT_PHYSICAL,
+                          neutron.VNIC_TYPE.DIRECT]):
             return False
 
     # Live migration is not supported if there is an attached pci passthrough
@@ -1718,6 +1717,16 @@ class NFVIComputeAPI(nfvi.api.v1.NFVIComputeAPI):
 
             instance_data = future.result.data['server']
 
+            future.work(neutron.get_ports_for_instance, self._token,
+                        instance_data['id'])
+            future.result = (yield)
+
+            if (not future.result.is_complete() or
+                future.result.data is None):
+                return
+
+            ports_data = future.result.data.get('ports', [])
+
             nfvi_data = dict()
             nfvi_data['vm_state'] = instance_data['OS-EXT-STS:vm_state']
             nfvi_data['task_state'] = instance_data['OS-EXT-STS:task_state']
@@ -1745,7 +1754,8 @@ class NFVIComputeAPI(nfvi.api.v1.NFVIComputeAPI):
 
             tenant_uuid = uuid.UUID(instance_data['tenant_id'])
 
-            live_migration_support = instance_supports_live_migration(instance_data)
+            live_migration_support = instance_supports_live_migration(
+                instance_data, ports_data)
 
             volumes = instance_data.get('os-extended-volumes:volumes_attached',
                                         list())
@@ -3117,6 +3127,16 @@ class NFVIComputeAPI(nfvi.api.v1.NFVIComputeAPI):
 
             instance_data = future.result.data['server']
 
+            future.work(neutron.get_ports_for_instance, self._token,
+                        instance_uuid)
+            future.result = (yield)
+
+            if (not future.result.is_complete() or
+                future.result.data is None):
+                return
+
+            ports_data = future.result.data.get('ports', [])
+
             power_state_str = \
                 nova.vm_power_state_str(instance_data['OS-EXT-STS:power_state'])
 
@@ -3155,7 +3175,8 @@ class NFVIComputeAPI(nfvi.api.v1.NFVIComputeAPI):
             else:
                 image_uuid = None
 
-            live_migration_support = instance_supports_live_migration(instance_data)
+            live_migration_support = instance_supports_live_migration(
+                instance_data, ports_data)
 
             volumes = instance_data.get('os-extended-volumes:volumes_attached',
                                         list())

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/neutron.py

@@ -56,11 +56,25 @@ class AgentType(Constants):
     DHCP = Constant('DHCP agent')
 
 
+@six.add_metaclass(Singleton)
+class VnicType(Constants):
+    """
+    VNIC TYPE constants
+    """
+    NORMAL = Constant('normal')
+    DIRECT = Constant('direct')
+    MACVTAP = Constant('macvtap')
+    BAREMETAL = Constant('baremetal')
+    DIRECT_PHYSICAL = Constant('direct-physical')
+    VIRTIO_FORWARDER = Constant('virtio-forwarder')
+
+
 # Constant Instantiation
 EXTENSION_NAMES = NeutronExtensionNames()
 NETWORK_ADMIN_STATE = NetworkAdministrativeState()
 NETWORK_STATUS = NetworkStatus()
 AGENT_TYPE = AgentType()
+VNIC_TYPE = VnicType()
 
 
 def get_network_agents(token, host_name):
@@ -372,6 +386,23 @@ def get_subnet(token, subnet_id):
     return response
 
 
+def get_ports_for_instance(token, instance_uuid):
+    """
+    Ask OpenStack Neutron for a list of ports attached to an instance
+    """
+    url = token.get_service_url(OPENSTACK_SERVICE.NEUTRON)
+    if url is None:
+        raise ValueError("OpenStack Neutron URL is invalid")
+
+    api_cmd = url + "/v2.0/ports?device_id=%s" % (instance_uuid)
+
+    api_cmd_headers = dict()
+    api_cmd_headers['wrs-header'] = 'true'
+
+    response = rest_api_request(token, "GET", api_cmd, api_cmd_headers)
+    return response
+
+
 def create_host_services(token, hostname, host_uuid):
     """
     Asks OpenStack Neutron to create a host