From 49a1cadd61b4badff0578ecd26adb57fb284ad9a Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Thu, 9 Dec 2010 16:42:52 +0000
Subject: raw instances can now be launched in xenapi (only as hvm at the
 moment)

---
 nova/virt/libvirt.qemu.xml.template | 18 ++++++++++--
 nova/virt/libvirt_conn.py           | 56 +++++++++++++++++++++++++++----------
 nova/virt/xenapi/vm_utils.py        | 41 ++++++++++++++++++++-------
 nova/virt/xenapi/vmops.py           | 19 +++++++++----
 4 files changed, 102 insertions(+), 32 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.qemu.xml.template b/nova/virt/libvirt.qemu.xml.template
index 2538b1ade..b2281297e 100644
--- a/nova/virt/libvirt.qemu.xml.template
+++ b/nova/virt/libvirt.qemu.xml.template
@@ -1,9 +1,9 @@
 <domain type='%(type)s'>
     <name>%(name)s</name>
     <os>
-        <type>hvm</type>
-        <kernel>%(basepath)s/kernel</kernel>
-        <initrd>%(basepath)s/ramdisk</initrd>
+        <type arch='i686'>hvm</type>
+        <kernel>%(kernel)s</kernel>
+        <initrd>%(ramdisk)s</initrd>
         <cmdline>root=/dev/vda1 console=ttyS0</cmdline>
     </os>
     <features>
@@ -29,5 +29,17 @@
             <source path='%(basepath)s/console.log'/>
             <target port='1'/>
         </serial>
+		<serial type='pty'>
+            <target port='0'/>
+       </serial>        
+       <console type='pty'>
+            <target type='serial' port='0'/>
+       </console>
+       <input type='mouse' bus='ps2'/>
+       <graphics type='vnc' port='-1' autoport='yes'/>
+       <video>
+            <model type='cirrus' vram='9216' heads='1'/>
+            <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+       </video>
     </devices>
 </domain>
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 18085089f..8111e46b9 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -448,20 +448,31 @@ class LibvirtConnection(object):
                            'kernel_id': inst['kernel_id'],
                            'ramdisk_id': inst['ramdisk_id']}
         if not os.path.exists(basepath('disk')):
-            yield images.fetch(inst.image_id, basepath('disk-raw'), user,
-                               project)
-        if not os.path.exists(basepath('kernel')):
-            yield images.fetch(inst.kernel_id, basepath('kernel'), user,
-                               project)
-        if not os.path.exists(basepath('ramdisk')):
-            yield images.fetch(inst.ramdisk_id, basepath('ramdisk'), user,
-                               project)
+           yield images.fetch(inst.image_id, basepath('disk-raw'), user, 
+                              project)
+
+        using_kernel = inst.kernel_id
+        if using_kernel:
+            if not os.path.exists(basepath('kernel')):
+                yield images.fetch(inst.kernel_id, basepath('kernel'), user, 
+                                   project)
+            if not os.path.exists(basepath('ramdisk')):
+                yield images.fetch(inst.ramdisk_id, basepath('ramdisk'), user, 
+                                   project)
+        
 
         execute = lambda cmd, process_input = None, check_exit_code = True: \
                   process.simple_execute(cmd=cmd,
                                          process_input=process_input,
                                          check_exit_code=check_exit_code)
 
+        # For now, we assume that if we're not using a kernel, we're using a 
+        # partitioned disk image where the target partition is the first 
+        # partition
+        target_partition = None
+        if not using_kernel:
+            target_partition = "1"
+            
         key = str(inst['key_data'])
         net = None
         network_ref = db.network_get_by_instance(context.get_admin_context(),
@@ -482,12 +493,19 @@ class LibvirtConnection(object):
             if net:
                 logging.info('instance %s: injecting net into image %s',
                     inst['name'], inst.image_id)
-            yield disk.inject_data(basepath('disk-raw'), key, net,
-                                   execute=execute)
-
-        if os.path.exists(basepath('disk')):
-            yield process.simple_execute('rm -f %s' % basepath('disk'))
-
+            try:
+                yield disk.inject_data(basepath('disk-raw'), key, net,
+                                       partition=target_partition, 
+                                       execute=execute)
+            except Exception as e:
+                # This could be a windows image, or a vmdk format disk
+                logging.warn('instance %s: ignoring error injecting data'
+                             ' into image %s (%s)',
+                             inst['name'], inst.image_id, e)
+
+        if using_kernel:
+            if os.path.exists(basepath('disk')):
+                yield process.simple_execute('rm -f %s' % basepath('disk'))
         local_bytes = (instance_types.INSTANCE_TYPES[inst.instance_type]
                                                     ['local_gb']
                                                     * 1024 * 1024 * 1024)
@@ -524,6 +542,16 @@ class LibvirtConnection(object):
                     'mac_address': instance['mac_address'],
                     'ip_address': ip_address,
                     'dhcp_server': dhcp_server}
+        if instance['kernel_id']:
+            xml_info['kernel'] = xml_info['basepath'] + "/kernel"
+        if instance['ramdisk_id']:
+            xml_info['ramdisk'] = xml_info['basepath'] + "/ramdisk"
+
+        if instance['ramdisk_id'] or instance['kernel_id']:
+            xml_info['disk'] = xml_info['basepath'] + "/disk"
+        else:
+            xml_info['disk'] = xml_info['basepath'] + "/disk-raw"
+        #TODO: Must find a way for not populating kernel and ramdisk attributes
         if rescue:
             libvirt_xml = self.rescue_xml % xml_info
         else:
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 407acda6e..3ab4581c4 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -69,9 +69,9 @@ class VMHelper():
             'actions_after_reboot': 'restart',
             'actions_after_crash': 'destroy',
             'PV_bootloader': '',
