From 87d90616df651787f52a59be37457335eb881ed7 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Wed, 15 Jun 2011 22:57:05 +0000
Subject: Workaround windows agent bugs where some responses have trailing
 \\r\\n

---
 nova/virt/xenapi/vmops.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 190bf7c20..5ca041059 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -526,7 +526,9 @@ class VMOps(object):
                 # No response from the agent
                 return
             resp_dict = json.loads(resp)
-            return resp_dict['message']
+            # Some old versions of the windows agent have a trailing \\r\\n
+            # (ie CRLF escaped) for some reason. Strip that off
+            return resp_dict['message'].replace('\\r\\n', '')
 
         if timeout:
             vm_ref = self._get_vm_opaque_ref(instance)
@@ -592,7 +594,9 @@ class VMOps(object):
             # There was some sort of error; the message will contain
             # a description of the error.
             raise RuntimeError(resp_dict['message'])
-        agent_pub = int(resp_dict['message'])
+        # Some old versions of the windows agent have a trailing \\r\\n
+        # (ie CRLF escaped) for some reason. Strip that off
+        agent_pub = int(resp_dict['message'].replace('\\r\\n', ''))
         dh.compute_shared(agent_pub)
         enc_pass = dh.encrypt(new_pass)
         # Send the encrypted password
-- 
cgit 


From 46e016348ff4303310af328fa1af8fab513632c9 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Wed, 15 Jun 2011 23:11:00 +0000
Subject: Add trailing LF (\n) to password for compatibility with old agents

---
 nova/virt/xenapi/vmops.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 5ca041059..24e293a7b 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -526,8 +526,8 @@ class VMOps(object):
                 # No response from the agent
                 return
             resp_dict = json.loads(resp)
-            # Some old versions of the windows agent have a trailing \\r\\n
-            # (ie CRLF escaped) for some reason. Strip that off
+            # Some old versions of the Windows agent have a trailing \\r\\n
+            # (ie CRLF escaped) for some reason. Strip that off.
             return resp_dict['message'].replace('\\r\\n', '')
 
         if timeout:
@@ -594,11 +594,13 @@ class VMOps(object):
             # There was some sort of error; the message will contain
             # a description of the error.
             raise RuntimeError(resp_dict['message'])
-        # Some old versions of the windows agent have a trailing \\r\\n
-        # (ie CRLF escaped) for some reason. Strip that off
+        # Some old versions of the Windows agent have a trailing \\r\\n
+        # (ie CRLF escaped) for some reason. Strip that off.
         agent_pub = int(resp_dict['message'].replace('\\r\\n', ''))
         dh.compute_shared(agent_pub)
-        enc_pass = dh.encrypt(new_pass)
+        # Some old versions of Linux and Windows agent expect trailing \n
+        # on password to work correctly.
+        enc_pass = dh.encrypt(new_pass + '\n')
         # Send the encrypted password
         password_transaction_id = str(uuid.uuid4())
         password_args = {'id': password_transaction_id, 'enc_pass': enc_pass}
-- 
cgit 


From faed18358f534ed7a743fcd168d649d06da092ab Mon Sep 17 00:00:00 2001
From: Arvind Somy <asomya@cisco.com>
Date: Fri, 17 Jun 2011 14:02:24 -0400
Subject: Fix for Bug lp:796813

- Adding support for distributed virtual portgroups on vmware ESX(i)
---
 nova/virt/vmwareapi/network_utils.py | 29 ++++++++++++++++++++++++-----
 nova/virt/vmwareapi/vm_util.py       | 23 ++++++++++++++++++-----
 nova/virt/vmwareapi/vmops.py         |  7 ++++---
 3 files changed, 46 insertions(+), 13 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/vmwareapi/network_utils.py b/nova/virt/vmwareapi/network_utils.py
index e77842535..345cd2bd0 100644
--- a/nova/virt/vmwareapi/network_utils.py
+++ b/nova/virt/vmwareapi/network_utils.py
@@ -45,11 +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: 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 a2fa7600c..d23472469 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
@@ -89,7 +89,7 @@ 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.
@@ -101,9 +101,22 @@ 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: 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 = \
+         client_factory.create('ns0:VirtualEthernetCardDistributedVirtualPortBackingInfo')
+        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')
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index 5f76b0df5..d23edbdf8 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -116,8 +116,9 @@ class VMWareVMOps(object):
                                                         net_name)
             if network_ref is None:
                 raise exception.NetworkNotFoundForBridge(bridge=net_name)
-
-        _check_if_network_bridge_exists()
+            return network_ref
+    
+        network_obj = _check_if_network_bridge_exists()
 
         def _get_datastore_ref():
             """Get the datastore list and choose the first local storage."""
@@ -176,7 +177,7 @@ class VMWareVMOps(object):
 
         # Get the create vm config spec
         config_spec = vm_util.get_vm_create_spec(client_factory, instance,
-                                data_store_name, net_name, os_type)
+                                data_store_name, net_name, os_type, network_obj)
 
         def _execute_create_vm():
             """Create VM on ESX host."""
-- 
cgit 


From c3af5e65508fb325a4a8e350c9ed6d84d87e7cd8 Mon Sep 17 00:00:00 2001
From: Arvind Somy <asomya@cisco.com>
Date: Fri, 17 Jun 2011 15:12:01 -0400
Subject: Fix for lp:796834

- Fixes and enhancements to the ESX(i) guest_tool.py script.
---
 nova/virt/vmwareapi/vm_util.py | 4 ++--
 nova/virt/vmwareapi/vmops.py   | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
index d23472469..c823ac710 100644
--- a/nova/virt/vmwareapi/vm_util.py
+++ b/nova/virt/vmwareapi/vm_util.py
@@ -287,9 +287,9 @@ 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 d23edbdf8..9f2a36bf4 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -715,11 +715,14 @@ class VMWareVMOps(object):
         mac_addr = instance.mac_address
         net_mask = network["netmask"]
         gateway = network["gateway"]
+        broadcast = network["broadcast"]
+        dns = network["dns"]
         ip_addr = db.instance_get_fixed_address(context.get_admin_context(),
                                             instance['id'])
         machine_id_chanfge_spec = \
             vm_util.get_machine_id_change_spec(client_factory, mac_addr,
-                                        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,
-- 
cgit 


From 03db1b862f38fa864316530c0a0b22ef74f25c81 Mon Sep 17 00:00:00 2001
From: "Arvind Somya asomya@cisco.com" <>
Date: Fri, 24 Jun 2011 12:15:13 -0400
Subject: Fixing PEP8 compliance issues.

---
 nova/virt/vmwareapi/network_utils.py | 11 ++++++-----
 nova/virt/vmwareapi/vm_util.py       |  5 +++--
 nova/virt/vmwareapi/vmops.py         |  8 +++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/vmwareapi/network_utils.py b/nova/virt/vmwareapi/network_utils.py
index 345cd2bd0..08e3bf0b1 100644
--- a/nova/virt/vmwareapi/network_utils.py
+++ b/nova/virt/vmwareapi/network_utils.py
@@ -50,9 +50,9 @@ def get_network_with_the_name(session, network_name="vmnet0"):
         # Get network properties
         if network._type == 'DistributedVirtualPortgroup':
             props = session._call_method(vim_util,
-                        "get_dynamic_property",network,
-                        "DistributedVirtualPortgroup","config")
-            # NOTE: This only works on ESXi if the port binding is 
+                        "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'
@@ -60,8 +60,8 @@ def get_network_with_the_name(session, network_name="vmnet0"):
                 network_obj['dvsw'] = props.distributedVirtualSwitch.value
         else:
             props = session._call_method(vim_util,
-                        "get_dynamic_property",network,
-                        "Network","summary.name")
+                        "get_dynamic_property", network,
+                        "Network", "summary.name")
             if props == network_name:
                 network_obj['type'] = 'Network'
                 network_obj['name'] = network_name
@@ -70,6 +70,7 @@ def get_network_with_the_name(session, network_name="vmnet0"):
     else:
         return None
 
+
 def get_vswitch_for_vlan_interface(session, vlan_interface):
     """
     Gets the vswitch associated with the physical network adapter
diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
index c823ac710..411305081 100644
--- a/nova/virt/vmwareapi/vm_util.py
+++ b/nova/virt/vmwareapi/vm_util.py
@@ -89,7 +89,8 @@ def create_controller_spec(client_factory, key):
     return virtual_device_config
 
 
-def create_network_spec(client_factory, network_name, mac_address,network_ref=None):
+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.
@@ -101,7 +102,7 @@ def create_network_spec(client_factory, network_name, mac_address,network_ref=No
     # Get the recommended card type for the VM based on the guest OS of the VM
     net_device = client_factory.create('ns0:VirtualPCNet32')
 
-    # NOTE: Only works on ESXi if the portgroup binding is set to 
+    # NOTE: 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
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index 9f2a36bf4..6f8b823c5 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -117,7 +117,7 @@ class VMWareVMOps(object):
             if network_ref is None:
                 raise exception.NetworkNotFoundForBridge(bridge=net_name)
             return network_ref
-    
+
         network_obj = _check_if_network_bridge_exists()
 
         def _get_datastore_ref():
@@ -176,8 +176,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, network_obj)
+        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."""
-- 
cgit 


From 43713a2e45862219c538ede60363053d36bb0f1b Mon Sep 17 00:00:00 2001
From: Arvind Somy <asomya@cisco.com>
Date: Mon, 27 Jun 2011 14:41:07 -0400
Subject: - Modified NOTE in vm_util.py - Changed gettext line to nova default
 in guest_tool.py

---
 nova/virt/vmwareapi/vm_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
index 411305081..b93c1f81b 100644
--- a/nova/virt/vmwareapi/vm_util.py
+++ b/nova/virt/vmwareapi/vm_util.py
@@ -102,7 +102,7 @@ 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')
 
-    # NOTE: Only works on ESXi if the portgroup binding is set to
+    # 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
-- 
cgit 


From b8b96769bfc49e75d2eee3ae561e4e9ee7615473 Mon Sep 17 00:00:00 2001
From: Yoshiaki Tamura <yoshi@midokura.jp>
Date: Mon, 4 Jul 2011 13:53:17 +0900
Subject: Fix boot from volume failure for network block devices.

This patch looks up the device_path and swithes between 'block' and
'network' when creating libvirt.xml.
---
 nova/virt/libvirt.xml.template  |  6 +++++-
 nova/virt/libvirt/connection.py | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index e1a683da8..36d8c5aaa 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.device_path}'/>
+                #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 0c6eaab84..3168bb9df 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -971,6 +971,7 @@ class LibvirtConnection(driver.ComputeDriver):
                 return True
         return False
 
+    @exception.wrap_exception
     def _prepare_xml_info(self, instance, rescue=False, network_info=None,
                           block_device_mapping=None):
         block_device_mapping = block_device_mapping or []
@@ -993,6 +994,16 @@ class LibvirtConnection(driver.ComputeDriver):
 
         for vol in block_device_mapping:
             vol['mount_device'] = _strip_dev(vol['mount_device'])
+            if vol['device_path'].startswith('/dev/'):
+                vol['type'] = 'block'
+            elif ':' in vol['device_path']:
+                (protocol, name) = vol['device_path'].split(':')
+                vol['type'] = 'network'
+                vol['protocol'] = protocol
+                vol['device_path'] = name
+            else:
+                raise exception.InvalidDevicePath(path=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,
-- 
cgit 


From 9b5adcbe92a4f7e0f9b1592be123c58f743def34 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 5 Jul 2011 15:55:16 -0700
Subject: pass in dhcp server address, fix a bunch of bugs

---
 nova/virt/libvirt/connection.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 0c6eaab84..5e8fcdd2f 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -928,7 +928,6 @@ class LibvirtConnection(driver.ComputeDriver):
 
     def _get_nic_for_xml(self, network, mapping):
         # Assume that the gateway also acts as the dhcp server.
-        dhcp_server = mapping['gateway']
         gateway6 = mapping.get('gateway6')
         mac_id = mapping['mac'].replace(':', '')
 
@@ -951,7 +950,7 @@ class LibvirtConnection(driver.ComputeDriver):
             'bridge_name': network['bridge'],
             'mac_address': mapping['mac'],
             'ip_address': mapping['ips'][0]['ip'],
-            'dhcp_server': dhcp_server,
+            'dhcp_server': mapping['dhcp_server'],
             'extra_params': extra_params,
         }
 
-- 
cgit 


From a05b0325a76dea16a2d5f7d1931a5cbc922e0364 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 7 Jul 2011 02:13:18 +0900
Subject: Added VIF driver concept

---
 nova/virt/libvirt.xml.template   | 18 ++++++++++
 nova/virt/libvirt/connection.py  | 48 +++++--------------------
 nova/virt/libvirt/vif_drivers.py | 76 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 39 deletions(-)
 create mode 100644 nova/virt/libvirt/vif_drivers.py

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index e1a683da8..ea27e5fd7 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -92,6 +92,22 @@
 #end if
 
 #for $nic in $nics
+    #if $vif_type='ethernet'
+        <interface type='ethernet'>
+            <target dev='${nic.name}' />
+            <mac address='${nic.mac_address}' />
+            <script path='${nic.script}' />
+        </interface>
+    #else if $vif_type='802.1Qbh'
+        <interface type='direct'>
+             <mac address=${nic.mac_address}/>
+             <source dev=${nic.device_name} mode='private'/>
+             <virtualport type='802.1Qbh'>
+                 <parameters profileid=${nic.profile_name}/>
+             </virtualport>
+             <model type='virtio'/>
+        </interface>
+    #else
         <interface type='bridge'>
             <source bridge='${nic.bridge_name}'/>
             <mac address='${nic.mac_address}'/>
@@ -107,6 +123,8 @@
 #end if
             </filterref>
         </interface>
+    #end if
+
 #end for
         <!-- The order is significant here.  File must be defined first -->
         <serial type="file">
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 0c6eaab84..224ad89a6 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1,4 +1,4 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
+o# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
@@ -96,9 +96,6 @@ flags.DEFINE_string('libvirt_uri',
                     '',
                     'Override the default libvirt URI (which is dependent'
                     ' on libvirt_type)')
-flags.DEFINE_bool('allow_project_net_traffic',
-                  True,
-                  'Whether to allow in project network traffic')
 flags.DEFINE_bool('use_cow_images',
                   True,
                   'Whether to use cow images')
@@ -123,6 +120,11 @@ flags.DEFINE_string('qemu_img', 'qemu-img',
                     'binary to use for qemu-img commands')
 flags.DEFINE_bool('start_guests_on_host_boot', False,
                   'Whether to restart guests when the host reboots')
+flags.DEFINE_string('libvirt_vif_type', 'bridge',
+                    'Type of VIF to create.')
+flags.DEFINE_string('libvirt_vif_driver',
+                    'nova.virt.libvirt.vif_drivers.BridgeDriver',
+                    'The VIF driver to configure the VIFs.')
 
 
 def get_connection(read_only):
@@ -165,6 +167,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
         fw_class = utils.import_class(FLAGS.firewall_driver)
         self.firewall_driver = fw_class(get_connection=self._get_connection)
+        self.vif_driver = utils.import_object(FLAGS.libvirt_vif_driver)
 
     def init_host(self, host):
         # Adopt existing VM's running here
@@ -926,40 +929,6 @@ class LibvirtConnection(driver.ComputeDriver):
         if FLAGS.libvirt_type == 'uml':
             utils.execute('sudo', 'chown', 'root', basepath('disk'))
 
