fixing merge conflict

6 files changed, 89 insertions, 23 deletions

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index c82732570..a75636390 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -82,9 +82,13 @@
             </disk>
         #end if
         #for $vol in $volumes
-            <disk type='block'>
+            <disk type='${vol.type}'>
                 <driver type='raw'/>
+                #if $vol.type == 'network'
+                <source protocol='${vol.protocol}' name='${vol.name}'/>
+                #else
                 <source dev='${vol.device_path}'/>
+                #end if
                 <target dev='${vol.mount_device}' bus='${disk_bus}'/>
             </disk>
         #end for
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 22dfac055..96f9c41f9 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -350,21 +350,20 @@ class LibvirtConnection(driver.ComputeDriver):
     def attach_volume(self, instance_name, device_path, mountpoint):
         virt_dom = self._lookup_by_name(instance_name)
         mount_device = mountpoint.rpartition("/")[2]
-        if device_path.startswith('/dev/'):
+        (type, protocol, name) = \
+            self._get_volume_device_info(vol['device_path'])
+        if type == 'block':
             xml = """<disk type='block'>
                          <driver name='qemu' type='raw'/>
                          <source dev='%s'/>
                          <target dev='%s' bus='virtio'/>
                      </disk>""" % (device_path, mount_device)
-        elif ':' in device_path:
-            (protocol, name) = device_path.split(':')
+        elif type == 'network':
             xml = """<disk type='network'>
                          <driver name='qemu' type='raw'/>
                          <source protocol='%s' name='%s'/>
                          <target dev='%s' bus='virtio'/>
-                     </disk>""" % (protocol,
-                                   name,
-                                   mount_device)
+                     </disk>""" % (protocol, name, mount_device)
         else:
             raise exception.InvalidDevicePath(path=device_path)
 
@@ -956,6 +955,16 @@ class LibvirtConnection(driver.ComputeDriver):
                 return True
         return False
 
+    @exception.wrap_exception
+    def _get_volume_device_info(self, device_path):
+        if device_path.startswith('/dev/'):
+            return ('block', None, None)
+        elif ':' in device_path:
+            (protocol, name) = device_path.split(':')
+            return ('network', protocol, name)
+        else:
+            raise exception.InvalidDevicePath(path=device_path)
+
     def _prepare_xml_info(self, instance, rescue=False, network_info=None,
                           block_device_mapping=None):
         block_device_mapping = block_device_mapping or []
@@ -978,6 +987,9 @@ class LibvirtConnection(driver.ComputeDriver):
 
         for vol in block_device_mapping:
             vol['mount_device'] = _strip_dev(vol['mount_device'])
+            (vol['type'], vol['protocol'], vol['name']) = \
+                self._get_volume_device_info(vol['device_path'])
+
         ebs_root = self._volume_in_mapping(self.root_mount_device,
                                            block_device_mapping)
         if self._volume_in_mapping(self.local_mount_device,
diff --git a/nova/virt/libvirt/netutils.py b/nova/virt/libvirt/netutils.py
index 8d36c0a05..041eacb2d 100644
--- a/nova/virt/libvirt/netutils.py
+++ b/nova/virt/libvirt/netutils.py
@@ -91,9 +91,14 @@ def get_network_info(instance):
             'broadcast': network['broadcast'],
             'mac': vif['address'],
             'rxtx_cap': flavor['rxtx_cap'],
-            'dns': [network['dns']],
+            'dns': [],
             'ips': [ip_dict(ip) for ip in network_ips]}
 
+        if network['dns1']:
+            mapping['dns'].append(network['dns1'])
+        if network['dns2']:
+            mapping['dns'].append(network['dns2'])
+
         if FLAGS.use_ipv6:
             mapping['ip6s'] = [ip6_dict()]
             mapping['gateway6'] = network['gateway_v6']
diff --git a/nova/virt/vmwareapi/network_utils.py b/nova/virt/vmwareapi/network_utils.py
index e77842535..08e3bf0b1 100644
--- a/nova/virt/vmwareapi/network_utils.py
+++ b/nova/virt/vmwareapi/network_utils.py
@@ -45,10 +45,30 @@ def get_network_with_the_name(session, network_name="vmnet0"):
     networks = session._call_method(vim_util,

                        "get_properties_for_a_collection_of_objects",

                        "Network", vm_networks, ["summary.name"])

-    for network in networks:

-        if network.propSet[0].val == network_name:

-            return network.obj

-    return None

+    network_obj = {}

+    for network in vm_networks:

+        # Get network properties

+        if network._type == 'DistributedVirtualPortgroup':

+            props = session._call_method(vim_util,

+                        "get_dynamic_property", network,

+                        "DistributedVirtualPortgroup", "config")

+            # NOTE(asomya): This only works on ESXi if the port binding is

+            # set to ephemeral

+            if props.name == network_name:

+                network_obj['type'] = 'DistributedVirtualPortgroup'

+                network_obj['dvpg'] = props.key

+                network_obj['dvsw'] = props.distributedVirtualSwitch.value

+        else:

+            props = session._call_method(vim_util,

+                        "get_dynamic_property", network,

+                        "Network", "summary.name")

+            if props == network_name:

+                network_obj['type'] = 'Network'

+                network_obj['name'] = network_name

+    if (len(network_obj) > 0):

+        return network_obj

+    else:

+        return None

 

 

 def get_vswitch_for_vlan_interface(session, vlan_interface):

diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
index 1638149f1..55578dd3c 100644
--- a/nova/virt/vmwareapi/vm_util.py
+++ b/nova/virt/vmwareapi/vm_util.py
@@ -40,7 +40,7 @@ def split_datastore_path(datastore_path):
 

 def get_vm_create_spec(client_factory, instance, data_store_name,

                        network_name="vmnet0",

-                       os_type="otherGuest"):

+                       os_type="otherGuest", network_ref=None):

     """Builds the VM Create spec."""

     config_spec = client_factory.create('ns0:VirtualMachineConfigSpec')

     config_spec.name = instance.name

@@ -93,7 +93,8 @@ def create_controller_spec(client_factory, key):
     return virtual_device_config

 

 

-def create_network_spec(client_factory, network_name, mac_address):

+def create_network_spec(client_factory, network_name, mac_address,

+                        network_ref=None):

     """

     Builds a config spec for the addition of a new network

     adapter to the VM.