-            'PV_kernel': kernel,
-            'PV_ramdisk': ramdisk,
-            'PV_args': 'root=/dev/xvda1',
+            'PV_kernel': '',
+            'PV_ramdisk': '',
+            'PV_args': '',
             'PV_bootloader_args': '',
             'PV_legacy_args': '',
             'HVM_boot_policy': '',
@@ -83,6 +83,22 @@ class VMHelper():
             'user_version': '0',
             'other_config': {},
             }
+        #TODO: if there is no kernel we need to call a plugin to understand whether 
+        #the VM should be launched as PV or HVM
+        if (instance.kernel_id):
+            logging.debug("A kernel (and hopefully a ramdisk) have been provided")
+            rec['PV_bootloader'] = ''
+            rec['PV_kernel'] = kernel
+            rec['PV_ramdisk'] = ramdisk
+            rec['PV_args'] = 'root=/dev/xvda1'
+            rec['PV_bootloader_args'] = ''
+            rec['PV_legacy_args'] = ''
+        else:
+            logging.debug("This a raw image, hopefully HVM")
+            #TODO: Windows needs a platform flag... 
+            rec['HVM_boot_policy'] = 'BIOS order'
+            rec['HVM_boot_params'] = {'order': 'dc'}
+            
         logging.debug('Created VM %s...', instance.name)
         vm_ref = yield session.call_xenapi('VM.create', rec)
         logging.debug('Created VM %s as %s.', instance.name, vm_ref)
@@ -137,12 +153,12 @@ class VMHelper():
 
     @classmethod
     @defer.inlineCallbacks
-    def fetch_image(cls, session, image, user, project, use_sr):
-        """use_sr: True to put the image as a VDI in an SR, False to place
-        it on dom0's filesystem.  The former is for VM disks, the latter for
-        its kernel and ramdisk (if external kernels are being used).
-        Returns a Deferred that gives the new VDI UUID."""
-
+    def fetch_image(cls, session, image, user, project, type):
+        """type: integer field for specifying how to handle the image
+            0 - kernel/ramdisk image (goes on dom0's filesystem)
+            1 - disk image (local SR, partitioned by objectstore plugin)
+            2 - raw disk image (local SR, NOT partitioned by objectstor plugin)"""
+            
         url = images.image_url(image)
         access = AuthManager().get_access_key(user, project)
         logging.debug("Asking xapi to fetch %s as %s", url, access)
@@ -151,8 +167,13 @@ class VMHelper():
         args['src_url'] = url
         args['username'] = access
         args['password'] = user.secret
-        if use_sr:
+        args['add_partition']='false'
+        args['raw']='false'
+        if use_sr<>0:
             args['add_partition'] = 'true'
+        else: 
+            if use_sr==2:
+                args['raw']='true'    
         task = yield session.async_call_plugin('objectstore', fn, args)
         uuid = yield session.wait_for_task(task)
         defer.returnValue(uuid)
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 3696782b3..3646965b1 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -57,12 +57,21 @@ class VMOps(object):
 
         user = AuthManager().get_user(instance.user_id)
         project = AuthManager().get_project(instance.project_id)
+        #if kernel is not present we must download a raw disk
+        if (instance.kernel_id):
+            disk_image_tye=1
+        else:
+            disk_image_type=2                
         vdi_uuid = yield VMHelper.fetch_image(self._session,
-            instance.image_id, user, project, True)
-        kernel = yield VMHelper.fetch_image(self._session,
-            instance.kernel_id, user, project, False)
-        ramdisk = yield VMHelper.fetch_image(self._session,
-            instance.ramdisk_id, user, project, False)
+            instance.image_id, user, project, disk_image_type)
+        kernel=None
+        if (instance.kernel_id):
+            kernel = yield VMHelper.fetch_image(self._session,
+                instance.kernel_id, user, project, 0)
+        ramdisk=None
+        if (instance.ramdisk_id):
+            ramdisk = yield VMHelper.fetch_image(self._session,
+                instance.ramdisk_id, user, project, 0)
         vdi_ref = yield self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)
         vm_ref = yield VMHelper.create_vm(self._session,
                                           instance, kernel, ramdisk)
-- 
cgit 


From 41203e726fd3e43bcce7f800c6bf042e9dd70531 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Tue, 14 Dec 2010 16:32:28 +0000
Subject: support for pv guests (in progress)

---
 nova/virt/xenapi/vm_utils.py | 45 ++++++++++++++++++++++++++++++++------------
 nova/virt/xenapi/vmops.py    |  8 ++++++--
 2 files changed, 39 insertions(+), 14 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 3ab4581c4..eeceb8e71 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -47,9 +47,11 @@ class VMHelper():
 
     @classmethod
     @defer.inlineCallbacks