-    def _get_nic_for_xml(self, network, mapping):
-        # Assume that the gateway also acts as the dhcp server.
-        dhcp_server = mapping['gateway']
-        gateway6 = mapping.get('gateway6')
-        mac_id = mapping['mac'].replace(':', '')
-
-        if FLAGS.allow_project_net_traffic:
-            template = "<parameter name=\"%s\"value=\"%s\" />\n"
-            net, mask = netutils.get_net_and_mask(network['cidr'])
-            values = [("PROJNET", net), ("PROJMASK", mask)]
-            if FLAGS.use_ipv6:
-                net_v6, prefixlen_v6 = netutils.get_net_and_prefixlen(
-                                           network['cidr_v6'])
-                values.extend([("PROJNETV6", net_v6),
-                               ("PROJMASKV6", prefixlen_v6)])
-
-            extra_params = "".join([template % value for value in values])
-        else:
-            extra_params = "\n"
-
-        result = {
-            'id': mac_id,
-            'bridge_name': network['bridge'],
-            'mac_address': mapping['mac'],
-            'ip_address': mapping['ips'][0]['ip'],
-            'dhcp_server': dhcp_server,
-            'extra_params': extra_params,
-        }
-
-        if gateway6:
-            result['gateway6'] = gateway6 + "/128"
-
-        return result
-
     root_mount_device = 'vda'  # FIXME for now. it's hard coded.
     local_mount_device = 'vdb'  # FIXME for now. it's hard coded.
 
@@ -981,7 +950,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
         nics = []
         for (network, mapping) in network_info:
-            nics.append(self._get_nic_for_xml(network, mapping))
+            nics.append(self.vif_driver(instance, network, mapping))
         # FIXME(vish): stick this in db
         inst_type_id = instance['instance_type_id']
         inst_type = instance_types.get_instance_type(inst_type_id)
@@ -1010,6 +979,7 @@ class LibvirtConnection(driver.ComputeDriver):
                     'rescue': rescue,
                     'local': local_gb,
                     'driver_type': driver_type,
+                    'vif_type': FLAGS.libvirt_vif_type,
                     'nics': nics,
                     'ebs_root': ebs_root,
                     'volumes': block_device_mapping}
diff --git a/nova/virt/libvirt/vif_drivers.py b/nova/virt/libvirt/vif_drivers.py
new file mode 100644
index 000000000..9ef218a21
--- /dev/null
+++ b/nova/virt/libvirt/vif_drivers.py
@@ -0,0 +1,76 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2011 Midokura KK
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+# Copyright (c) 2010 Citrix Systems, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""Drivers responsible for VIF creation in libvirt."""
+
+from nova import flags
+from nova.virt.libvirt import netutils
+
+FLAGS = flags.FLAGS
+flags.DEFINE_bool('allow_project_net_traffic',
+                  True,
+                  'Whether to allow in project network traffic')
+
+
+class VIFDriver(object):
+    """Base class that defines generic interfaces for VIF drivers."""
+
+    def get_configuration(self, instance, network, mapping):
+        """Get a dictionary of VIF configuration for libvirt interfaces."""
+        raise NotImplementedError()
+
+
+class BridgeDriver(VIFDriver):
+    """Class that generates VIF configuration of bridge interface type."""
+
+    def get_configuration(self, instance, network, mapping):
+        """Get a dictionary of VIF configurations for bridge type."""
+        # Assume that the gateway also acts as the dhcp server.
+        dhcp_server = mapping['gateway']
+        gateway6 = mapping.get('gateway6')
+        mac_id = mapping['mac'].replace(':', '')
+
+        if FLAGS.allow_project_net_traffic:
+            template = "<parameter name=\"%s\"value=\"%s\" />\n"
+            net, mask = netutils.get_net_and_mask(network['cidr'])
+            values = [("PROJNET", net), ("PROJMASK", mask)]
+            if FLAGS.use_ipv6:
+                net_v6, prefixlen_v6 = netutils.get_net_and_prefixlen(
+                                           network['cidr_v6'])
+                values.extend([("PROJNETV6", net_v6),
+                               ("PROJMASKV6", prefixlen_v6)])
+
+            extra_params = "".join([template % value for value in values])
+        else:
+            extra_params = "\n"
+
+        result = {
+            'id': mac_id,
+            'bridge_name': network['bridge'],
+            'mac_address': mapping['mac'],
+            'ip_address': mapping['ips'][0]['ip'],
+            'dhcp_server': dhcp_server,
+            'extra_params': extra_params,
+        }
+
+        if gateway6:
+            result['gateway6'] = gateway6 + "/128"
+
+        return result
+        
-- 
cgit 


From e71cf10dcf88f4a2f695285b25af75d8a0df2b3e Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 7 Jul 2011 03:16:28 +0900
Subject: Removed a typo error in libvirt connection.py

---
 nova/virt/libvirt/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 224ad89a6..606bc18bc 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1,4 +1,4 @@
-o# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
-- 
cgit 


From 1da51f7b07f0080c44063a355c84fafd1fdf02bc Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Mon, 11 Jul 2011 04:38:27 +0900
Subject: Moved 'setup_compute_network' logic into the virt layer

---
 nova/virt/libvirt/connection.py  | 13 ++++--
 nova/virt/libvirt/vif.py         | 99 ++++++++++++++++++++++++++++++++++++++++
 nova/virt/libvirt/vif_drivers.py | 76 ------------------------------
 nova/virt/vif.py                 | 29 ++++++++++++
 4 files changed, 138 insertions(+), 79 deletions(-)
 create mode 100644 nova/virt/libvirt/vif.py
 delete mode 100644 nova/virt/libvirt/vif_drivers.py
 create mode 100644 nova/virt/vif.py

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 606bc18bc..15ad85176 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -123,8 +123,8 @@ flags.DEFINE_bool('start_guests_on_host_boot', False,
 flags.DEFINE_string('libvirt_vif_type', 'bridge',
                     'Type of VIF to create.')
 flags.DEFINE_string('libvirt_vif_driver',
-                    'nova.virt.libvirt.vif_drivers.BridgeDriver',
-                    'The VIF driver to configure the VIFs.')
+                    'nova.virt.libvirt.vif.LibvirtVlanBridgeDriver',
+                    'The libvirt VIF driver to configure the VIFs.')
 
 
 def get_connection(read_only):
@@ -259,6 +259,12 @@ class LibvirtConnection(driver.ComputeDriver):
             infos.append(info)
         return infos
 
+    def setup_vif_network(self, ctxt, instance_id):
+        """Set up VIF networking on the host."""
+        networks = db.network_get_all_by_instance(ctxt, instance_id)
+        for network in networks:
+            self.vif_driver.plug(network)
+
     def destroy(self, instance, cleanup=True):
         instance_name = instance['name']
 
@@ -950,7 +956,8 @@ class LibvirtConnection(driver.ComputeDriver):
 
         nics = []
         for (network, mapping) in network_info:
-            nics.append(self.vif_driver(instance, network, mapping))
+            nics.append(self.vif_driver.get_configurations(instance, network,
+                                                           mapping))
         # FIXME(vish): stick this in db
         inst_type_id = instance['instance_type_id']
         inst_type = instance_types.get_instance_type(inst_type_id)
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
new file mode 100644
index 000000000..50c2d444c
--- /dev/null
+++ b/nova/virt/libvirt/vif.py
@@ -0,0 +1,99 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2011 Midokura KK
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""VIF drivers for libvirt."""
+
+from nova import flags
+from nova.network import linux_net
+from nova.virt.libvirt import netutils
+from nova.virt.vif import VIFDriver
+
+FLAGS = flags.FLAGS
+flags.DEFINE_bool('allow_project_net_traffic',
+                  True,
+                  'Whether to allow in project network traffic')
+
+
+class LibvirtVIF(object):
+    """VIF class for libvirt"""
+
+    def get_configurations(self, instance, network, mapping):
+        """Get a dictionary of VIF configuration for libvirt interfaces."""
+        raise NotImplementedError()
+
+
+class LibvirtBridge(LibvirtVIF):
+    """Linux bridge VIF for Libvirt."""
+
+    def get_configurations(self, instance, network, mapping):
+        """Get a dictionary of VIF configurations for bridge type."""
+        # Assume that the gateway also acts as the dhcp server.
+        dhcp_server = mapping['gateway']
+        gateway6 = mapping.get('gateway6')
+        mac_id = mapping['mac'].replace(':', '')
+
+        if FLAGS.allow_project_net_traffic:
+            template = "<parameter name=\"%s\"value=\"%s\" />\n"
+            net, mask = netutils.get_net_and_mask(network['cidr'])
+            values = [("PROJNET", net), ("PROJMASK", mask)]
+            if FLAGS.use_ipv6:
+                net_v6, prefixlen_v6 = netutils.get_net_and_prefixlen(
+                                           network['cidr_v6'])
+                values.extend([("PROJNETV6", net_v6),
+                               ("PROJMASKV6", prefixlen_v6)])
+
+            extra_params = "".join([template % value for value in values])
+        else:
+            extra_params = "\n"
+
+        result = {
+            'id': mac_id,
+            'bridge_name': network['bridge'],
+            'mac_address': mapping['mac'],
+            'ip_address': mapping['ips'][0]['ip'],
+            'dhcp_server': dhcp_server,
+            'extra_params': extra_params,
+        }
+
+        if gateway6:
+            result['gateway6'] = gateway6 + "/128"
+
+        return result
+
+    
+class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
+    """VIF driver for Linux bridge."""
+
+    def plug(self, network):
+        """Ensure that the bridge exists, and add VIF to it."""
+        linux_net.ensure_bridge(network['bridge'],
+                                network['bridge_interface'])
+
+    def unplug(self, network):
+        pass
+
+
+class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
+    """VIF driver for Linux bridge with VLAN."""
+
+    def plug(self, network):
+        """Ensure that VLAN and bridge exist and add VIF to the bridge."""
+        linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
+                                     network['bridge_interface'])
+
+    def unplug(self, network):
+        pass
diff --git a/nova/virt/libvirt/vif_drivers.py b/nova/virt/libvirt/vif_drivers.py
deleted file mode 100644
index 9ef218a21..000000000
--- a/nova/virt/libvirt/vif_drivers.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (C) 2011 Midokura KK
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-# Copyright (c) 2010 Citrix Systems, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-"""Drivers responsible for VIF creation in libvirt."""
-
-from nova import flags
-from nova.virt.libvirt import netutils
-
-FLAGS = flags.FLAGS
-flags.DEFINE_bool('allow_project_net_traffic',
-                  True,
-                  'Whether to allow in project network traffic')
-
-
-class VIFDriver(object):
-    """Base class that defines generic interfaces for VIF drivers."""
-
-    def get_configuration(self, instance, network, mapping):
-        """Get a dictionary of VIF configuration for libvirt interfaces."""
-        raise NotImplementedError()
-
-
-class BridgeDriver(VIFDriver):
-    """Class that generates VIF configuration of bridge interface type."""
-
-    def get_configuration(self, instance, network, mapping):
-        """Get a dictionary of VIF configurations for bridge type."""
-        # Assume that the gateway also acts as the dhcp server.
-        dhcp_server = mapping['gateway']
-        gateway6 = mapping.get('gateway6')
-        mac_id = mapping['mac'].replace(':', '')
-
-        if FLAGS.allow_project_net_traffic:
-            template = "<parameter name=\"%s\"value=\"%s\" />\n"
-            net, mask = netutils.get_net_and_mask(network['cidr'])
-            values = [("PROJNET", net), ("PROJMASK", mask)]
-            if FLAGS.use_ipv6:
-                net_v6, prefixlen_v6 = netutils.get_net_and_prefixlen(
-                                           network['cidr_v6'])
-                values.extend([("PROJNETV6", net_v6),
-                               ("PROJMASKV6", prefixlen_v6)])
-
-            extra_params = "".join([template % value for value in values])
-        else:
-            extra_params = "\n"
-
-        result = {
-            'id': mac_id,
-            'bridge_name': network['bridge'],
-            'mac_address': mapping['mac'],
-            'ip_address': mapping['ips'][0]['ip'],
-            'dhcp_server': dhcp_server,
-            'extra_params': extra_params,
-        }
-
-        if gateway6:
-            result['gateway6'] = gateway6 + "/128"
-
-        return result
-        
diff --git a/nova/virt/vif.py b/nova/virt/vif.py
new file mode 100644
index 000000000..1ff41ed7e
--- /dev/null
+++ b/nova/virt/vif.py
@@ -0,0 +1,29 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (C) 2011 Midokura KK
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""VIF module common to all virt layers."""
+
+class VIFDriver(object):
+    """Abstract class that defines generic interfaces for all VIF drivers."""
+
+    def plug(self, network):
+        """Plug VIF into network."""
+        raise NotImplementedError()
+
+    def unplug(self, network):
+        """Unplug VIF from network."""
+        raise NotImplementedError()
-- 
cgit 


From 7e4a23c489946eb5e6a1568d197cab34367d8078 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Tue, 19 Jul 2011 00:26:58 -0700
Subject: merge of ovs L2 branch

---
 nova/virt/libvirt.xml.template  |  4 ++--
 nova/virt/libvirt/connection.py | 23 ++++++++++++++++++-----
 nova/virt/libvirt/vif.py        | 41 ++++++++++++++++++++++++++++++++++++++---
 nova/virt/xenapi_conn.py        |  2 +-
 4 files changed, 59 insertions(+), 11 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index ea27e5fd7..efcb96d15 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -92,13 +92,13 @@
 #end if
 
 #for $nic in $nics
-    #if $vif_type='ethernet'
+    #if $vif_type=='ethernet'
         <interface type='ethernet'>
             <target dev='${nic.name}' />
             <mac address='${nic.mac_address}' />
             <script path='${nic.script}' />
         </interface>
-    #else if $vif_type='802.1Qbh'
+    #else if $vif_type=='802.1Qbh'
         <interface type='direct'>
              <mac address=${nic.mac_address}/>
              <source dev=${nic.device_name} mode='private'/>
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 15ad85176..36a6d62fe 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -261,11 +261,13 @@ class LibvirtConnection(driver.ComputeDriver):
 
     def setup_vif_network(self, ctxt, instance_id):
         """Set up VIF networking on the host."""
-        networks = db.network_get_all_by_instance(ctxt, instance_id)
-        for network in networks:
-            self.vif_driver.plug(network)
+        # FIXME: this is dying because DB has no networks for instances
+        #networks = db.network_get_all_by_instance(ctxt, instance_id)
+        #for network in networks:
+        #    self.vif_driver.plug(network)
+        pass
 
-    def destroy(self, instance, cleanup=True):
+    def destroy(self, instance, network_info, cleanup=True):
         instance_name = instance['name']
 
         try:
@@ -309,6 +311,14 @@ class LibvirtConnection(driver.ComputeDriver):
                             locals())
                 raise
 
+            try:
+                for (network, mapping) in network_info:
+                            self.vif_driver.unplug(instance, network, mapping)
+            except:
+                LOG.warning("Failed while unplugging vif of instance '%s'" % \
+                    instance['name'])
+                raise
+
         def _wait_for_destroy():
             """Called at an interval until the VM is gone."""
             instance_name = instance['name']
@@ -890,9 +900,12 @@ class LibvirtConnection(driver.ComputeDriver):
             address = mapping['ips'][0]['ip']
             netmask = mapping['ips'][0]['netmask']
             address_v6 = None
+            gateway_v6 = None
+            netmask_v6 = None
             if FLAGS.use_ipv6:
                 address_v6 = mapping['ip6s'][0]['ip']
                 netmask_v6 = mapping['ip6s'][0]['netmask']
+                gateway_v6 = mapping['gateway6']
             net_info = {'name': 'eth%d' % ifc_num,
                    'address': address,
                    'netmask': netmask,
@@ -900,7 +913,7 @@ class LibvirtConnection(driver.ComputeDriver):
                    'broadcast': mapping['broadcast'],
                    'dns': mapping['dns'],
                    'address_v6': address_v6,
-                   'gateway6': mapping['gateway6'],
+                   'gateway6': gateway_v6,
                    'netmask_v6': netmask_v6}
             nets.append(net_info)
 
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 50c2d444c..8ce1f1f7e 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -1,6 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
 # Copyright (C) 2011 Midokura KK
+# Copyright (C) 2011 Nicira, Inc
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -20,6 +21,7 @@
 from nova import flags
 from nova.network import linux_net
 from nova.virt.libvirt import netutils
+from nova import utils
 from nova.virt.vif import VIFDriver
 
 FLAGS = flags.FLAGS
@@ -74,7 +76,7 @@ class LibvirtBridge(LibvirtVIF):
 
         return result
 