@@ -105,9 +106,24 @@ def create_network_spec(client_factory, network_name, mac_address):
     # Get the recommended card type for the VM based on the guest OS of the VM

     net_device = client_factory.create('ns0:VirtualPCNet32')

 

-    backing = \

-        client_factory.create('ns0:VirtualEthernetCardNetworkBackingInfo')

-    backing.deviceName = network_name

+    # NOTE(asomya): Only works on ESXi if the portgroup binding is set to

+    # ephemeral. Invalid configuration if set to static and the NIC does

+    # not come up on boot if set to dynamic.

+    backing = None

+    if (network_ref['type'] == "DistributedVirtualPortgroup"):

+        backing_name = \

+         'ns0:VirtualEthernetCardDistributedVirtualPortBackingInfo'

+        backing = \

+         client_factory.create(backing_name)

+        portgroup = \

+         client_factory.create('ns0:DistributedVirtualSwitchPortConnection')

+        portgroup.switchUuid = network_ref['dvsw']

+        portgroup.portgroupKey = network_ref['dvpg']

+        backing.port = portgroup

+    else:

+        backing = \

+         client_factory.create('ns0:VirtualEthernetCardNetworkBackingInfo')

+        backing.deviceName = network_name

 

     connectable_spec = \

         client_factory.create('ns0:VirtualDeviceConnectInfo')

@@ -278,9 +294,11 @@ def get_dummy_vm_create_spec(client_factory, name, data_store_name):
     return config_spec

 

 

-def get_machine_id_change_spec(client_factory, mac, ip_addr, netmask, gateway):

+def get_machine_id_change_spec(client_factory, mac, ip_addr, netmask,

+                               gateway, broadcast, dns):

     """Builds the machine id change config spec."""

-    machine_id_str = "%s;%s;%s;%s" % (mac, ip_addr, netmask, gateway)

+    machine_id_str = "%s;%s;%s;%s;%s;%s" % (mac, ip_addr, netmask,

+                                            gateway, broadcast, dns)

     virtual_machine_config_spec = \

         client_factory.create('ns0:VirtualMachineConfigSpec')

 

diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index 6cc130809..7e7d2dac3 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -122,9 +122,10 @@ class VMWareVMOps(object):
                                                         net_name)

             if network_ref is None:

                 raise exception.NetworkNotFoundForBridge(bridge=net_name)

+            return network_ref

 

         self.plug_vifs(instance, network_info)

-        _check_if_network_bridge_exists()

+        network_obj = _check_if_network_bridge_exists()

 

         def _get_datastore_ref():

             """Get the datastore list and choose the first local storage."""

@@ -182,8 +183,10 @@ class VMWareVMOps(object):
         vm_folder_mor, res_pool_mor = _get_vmfolder_and_res_pool_mors()

 

         # Get the create vm config spec

-        config_spec = vm_util.get_vm_create_spec(client_factory, instance,

-                                data_store_name, net_name, os_type)

+        config_spec = vm_util.get_vm_create_spec(

+                            client_factory, instance,

+                            data_store_name, net_name, os_type,

+                            network_obj)

 

         def _execute_create_vm():

             """Create VM on ESX host."""

@@ -730,13 +733,17 @@ class VMWareVMOps(object):
 

         net_mask = network["netmask"]

         gateway = network["gateway"]

+        broadcast = network["broadcast"]

+        dns = network["dns"]

+

         addresses = db.instance_get_fixed_addresses(admin_context,

                                                     instance['id'])

         ip_addr = addresses[0] if addresses else None

 

         machine_id_chanfge_spec = \

             vm_util.get_machine_id_change_spec(client_factory, mac_address,

-                                        ip_addr, net_mask, gateway)

+                                               ip_addr, net_mask, gateway,

+                                               broadcast, dns)

         LOG.debug(_("Reconfiguring VM instance %(name)s to set the machine id "

                   "with ip - %(ip_addr)s") %

                   ({'name': instance.name,