-    def create_vm(cls, session, instance, kernel, ramdisk):
+    def create_vm(cls, session, instance, kernel, ramdisk,pv_kernel=False):
         """Create a VM record.  Returns a Deferred that gives the new
-        VM reference."""
+        VM reference.
+        the pv_kernel flag indicates whether the guest is HVM or PV
+        """
 
         instance_type = instance_types.INSTANCE_TYPES[instance.instance_type]
         mem = str(long(instance_type['memory_mb']) * 1024 * 1024)
@@ -79,7 +81,7 @@ class VMHelper():
             'platform': {},
             'PCI_bus': '',
             'recommendations': '',
-            'affinity': '',
+            'affinity': '',  
             'user_version': '0',
             'other_config': {},
             }
@@ -94,11 +96,14 @@ class VMHelper():
             rec['PV_bootloader_args'] = ''
             rec['PV_legacy_args'] = ''
         else:
-            logging.debug("This a raw image, hopefully HVM")
-            #TODO: Windows needs a platform flag... 
-            rec['HVM_boot_policy'] = 'BIOS order'
-            rec['HVM_boot_params'] = {'order': 'dc'}
-            
+            logging.debug("This a raw image")
+            if (pv_kernel):
+                rec['PV_args'] = 'noninteractive'
+                rec['PV_bootloader'] = 'pygrub'    
+            else:
+                rec['HVM_boot_policy'] = 'BIOS order'
+                rec['HVM_boot_params'] = {'order': 'dc'}
+                rec['platform']={'acpi':'true','apic':'true','pae':'true','viridian':'true'}
         logging.debug('Created VM %s...', instance.name)
         vm_ref = yield session.call_xenapi('VM.create', rec)
         logging.debug('Created VM %s as %s.', instance.name, vm_ref)
@@ -162,22 +167,38 @@ class VMHelper():
         url = images.image_url(image)
         access = AuthManager().get_access_key(user, project)
         logging.debug("Asking xapi to fetch %s as %s", url, access)
-        fn = use_sr and 'get_vdi' or 'get_kernel'
+        logging.debug("Salvatore: image type = %d",type)
+        fn = (type<>0) and 'get_vdi' or 'get_kernel'
+        logging.debug("Salvatore: fn=%s",fn)
         args = {}
         args['src_url'] = url
         args['username'] = access
         args['password'] = user.secret
         args['add_partition']='false'
         args['raw']='false'
-        if use_sr<>0:
+        if type<>0:
             args['add_partition'] = 'true'
-        else: 
-            if use_sr==2:
+            if type==2:
                 args['raw']='true'    
+        logging.debug("Salvatore: args['raw']=%s",args['raw'])
+        logging.debug("Salvatore: args['add_partition']=%s",args['add_partition'])
         task = yield session.async_call_plugin('objectstore', fn, args)
         uuid = yield session.wait_for_task(task)
         defer.returnValue(uuid)
 
+    @classmethod
+    @defer.inlineCallbacks
+    def lookup_image(cls, session, vdi_ref):
+        logging.debug("Looking up vdi %s for PV kernel",vdi_ref)
+        fn="is_vdi_pv"
+        args={}
+        args['vdi-ref']=vdi_ref
+        #TODO: Call proper function in plugin
+        task = yield session.async_call_plugin('objectstore', fn, args)
+        pv=yield session.wait_for_task(task)
+        logging.debug("PV Kernel in VDI:%d",pv)
+        defer.returnValue(pv)
+
     @classmethod
     @utils.deferredToThread
     def lookup(cls, session, i):
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 3646965b1..17379e9f2 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -64,6 +64,11 @@ class VMOps(object):
             disk_image_type=2                
         vdi_uuid = yield VMHelper.fetch_image(self._session,
             instance.image_id, user, project, disk_image_type)
+        vdi_ref = yield self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)        
+        #Have a look at the VDI and see if it has a PV kernel
+        pv_kernel=False
+        if (not instance.kernel_id):
+            pv_kernel=yield VMHelper.lookup_image(self._session,vdi_ref)
         kernel=None
         if (instance.kernel_id):
             kernel = yield VMHelper.fetch_image(self._session,
@@ -72,9 +77,8 @@ class VMOps(object):
         if (instance.ramdisk_id):
             ramdisk = yield VMHelper.fetch_image(self._session,
                 instance.ramdisk_id, user, project, 0)
-        vdi_ref = yield self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)
         vm_ref = yield VMHelper.create_vm(self._session,
-                                          instance, kernel, ramdisk)
+                                          instance, kernel, ramdisk,pv_kernel)
         yield VMHelper.create_vbd(self._session, vm_ref, vdi_ref, 0, True)
         if network_ref:
             yield VMHelper.create_vif(self._session, vm_ref,
-- 
cgit 


From 1dfcd8e6cdd58a0737a8667f8d2b18190527657a Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Tue, 14 Dec 2010 17:02:43 +0000
Subject: nothing

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

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index eeceb8e71..2c20e33ac 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -195,6 +195,7 @@ class VMHelper():
         args['vdi-ref']=vdi_ref
         #TODO: Call proper function in plugin
         task = yield session.async_call_plugin('objectstore', fn, args)
+        logging.debug("Waiting for task completion")
         pv=yield session.wait_for_task(task)
         logging.debug("PV Kernel in VDI:%d",pv)
         defer.returnValue(pv)
-- 
cgit 


From a6e1399dfb7ffc411876b537ad5a9b80122feacc Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Tue, 14 Dec 2010 17:16:58 +0000
Subject: nothing

---
 nova/virt/xenapi/vm_utils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 2c20e33ac..975711253 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -196,7 +196,11 @@ class VMHelper():
         #TODO: Call proper function in plugin
         task = yield session.async_call_plugin('objectstore', fn, args)
         logging.debug("Waiting for task completion")
-        pv=yield session.wait_for_task(task)
+        pv_str=yield session.wait_for_task(task)
+        if pv_str.lower() == 'true':
+            pv=True
+        elif pv_str.lower() == 'false':
+            pv=False
         logging.debug("PV Kernel in VDI:%d",pv)
         defer.returnValue(pv)
 
-- 
cgit 


From eaf463e4cc15820a5a8b91a31266fee02438c2c9 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Wed, 15 Dec 2010 14:27:07 +0000
Subject: removed temporary comment lines

---
 nova/virt/xenapi/vm_utils.py | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 975711253..2f8e19128 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -85,10 +85,9 @@ class VMHelper():
             'user_version': '0',
             'other_config': {},
             }
-        #TODO: if there is no kernel we need to call a plugin to understand whether 
-        #the VM should be launched as PV or HVM
+        #Complete VM configuration record according to the image type
+        #non-raw/raw with PV kernel/raw in HVM mode
         if (instance.kernel_id):
-            logging.debug("A kernel (and hopefully a ramdisk) have been provided")
             rec['PV_bootloader'] = ''
             rec['PV_kernel'] = kernel
             rec['PV_ramdisk'] = ramdisk
@@ -96,14 +95,14 @@ class VMHelper():
             rec['PV_bootloader_args'] = ''
             rec['PV_legacy_args'] = ''
         else:
-            logging.debug("This a raw image")
             if (pv_kernel):
                 rec['PV_args'] = 'noninteractive'
                 rec['PV_bootloader'] = 'pygrub'    
             else:
                 rec['HVM_boot_policy'] = 'BIOS order'
                 rec['HVM_boot_params'] = {'order': 'dc'}
-                rec['platform']={'acpi':'true','apic':'true','pae':'true','viridian':'true'}
+                rec['platform']={'acpi':'true','apic':'true','pae':'true',
+                                 'viridian':'true'}
         logging.debug('Created VM %s...', instance.name)
         vm_ref = yield session.call_xenapi('VM.create', rec)
         logging.debug('Created VM %s as %s.', instance.name, vm_ref)
@@ -167,9 +166,7 @@ class VMHelper():
         url = images.image_url(image)
         access = AuthManager().get_access_key(user, project)
         logging.debug("Asking xapi to fetch %s as %s", url, access)
-        logging.debug("Salvatore: image type = %d",type)
         fn = (type<>0) and 'get_vdi' or 'get_kernel'
-        logging.debug("Salvatore: fn=%s",fn)
         args = {}
         args['src_url'] = url
         args['username'] = access
@@ -180,8 +177,6 @@ class VMHelper():
             args['add_partition'] = 'true'
             if type==2:
                 args['raw']='true'    
-        logging.debug("Salvatore: args['raw']=%s",args['raw'])
-        logging.debug("Salvatore: args['add_partition']=%s",args['add_partition'])
         task = yield session.async_call_plugin('objectstore', fn, args)
         uuid = yield session.wait_for_task(task)
         defer.returnValue(uuid)
-- 
cgit 


From 9308d57ee06baab7eda304d0456544d1f9e587f0 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Wed, 15 Dec 2010 17:35:56 +0000
Subject: final cleanup

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

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 2f8e19128..2e0f957a5 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -190,7 +190,6 @@ class VMHelper():
         args['vdi-ref']=vdi_ref
         #TODO: Call proper function in plugin
         task = yield session.async_call_plugin('objectstore', fn, args)
-        logging.debug("Waiting for task completion")
         pv_str=yield session.wait_for_task(task)
         if pv_str.lower() == 'true':
             pv=True
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 17379e9f2..d00d58c80 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -59,7 +59,7 @@ class VMOps(object):
         project = AuthManager().get_project(instance.project_id)
         #if kernel is not present we must download a raw disk
         if (instance.kernel_id):
-            disk_image_tye=1
+            disk_image_type=1
         else:
             disk_image_type=2                
         vdi_uuid = yield VMHelper.fetch_image(self._session,
-- 
cgit 


From 57e839b1333e29a44a33dc2571dfb8a0a0c956e3 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Wed, 15 Dec 2010 17:58:55 +0000
Subject: I made pep8 happy

---
 nova/virt/libvirt_conn.py    | 15 +++++++--------
 nova/virt/xenapi/vm_utils.py | 42 +++++++++++++++++++++---------------------
 nova/virt/xenapi/vmops.py    | 16 ++++++++--------
 3 files changed, 36 insertions(+), 37 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 8111e46b9..81fa5101f 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -448,31 +448,30 @@ class LibvirtConnection(object):
                            'kernel_id': inst['kernel_id'],
                            'ramdisk_id': inst['ramdisk_id']}
         if not os.path.exists(basepath('disk')):
-           yield images.fetch(inst.image_id, basepath('disk-raw'), user, 
+            yield images.fetch(inst.image_id, basepath('disk-raw'), user,
                               project)
 
         using_kernel = inst.kernel_id
         if using_kernel:
             if not os.path.exists(basepath('kernel')):
-                yield images.fetch(inst.kernel_id, basepath('kernel'), user, 
+                yield images.fetch(inst.kernel_id, basepath('kernel'), user,
                                    project)
             if not os.path.exists(basepath('ramdisk')):
-                yield images.fetch(inst.ramdisk_id, basepath('ramdisk'), user, 
+                yield images.fetch(inst.ramdisk_id, basepath('ramdisk'), user,
                                    project)
-        
 
         execute = lambda cmd, process_input = None, check_exit_code = True: \
                   process.simple_execute(cmd=cmd,
                                          process_input=process_input,
                                          check_exit_code=check_exit_code)
 
-        # For now, we assume that if we're not using a kernel, we're using a 
-        # partitioned disk image where the target partition is the first 
+        # For now, we assume that if we're not using a kernel, we're using a
+        # partitioned disk image where the target partition is the first
         # partition
         target_partition = None
         if not using_kernel:
             target_partition = "1"
-            
+
         key = str(inst['key_data'])
         net = None
         network_ref = db.network_get_by_instance(context.get_admin_context(),
@@ -495,7 +494,7 @@ class LibvirtConnection(object):
                     inst['name'], inst.image_id)
             try:
                 yield disk.inject_data(basepath('disk-raw'), key, net,
-                                       partition=target_partition, 
+                                       partition=target_partition,
                                        execute=execute)
             except Exception as e:
                 # This could be a windows image, or a vmdk format disk
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 2e0f957a5..8775aa91a 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -47,7 +47,7 @@ class VMHelper():
 
     @classmethod
     @defer.inlineCallbacks
-    def create_vm(cls, session, instance, kernel, ramdisk,pv_kernel=False):
+    def create_vm(cls, session, instance, kernel, ramdisk, pv_kernel=False):
         """Create a VM record.  Returns a Deferred that gives the new
         VM reference.
         the pv_kernel flag indicates whether the guest is HVM or PV