-    
+
 class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
     """VIF driver for Linux bridge."""
 
@@ -83,7 +85,7 @@ class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
         linux_net.ensure_bridge(network['bridge'],
                                 network['bridge_interface'])
 
-    def unplug(self, network):
+    def unplug(self, instance, network, mapping):
         pass
 
 
@@ -95,5 +97,38 @@ class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
         linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
                                      network['bridge_interface'])
 
-    def unplug(self, network):
+    def unplug(self, instance, network, mapping):
         pass
+
+class LibvirtOpenVswitchDriver(VIFDriver):
+    """VIF driver for Open vSwitch."""
+
+    def get_configurations(self, instance, network, mapping):
+        vif_id = str(instance['id']) + "-" + str(network['id'])
+        dev = "tap-%s" % vif_id
+        utils.execute('sudo','ip','tuntap','add', dev, 'mode','tap')
+        utils.execute('sudo','ip','link','set', dev, 'up')
+        utils.execute('sudo', 'ovs-vsctl','--', '--may-exist', 'add-port',
+           FLAGS.flat_network_bridge, dev,
+           '--', 'set', 'Interface', dev, "external-ids:iface-id=%s" % vif_id,
+           '--', 'set', 'Interface', dev, "external-ids:iface-status=active",
+           '--', 'set', 'Interface', dev, "external-ids:attached-mac=%s" % \
+                mapping['mac'])
+
+        result = {
+            'script': '',
+            'name': dev,
+            'mac_address' : mapping['mac']
+        }
+        print "using result = %s" % str(result)
+        return result
+
+
+    def plug(self, network):
+        pass
+
+    def unplug(self, instance, network, mapping):
+        vif_id = str(instance['id']) + "-" + str(network['id'])
+        dev = "tap-%s" % vif_id
+        utils.execute('sudo', 'ovs-vsctl','del-port', FLAGS.flat_network_bridge, dev)
+        utils.execute('sudo','ip','link','delete', dev)
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index cd4dc1b60..09914bc1c 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -224,7 +224,7 @@ class XenAPIConnection(driver.ComputeDriver):
         """
         self._vmops.inject_file(instance, b64_path, b64_contents)
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """Destroy VM instance"""
         self._vmops.destroy(instance)
 
-- 
cgit 


From 9fe72ac7b0ed0f8e294b97e267393f352c4af97f Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Tue, 19 Jul 2011 00:40:05 -0700
Subject: cleanup

---
 nova/virt/libvirt/connection.py |  2 +-
 nova/virt/libvirt/vif.py        | 16 ++++++++--------
 nova/virt/vif.py                |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 36a6d62fe..d7f7d8980 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -313,7 +313,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
             try:
                 for (network, mapping) in network_info:
-                            self.vif_driver.unplug(instance, network, mapping)
+                    self.vif_driver.unplug(instance, network, mapping)
             except:
                 LOG.warning("Failed while unplugging vif of instance '%s'" % \
                     instance['name'])
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 8ce1f1f7e..4f7bb0b4d 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -100,15 +100,16 @@ class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
     def unplug(self, instance, network, mapping):
         pass
 
+
 class LibvirtOpenVswitchDriver(VIFDriver):
     """VIF driver for Open vSwitch."""
 
     def get_configurations(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        utils.execute('sudo','ip','tuntap','add', dev, 'mode','tap')
-        utils.execute('sudo','ip','link','set', dev, 'up')
-        utils.execute('sudo', 'ovs-vsctl','--', '--may-exist', 'add-port',
+        utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
+        utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
+        utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
            FLAGS.flat_network_bridge, dev,
            '--', 'set', 'Interface', dev, "external-ids:iface-id=%s" % vif_id,
            '--', 'set', 'Interface', dev, "external-ids:iface-status=active",
@@ -118,17 +119,16 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         result = {
             'script': '',
             'name': dev,
-            'mac_address' : mapping['mac']
-        }
+            'mac_address': mapping['mac']}
         print "using result = %s" % str(result)
         return result
 
-
     def plug(self, network):
         pass
 
     def unplug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        utils.execute('sudo', 'ovs-vsctl','del-port', FLAGS.flat_network_bridge, dev)
-        utils.execute('sudo','ip','link','delete', dev)
+        utils.execute('sudo', 'ovs-vsctl', 'del-port',
+                FLAGS.flat_network_bridge, dev)
+        utils.execute('sudo', 'ip', 'link', 'delete', dev)
diff --git a/nova/virt/vif.py b/nova/virt/vif.py
index 1ff41ed7e..bab1bdac9 100644
--- a/nova/virt/vif.py
+++ b/nova/virt/vif.py
@@ -17,6 +17,7 @@
 
 """VIF module common to all virt layers."""
 
+
 class VIFDriver(object):
     """Abstract class that defines generic interfaces for all VIF drivers."""
 
-- 
cgit 


From 09c14af77b5fbb721316ca18abe4b93bd8bf6fdf Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 00:58:19 +0900
Subject: Fixed equality comparison bug in libvirt XML

---
 nova/virt/libvirt.xml.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index ea27e5fd7..619d69523 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -92,13 +92,13 @@
 #end if
 
 #for $nic in $nics
-    #if $vif_type='ethernet'
+    #if $vif_type == 'ethernet'
         <interface type='ethernet'>
             <target dev='${nic.name}' />
             <mac address='${nic.mac_address}' />
             <script path='${nic.script}' />
         </interface>
-    #else if $vif_type='802.1Qbh'
+    #else if $vif_type == '802.1Qbh'
         <interface type='direct'>
              <mac address=${nic.mac_address}/>
              <source dev=${nic.device_name} mode='private'/>
-- 
cgit 


From 9febf1eec69708d8c54b6348e882da384d8b42a9 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 19 Jul 2011 12:26:41 -0400
Subject: correct broken logic for lxc and uml to avoid adding vnc arguments
 (LP: #812553)

This fixes the logic, so that lxc and uml will not get vnc arguments added to
their libvirt xml.  To also seems more readable to me.
---
 nova/virt/libvirt/connection.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 977bb7dfe..56aaa6c50 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1014,8 +1014,7 @@ class LibvirtConnection(driver.ComputeDriver):
                     'ebs_root': ebs_root,
                     'volumes': block_device_mapping}
 
-        if FLAGS.vnc_enabled:
-            if FLAGS.libvirt_type != 'lxc' or FLAGS.libvirt_type != 'uml':
+        if FLAGS.vnc_enabled and FLAGS.libvirt_type not in ('lxc', 'uml'):
                 xml_info['vncserver_host'] = FLAGS.vncserver_host
                 xml_info['vnc_keymap'] = FLAGS.vnc_keymap
         if not rescue:
-- 
cgit 


From 36f8bd801bc8a7696e7850613747a5f7ae8c487a Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@canonical.com>
Date: Tue, 19 Jul 2011 10:19:10 -0700
Subject: Fix unchecked key reference to mappings['gateway6']. Fixes LP
 #807764.

---
 nova/virt/libvirt/connection.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 977bb7dfe..572be38d8 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -881,9 +881,12 @@ class LibvirtConnection(driver.ComputeDriver):
             address = mapping['ips'][0]['ip']
             netmask = mapping['ips'][0]['netmask']
             address_v6 = None
+            gateway_v6 = None
+            netmask_v6 = None
             if FLAGS.use_ipv6:
                 address_v6 = mapping['ip6s'][0]['ip']
                 netmask_v6 = mapping['ip6s'][0]['netmask']
+                gateway_v6 = mapping['gateway6']
             net_info = {'name': 'eth%d' % ifc_num,
                    'address': address,
                    'netmask': netmask,
@@ -891,7 +894,7 @@ class LibvirtConnection(driver.ComputeDriver):
                    'broadcast': mapping['broadcast'],
                    'dns': mapping['dns'],
                    'address_v6': address_v6,
-                   'gateway6': mapping['gateway6'],
+                   'gateway6': gateway_v6,
                    'netmask_v6': netmask_v6}
             nets.append(net_info)
 
-- 
cgit 


From 22b54cf790a60ecf255ce6eb8161105d81761fc6 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 04:12:37 +0900
Subject: Removed blank lines

---
 nova/virt/libvirt/vif.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 50c2d444c..5974f0570 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -74,7 +74,7 @@ class LibvirtBridge(LibvirtVIF):
 
         return result
 
-    
+
 class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
     """VIF driver for Linux bridge."""
 
-- 
cgit 


From aa3df15fa304894d9e62e3282956fe406a89b136 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 05:41:09 +0900
Subject: Added detroy_vif_network

---
 nova/virt/libvirt/connection.py | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 2d654ddaf..85fffb14f 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -265,6 +265,12 @@ class LibvirtConnection(driver.ComputeDriver):
         for network in networks:
             self.vif_driver.plug(network)
 
+    def destroy_vif_network(self, ctxt, instance_id):
+        """Clean up VIF networking on the host."""
+        networks = db.network_get_all_by_instance(ctxt, instance_id)
+        for network in networks:
+            self.vif_driver.unplug(network)
+
     def destroy(self, instance, cleanup=True):
         instance_name = instance['name']
 
@@ -323,6 +329,8 @@ class LibvirtConnection(driver.ComputeDriver):
         timer = utils.LoopingCall(_wait_for_destroy)
         timer.start(interval=0.5, now=True)
 
+        ctxt = context.get_admin_context()
+        self.destroy_vif_network(ctxt, instance['id'])
         self.firewall_driver.unfilter_instance(instance)
 
         if cleanup:
-- 
cgit 


From 45bdf5cc27c9389255d32ad189a561b967b8f89e Mon Sep 17 00:00:00 2001
From: "matt.dietz@rackspace.com" <>
Date: Tue, 19 Jul 2011 16:25:16 -0500
Subject: Fixes lp813006 - inconsistent DB API naming

---
 nova/virt/libvirt/netutils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/netutils.py b/nova/virt/libvirt/netutils.py
index e5aaf7cec..8d36c0a05 100644
--- a/nova/virt/libvirt/netutils.py
+++ b/nova/virt/libvirt/netutils.py
@@ -59,7 +59,7 @@ def get_network_info(instance):
     vifs = db.virtual_interface_get_by_instance(admin_context, instance['id'])
     networks = db.network_get_all_by_instance(admin_context,
                                               instance['id'])
-    flavor = db.instance_type_get_by_id(admin_context,
+    flavor = db.instance_type_get(admin_context,
                                         instance['instance_type_id'])
     network_info = []
 
-- 
cgit 


From 6fafda1ffbf2838ef33a4948303f24ed075c292d Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 06:42:49 +0900
Subject: Renamed setup_vif_network to plug_vif

---
 nova/virt/libvirt/connection.py | 11 ++++-------
 nova/virt/libvirt/vif.py        | 16 ++++------------
 nova/virt/vif.py                |  4 ++--
 3 files changed, 10 insertions(+), 21 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 936e1b171..572503311 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -259,13 +259,10 @@ class LibvirtConnection(driver.ComputeDriver):
             infos.append(info)
         return infos
 
-    def setup_vif_network(self, ctxt, instance_id):
-        """Set up VIF networking on the host."""
-        # FIXME: this is dying because DB has no networks for instances
-        #networks = db.network_get_all_by_instance(ctxt, instance_id)
-        #for network in networks:
-        #    self.vif_driver.plug(network)
-        pass
+    def plug_vifs(self, ctxt, instance, network_info):
+        """Plugin VIFs into networks."""
+        for (network, mapping) in network_info:
+            self.vif_driver.plug(instance, network, mapping)
 
     def destroy(self, instance, network_info, cleanup=True):
         instance_name = instance['name']
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 4f7bb0b4d..820055cf0 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -30,15 +30,7 @@ flags.DEFINE_bool('allow_project_net_traffic',
                   'Whether to allow in project network traffic')
 
 
-class LibvirtVIF(object):
-    """VIF class for libvirt"""
-
-    def get_configurations(self, instance, network, mapping):
-        """Get a dictionary of VIF configuration for libvirt interfaces."""
-        raise NotImplementedError()
-
-
-class LibvirtBridge(LibvirtVIF):
+class LibvirtBridge(object):
     """Linux bridge VIF for Libvirt."""
 
     def get_configurations(self, instance, network, mapping):
@@ -80,7 +72,7 @@ class LibvirtBridge(LibvirtVIF):
 class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
     """VIF driver for Linux bridge."""
 
-    def plug(self, network):
+    def plug(self, instance, network, mapping):
         """Ensure that the bridge exists, and add VIF to it."""
         linux_net.ensure_bridge(network['bridge'],
                                 network['bridge_interface'])
@@ -92,7 +84,7 @@ class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
 class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
     """VIF driver for Linux bridge with VLAN."""
 
-    def plug(self, network):
+    def plug(self, instance, network, mapping):
         """Ensure that VLAN and bridge exist and add VIF to the bridge."""
         linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
                                      network['bridge_interface'])
@@ -123,7 +115,7 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         print "using result = %s" % str(result)
         return result
 
-    def plug(self, network):
+    def plug(self, instance, network, mapping):
         pass
 
     def unplug(self, instance, network, mapping):
diff --git a/nova/virt/vif.py b/nova/virt/vif.py
index bab1bdac9..b78689957 100644
--- a/nova/virt/vif.py
+++ b/nova/virt/vif.py
@@ -21,10 +21,10 @@
 class VIFDriver(object):
     """Abstract class that defines generic interfaces for all VIF drivers."""
 
-    def plug(self, network):
+    def plug(self, instance, network, mapping):
         """Plug VIF into network."""
         raise NotImplementedError()
 
-    def unplug(self, network):
+    def unplug(self, instance, network, mapping):
         """Unplug VIF from network."""
         raise NotImplementedError()
-- 
cgit 


From a2b07be9fb30321eb35ba7b76fac5588c8c06300 Mon Sep 17 00:00:00 2001
From: Yoshiaki Tamura <yoshi@midokura.jp>
Date: Wed, 20 Jul 2011 16:18:31 +0900
Subject: Refactor device type checking.

Modify duplicated logics to use newly added _get_volume_device_info().
---
 nova/virt/libvirt.xml.template  |  2 +-
 nova/virt/libvirt/connection.py | 31 ++++++++++++++++---------------
 2 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index 36d8c5aaa..ea62524cf 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -85,7 +85,7 @@
             <disk type='${vol.type}'>
                 <driver type='raw'/>
                 #if $vol.type == 'network'
-                <source protocol='${vol.protocol}' name='${vol.device_path}'/>
+                <source protocol='${vol.protocol}' name='${vol.name}'/>
                 #else
                 <source dev='${vol.device_path}'/>
                 #end if
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 3168bb9df..ae29b50c6 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -335,21 +335,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)
 
@@ -972,6 +971,15 @@ class LibvirtConnection(driver.ComputeDriver):
         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 []
@@ -994,15 +1002,8 @@ class LibvirtConnection(driver.ComputeDriver):
 
         for vol in block_device_mapping:
             vol['mount_device'] = _strip_dev(vol['mount_device'])
-            if vol['device_path'].startswith('/dev/'):
-                vol['type'] = 'block'
-            elif ':' in vol['device_path']:
-                (protocol, name) = vol['device_path'].split(':')
-                vol['type'] = 'network'
-                vol['protocol'] = protocol
-                vol['device_path'] = name
-            else:
-                raise exception.InvalidDevicePath(path=vol['device_path'])
+            (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)
-- 
cgit 


From 979282fba8b9dc20bc6345a3b3c017d6339662fa Mon Sep 17 00:00:00 2001
From: danwent <danwent@dan-xs3-cs>
Date: Wed, 20 Jul 2011 00:41:26 -0700
Subject: first cut of xenserver vif-plugging, some minor tweaks to libvirt
 plugging

---
 nova/virt/libvirt/connection.py |  8 +++-----
 nova/virt/libvirt/vif.py        |  5 +++--
 nova/virt/xenapi/vm_utils.py    | 22 ----------------------
 nova/virt/xenapi/vmops.py       | 34 ++++++++++++++++++++++++----------
 nova/virt/xenapi_conn.py        |  3 +++
 5 files changed, 33 insertions(+), 39 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 936e1b171..1fa6e5c2f 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -261,11 +261,9 @@ class LibvirtConnection(driver.ComputeDriver):
 
     def setup_vif_network(self, ctxt, instance_id):
         """Set up VIF networking on the host."""
-        # FIXME: this is dying because DB has no networks for instances
-        #networks = db.network_get_all_by_instance(ctxt, instance_id)
-        #for network in networks:
-        #    self.vif_driver.plug(network)
-        pass
+        networks = db.network_get_all_by_instance(ctxt, instance_id)
+        for network in networks:
+            self.vif_driver.plug(network)
 
     def destroy(self, instance, network_info, cleanup=True):
         instance_name = instance['name']
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 4f7bb0b4d..2188251f0 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -28,6 +28,8 @@ FLAGS = flags.FLAGS
 flags.DEFINE_bool('allow_project_net_traffic',
                   True,
                   'Whether to allow in project network traffic')
+flags.DEFINE_string('libvirt_ovs_integration_bridge', 'br-int',
+			'Name of Integration Bridge used by Open vSwitch')
 
 
 class LibvirtVIF(object):
@@ -110,7 +112,7 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
         utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
         utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
-           FLAGS.flat_network_bridge, dev,
+           FLAGS.libvirt_ovs_integration_bridge, dev,
            '--', 'set', 'Interface', dev, "external-ids:iface-id=%s" % vif_id,
            '--', 'set', 'Interface', dev, "external-ids:iface-status=active",
            '--', 'set', 'Interface', dev, "external-ids:attached-mac=%s" % \
@@ -120,7 +122,6 @@ class LibvirtOpenVswitchDriver(VIFDriver):
             'script': '',
             'name': dev,
             'mac_address': mapping['mac']}
-        print "using result = %s" % str(result)
         return result
 
     def plug(self, network):
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 71107aff4..e63582b54 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -282,27 +282,6 @@ class VMHelper(HelperBase):
             LOG.exception(exc)
             raise StorageError(_('Unable to destroy VDI %s') % vdi_ref)
 
-    @classmethod
-    def create_vif(cls, session, vm_ref, network_ref, mac_address,
-                   dev, rxtx_cap=0):
-        """Create a VIF record.  Returns a Deferred that gives the new
-        VIF reference."""
-        vif_rec = {}
-        vif_rec['device'] = str(dev)
-        vif_rec['network'] = network_ref
-        vif_rec['VM'] = vm_ref
-        vif_rec['MAC'] = mac_address
-        vif_rec['MTU'] = '1500'
-        vif_rec['other_config'] = {}
-        vif_rec['qos_algorithm_type'] = "ratelimit" if rxtx_cap else ''
-        vif_rec['qos_algorithm_params'] = \
-                {"kbps": str(rxtx_cap * 1024)} if rxtx_cap else {}
-        LOG.debug(_('Creating VIF for VM %(vm_ref)s,'
-                ' network %(network_ref)s.') % locals())
-        vif_ref = session.call_xenapi('VIF.create', vif_rec)
-        LOG.debug(_('Created VIF %(vif_ref)s for VM %(vm_ref)s,'
-                ' network %(network_ref)s.') % locals())
-        return vif_ref
 
     @classmethod
     def create_vdi(cls, session, sr_ref, name_label, virtual_size, read_only):
@@ -1116,7 +1095,6 @@ def _stream_disk(dev, image_type, virtual_size, image_file):
         for chunk in image_file:
             f.write(chunk)
 
-
 def _write_partition(virtual_size, dev):
     dest = '/dev/%s' % dev
     primary_first = MBR_SIZE_SECTORS
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index c332c27b0..26f90fedd 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -52,6 +52,9 @@ FLAGS = flags.FLAGS
 flags.DEFINE_integer('windows_version_timeout', 300,
                      'number of seconds to wait for windows agent to be '
                      'fully operational')
+flags.DEFINE_string('xenapi_vif_driver',
+                    'nova.virt.xenapi.vif.XenAPIBridgeDriver',
+                    'The XenAPI VIF driver using XenServer Network APIs.')
 
 
 def cmp_version(a, b):
@@ -78,6 +81,7 @@ class VMOps(object):
         self._session = session
         self.poll_rescue_last_ran = None
         VMHelper.XenAPI = self.XenAPI
+        self.vif_driver = utils.import_object(FLAGS.xenapi_vif_driver)
 
     def list_instances(self):
         """List VM instances."""
@@ -255,7 +259,7 @@ class VMOps(object):
             VMHelper.preconfigure_instance(self._session, instance,
                                            first_vdi_ref, network_info)
 
-        self.create_vifs(vm_ref, network_info)
+        self.create_vifs(vm_ref, instance, network_info)
         self.inject_network_info(instance, network_info, vm_ref)
         return vm_ref
 
@@ -873,6 +877,11 @@ class VMOps(object):
             self._destroy_kernel_ramdisk(instance, vm_ref)
         self._destroy_vm(instance, vm_ref)
 
+        networks = db.network_get_all_by_instance(ctxt, instance['id'])
+        for network in networks:
+            self.vif_driver.unplug(network)
+
+
     def _wait_with_callback(self, instance_id, task, callback):
         ret = None
         try:
@@ -1068,7 +1077,7 @@ class VMOps(object):
                 # catch KeyError for domid if instance isn't running
                 pass
 
-    def create_vifs(self, vm_ref, network_info):
+    def create_vifs(self, vm_ref, instance, network_info):
         """Creates vifs for an instance."""
 
         logging.debug(_("creating vif(s) for vm: |%s|"), vm_ref)
@@ -1077,14 +1086,19 @@ class VMOps(object):
         self._session.get_xenapi().VM.get_record(vm_ref)
 
         for device, (network, info) in enumerate(network_info):
-            mac_address = info['mac']
-            bridge = network['bridge']
-            rxtx_cap = info.pop('rxtx_cap')
-            network_ref = \
-                NetworkHelper.find_network_with_bridge(self._session,
-                                                       bridge)
-            VMHelper.create_vif(self._session, vm_ref, network_ref,
-                                mac_address, device, rxtx_cap)
+            vif_rec = self.vif_driver.get_vif_rec(self._session,
+                    vm_ref, instance, device, network, info)
+            LOG.debug(_('Creating VIF for VM %(vm_ref)s,' \
+                ' network %(network_ref)s.') % locals())
+            vif_ref = session.call_xenapi('VIF.create', vif_rec)
+            LOG.debug(_('Created VIF %(vif_ref)s for VM %(vm_ref)s,'
+                ' network %(network_ref)s.') % locals())
+
+    def setup_vif_network(self, ctxt, instance_id):
+        """Set up VIF networking on the host."""
+        networks = db.network_get_all_by_instance(ctxt, instance_id)
+        for network in networks:
+            self.vif_driver.plug(network)
 
     def reset_network(self, instance, vm_ref=None):
         """Creates uuid arg to pass to make_agent_call and calls it."""
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 032ab7345..ae39ecab4 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -269,6 +269,9 @@ class XenAPIConnection(driver.ComputeDriver):
         """inject network info for specified instance"""
         self._vmops.inject_network_info(instance, network_info)
 
+    def setup_vif_network(self, ctxt, instance_id):
+        self._vmops.setup_vif_network(ctxt, instance_id)
+
     def get_info(self, instance_id):
         """Return data about VM instance"""
         return self._vmops.get_info(instance_id)
-- 
cgit 


From 798a5e31b304df1c59e226f9426c07cb250dae16 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 20:21:44 +0900
Subject: Added network_info parameter to all the appropriate places in virt
 layers and compute manager

---
 nova/virt/driver.py             | 10 +++++-----
 nova/virt/fake.py               |  8 ++++----
 nova/virt/hyperv.py             |  6 +++---
 nova/virt/libvirt/connection.py | 14 +++++++-------
 nova/virt/vmwareapi_conn.py     |  6 +++---
 nova/virt/xenapi_conn.py        |  6 +++---
 6 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 178279d31..61f26ad96 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -61,11 +61,11 @@ class ComputeDriver(object):
         """Return a list of InstanceInfo for all registered VMs"""
         raise NotImplementedError()
 
-    def spawn(self, instance, network_info=None, block_device_mapping=None):
+    def spawn(self, instance, network_info, block_device_mapping=None):
         """Launch a VM for the specified instance"""
         raise NotImplementedError()
 
-    def destroy(self, instance, cleanup=True):
+    def destroy(self, instance, network_info, cleanup=True):
         """Destroy (shutdown and delete) the specified instance.
 
         The given parameter is an instance of nova.compute.service.Instance,
@@ -81,7 +81,7 @@ class ComputeDriver(object):
         """
         raise NotImplementedError()
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot specified VM"""
         raise NotImplementedError()
 
@@ -146,11 +146,11 @@ class ComputeDriver(object):
         """resume the specified instance"""
         raise NotImplementedError()
 
-    def rescue(self, instance, callback):
+    def rescue(self, instance, callback, network_info):
         """Rescue the specified instance"""
         raise NotImplementedError()
 
-    def unrescue(self, instance, callback):
+    def unrescue(self, instance, callback, network_info):
         """Unrescue the specified instance"""
         raise NotImplementedError()
 
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index ea0a59f21..c5e9d89e4 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -167,7 +167,7 @@ class FakeConnection(driver.ComputeDriver):
         """
         pass
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """
         Reboot the specified instance.
 
@@ -240,13 +240,13 @@ class FakeConnection(driver.ComputeDriver):
         """
         pass
 
-    def rescue(self, instance):
+    def rescue(self, instance, callback, network_info):
         """
         Rescue the specified instance.
         """
         pass
 
-    def unrescue(self, instance):
+    def unrescue(self, instance, callback, network_info):
         """
         Unrescue the specified instance.
         """
@@ -293,7 +293,7 @@ class FakeConnection(driver.ComputeDriver):
         """
         pass
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         key = instance.name
         if key in self.instances:
             del self.instances[key]
diff --git a/nova/virt/hyperv.py b/nova/virt/hyperv.py
index 5c1dc772d..81c7dea58 100644
--- a/nova/virt/hyperv.py
+++ b/nova/virt/hyperv.py
@@ -139,7 +139,7 @@ class HyperVConnection(driver.ComputeDriver):
 
         return instance_infos
 
-    def spawn(self, instance, network_info=None, block_device_mapping=None):
+    def spawn(self, instance, network_info, block_device_mapping=None):
         """ Create a new VM and start it."""
         vm = self._lookup(instance.name)
         if vm is not None:
@@ -368,14 +368,14 @@ class HyperVConnection(driver.ComputeDriver):
                     wmi_obj.Properties_.Item(prop).Value
         return newinst
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot the specified instance."""
         vm = self._lookup(instance.name)
         if vm is None:
             raise exception.InstanceNotFound(instance_id=instance.id)
         self._set_vm_state(instance.name, 'Reboot')
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """Destroy the VM. Also destroy the associated VHD disk files"""
         LOG.debug(_("Got request to destroy vm %s"), instance.name)
         vm = self._lookup(instance.name)
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 572503311..5f347989c 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -477,7 +477,7 @@ class LibvirtConnection(driver.ComputeDriver):
         shutil.rmtree(temp_dir)
 
     @exception.wrap_exception()
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot a virtual machine, given an instance reference.
 
         This method actually destroys and re-creates the domain to ensure the
@@ -492,7 +492,7 @@ class LibvirtConnection(driver.ComputeDriver):
         # NOTE(itoumsn): self.shutdown() and wait instead of self.destroy() is
         # better because we cannot ensure flushing dirty buffers
         # in the guest OS. But, in case of KVM, shutdown() does not work...
-        self.destroy(instance, False)
+        self.destroy(instance, network_info, cleanup=False)
         self.firewall_driver.setup_basic_filtering(instance)
         self.firewall_driver.prepare_instance_filter(instance)
         self._create_new_domain(xml)
@@ -542,7 +542,7 @@ class LibvirtConnection(driver.ComputeDriver):
         dom.create()
 
     @exception.wrap_exception()
-    def rescue(self, instance):
+    def rescue(self, instance, callback, network_info):
         """Loads a VM using rescue images.
 
         A rescue is normally performed when something goes wrong with the
@@ -551,7 +551,7 @@ class LibvirtConnection(driver.ComputeDriver):
         data recovery.
 
         """
-        self.destroy(instance, False)
+        self.destroy(instance, network_info, cleanup=False)
 
         xml = self.to_xml(instance, rescue=True)
         rescue_images = {'image_id': FLAGS.rescue_image_id,
@@ -580,14 +580,14 @@ class LibvirtConnection(driver.ComputeDriver):
         return timer.start(interval=0.5, now=True)
 
     @exception.wrap_exception()
-    def unrescue(self, instance):
+    def unrescue(self, instance, network_info):
         """Reboot the VM which is being rescued back into primary images.
 
         Because reboot destroys and re-creates instances, unresue should
         simply call reboot.
 
         """
-        self.reboot(instance)
+        self.reboot(instance, network_info)
 
     @exception.wrap_exception()
     def poll_rescued_instances(self, timeout):
@@ -596,7 +596,7 @@ class LibvirtConnection(driver.ComputeDriver):
     # NOTE(ilyaalekseyev): Implementation like in multinics
     # for xenapi(tr3buchet)
     @exception.wrap_exception()
-    def spawn(self, instance, network_info=None, block_device_mapping=None):
+    def spawn(self, instance, network_info, block_device_mapping=None):
         xml = self.to_xml(instance, False, network_info=network_info,
                           block_device_mapping=block_device_mapping)
         block_device_mapping = block_device_mapping or []
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index d80e14931..9e15510ab 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -124,7 +124,7 @@ class VMWareESXConnection(driver.ComputeDriver):
         """List VM instances."""
         return self._vmops.list_instances()
 
-    def spawn(self, instance, network_info=None, block_device_mapping=None):
+    def spawn(self, instance, network_info, block_device_mapping=None):
         """Create VM instance."""
         self._vmops.spawn(instance)
 
@@ -132,11 +132,11 @@ class VMWareESXConnection(driver.ComputeDriver):
         """Create snapshot from a running VM instance."""
         self._vmops.snapshot(instance, name)
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot VM instance."""
         self._vmops.reboot(instance)
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """Destroy VM instance."""
         self._vmops.destroy(instance)
 
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 032ab7345..b8e5251a9 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -210,7 +210,7 @@ class XenAPIConnection(driver.ComputeDriver):
         """ Create snapshot from a running VM instance """
         self._vmops.snapshot(instance, image_id)
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot VM instance"""
         self._vmops.reboot(instance)
 
@@ -249,11 +249,11 @@ class XenAPIConnection(driver.ComputeDriver):
         """resume the specified instance"""
         self._vmops.resume(instance, callback)
 
-    def rescue(self, instance, callback):
+    def rescue(self, instance, callback, network_info):
         """Rescue the specified instance"""
         self._vmops.rescue(instance, callback)
 
-    def unrescue(self, instance, callback):
+    def unrescue(self, instance, callback, network_info):
         """Unrescue the specified instance"""
         self._vmops.unrescue(instance, callback)
 
-- 
cgit 


From 7bdd244541fd9cef4031d4050b5200f58a15f757 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 21:00:20 +0900
Subject: Moved ensure_vlan_bridge of vmware to VIF driver

---
 nova/virt/vmwareapi/vif.py | 93 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 nova/virt/vmwareapi/vif.py

(limited to 'nova/virt')

diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
new file mode 100644
index 000000000..902699089
--- /dev/null
+++ b/nova/virt/vmwareapi/vif.py
@@ -0,0 +1,93 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2011 Citrix Systems, Inc.
+# Copyright 2011 OpenStack LLC.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""VIF drivers for VMWare."""
+
+from nova import db
+from nova import exception
+from nova import flags
+from nova import log as logging
+from nova import utils
+from nova.virt.vif import VIFDriver
+from nova.virt.vmwareapi_conn import VMWareAPISession
+from nova.virt.vmwareapi import network_utils
+
+
+LOG = logging.getLogger("nova.virt.vmwareapi.vif")
+
+FLAGS = flags.FLAGS
+
+
+class VMWareVlanBridgeDriver(VIFDriver):
+    """VIF driver for Linux VLAN bridge."""
+
+    def plug(self, instance, network, mapping):
+        """Create a vlan and bridge unless they already exist."""
+        vlan_num = network['vlan']
+        bridge = network['bridge']
+        bridge_interface = network['bridge_interface']
+
+        # Open vmwareapi session
+        host_ip = FLAGS.vmwareapi_host_ip
+        host_username = FLAGS.vmwareapi_host_username
+        host_password = FLAGS.vmwareapi_host_password
+        if not host_ip or host_username is None or host_password is None:
+            raise Exception(_('Must specify vmwareapi_host_ip, '
+                              'vmwareapi_host_username '
+                              'and vmwareapi_host_password to use '
+                              'connection_type=vmwareapi'))
+        session = VMWareAPISession(host_ip, host_username, host_password,
+                                   FLAGS.vmwareapi_api_retry_count)
+        vlan_interface = bridge_interface
+        # Check if the vlan_interface physical network adapter exists on the host
+        if not network_utils.check_if_vlan_interface_exists(session,
+                                                            vlan_interface):
+            raise exception.NetworkAdapterNotFound(adapter=vlan_interface)
+
+        # Get the vSwitch associated with the Physical Adapter
+        vswitch_associated = network_utils.get_vswitch_for_vlan_interface(
+                                            session, vlan_interface)
+        if vswitch_associated is None:
+            raise exception.SwicthNotFoundForNetworkAdapter(adapter=vlan_interface)
+        # Check whether bridge already exists and retrieve the the ref of the
+        # network whose name_label is "bridge"
+        network_ref = network_utils.get_network_with_the_name(session, bridge)
+        if network_ref is None:
+            # Create a port group on the vSwitch associated with the vlan_interface
+            # corresponding physical network adapter on the ESX host
+            network_utils.create_port_group(session, bridge, vswitch_associated,
+                                    vlan_num)
+        else:
+            # Get the vlan id and vswitch corresponding to the port group
+            pg_vlanid, pg_vswitch = \
+                network_utils.get_vlanid_and_vswitch_for_portgroup(session, bridge)
+
+            # Check if the vswitch associated is proper
+            if pg_vswitch != vswitch_associated:
+                raise exception.InvalidVLANPortGroup(bridge=bridge,
+                                                     expected=vswitch_associated,
+                                                     actual=pg_vswitch)
+
+            # Check if the vlan id is proper for the port group
+            if pg_vlanid != vlan_num:
+                raise exception.InvalidVLANTag(bridge=bridge, tag=vlan_num,
+                                               pgroup=pg_vlanid)
+
+
+    def unplug(self, instance, network, mapping):
+        pass
+
-- 
cgit 