@@ -81,7 +81,7 @@ class VMHelper():
             'platform': {},
             'PCI_bus': '',
             'recommendations': '',
-            'affinity': '',  
+            'affinity': '',
             'user_version': '0',
             'other_config': {},
             }
@@ -97,12 +97,12 @@ class VMHelper():
         else:
             if (pv_kernel):
                 rec['PV_args'] = 'noninteractive'
-                rec['PV_bootloader'] = 'pygrub'    
+                rec['PV_bootloader'] = 'pygrub'
             else:
                 rec['HVM_boot_policy'] = 'BIOS order'
                 rec['HVM_boot_params'] = {'order': 'dc'}
-                rec['platform']={'acpi':'true','apic':'true','pae':'true',
-                                 'viridian':'true'}
+                rec['platform'] = {'acpi': 'true', 'apic': 'true',
+                                   'pae': 'true', 'viridian': 'true'}
         logging.debug('Created VM %s...', instance.name)
         vm_ref = yield session.call_xenapi('VM.create', rec)
         logging.debug('Created VM %s as %s.', instance.name, vm_ref)
@@ -161,22 +161,22 @@ class VMHelper():
         """type: integer field for specifying how to handle the image
             0 - kernel/ramdisk image (goes on dom0's filesystem)
             1 - disk image (local SR, partitioned by objectstore plugin)
-            2 - raw disk image (local SR, NOT partitioned by objectstor plugin)"""
-            
+            2 - raw disk image (local SR, NOT partitioned by plugin)"""
+
         url = images.image_url(image)
         access = AuthManager().get_access_key(user, project)
         logging.debug("Asking xapi to fetch %s as %s", url, access)
-        fn = (type<>0) and 'get_vdi' or 'get_kernel'
+        fn = (type != 0) and 'get_vdi' or 'get_kernel'
         args = {}
         args['src_url'] = url
         args['username'] = access
         args['password'] = user.secret
-        args['add_partition']='false'
-        args['raw']='false'
-        if type<>0:
+        args['add_partition'] = 'false'
+        args['raw'] = 'false'
+        if type != 0:
             args['add_partition'] = 'true'
-            if type==2:
-                args['raw']='true'    
+            if type == 2:
+                args['raw'] = 'true'
         task = yield session.async_call_plugin('objectstore', fn, args)
         uuid = yield session.wait_for_task(task)
         defer.returnValue(uuid)
@@ -184,18 +184,18 @@ class VMHelper():
     @classmethod
     @defer.inlineCallbacks
     def lookup_image(cls, session, vdi_ref):
-        logging.debug("Looking up vdi %s for PV kernel",vdi_ref)
-        fn="is_vdi_pv"
-        args={}
-        args['vdi-ref']=vdi_ref
+        logging.debug("Looking up vdi %s for PV kernel", vdi_ref)
+        fn = "is_vdi_pv"
+        args = {}
+        args['vdi-ref'] = vdi_ref
         #TODO: Call proper function in plugin
         task = yield session.async_call_plugin('objectstore', fn, args)
-        pv_str=yield session.wait_for_task(task)
+        pv_str = yield session.wait_for_task(task)
         if pv_str.lower() == 'true':
-            pv=True
+            pv = True
         elif pv_str.lower() == 'false':
-            pv=False
-        logging.debug("PV Kernel in VDI:%d",pv)
+            pv = False
+        logging.debug("PV Kernel in VDI:%d", pv)
         defer.returnValue(pv)
 
     @classmethod
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index d00d58c80..170d8af32 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -59,26 +59,26 @@ class VMOps(object):
         project = AuthManager().get_project(instance.project_id)
         #if kernel is not present we must download a raw disk
         if (instance.kernel_id):
-            disk_image_type=1
+            disk_image_type = 1
         else:
-            disk_image_type=2                
+            disk_image_type = 2
         vdi_uuid = yield VMHelper.fetch_image(self._session,
             instance.image_id, user, project, disk_image_type)
-        vdi_ref = yield self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)        
+        vdi_ref = yield self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)
         #Have a look at the VDI and see if it has a PV kernel
-        pv_kernel=False
+        pv_kernel = False
         if (not instance.kernel_id):
-            pv_kernel=yield VMHelper.lookup_image(self._session,vdi_ref)
-        kernel=None
+            pv_kernel = yield VMHelper.lookup_image(self._session, vdi_ref)
+        kernel = None
         if (instance.kernel_id):
             kernel = yield VMHelper.fetch_image(self._session,
                 instance.kernel_id, user, project, 0)
-        ramdisk=None
+        ramdisk = None
         if (instance.ramdisk_id):
             ramdisk = yield VMHelper.fetch_image(self._session,
                 instance.ramdisk_id, user, project, 0)
         vm_ref = yield VMHelper.create_vm(self._session,
-                                          instance, kernel, ramdisk,pv_kernel)
+                                          instance, kernel, ramdisk, pv_kernel)
         yield VMHelper.create_vbd(self._session, vm_ref, vdi_ref, 0, True)
         if network_ref:
             yield VMHelper.create_vif(self._session, vm_ref,
-- 
cgit 


From 988d6c01b0f6870a21c7294534cdcc01fbf15dc0 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Thu, 16 Dec 2010 12:22:29 +0000
Subject: removed extra stuff used for debugging

---
 nova/virt/libvirt.qemu.xml.template | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.qemu.xml.template b/nova/virt/libvirt.qemu.xml.template
index b2281297e..55768c45c 100644
--- a/nova/virt/libvirt.qemu.xml.template
+++ b/nova/virt/libvirt.qemu.xml.template
@@ -1,7 +1,7 @@
 <domain type='%(type)s'>
     <name>%(name)s</name>
     <os>
-        <type arch='i686'>hvm</type>
+        <type>hvm</type>
         <kernel>%(kernel)s</kernel>
         <initrd>%(ramdisk)s</initrd>
         <cmdline>root=/dev/vda1 console=ttyS0</cmdline>
@@ -29,17 +29,5 @@
             <source path='%(basepath)s/console.log'/>
             <target port='1'/>
         </serial>
-		<serial type='pty'>
-            <target port='0'/>
-       </serial>        
-       <console type='pty'>
-            <target type='serial' port='0'/>
-       </console>
-       <input type='mouse' bus='ps2'/>
-       <graphics type='vnc' port='-1' autoport='yes'/>
-       <video>
-            <model type='cirrus' vram='9216' heads='1'/>
-            <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-       </video>
     </devices>
 </domain>
-- 
cgit 


From 6c9ec94d0c9303316ad8f3347532eabf31ca8316 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Fri, 17 Dec 2010 11:49:00 +0000
Subject: Code reviewed

---
 nova/virt/xenapi/vm_utils.py | 4 ++--
 nova/virt/xenapi/vmops.py    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 18938ec3c..d136810d5 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -105,7 +105,7 @@ class VMHelper():
             }
         #Complete VM configuration record according to the image type
         #non-raw/raw with PV kernel/raw in HVM mode
-        if (instance.kernel_id):
+        if instance.kernel_id:
             rec['PV_bootloader'] = ''
             rec['PV_kernel'] = kernel
             rec['PV_ramdisk'] = ramdisk
@@ -113,7 +113,7 @@ class VMHelper():
             rec['PV_bootloader_args'] = ''
             rec['PV_legacy_args'] = ''
         else:
-            if (pv_kernel):
+            if pv_kernel:
                 rec['PV_args'] = 'noninteractive'
                 rec['PV_bootloader'] = 'pygrub'
             else:
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 85e199275..0726882df 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -65,7 +65,7 @@ class VMOps(object):
         user = AuthManager().get_user(instance.user_id)
         project = AuthManager().get_project(instance.project_id)
         #if kernel is not present we must download a raw disk
-        if (instance.kernel_id):
+        if instance.kernel_id:
             disk_image_type = 1
         else:
             disk_image_type = 2
@@ -74,14 +74,14 @@ class VMOps(object):
         vdi_ref = yield self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)
         #Have a look at the VDI and see if it has a PV kernel
         pv_kernel = False
-        if (not instance.kernel_id):
+        if not instance.kernel_id:
             pv_kernel = yield VMHelper.lookup_image(self._session, vdi_ref)
         kernel = None
-        if (instance.kernel_id):
+        if instance.kernel_id:
             kernel = yield VMHelper.fetch_image(self._session,
                 instance.kernel_id, user, project, 0)
         ramdisk = None
-        if (instance.ramdisk_id):
+        if instance.ramdisk_id:
             ramdisk = yield VMHelper.fetch_image(self._session,
                 instance.ramdisk_id, user, project, 0)
         vm_ref = yield VMHelper.create_vm(self._session,
-- 
cgit 


From 3356aebe4d830e8d488a8eba2847a58e621045f6 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Fri, 17 Dec 2010 16:41:35 +0000
Subject: bug fixes

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

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 3c48c7aaf..4c58598c1 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -62,7 +62,6 @@ class VMHelper():
             XenAPI = __import__('XenAPI')
 
     @classmethod
-    @defer.inlineCallbacks
     def create_vm(cls, session, instance, kernel, ramdisk, pv_kernel=False):
         """Create a VM record.  Returns a Deferred that gives the new
         VM reference.