From 0c66b0b8caad7437fa2afd64a2038bcb166c83a5 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 21:34:30 +0900
Subject: Merged get_configurations and plug of VIF drivers

---
 nova/virt/libvirt/connection.py | 3 +--
 nova/virt/libvirt/vif.py        | 9 ++++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 5f347989c..5cedcf2c1 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -966,8 +966,7 @@ class LibvirtConnection(driver.ComputeDriver):
 
         nics = []
         for (network, mapping) in network_info:
-            nics.append(self.vif_driver.get_configurations(instance, network,
-                                                           mapping))
+            nics.append(self.vif_driver.plug(instance, network, mapping))
         # FIXME(vish): stick this in db
         inst_type_id = instance['instance_type_id']
         inst_type = instance_types.get_instance_type(inst_type_id)
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 820055cf0..d35a3c8f6 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -33,7 +33,7 @@ flags.DEFINE_bool('allow_project_net_traffic',
 class LibvirtBridge(object):
     """Linux bridge VIF for Libvirt."""
 
-    def get_configurations(self, instance, network, mapping):
+    def get_configurations(self, network, mapping):
         """Get a dictionary of VIF configurations for bridge type."""
         # Assume that the gateway also acts as the dhcp server.
         dhcp_server = mapping['gateway']
@@ -76,6 +76,7 @@ class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
         """Ensure that the bridge exists, and add VIF to it."""
         linux_net.ensure_bridge(network['bridge'],
                                 network['bridge_interface'])
+        return self.get_configurations(network, mapping)
 
     def unplug(self, instance, network, mapping):
         pass
@@ -88,6 +89,7 @@ class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
         """Ensure that VLAN and bridge exist and add VIF to the bridge."""
         linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
                                      network['bridge_interface'])
+        return self.get_configurations(network, mapping)
 
     def unplug(self, instance, network, mapping):
         pass
@@ -96,7 +98,7 @@ class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
 class LibvirtOpenVswitchDriver(VIFDriver):
     """VIF driver for Open vSwitch."""
 
-    def get_configurations(self, instance, network, mapping):
+    def plug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
         utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
@@ -115,9 +117,6 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         print "using result = %s" % str(result)
         return result
 
-    def plug(self, instance, network, mapping):
-        pass
-
     def unplug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-- 
cgit 


From 27d8dc42120d3cefc91bf6510f215dfdef7f23d2 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 22:21:48 +0900
Subject: Removed unnecessary context parameter

---
 nova/virt/driver.py             | 5 +++++
 nova/virt/libvirt/connection.py | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 61f26ad96..e8dcf138b 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -253,3 +253,8 @@ class ComputeDriver(object):
     def set_host_enabled(self, host, enabled):
         """Sets the specified host's ability to accept new instances."""
         raise NotImplementedError()
+
+    def plug_vifs(self, instance, network_info):
+        """Plugs in VIFs to networks."""
+        raise NotImplementedError()
+
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 5cedcf2c1..3f6230e95 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -259,7 +259,7 @@ class LibvirtConnection(driver.ComputeDriver):
             infos.append(info)
         return infos
 
-    def plug_vifs(self, ctxt, instance, network_info):
+    def plug_vifs(self, instance, network_info):
         """Plugin VIFs into networks."""
         for (network, mapping) in network_info:
             self.vif_driver.plug(instance, network, mapping)
@@ -493,6 +493,7 @@ class LibvirtConnection(driver.ComputeDriver):
         # better because we cannot ensure flushing dirty buffers
         # in the guest OS. But, in case of KVM, shutdown() does not work...
         self.destroy(instance, network_info, cleanup=False)
+        self.plug_vifs(instance, network_info)
         self.firewall_driver.setup_basic_filtering(instance)
         self.firewall_driver.prepare_instance_filter(instance)
         self._create_new_domain(xml)
-- 
cgit 


From 2bfa91575d36363b16c25c29623f7ac988e844bb Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Wed, 20 Jul 2011 22:22:07 +0900
Subject: First attempt at vmware API VIF driver integration

---
 nova/virt/vmwareapi/vmops.py | 29 ++++++++++++++++++++++++++---
 nova/virt/vmwareapi_conn.py  |  9 ++++++---
 2 files changed, 32 insertions(+), 6 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index 94d9e6226..eded4391e 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -31,6 +31,7 @@ from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
+from nova import utils
 from nova.compute import power_state
 from nova.virt.vmwareapi import vim_util
 from nova.virt.vmwareapi import vm_util
@@ -38,6 +39,10 @@ from nova.virt.vmwareapi import vmware_images
 from nova.virt.vmwareapi import network_utils
 
 FLAGS = flags.FLAGS
+flags.DEFINE_string('vmware_vif_driver',
+                    'nova.virt.vmwareapi.vif.VMWareVlanBridgeDriver',
+                    'The VMWare VIF driver to configure the VIFs.')
+
 LOG = logging.getLogger("nova.virt.vmwareapi.vmops")
 
 VMWARE_POWER_STATES = {
@@ -52,6 +57,7 @@ class VMWareVMOps(object):
     def __init__(self, session):
         """Initializer."""
         self._session = session
+        self._vif_driver = utils.import_object(FLAGS.vmware_vif_driver)
 
     def _wait_with_callback(self, instance_id, task, callback):
         """Waits for the task to finish and does a callback after."""
@@ -83,7 +89,7 @@ class VMWareVMOps(object):
         LOG.debug(_("Got total of %s instances") % str(len(lst_vm_names)))
         return lst_vm_names
 
-    def spawn(self, instance):
+    def spawn(self, instance, network_info):
         """
         Creates a VM instance.
 
@@ -117,6 +123,7 @@ class VMWareVMOps(object):
             if network_ref is None:
                 raise exception.NetworkNotFoundForBridge(bridge=net_name)
 
+        self.plug_vifs(instance, network_info)
         _check_if_network_bridge_exists()
 
         def _get_datastore_ref():
@@ -472,11 +479,14 @@ class VMWareVMOps(object):
 
         _clean_temp_data()
 
-    def reboot(self, instance):
+    def reboot(self, instance, network_info):
         """Reboot a VM instance."""
         vm_ref = self._get_vm_ref_from_the_name(instance.name)
         if vm_ref is None:
             raise exception.InstanceNotFound(instance_id=instance.id)
+
+        self.plug_vifs(instance, network_info)
+
         lst_properties = ["summary.guest.toolsStatus", "runtime.powerState",
                           "summary.guest.toolsRunningStatus"]
         props = self._session._call_method(vim_util, "get_object_properties",
@@ -514,7 +524,7 @@ class VMWareVMOps(object):
             self._session._wait_for_task(instance.id, reset_task)
             LOG.debug(_("Did hard reboot of VM %s") % instance.name)
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """
         Destroy a VM instance. Steps followed are:
         1. Power off the VM, if it is in poweredOn state.
@@ -560,6 +570,8 @@ class VMWareVMOps(object):
                 LOG.warn(_("In vmwareapi:vmops:destroy, got this exception"
                            " while un-registering the VM: %s") % str(excep))
 
+            self._unplug_vifs(instance, network_info)
+
             # Delete the folder holding the VM related content on
             # the datastore.
             try:
@@ -784,3 +796,14 @@ class VMWareVMOps(object):
             if vm.propSet[0].val == vm_name:
                 return vm.obj
         return None
+
+    def plug_vifs(self, instance, network_info):
+        """Plug VIFs into networks."""
+        for (network, mapping) in network_info:
+            self._vif_driver.plug(instance, network, mapping)
+
+    def _unplug_vifs(self, instance, network_info):
+        """Unplug VIFs from networks."""
+        for (network, mapping) in network_info:
+            self._vif_driver.unplug(instance, network, mapping)
+
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index 9e15510ab..2492c9951 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -126,7 +126,7 @@ class VMWareESXConnection(driver.ComputeDriver):
 
     def spawn(self, instance, network_info, block_device_mapping=None):
         """Create VM instance."""
-        self._vmops.spawn(instance)
+        self._vmops.spawn(instance, network_info)
 
     def snapshot(self, instance, name):
         """Create snapshot from a running VM instance."""
@@ -134,11 +134,11 @@ class VMWareESXConnection(driver.ComputeDriver):
 
     def reboot(self, instance, network_info):
         """Reboot VM instance."""
-        self._vmops.reboot(instance)
+        self._vmops.reboot(instance, network_info)
 
     def destroy(self, instance, network_info):
         """Destroy VM instance."""
-        self._vmops.destroy(instance)
+        self._vmops.destroy(instance, network_info)
 
     def pause(self, instance, callback):
         """Pause VM instance."""
@@ -194,6 +194,9 @@ class VMWareESXConnection(driver.ComputeDriver):
         """Sets the specified host's ability to accept new instances."""
         pass
 
+    def plug_vifs(self, instance, network_info):
+        """Plugs in VIFs to networks."""
+        self._vmops.plug_vifs(instance, network_info)
 
 class VMWareAPISession(object):
     """
-- 
cgit 


From e65a9fe5827e0d5961e618a3163382c2ad02274c Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Wed, 20 Jul 2011 12:17:44 -0400
Subject: correct indentation

---
 nova/virt/libvirt/connection.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 56aaa6c50..4905d931a 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1015,8 +1015,8 @@ class LibvirtConnection(driver.ComputeDriver):
                     'volumes': block_device_mapping}
 
         if FLAGS.vnc_enabled and FLAGS.libvirt_type not in ('lxc', 'uml'):
-                xml_info['vncserver_host'] = FLAGS.vncserver_host
-                xml_info['vnc_keymap'] = FLAGS.vnc_keymap
+            xml_info['vncserver_host'] = FLAGS.vncserver_host
+            xml_info['vnc_keymap'] = FLAGS.vnc_keymap
         if not rescue:
             if instance['kernel_id']:
                 xml_info['kernel'] = xml_info['basepath'] + "/kernel"
-- 
cgit 


From cea17225c9a568e97f55287edf7510ebcfbae301 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 02:57:52 +0900
Subject: Moved back allow_project_net_traffic to libvirt conn

---
 nova/virt/libvirt/connection.py | 3 +++
 nova/virt/libvirt/vif.py        | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 3f6230e95..c2a867e30 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -96,6 +96,9 @@ flags.DEFINE_string('libvirt_uri',
                     '',
                     'Override the default libvirt URI (which is dependent'
                     ' on libvirt_type)')
+flags.DEFINE_bool('allow_project_net_traffic',
+                  True,
+                  'Whether to allow in project network traffic')
 flags.DEFINE_bool('use_cow_images',
                   True,
                   'Whether to use cow images')
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index d35a3c8f6..3d9b234b8 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -25,9 +25,6 @@ from nova import utils
 from nova.virt.vif import VIFDriver
 
 FLAGS = flags.FLAGS
-flags.DEFINE_bool('allow_project_net_traffic',
-                  True,
-                  'Whether to allow in project network traffic')
 
 
 class LibvirtBridge(object):
-- 
cgit 


From 58a76cede01b6bb141d060636c21318db1712527 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Wed, 20 Jul 2011 18:46:29 +0000
Subject: Make sure reset_network() call happens after we've determined the
 agent is running.

---
 nova/virt/xenapi/vmops.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index bade23889..419685a6f 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -311,6 +311,7 @@ class VMOps(object):
                     _check_agent_version()
                     _inject_files()
                     _set_admin_password()
+                    self.reset_network(instance, vm_ref)
                     return True
             except Exception, exc:
                 LOG.warn(exc)
@@ -320,9 +321,6 @@ class VMOps(object):
 
         timer.f = _wait_for_boot
 
-        # call to reset network to configure network from xenstore
-        self.reset_network(instance, vm_ref)
-
         return timer.start(interval=0.5, now=True)
 
     def _get_vm_opaque_ref(self, instance_or_vm):
-- 
cgit 


From 2b8cc5f98435423eb2b8bc42bcb7e9c38e453c34 Mon Sep 17 00:00:00 2001
From: danwent <danwent@dan-xs3-cs>
Date: Wed, 20 Jul 2011 13:03:27 -0700
Subject: update for ryu's naming changes, fix some bugs.  tested with
 OVSDriver only so far

---
 nova/virt/xenapi/vmops.py | 32 +++++++++++++++++++-------------
 nova/virt/xenapi_conn.py  |  6 +++---
 2 files changed, 22 insertions(+), 16 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 26f90fedd..f88715c50 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -81,8 +81,9 @@ class VMOps(object):
         self._session = session
         self.poll_rescue_last_ran = None
         VMHelper.XenAPI = self.XenAPI
+        print "loading vif_driver = %s" % FLAGS.xenapi_vif_driver
         self.vif_driver = utils.import_object(FLAGS.xenapi_vif_driver)
-
+        print "driver class = %s" % str(self.vif_driver)
     def list_instances(self):
         """List VM instances."""
         # TODO(justinsb): Should we just always use the details method?
@@ -473,7 +474,7 @@ class VMOps(object):
                     self._session, instance, template_vdi_uuids, image_id)
         finally:
             if template_vm_ref:
-                self._destroy(instance, template_vm_ref,
+                self._destroy(instance, template_vm_ref, None,
                         shutdown=False, destroy_kernel_ramdisk=False)
 
         logging.debug(_("Finished snapshot and upload for VM %s"), instance)
@@ -843,7 +844,7 @@ class VMOps(object):
 
         self._session.call_xenapi("Async.VM.destroy", rescue_vm_ref)
 
-    def destroy(self, instance):
+    def destroy(self, instance, network_info):
         """Destroy VM instance.
 
         This is the method exposed by xenapi_conn.destroy(). The rest of the
@@ -853,9 +854,9 @@ class VMOps(object):
         instance_id = instance.id
         LOG.info(_("Destroying VM for Instance %(instance_id)s") % locals())
         vm_ref = VMHelper.lookup(self._session, instance.name)
-        return self._destroy(instance, vm_ref, shutdown=True)
+        return self._destroy(instance, vm_ref, network_info, shutdown=True)
 
-    def _destroy(self, instance, vm_ref, shutdown=True,
+    def _destroy(self, instance, vm_ref, network_info, shutdown=True,
                  destroy_kernel_ramdisk=True):
         """Destroys VM instance by performing:
 
@@ -877,9 +878,14 @@ class VMOps(object):
             self._destroy_kernel_ramdisk(instance, vm_ref)
         self._destroy_vm(instance, vm_ref)
 
-        networks = db.network_get_all_by_instance(ctxt, instance['id'])
-        for network in networks:
-            self.vif_driver.unplug(network)
+        if network_info:
+            try:
+                for (network, mapping) in network_info:
+                    self.vif_driver.unplug(instance, network, mapping)
+            except:
+                LOG.warning("Failed while unplugging vif of instance '%s'" % \
+                    instance['name'])
+                raise
 
 
     def _wait_with_callback(self, instance_id, task, callback):
@@ -1088,17 +1094,17 @@ class VMOps(object):
         for device, (network, info) in enumerate(network_info):
             vif_rec = self.vif_driver.get_vif_rec(self._session,
                     vm_ref, instance, device, network, info)
+            network_ref = vif_rec['network']
             LOG.debug(_('Creating VIF for VM %(vm_ref)s,' \
                 ' network %(network_ref)s.') % locals())
-            vif_ref = session.call_xenapi('VIF.create', vif_rec)
+            vif_ref = self._session.call_xenapi('VIF.create', vif_rec)
             LOG.debug(_('Created VIF %(vif_ref)s for VM %(vm_ref)s,'
                 ' network %(network_ref)s.') % locals())
 
-    def setup_vif_network(self, ctxt, instance_id):
+    def plug_vifs(instance, network_info):
         """Set up VIF networking on the host."""
-        networks = db.network_get_all_by_instance(ctxt, instance_id)
-        for network in networks:
-            self.vif_driver.plug(network)
+        for (network, mapping) in network_info:
+            self.vif_driver.plug(self._session, instance, network, mapping)
 
     def reset_network(self, instance, vm_ref=None):
         """Creates uuid arg to pass to make_agent_call and calls it."""
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 10a532ea0..102278e1c 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -226,7 +226,7 @@ class XenAPIConnection(driver.ComputeDriver):
 
     def destroy(self, instance, network_info):
         """Destroy VM instance"""
-        self._vmops.destroy(instance)
+        self._vmops.destroy(instance, network_info)
 
     def pause(self, instance, callback):
         """Pause VM instance"""
@@ -269,8 +269,8 @@ class XenAPIConnection(driver.ComputeDriver):
         """inject network info for specified instance"""
         self._vmops.inject_network_info(instance, network_info)
 
-    def setup_vif_network(self, ctxt, instance_id):
-        self._vmops.setup_vif_network(ctxt, instance_id)
+    def plug_vifs(self, instance_ref, network_info):
+        self._vmops.plug_vifs(instance_ref, network_info)
 
     def get_info(self, instance_id):
         """Return data about VM instance"""
-- 
cgit 


From 407e30e4843d27943e38374d61525805236319d2 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Wed, 20 Jul 2011 13:10:25 -0700
Subject: remove debug prints

---
 nova/virt/xenapi/vmops.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index f88715c50..bdf471d16 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -81,9 +81,8 @@ class VMOps(object):
         self._session = session
         self.poll_rescue_last_ran = None
         VMHelper.XenAPI = self.XenAPI
-        print "loading vif_driver = %s" % FLAGS.xenapi_vif_driver
         self.vif_driver = utils.import_object(FLAGS.xenapi_vif_driver)
-        print "driver class = %s" % str(self.vif_driver)
+
     def list_instances(self):
         """List VM instances."""
         # TODO(justinsb): Should we just always use the details method?
-- 
cgit 


From e3abccb611345d61584569114a4929e751de14ae Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 16:17:23 +0900
Subject: Combined bridige and vlan VIF driver to allow better transition for
 current Nova users

---
 nova/virt/libvirt/vif.py | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index c43ce14e3..24634d7d2 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -19,20 +19,24 @@
 """VIF drivers for libvirt."""
 
 from nova import flags
+from nova import log as logging
 from nova.network import linux_net
 from nova.virt.libvirt import netutils
 from nova import utils
 from nova.virt.vif import VIFDriver
 
+LOG = logging.getLogger('nova.virt.libvirt.vif')
+
 FLAGS = flags.FLAGS
 
 flags.DEFINE_string('libvirt_ovs_integration_bridge', 'br-int',
 			'Name of Integration Bridge used by Open vSwitch')
 
-class LibvirtBridge(object):
-    """Linux bridge VIF for Libvirt."""
 
-    def get_configurations(self, network, mapping):
+class LibvirtBridgeDriver(VIFDriver):
+    """VIF driver for Linux bridge."""
+
+    def _get_configurations(self, network, mapping):
         """Get a dictionary of VIF configurations for bridge type."""
         # Assume that the gateway also acts as the dhcp server.
         gateway6 = mapping.get('gateway6')
@@ -66,32 +70,24 @@ class LibvirtBridge(object):
 
         return result
 
-
-class LibvirtBridgeDriver(VIFDriver, LibvirtBridge):
-    """VIF driver for Linux bridge."""
-
     def plug(self, instance, network, mapping):
         """Ensure that the bridge exists, and add VIF to it."""
-        if not network.get('multi_host'):
-            linux_net.ensure_bridge(network['bridge'],
-                                    network['bridge_interface'])
-        return self.get_configurations(network, mapping)
-
-    def unplug(self, instance, network, mapping):
-        pass
-
-
-class LibvirtVlanBridgeDriver(VIFDriver, LibvirtBridge):
-    """VIF driver for Linux bridge with VLAN."""
-
-    def plug(self, instance, network, mapping):
-        """Ensure that VLAN and bridge exist and add VIF to the bridge."""
-        if not network.get('multi_host'):
-            linux_net.ensure_vlan_bridge(network['vlan'], network['bridge'],
-                                         network['bridge_interface'])
-        return self.get_configurations(network, mapping)
+        if not network.get('multi_host') and mapping.get('create_bridge'):
+            if mapping.get('create_vlan'):
+                LOG.debug(_("Ensuring vlan %s and bridge %s") %
+                          (network['vlan'], network['bridge']))
+                linux_net.ensure_vlan_bridge(network['vlan'],
+                                             network['bridge'],
+                                             network['bridge_interface'])
+            else:
+                LOG.debug(_("Ensuring bridge %s") % network['bridge'])
+                linux_net.ensure_bridge(network['bridge'],
+                                        network['bridge_interface'])
+
+        return self._get_configurations(network, mapping)
 
     def unplug(self, instance, network, mapping):
+        """No manual unplugging required."""
         pass
 
 
-- 
cgit 


From 3b32c0270d6f61e0164185757ed97c82bda25600 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 16:31:14 +0900
Subject: Fixed PEP8 issues

---
 nova/virt/driver.py          |  1 -
 nova/virt/libvirt/vif.py     |  2 +-
 nova/virt/vmwareapi/vif.py   | 26 ++++++++++++++------------
 nova/virt/vmwareapi/vmops.py |  1 -
 nova/virt/vmwareapi_conn.py  |  1 +
 nova/virt/xenapi/vm_utils.py |  2 +-
 nova/virt/xenapi/vmops.py    |  1 -
 7 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index e8dcf138b..2faff0a1e 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -257,4 +257,3 @@ class ComputeDriver(object):
     def plug_vifs(self, instance, network_info):
         """Plugs in VIFs to networks."""
         raise NotImplementedError()
-
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 24634d7d2..fdd12d2f4 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -30,7 +30,7 @@ LOG = logging.getLogger('nova.virt.libvirt.vif')
 FLAGS = flags.FLAGS
 
 flags.DEFINE_string('libvirt_ovs_integration_bridge', 'br-int',
-			'Name of Integration Bridge used by Open vSwitch')
+                    'Name of Integration Bridge used by Open vSwitch')
 
 
 class LibvirtBridgeDriver(VIFDriver):
diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
index 902699089..281565bbc 100644
--- a/nova/virt/vmwareapi/vif.py
+++ b/nova/virt/vmwareapi/vif.py
@@ -53,7 +53,8 @@ class VMWareVlanBridgeDriver(VIFDriver):
         session = VMWareAPISession(host_ip, host_username, host_password,
                                    FLAGS.vmwareapi_api_retry_count)
         vlan_interface = bridge_interface
-        # Check if the vlan_interface physical network adapter exists on the host
+        # Check if the vlan_interface physical network adapter exists on the
+        # host.
         if not network_utils.check_if_vlan_interface_exists(session,
                                                             vlan_interface):
             raise exception.NetworkAdapterNotFound(adapter=vlan_interface)
@@ -62,32 +63,33 @@ class VMWareVlanBridgeDriver(VIFDriver):
         vswitch_associated = network_utils.get_vswitch_for_vlan_interface(
                                             session, vlan_interface)
         if vswitch_associated is None:
-            raise exception.SwicthNotFoundForNetworkAdapter(adapter=vlan_interface)
+            raise exception.SwicthNotFoundForNetworkAdapter(
+                adapter=vlan_interface)
         # Check whether bridge already exists and retrieve the the ref of the
         # network whose name_label is "bridge"
         network_ref = network_utils.get_network_with_the_name(session, bridge)
         if network_ref is None:
-            # Create a port group on the vSwitch associated with the vlan_interface
-            # corresponding physical network adapter on the ESX host
-            network_utils.create_port_group(session, bridge, vswitch_associated,
-                                    vlan_num)
+            # Create a port group on the vSwitch associated with the
+            # vlan_interface corresponding physical network adapter on the ESX
+            # host.
+            network_utils.create_port_group(session, bridge,
+                                            vswitch_associated, vlan_num)
         else:
             # Get the vlan id and vswitch corresponding to the port group
             pg_vlanid, pg_vswitch = \
-                network_utils.get_vlanid_and_vswitch_for_portgroup(session, bridge)
+                network_utils.get_vlanid_and_vswitch_for_portgroup(session,
+                                                                   bridge)
 
             # Check if the vswitch associated is proper
             if pg_vswitch != vswitch_associated:
-                raise exception.InvalidVLANPortGroup(bridge=bridge,
-                                                     expected=vswitch_associated,
-                                                     actual=pg_vswitch)
+                raise exception.InvalidVLANPortGroup(
+                    bridge=bridge, expected=vswitch_associated,
+                    actual=pg_vswitch)
 
             # Check if the vlan id is proper for the port group
             if pg_vlanid != vlan_num:
                 raise exception.InvalidVLANTag(bridge=bridge, tag=vlan_num,
                                                pgroup=pg_vlanid)
 
-
     def unplug(self, instance, network, mapping):
         pass
-
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index eded4391e..6cc130809 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -806,4 +806,3 @@ class VMWareVMOps(object):
         """Unplug VIFs from networks."""
         for (network, mapping) in network_info:
             self._vif_driver.unplug(instance, network, mapping)
-
diff --git a/nova/virt/vmwareapi_conn.py b/nova/virt/vmwareapi_conn.py
index 2492c9951..ce57847b2 100644
--- a/nova/virt/vmwareapi_conn.py
+++ b/nova/virt/vmwareapi_conn.py
@@ -198,6 +198,7 @@ class VMWareESXConnection(driver.ComputeDriver):
         """Plugs in VIFs to networks."""
         self._vmops.plug_vifs(instance, network_info)
 
+
 class VMWareAPISession(object):
     """
     Sets up a session with the ESX host and handles all
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index e63582b54..62863c6d8 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -282,7 +282,6 @@ class VMHelper(HelperBase):
             LOG.exception(exc)
             raise StorageError(_('Unable to destroy VDI %s') % vdi_ref)
 
-
     @classmethod
     def create_vdi(cls, session, sr_ref, name_label, virtual_size, read_only):
         """Create a VDI record and returns its reference."""
@@ -1095,6 +1094,7 @@ def _stream_disk(dev, image_type, virtual_size, image_file):
         for chunk in image_file:
             f.write(chunk)
 
+
 def _write_partition(virtual_size, dev):
     dest = '/dev/%s' % dev
     primary_first = MBR_SIZE_SECTORS
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index ad90e38e9..4fa59b6b7 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -884,7 +884,6 @@ class VMOps(object):
                     instance['name'])
                 raise
 
-
     def _wait_with_callback(self, instance_id, task, callback):
         ret = None
         try:
-- 
cgit 


From b2b378748aa859bab63c65fe88aa45081945b3c6 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Thu, 21 Jul 2011 18:41:32 +0900
Subject: Changed the default of VIF driver

---
 nova/virt/libvirt/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 7b2ff49b2..585cd74a3 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -126,7 +126,7 @@ flags.DEFINE_bool('start_guests_on_host_boot', False,
 flags.DEFINE_string('libvirt_vif_type', 'bridge',
                     'Type of VIF to create.')
 flags.DEFINE_string('libvirt_vif_driver',
-                    'nova.virt.libvirt.vif.LibvirtVlanBridgeDriver',
+                    'nova.virt.libvirt.vif.LibvirtBridgeDriver',
                     'The libvirt VIF driver to configure the VIFs.')
 
 
-- 
cgit 


From a3c761110d7ee49ac9d18ff13e584aa8cdaedab8 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 21 Jul 2011 07:07:34 -0700
Subject: forgot to add xenapi/vif.py

---
 nova/virt/xenapi/vif.py | 146 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 146 insertions(+)
 create mode 100644 nova/virt/xenapi/vif.py

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
new file mode 100644
index 000000000..cc5aa38f5
--- /dev/null
+++ b/nova/virt/xenapi/vif.py
@@ -0,0 +1,146 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2011 Citrix Systems, Inc.
+# Copyright 2011 OpenStack LLC.
+# Copyright (C) 2011 Nicira, Inc
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""VIF drivers for XenAPI."""
+
+from nova import flags
+from nova import log as logging
+from nova.virt.vif import VIFDriver
+from nova.virt.xenapi.network_utils import NetworkHelper
+
+FLAGS = flags.FLAGS
+flags.DEFINE_string('xenapi_ovs_integration_bridge', 'xapi1',
+			'Name of Integration Bridge used by Open vSwitch')
+
+LOG = logging.getLogger("nova.virt.xenapi.vif")
+
+class XenAPIBridgeDriver(VIFDriver):
+    """Combined VIF and Bridge class for XenAPI."""
+
+    def get_vif_rec(self, xenapi_session, vm_ref, instance, device, network,
+                                                    network_mapping):
+        print "bridge = '%s'" % network['bridge']
+       	network_ref = NetworkHelper.find_network_with_bridge(xenapi_session,
+							network['bridge'])
+        rxtx_cap = network_mapping.pop('rxtx_cap')
+        vif_rec = {}
+        vif_rec['device'] = str(device)
+        vif_rec['network'] = network_ref
+        vif_rec['VM'] = vm_ref
+        vif_rec['MAC'] = network_mapping['mac']
+        vif_rec['MTU'] = '1500'
+        vif_rec['other_config'] = {}
+        vif_rec['qos_algorithm_type'] = "ratelimit" if rxtx_cap else ''
+        vif_rec['qos_algorithm_params'] = \
+                {"kbps": str(rxtx_cap * 1024)} if rxtx_cap else {}
+        return vif_rec
+
+    def plug(self, xenapi_session, instance, network, mapping):
+        """Ensure that the bridge exists, if using VLANs"""
+
+        vlan_num = network['vlan']
+        if vlan_num is None:
+            return # no plugging done for non-VLAN networks
+	    bridge = network['bridge']
+        bridge_interface = network['bridge_interface']
+
+        print "in plug with bridge = %s and bridge_interface = %s" % (bridge,bridge_interface)
+    	# Check whether bridge already exists
+    	# Retrieve network whose name_label is "bridge"
+    	network_ref = network_utils.NetworkHelper.find_network_with_name_label(
+                                                               xenapi_session,
+                                                                       bridge)
+    	print "got network_ref = %s" % network_ref
+        if network_ref is None:
+        	# If bridge does not exists
+        	# 1 - create network
+        	description = 'network for nova bridge %s' % bridge
+        	network_rec = {'name_label': bridge,
+                       'name_description': description,
+                       'other_config': {}}
+        	network_ref = xenapi_session.call_xenapi('network.create', network_rec)
+		    # 2 - find PIF for VLAN NOTE(salvatore-orlando): using double
+		    # quotes inside single quotes as xapi filter only support
+		    # tokens in double quotes
+        	expr = 'field "device" = "%s" and \
+                field "VLAN" = "-1"' % bridge_interface
+        	pifs = xenapi_session.call_xenapi('PIF.get_all_records_where', expr)
+        	pif_ref = None
+        	# Multiple PIF are ok: we are dealing with a pool
+        	if len(pifs) == 0:
+            		raise Exception(
+                  	_('Found no PIF for device %s') % bridge_interface)
+            # 3 - create vlan for network
+            print "creating vlan %s" % str(vlan_num)
+            for pif_ref in pifs.keys():
+            		xenapi_session.call_xenapi('VLAN.create',
+                                pif_ref,
+                                str(vlan_num),
+                                network_ref)
+    	else:
+           	# Check VLAN tag is appropriate
+        	network_rec = xenapi_session.call_xenapi('network.get_record',
+								network_ref)
+        	# Retrieve PIFs from network
+        	for pif_ref in network_rec['PIFs']:
+            		# Retrieve VLAN from PIF
+            		pif_rec = xenapi_session.call_xenapi('PIF.get_record', pif_ref)
+            		pif_vlan = int(pif_rec['VLAN'])
+            		# Raise an exception if VLAN != vlan_num
+            		if pif_vlan != vlan_num:
+                		raise Exception(_("PIF %(pif_rec['uuid'])s for network "
+                                  "%(bridge)s has VLAN id %(pif_vlan)d. "
+                                  "Expected %(vlan_num)d") % locals())
+            print "vlan is good"
+
+        print "all done"
+
+    def unplug(self, instance, network, mapping):
+        pass
+
+class XenAPIOpenVswitchDriver(VIFDriver):
+    """VIF driver for Open vSwitch with XenAPI."""
+
+    def get_vif_rec(self, xenapi_session, vm_ref, instance, device, network,
+                                                    network_mapping):
+	    # with OVS model, always plug into OVS integration bridge
+       	network_ref = NetworkHelper.find_network_with_bridge(xenapi_session,
+			FLAGS.xenapi_ovs_integration_bridge)
+        vif_rec = {}
+        vif_rec['device'] = str(device)
+        vif_rec['network'] = network_ref
+        vif_rec['VM'] = vm_ref
+        vif_rec['MAC'] = network_mapping['mac']
+        vif_rec['MTU'] = '1500'
+        vif_id = str(instance['id']) + "-" + str(network['id'])
+        vif_rec['qos_algorithm_type'] = ""
+        vif_rec['qos_algorithm_params'] = {}
+        # OVS on the hypervisor monitors this key and uses it to
+        # set the iface-id attribute
+        vif_rec['other_config'] = {"nicira-iface-id" : vif_id }
+        return vif_rec
+
+    def plug(self, xenapi_session, instance, network, mapping):
+	    # nothing to do, as this driver assumes that integration bridge
+	    # was created by administrator
+        pass
+
+    def unplug(self, instance, network, mapping):
+	    pass
+
-- 
cgit 


From 7aca24e8463c38c4e051a59788de1c0c0b15cd0c Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Fri, 22 Jul 2011 00:27:45 +0900
Subject: Fixed the localization unit test error in the vif driver logging

---
 nova/virt/libvirt/vif.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index fdd12d2f4..bf3579608 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -74,13 +74,14 @@ class LibvirtBridgeDriver(VIFDriver):
         """Ensure that the bridge exists, and add VIF to it."""
         if not network.get('multi_host') and mapping.get('create_bridge'):
             if mapping.get('create_vlan'):
-                LOG.debug(_("Ensuring vlan %s and bridge %s") %
-                          (network['vlan'], network['bridge']))
+                LOG.debug(_('Ensuring vlan %(vlan)s and bridge %(bridge)s'),
+                          {'vlan': network['vlan'],
+                           'bridge': network['bridge']})
                 linux_net.ensure_vlan_bridge(network['vlan'],
                                              network['bridge'],
                                              network['bridge_interface'])
             else:
-                LOG.debug(_("Ensuring bridge %s") % network['bridge'])
+                LOG.debug(_("Ensuring bridge %s"), network['bridge'])
                 linux_net.ensure_bridge(network['bridge'],
                                         network['bridge_interface'])
 
-- 
cgit 


From d78d188d41e580ef0e2b4f0116bb0402ce83930f Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 21 Jul 2011 21:36:26 -0700
Subject: refactor xenapi vif plug to combine plug + get_vif_rec, tested and
 fixed XenAPIBridgeDriver

---
 nova/virt/libvirt/vif.py  | 13 ++++----
 nova/virt/xenapi/vif.py   | 75 +++++++++++++++++++++++------------------------
 nova/virt/xenapi/vmops.py |  2 +-
 3 files changed, 46 insertions(+), 44 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index bf3579608..07c3973d4 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -98,14 +98,17 @@ class LibvirtOpenVswitchDriver(VIFDriver):
     def plug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
+        iface_id = "nova-" + vif_id
         utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
         utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
         utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
-           FLAGS.libvirt_ovs_integration_bridge, dev,
-           '--', 'set', 'Interface', dev, "external-ids:iface-id=%s" % vif_id,
-           '--', 'set', 'Interface', dev, "external-ids:iface-status=active",
-           '--', 'set', 'Interface', dev, "external-ids:attached-mac=%s" % \
-                mapping['mac'])
+            FLAGS.libvirt_ovs_integration_bridge, dev,
+            '--', 'set', 'Interface', dev,
+            "external-ids:iface-id=%s" % iface_id,
+            '--', 'set', 'Interface', dev,
+            "external-ids:iface-status=active",
+            '--', 'set', 'Interface', dev,
+            "external-ids:attached-mac=%s" % mapping['mac'])
 
         result = {
             'script': '',
diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index beee2390d..0557d63af 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -26,18 +26,21 @@ from nova.virt.xenapi.network_utils import NetworkHelper
 
 FLAGS = flags.FLAGS
 flags.DEFINE_string('xenapi_ovs_integration_bridge', 'xapi1',
-                    'Name of Integration Bridge used by Open vSwitch')
+                'Name of Integration Bridge used by Open vSwitch')
 
 LOG = logging.getLogger("nova.virt.xenapi.vif")
 
 
 class XenAPIBridgeDriver(VIFDriver):
-    """Combined VIF and Bridge class for XenAPI."""
+    """VIF Driver for XenAPI that uses XenAPI to create Networks."""
 
-    def get_vif_rec(self, xenapi_session, vm_ref, instance, device, network,
+    def plug(self, xenapi_session, vm_ref, instance, device, network,
                                                     network_mapping):
-        network_ref = NetworkHelper.find_network_with_bridge(xenapi_session,
-                                                             network['bridge'])
+        if network['vlan']:
+            network_ref = self.ensure_vlan_bridge(xenapi_session, network)
+        else:
+            network_ref = NetworkHelper.find_network_with_bridge(
+                                        xenapi_session, network['bridge'])
         rxtx_cap = network_mapping.pop('rxtx_cap')
         vif_rec = {}
         vif_rec['device'] = str(device)
@@ -51,60 +54,60 @@ class XenAPIBridgeDriver(VIFDriver):
                 {"kbps": str(rxtx_cap * 1024)} if rxtx_cap else {}
         return vif_rec
 
-    def plug(self, xenapi_session, instance, network, mapping):
-        """Ensure that the bridge exists, if using VLANs"""
+    def ensure_vlan_bridge(self, xenapi_session, network):
+        """Ensure that a VLAN bridge exists"""
 
         vlan_num = network['vlan']
-        if vlan_num is None:
-            return  # no plugging done for non-VLAN networks
         bridge = network['bridge']
         bridge_interface = network['bridge_interface']
-
         # Check whether bridge already exists
         # Retrieve network whose name_label is "bridge"
-        network_ref = network_utils.NetworkHelper.find_network_with_name_label(
-            xenapi_session, bridge)
-
+        network_ref = NetworkHelper.find_network_with_name_label(
+                                        xenapi_session, bridge)
         if network_ref is None:
             # If bridge does not exists
             # 1 - create network
             description = 'network for nova bridge %s' % bridge
             network_rec = {'name_label': bridge,
-                           'name_description': description,
-                           'other_config': {}}
+                       'name_description': description,
+                       'other_config': {}}
             network_ref = xenapi_session.call_xenapi('network.create',
-                                                     network_rec)
+                                                        network_rec)
             # 2 - find PIF for VLAN NOTE(salvatore-orlando): using double
             # quotes inside single quotes as xapi filter only support
             # tokens in double quotes
             expr = 'field "device" = "%s" and \
                 field "VLAN" = "-1"' % bridge_interface
             pifs = xenapi_session.call_xenapi('PIF.get_all_records_where',
-                                              expr)
+                                                                    expr)
             pif_ref = None
             # Multiple PIF are ok: we are dealing with a pool
             if len(pifs) == 0:
-                raise Exception(_('Found no PIF for device %s') %
-                                bridge_interface)
-
-            # 3 - create vlan for network
+                raise Exception(_('Found no PIF for device %s') % \
+                                        bridge_interface)
             for pif_ref in pifs.keys():
-                xenapi_session.call_xenapi('VLAN.create', pif_ref,
-                                           str(vlan_num), network_ref)
+                xenapi_session.call_xenapi('VLAN.create',
+                                pif_ref,
+                                str(vlan_num),
+                                network_ref)
         else:
             # Check VLAN tag is appropriate
             network_rec = xenapi_session.call_xenapi('network.get_record',
-                                                     network_ref)
+                                                            network_ref)
             # Retrieve PIFs from network
             for pif_ref in network_rec['PIFs']:
                 # Retrieve VLAN from PIF
-                pif_rec = xenapi_session.call_xenapi('PIF.get_record', pif_ref)
+                pif_rec = xenapi_session.call_xenapi('PIF.get_record',
+                                                                pif_ref)
                 pif_vlan = int(pif_rec['VLAN'])
                 # Raise an exception if VLAN != vlan_num
                 if pif_vlan != vlan_num:
-                    raise Exception(_("PIF %(pif_rec['uuid'])s for network "
-                          "%(bridge)s has VLAN id %(pif_vlan)d. "
-                          "Expected %(vlan_num)d") % locals())
+                    raise Exception(_(
+                                "PIF %(pif_rec['uuid'])s for network "
+                                "%(bridge)s has VLAN id %(pif_vlan)d. "
+                                "Expected %(vlan_num)d") % locals())
+
+        return network_ref
 
     def unplug(self, instance, network, mapping):
         pass
@@ -113,18 +116,19 @@ class XenAPIBridgeDriver(VIFDriver):
 class XenAPIOpenVswitchDriver(VIFDriver):
     """VIF driver for Open vSwitch with XenAPI."""
 
-    def get_vif_rec(self, xenapi_session, vm_ref, instance, device, network,
+    def plug(self, xenapi_session, vm_ref, instance, device, network,
                                                     network_mapping):
-        # with OVS model, always plug into OVS integration bridge
-        network_ref = NetworkHelper.find_network_with_bridge(
-            xenapi_session, FLAGS.xenapi_ovs_integration_bridge)
+        # with OVS model, always plug into an OVS integration bridge
+        # that is already created
+        network_ref = NetworkHelper.find_network_with_bridge(xenapi_session,
+                                        FLAGS.xenapi_ovs_integration_bridge)
         vif_rec = {}
         vif_rec['device'] = str(device)
         vif_rec['network'] = network_ref
         vif_rec['VM'] = vm_ref
         vif_rec['MAC'] = network_mapping['mac']
         vif_rec['MTU'] = '1500'
-        vif_id = str(instance['id']) + "-" + str(network['id'])
+        vif_id = "nova-" + str(instance['id']) + "-" + str(network['id'])
         vif_rec['qos_algorithm_type'] = ""
         vif_rec['qos_algorithm_params'] = {}
         # OVS on the hypervisor monitors this key and uses it to
@@ -132,10 +136,5 @@ class XenAPIOpenVswitchDriver(VIFDriver):
         vif_rec['other_config'] = {"nicira-iface-id": vif_id}
         return vif_rec
 
-    def plug(self, xenapi_session, instance, network, mapping):
-        # nothing to do, as this driver assumes that integration bridge
-        # was created by administrator
-        pass
-
     def unplug(self, instance, network, mapping):
         pass
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 4fa59b6b7..bc47ac494 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -1088,7 +1088,7 @@ class VMOps(object):
         self._session.get_xenapi().VM.get_record(vm_ref)
 
         for device, (network, info) in enumerate(network_info):
-            vif_rec = self.vif_driver.get_vif_rec(self._session,
+            vif_rec = self.vif_driver.plug(self._session,
                     vm_ref, instance, device, network, info)
             network_ref = vif_rec['network']
             LOG.debug(_('Creating VIF for VM %(vm_ref)s,' \
-- 
cgit 


From ff9b31734f15fec0a5b1f9de96dadbda6475a3b4 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 21 Jul 2011 21:57:03 -0700
Subject: for libvirt OVS driver, do not make device if it exists already

---
 nova/virt/libvirt/vif.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 07c3973d4..02bbcc194 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -98,17 +98,18 @@ class LibvirtOpenVswitchDriver(VIFDriver):
     def plug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        iface_id = "nova-" + vif_id
-        utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
-        utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
+        if not linux_net._device_exists(dev): 
+            iface_id = "nova-" + vif_id
+            utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
+            utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
         utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
-            FLAGS.libvirt_ovs_integration_bridge, dev,
-            '--', 'set', 'Interface', dev,
-            "external-ids:iface-id=%s" % iface_id,
-            '--', 'set', 'Interface', dev,
-            "external-ids:iface-status=active",
-            '--', 'set', 'Interface', dev,
-            "external-ids:attached-mac=%s" % mapping['mac'])
+                FLAGS.libvirt_ovs_integration_bridge, dev,
+                '--', 'set', 'Interface', dev,
+                "external-ids:iface-id=%s" % iface_id,
+                '--', 'set', 'Interface', dev,
+                "external-ids:iface-status=active",
+                '--', 'set', 'Interface', dev,
+                "external-ids:attached-mac=%s" % mapping['mac'])
 
         result = {
             'script': '',
-- 
cgit 


From 162563d48d5b5b4626c20de7fd93dd17ea31f123 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 21 Jul 2011 22:17:37 -0700
Subject: use new 'create_vlan' field in XenAPIBridgeDriver

---
 nova/virt/xenapi/vif.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index 0557d63af..f5fb789ff 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -36,7 +36,7 @@ class XenAPIBridgeDriver(VIFDriver):
 
     def plug(self, xenapi_session, vm_ref, instance, device, network,
                                                     network_mapping):
-        if network['vlan']:
+        if network_mapping.get('create_vlan'):
             network_ref = self.ensure_vlan_bridge(xenapi_session, network)
         else:
             network_ref = NetworkHelper.find_network_with_bridge(
-- 
cgit 


From c4f650278d01437a9e1866ba2fec86d4a6d70d6a Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Fri, 22 Jul 2011 18:55:04 +0900
Subject: Fixed the missing quotes for 802.1Qbh in libvirt template

---
 nova/virt/libvirt.xml.template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index 619d69523..c82732570 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -99,14 +99,14 @@
             <script path='${nic.script}' />
         </interface>
     #else if $vif_type == '802.1Qbh'
-        <interface type='direct'>
-             <mac address=${nic.mac_address}/>
-             <source dev=${nic.device_name} mode='private'/>
-             <virtualport type='802.1Qbh'>
-                 <parameters profileid=${nic.profile_name}/>
-             </virtualport>
-             <model type='virtio'/>
-        </interface>
+       <interface type='direct'>
+            <mac address='${nic.mac_address}'/>
+            <source dev='${nic.device_name}' mode='private'/>
+            <virtualport type='802.1Qbh'>
+                <parameters profileid='${nic.profile_name}'/>
+            </virtualport>
+            <model type='virtio'/>
+       </interface>
     #else
         <interface type='bridge'>
             <source bridge='${nic.bridge_name}'/>
-- 
cgit 


From 93ffbbb234df486a1adb558a5228a7f23ea3451b Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Fri, 22 Jul 2011 22:12:15 +0900
Subject: Added network_info to unfilter_instance to avoid exceptions when
 shutting down instances

---
 nova/virt/driver.py             |  2 +-
 nova/virt/fake.py               |  2 +-
 nova/virt/libvirt/connection.py |  8 +++++---
 nova/virt/libvirt/firewall.py   | 11 ++++++-----
 nova/virt/xenapi_conn.py        |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 2faff0a1e..5c3130dfc 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -224,7 +224,7 @@ class ComputeDriver(object):
         """
         raise NotImplementedError()
 
-    def unfilter_instance(self, instance):
+    def unfilter_instance(self, instance, network_info=None):
         """Stop filtering instance"""
         raise NotImplementedError()
 
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index c5e9d89e4..26bc421c0 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -499,7 +499,7 @@ class FakeConnection(driver.ComputeDriver):
         """This method is supported only by libvirt."""
         return
 
-    def unfilter_instance(self, instance_ref):
+    def unfilter_instance(self, instance_ref, network_info=None):
         """This method is supported only by libvirt."""
         raise NotImplementedError('This method is supported only by libvirt.')
 
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 585cd74a3..d4f547ec4 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -333,7 +333,8 @@ class LibvirtConnection(driver.ComputeDriver):
         timer = utils.LoopingCall(_wait_for_destroy)
         timer.start(interval=0.5, now=True)
 
-        self.firewall_driver.unfilter_instance(instance)
+        self.firewall_driver.unfilter_instance(instance,
+                                               network_info=network_info)
 
         if cleanup:
             self._cleanup(instance)
@@ -1569,9 +1570,10 @@ class LibvirtConnection(driver.ComputeDriver):
         timer.f = wait_for_live_migration
         timer.start(interval=0.5, now=True)
 
-    def unfilter_instance(self, instance_ref):
+    def unfilter_instance(self, instance_ref, network_info=None):
         """See comments of same method in firewall_driver."""
-        self.firewall_driver.unfilter_instance(instance_ref)
+        self.firewall_driver.unfilter_instance(instance_ref,
+                                               network_info=network_info)
 
     def update_host_status(self):
         """See xenapi_conn.py implementation."""
diff --git a/nova/virt/libvirt/firewall.py b/nova/virt/libvirt/firewall.py
index 379197398..9ce57b6c9 100644
--- a/nova/virt/libvirt/firewall.py
+++ b/nova/virt/libvirt/firewall.py
@@ -46,7 +46,7 @@ class FirewallDriver(object):
         At this point, the instance isn't running yet."""
         raise NotImplementedError()
 
-    def unfilter_instance(self, instance):
+    def unfilter_instance(self, instance, network_info=None):
         """Stop filtering instance"""
         raise NotImplementedError()
 
@@ -300,9 +300,10 @@ class NWFilterFirewall(FirewallDriver):
         # execute in a native thread and block current greenthread until done
         tpool.execute(self._conn.nwfilterDefineXML, xml)
 
-    def unfilter_instance(self, instance):
+    def unfilter_instance(self, instance, network_info=None):
         """Clear out the nwfilter rules."""
-        network_info = netutils.get_network_info(instance)
+        if not network_info:
+            network_info = netutils.get_network_info(instance)
         instance_name = instance.name
         for (network, mapping) in network_info:
             nic_id = mapping['mac'].replace(':', '')
@@ -542,11 +543,11 @@ class IptablesFirewallDriver(FirewallDriver):
         """No-op. Everything is done in prepare_instance_filter"""
         pass
 
-    def unfilter_instance(self, instance):
+    def unfilter_instance(self, instance, network_info=None):
         if self.instances.pop(instance['id'], None):
             self.remove_filters_for_instance(instance)
             self.iptables.apply()
-            self.nwfilter.unfilter_instance(instance)
+            self.nwfilter.unfilter_instance(instance, network_info)
         else:
             LOG.info(_('Attempted to unfilter instance %s which is not '
                      'filtered'), instance['id'])
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 102278e1c..03ed2ecbe 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -325,7 +325,7 @@ class XenAPIConnection(driver.ComputeDriver):
         """This method is supported only by libvirt."""
         return
 
-    def unfilter_instance(self, instance_ref):
+    def unfilter_instance(self, instance_ref, network_info=None):
         """This method is supported only by libvirt."""
         raise NotImplementedError('This method is supported only by libvirt.')
 
-- 
cgit 


From d06908783c9a20621af124d824a88d34b6d78b33 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Sat, 23 Jul 2011 01:38:26 +0900
Subject: Updated the comments for VMWare VIF driver

---
 nova/virt/vmwareapi/vif.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/vmwareapi/vif.py b/nova/virt/vmwareapi/vif.py
index 281565bbc..b3e43b209 100644
--- a/nova/virt/vmwareapi/vif.py
+++ b/nova/virt/vmwareapi/vif.py
@@ -33,7 +33,7 @@ FLAGS = flags.FLAGS
 
 
 class VMWareVlanBridgeDriver(VIFDriver):
-    """VIF driver for Linux VLAN bridge."""
+    """VIF Driver to setup bridge/VLAN networking using VMWare API."""
 
     def plug(self, instance, network, mapping):
         """Create a vlan and bridge unless they already exist."""
-- 
cgit 


From 348dcb39f879926c20ed87256b149aeeaa4c6832 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Sat, 23 Jul 2011 05:11:39 +0900
Subject: Add i18n for logging, changed create_bridge/vlan to
 should_create_bridge/vlan, changed unfilter_instance's keyword param to
 positional, and added Dan's alternate ID to .mailmap

---
 nova/virt/driver.py             | 2 +-
 nova/virt/libvirt/connection.py | 6 +++---
 nova/virt/libvirt/vif.py        | 5 +++--
 nova/virt/xenapi/vif.py         | 2 +-
 nova/virt/xenapi/vmops.py       | 4 ++--
 nova/virt/xenapi_conn.py        | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 5c3130dfc..34dc5f544 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -224,7 +224,7 @@ class ComputeDriver(object):
         """
         raise NotImplementedError()
 
-    def unfilter_instance(self, instance, network_info=None):
+    def unfilter_instance(self, instance, network_info):
         """Stop filtering instance"""
         raise NotImplementedError()
 
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index d4f547ec4..c9965185a 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -315,8 +315,8 @@ class LibvirtConnection(driver.ComputeDriver):
                 for (network, mapping) in network_info:
                     self.vif_driver.unplug(instance, network, mapping)
             except:
-                LOG.warning("Failed while unplugging vif of instance '%s'" % \
-                    instance['name'])
+                LOG.warning(_("Failed while unplugging vif of instance '%s'"),
+                            instance['name'])
                 raise
 
         def _wait_for_destroy():
@@ -1570,7 +1570,7 @@ class LibvirtConnection(driver.ComputeDriver):
         timer.f = wait_for_live_migration
         timer.start(interval=0.5, now=True)
 
-    def unfilter_instance(self, instance_ref, network_info=None):
+    def unfilter_instance(self, instance_ref, network_info):
         """See comments of same method in firewall_driver."""
         self.firewall_driver.unfilter_instance(instance_ref,
                                                network_info=network_info)
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 7fb80a5cc..aa566cc72 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -72,8 +72,9 @@ class LibvirtBridgeDriver(VIFDriver):
 
     def plug(self, instance, network, mapping):
         """Ensure that the bridge exists, and add VIF to it."""
-        if not network.get('multi_host') and mapping.get('create_bridge'):
-            if mapping.get('create_vlan'):
+        if (not network.get('multi_host') and
+            mapping.get('should_create_bridge')):
+            if mapping.get('should_create_vlan'):
                 LOG.debug(_('Ensuring vlan %(vlan)s and bridge %(bridge)s'),
                           {'vlan': network['vlan'],
                            'bridge': network['bridge']})
diff --git a/nova/virt/xenapi/vif.py b/nova/virt/xenapi/vif.py
index f5fb789ff..527602243 100644
--- a/nova/virt/xenapi/vif.py
+++ b/nova/virt/xenapi/vif.py
@@ -36,7 +36,7 @@ class XenAPIBridgeDriver(VIFDriver):
 
     def plug(self, xenapi_session, vm_ref, instance, device, network,
                                                     network_mapping):
-        if network_mapping.get('create_vlan'):
+        if network_mapping.get('should_create_vlan'):
             network_ref = self.ensure_vlan_bridge(xenapi_session, network)
         else:
             network_ref = NetworkHelper.find_network_with_bridge(
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index bc47ac494..b63308f55 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -880,8 +880,8 @@ class VMOps(object):
                 for (network, mapping) in network_info:
                     self.vif_driver.unplug(instance, network, mapping)
             except:
-                LOG.warning("Failed while unplugging vif of instance '%s'" % \
-                    instance['name'])
+                LOG.warning(_("Failed while unplugging vif of instance '%s'"),
+                            instance['name'])
                 raise
 
     def _wait_with_callback(self, instance_id, task, callback):
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 03ed2ecbe..7c355a55b 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -325,7 +325,7 @@ class XenAPIConnection(driver.ComputeDriver):
         """This method is supported only by libvirt."""
         return
 
-    def unfilter_instance(self, instance_ref, network_info=None):
+    def unfilter_instance(self, instance_ref, network_info):
         """This method is supported only by libvirt."""
         raise NotImplementedError('This method is supported only by libvirt.')
 
-- 
cgit 


From 0206da24a6d9175b9dd50000fb9d8435355696bd Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Sat, 23 Jul 2011 00:00:04 +0000
Subject: update netutils in libvirt to match the 2 dns setup

---
 nova/virt/libvirt/netutils.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'nova/virt')

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']
-- 
cgit 


From b878a6e7a3143e90b8d3d665dbec78a21ca63166 Mon Sep 17 00:00:00 2001
From: "Arvind Somya asomya@cisco.com" <>
Date: Mon, 25 Jul 2011 11:20:23 -0400
Subject: Fixing PEP8 compliance issues.

---
 nova/virt/vmwareapi/vm_util.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/vmwareapi/vm_util.py b/nova/virt/vmwareapi/vm_util.py
index c09226e03..55578dd3c 100644
--- a/nova/virt/vmwareapi/vm_util.py
+++ b/nova/virt/vmwareapi/vm_util.py
@@ -111,8 +111,10 @@ def create_network_spec(client_factory, network_name, mac_address,
     # not come up on boot if set to dynamic.
     backing = None
     if (network_ref['type'] == "DistributedVirtualPortgroup"):
+        backing_name = \
+         'ns0:VirtualEthernetCardDistributedVirtualPortBackingInfo'
         backing = \
-         client_factory.create('ns0:VirtualEthernetCardDistributedVirtualPortBackingInfo')
+         client_factory.create(backing_name)
         portgroup = \
          client_factory.create('ns0:DistributedVirtualSwitchPortConnection')
         portgroup.switchUuid = network_ref['dvsw']
@@ -292,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, broadcast, dns):
+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;%s;%s" % (mac, ip_addr, netmask, gateway, broadcast, dns)
+    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')
 
-- 
cgit 


From 4c9ca0962e98c33b54d289c5ac1cd0dc79d36b51 Mon Sep 17 00:00:00 2001
From: Ryu Ishimoto <ryu@midokura.jp>
Date: Tue, 26 Jul 2011 01:52:12 +0900
Subject: Moved the exception handling of unplugging VIF from virt driver to
 VIF driver.  Added better comments.  Added OpenStack copyrights to libivrt
 vifs.py

---
 nova/virt/libvirt/connection.py |  9 ++-------
 nova/virt/libvirt/vif.py        | 20 ++++++++++++++------
 nova/virt/xenapi/vmops.py       |  9 ++-------
 3 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index c9965185a..22dfac055 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -311,13 +311,8 @@ class LibvirtConnection(driver.ComputeDriver):
                             locals())
                 raise
 
-            try:
-                for (network, mapping) in network_info:
-                    self.vif_driver.unplug(instance, network, mapping)
-            except:
-                LOG.warning(_("Failed while unplugging vif of instance '%s'"),
-                            instance['name'])
-                raise
+            for (network, mapping) in network_info:
+                self.vif_driver.unplug(instance, network, mapping)
 
         def _wait_for_destroy():
             """Called at an interval until the VM is gone."""
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index aa566cc72..24d45d1a7 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -2,6 +2,7 @@
 
 # Copyright (C) 2011 Midokura KK
 # Copyright (C) 2011 Nicira, Inc
+# Copyright 2011 OpenStack LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
@@ -29,7 +30,7 @@ LOG = logging.getLogger('nova.virt.libvirt.vif')
 
 FLAGS = flags.FLAGS
 
-flags.DEFINE_string('libvirt_ovs_integration_bridge', 'br-int',
+flags.DEFINE_string('libvirt_ovs_bridge', 'br-int',
                     'Name of Integration Bridge used by Open vSwitch')
 
 
@@ -99,12 +100,12 @@ class LibvirtOpenVswitchDriver(VIFDriver):
     def plug(self, instance, network, mapping):
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
+        iface_id = "nova-" + vif_id
         if not linux_net._device_exists(dev):
-            iface_id = "nova-" + vif_id
             utils.execute('sudo', 'ip', 'tuntap', 'add', dev, 'mode', 'tap')
             utils.execute('sudo', 'ip', 'link', 'set', dev, 'up')
         utils.execute('sudo', 'ovs-vsctl', '--', '--may-exist', 'add-port',
-                FLAGS.libvirt_ovs_integration_bridge, dev,
+                FLAGS.libvirt_ovs_bridge, dev,
                 '--', 'set', 'Interface', dev,
                 "external-ids:iface-id=%s" % iface_id,
                 '--', 'set', 'Interface', dev,
@@ -119,8 +120,15 @@ class LibvirtOpenVswitchDriver(VIFDriver):
         return result
 
     def unplug(self, instance, network, mapping):
+        """Unplug the VIF from the network by deleting the port from
+        the bridge."""
         vif_id = str(instance['id']) + "-" + str(network['id'])
         dev = "tap-%s" % vif_id
-        utils.execute('sudo', 'ovs-vsctl', 'del-port',
-                FLAGS.flat_network_bridge, dev)
-        utils.execute('sudo', 'ip', 'link', 'delete', dev)
+        try:
+            utils.execute('sudo', 'ovs-vsctl', 'del-port',
+                          FLAGS.flat_network_bridge, dev)
+            utils.execute('sudo', 'ip', 'link', 'delete', dev)
+        except:
+            LOG.warning(_("Failed while unplugging vif of instance '%s'"),
+                        instance['name'])
+            raise
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index b63308f55..0473abb97 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -876,13 +876,8 @@ class VMOps(object):
         self._destroy_vm(instance, vm_ref)
 
         if network_info:
-            try:
-                for (network, mapping) in network_info:
-                    self.vif_driver.unplug(instance, network, mapping)
-            except:
-                LOG.warning(_("Failed while unplugging vif of instance '%s'"),
-                            instance['name'])
-                raise
+            for (network, mapping) in network_info:
+                self.vif_driver.unplug(instance, network, mapping)
 
     def _wait_with_callback(self, instance_id, task, callback):
         ret = None
-- 
cgit