@@ -170,7 +169,6 @@ class VMHelper():
         return vif_ref
 
     @classmethod
-    @defer.inlineCallbacks
     def fetch_image(cls, session, image, user, project, type):
         """type: integer field for specifying how to handle the image
             0 - kernel/ramdisk image (goes on dom0's filesystem)
@@ -196,24 +194,22 @@ class VMHelper():
         return uuid
 
     @classmethod
-    @defer.inlineCallbacks
     def lookup_image(cls, session, vdi_ref):
         logging.debug("Looking up vdi %s for PV kernel", vdi_ref)
         fn = "is_vdi_pv"
         args = {}
         args['vdi-ref'] = vdi_ref
         #TODO: Call proper function in plugin
-        task = yield session.async_call_plugin('objectstore', fn, args)
-        pv_str = yield session.wait_for_task(task)
+        task = session.async_call_plugin('objectstore', fn, args)
+        pv_str = session.wait_for_task(task)
         if pv_str.lower() == 'true':
             pv = True
         elif pv_str.lower() == 'false':
             pv = False
         logging.debug("PV Kernel in VDI:%d", pv)
-        defer.returnValue(pv)
+        return pv
 
     @classmethod
-    @utils.deferredToThread
     def lookup(cls, session, i):
         """ Look the instance i up, and returns it if available """
         return VMHelper.lookup_blocking(session, i)
-- 
cgit 


From aded4faba96e4de88f0294604927ef824cb249be Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 20 Dec 2010 22:55:11 +0000
Subject: added suspend and resume

---
 nova/virt/fake.py         |  8 ++++++++
 nova/virt/libvirt_conn.py |  8 ++++++++
 nova/virt/xenapi/vmops.py | 23 +++++++++++++++++++++--
 nova/virt/xenapi_conn.py  |  8 ++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 55c6dcef9..54787751e 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -142,6 +142,14 @@ class FakeConnection(object):
         """
         pass
 
+    def suspend(self, instance, callback):
+        """suspend the specified instance"""
+        pass
+
+    def resume(self, instance, callback):
+        """resume the specified instance"""
+        pass
+
     def destroy(self, instance):
         """
         Destroy (shutdown and delete) the specified instance.
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index ad101db2a..6c77a2693 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -269,6 +269,14 @@ class LibvirtConnection(object):
     def unpause(self, instance, callback):
         raise exception.APIError("unpause not supported for libvirt.")
 
+    @exception.wrap_exception
+    def suspend(self, instance, callback):
+        raise exception.APIError("suspend not supported for libvirt")
+
+    @exception.wrap_exception
+    def resume(self, instance, callback):
+        raise exception.APIError("resume not supported for libvirt")
+
     @exception.wrap_exception
     def rescue(self, instance):
         self.destroy(instance, False)
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index a18eacf07..eb6743a7a 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -144,11 +144,29 @@ class VMOps(object):
         task = self._session.call_xenapi('Async.VM.unpause', vm)
         self._wait_with_callback(task, callback)
 
+    def suspend(self, instance, callback):
+        """suspend the specified instance"""
+        instance_name = instance.name
+        vm = VMHelper.lookup(self._session, instance_name)
+        if vm is None:
+            raise Exception("suspend: instance not present %s" % instance_name)
+        task = self._session.call_xenapi('Async.VM.suspend', vm)
+        self._wait_with_callback(task, callback)
+
+    def resume(self, instance, callback):
+        """resume the specified instance"""
+        instance_name = instance.name
+        vm = VMHelper.lookup(self._session, instance_name)
+        if vm is None:
+            raise Exception("resume: instance not present %s" % instance_name)
+        task = self._session.call_xenapi('Async.VM.resume', vm)
+        self._wait_with_callback(task, callback)
+
     def get_info(self, instance_id):
         """ Return data about VM instance """
         vm = VMHelper.lookup_blocking(self._session, instance_id)
         if vm is None:
-            raise Exception('instance not present %s' % instance_id)
+            raise Exception("get_info: instance not present %s" % instance_id)
         rec = self._session.get_xenapi().VM.get_record(vm)
         return VMHelper.compile_info(rec)
 
@@ -156,7 +174,8 @@ class VMOps(object):
         """Return data about VM diagnostics"""
         vm = VMHelper.lookup(self._session, instance_id)
         if vm is None:
-            raise Exception("instance not present %s" % instance_id)
+            raise Exception("get_diagnostics: instance not present %s" % \
+                                                                   instance_id)
         rec = self._session.get_xenapi().VM.get_record(vm)
         return VMHelper.compile_diagnostics(self._session, rec)
 
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 21ed2cd65..7e430cbdc 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -132,6 +132,14 @@ class XenAPIConnection(object):
         """ Unpause paused VM instance """
         self._vmops.unpause(instance, callback)
 
+    def suspend(self, instance, callback):
+        """suspend the specified instance"""
+        self._vmops.suspend(instance, callback)
+
+    def resume(self, instance, callback):
+        """resume the specified instance"""
+        self._vmops.resume(instance, callback)
+
     def get_info(self, instance_id):
         """ Return data about VM instance """
         return self._vmops.get_info(instance_id)
-- 
cgit 


From f9e2bbdf1182f54d69f6005eb7c39007eddbd3cd Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Tue, 21 Dec 2010 20:06:53 +0000
Subject: correct xenapi resume call

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

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index eb6743a7a..3ec131600 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -159,7 +159,7 @@ class VMOps(object):
         vm = VMHelper.lookup(self._session, instance_name)
         if vm is None:
             raise Exception("resume: instance not present %s" % instance_name)
-        task = self._session.call_xenapi('Async.VM.resume', vm)
+        task = self._session.call_xenapi('Async.VM.resume', vm, False, True)
         self._wait_with_callback(task, callback)
 
     def get_info(self, instance_id):
-- 
cgit 


From 62286399b69218418020baaf524292c1677d27d3 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 06:48:15 +0000
Subject: added suspend as a power state

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

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 017a6eab0..667da27ea 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -37,7 +37,7 @@ XENAPI_POWER_STATE = {
     'Halted': power_state.SHUTDOWN,
     'Running': power_state.RUNNING,
     'Paused': power_state.PAUSED,
-    'Suspended': power_state.SHUTDOWN,  # FIXME
+    'Suspended': power_state.SUSPENDED,
     'Crashed': power_state.CRASHED}
 
 XenAPI = None
-- 
cgit 


From 45c75b0c8ecea6952d68cc28d2925c6a42a799de Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 07:05:45 +0000
Subject: added power state logging to nova.virt.xenapi.vm_utils

---
 nova/virt/xenapi/vm_utils.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 667da27ea..095e32ae2 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -217,6 +217,10 @@ class VMHelper():
 
     @classmethod
     def compile_info(cls, record):
+        logging.info("(VM_UTILS) xenserver vm state -> |%s|",
+                     record['power_state'])
+        logging.info("(VM_UTILS) xenapi power_state -> |%s|",
+                     XENAPI_POWER_STATE[record['power_state']])
         return {'state': XENAPI_POWER_STATE[record['power_state']],
                 'max_mem': long(record['memory_static_max']) >> 10,
                 'mem': long(record['memory_dynamic_max']) >> 10,
-- 
cgit 


From a0ca9d4a9550370cc262574fbee097e5b70e408d Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 20:35:16 +0000
Subject: added _() for gettext and a couple of pep8s

---
 nova/virt/fake.py            | 8 ++++++--
 nova/virt/xenapi/vm_utils.py | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 54787751e..3bb062294 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -143,11 +143,15 @@ class FakeConnection(object):
         pass
 
     def suspend(self, instance, callback):
-        """suspend the specified instance"""
+        """
+        suspend the specified instance
+        """
         pass
 
     def resume(self, instance, callback):
-        """resume the specified instance"""
+        """
+        resume the specified instance
+        """
         pass
 
     def destroy(self, instance):
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 095e32ae2..dc8359204 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -217,9 +217,9 @@ class VMHelper():
 
     @classmethod
     def compile_info(cls, record):
-        logging.info("(VM_UTILS) xenserver vm state -> |%s|",
+        logging.info(_("(VM_UTILS) xenserver vm state -> |%s|"),
                      record['power_state'])
-        logging.info("(VM_UTILS) xenapi power_state -> |%s|",
+        logging.info(_("(VM_UTILS) xenapi power_state -> |%s|"),
                      XENAPI_POWER_STATE[record['power_state']])
         return {'state': XENAPI_POWER_STATE[record['power_state']],
                 'max_mem': long(record['memory_static_max']) >> 10,
-- 
cgit 


From f4a6468b9694a34c477df7fc0c5a077ae6f1207e Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Thu, 23 Dec 2010 21:57:11 +0000
Subject: Merged with trunk All tests passed Could not fix some pep8 errors in
 nova/virt/libvirt_conn.py

---
 nova/virt/xenapi/fake.py         | 1 +
 nova/virt/xenapi/volume_utils.py | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py
index 7a6c9ee71..ad62e2a89 100644
--- a/nova/virt/xenapi/fake.py
+++ b/nova/virt/xenapi/fake.py
@@ -235,6 +235,7 @@ class SessionBase(object):
         elif '.' in name:
             impl = getattr(self, name.replace('.', '_'))
             if impl is not None:
+                
                 def callit(*params):
                     logging.warn('Calling %s %s', name, impl)
                     self._check_session(params)
diff --git a/nova/virt/xenapi/volume_utils.py b/nova/virt/xenapi/volume_utils.py
index a0c0a67d4..1ca813bcf 100644
--- a/nova/virt/xenapi/volume_utils.py
+++ b/nova/virt/xenapi/volume_utils.py
@@ -60,13 +60,11 @@ class VolumeHelper(HelperBase):
                           'port': info['targetPort'],
                           'targetIQN': info['targetIQN'],
                           'chapuser': info['chapuser'],
-                          'chappassword': info['chappassword']
-                          }
+                          'chappassword': info['chappassword']}
             else:
                 record = {'target': info['targetHost'],
                           'port': info['targetPort'],
-                          'targetIQN': info['targetIQN']
-                          }
+                          'targetIQN': info['targetIQN']}
             try:
                 sr_ref = session.get_xenapi().SR.create(
                     session.get_xenapi_host(),
-- 
cgit 


From c2e645416d88e4438b9359c5dccacf4690c4f54e Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Mon, 27 Dec 2010 10:04:25 +0000
Subject: Fixed pep8 errors

---
 nova/virt/libvirt_conn.py | 15 ++++++++-------
 nova/virt/xenapi/fake.py  |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 651b2af93..67b9fc47e 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -512,9 +512,10 @@ class LibvirtConnection(object):
 
         if FLAGS.allow_project_net_traffic:
             net, mask = _get_net_and_mask(network['cidr'])
-            extra_params = ("<parameter name=\"PROJNET\" value=\"%s\" />\n"
-                            "<parameter name=\"PROJMASK\" value=\"%s\" />\n"
-                           ) % (net, mask)
+            extra_params = ("<parameter name=\"PROJNET\" "
+                            "value=\"%s\" />\n"
+                            "<parameter name=\"PROJMASK\" "
+                            "value=\"%s\" />\n") % (net, mask)
         else:
             extra_params = "\n"
 
@@ -800,8 +801,8 @@ class NWFilterFirewall(object):
         the base filter are all in place.
         """
 
-        nwfilter_xml = ("<filter name='nova-instance-%s' chain='root'>\n"
-                       ) % instance['name']
+        nwfilter_xml = ("<filter name='nova-instance-%s' "
+                        "chain='root'>\n") % instance['name']
 
         if instance['image_id'] == FLAGS.vpn_image_id:
             nwfilter_xml += "  <filterref filter='nova-vpn' />\n"
@@ -814,8 +815,8 @@ class NWFilterFirewall(object):
         for security_group in instance.security_groups:
             self.ensure_security_group_filter(security_group['id'])
 
-            nwfilter_xml += ("  <filterref filter='nova-secgroup-%d' />\n"
-                            ) % security_group['id']
+            nwfilter_xml += ("  <filterref filter='nova-secgroup-%d' "
+                             "/>\n") % security_group['id']
         nwfilter_xml += "</filter>"
 
         self._define_filter(nwfilter_xml)
diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py
index ad62e2a89..1eaf31c25 100644
--- a/nova/virt/xenapi/fake.py
+++ b/nova/virt/xenapi/fake.py
@@ -235,7 +235,7 @@ class SessionBase(object):
         elif '.' in name:
             impl = getattr(self, name.replace('.', '_'))
             if impl is not None:
-                
+
                 def callit(*params):
                     logging.warn('Calling %s %s', name, impl)
                     self._check_session(params)
-- 
cgit 


From 7cc68042a911dc38f1c2c24b3361757c16142b74 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 22:59:08 +0000
Subject: missed a couple of gettext _()

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

(limited to 'nova/virt')

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index cb5a49350..d756eae53 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -178,7 +178,8 @@ class VMOps(object):
         instance_name = instance.name
         vm = VMHelper.lookup(self._session, instance_name)
         if vm is None:
-            raise Exception("suspend: instance not present %s" % instance_name)
+            raise Exception(_("suspend: instance not present %s") %
+                                                     instance_name)
         task = self._session.call_xenapi('Async.VM.suspend', vm)
         self._wait_with_callback(task, callback)
 
@@ -187,7 +188,8 @@ class VMOps(object):
         instance_name = instance.name
         vm = VMHelper.lookup(self._session, instance_name)
         if vm is None:
-            raise Exception("resume: instance not present %s" % instance_name)
+            raise Exception(_("resume: instance not present %s") %
+                                                    instance_name)
         task = self._session.call_xenapi('Async.VM.resume', vm, False, True)
         self._wait_with_callback(task, callback)
 
-- 
cgit