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/compute/api.py                 | 25 +++++++++++++----
 nova/compute/instance_types.py      |  2 +-
 nova/db/sqlalchemy/api.py           |  2 +-
 nova/flags.py                       |  7 +++++
 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 +++++++++----
 8 files changed, 130 insertions(+), 40 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 929342a1e..829dfdaa5 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -74,10 +74,22 @@ class ComputeAPI(base.Base):
                 kernel_id = image.get('kernelId', FLAGS.default_kernel)
             if ramdisk_id is None:
                 ramdisk_id = image.get('ramdiskId', FLAGS.default_ramdisk)
-
-            # Make sure we have access to kernel and ramdisk
-            image_service.show(context, kernel_id)
-            image_service.show(context, ramdisk_id)
+            #Salvatore - No kernel and ramdisk for raw images
+            pv_kernel=None
+            if (kernel_id == str(FLAGS.null_kernel) or kernel_id == str(FLAGS.null_kernel_pv)):
+                if kernel_id == str(FLAGS.null_kernel):
+                    pv_kernel=False
+                else:
+                    pv_kernel=True
+                kernel_id = None
+                ramdisk_id = None
+                logging.debug("Creating a raw instance (no kernel and ramdisk) - Paravirtualization:%s" %str(pv_kernel))
+
+            # Make sure we have access to kernel and ramdisk (as long as we want them)
+            if (kernel_id!=None):
+                image_service.show(context, kernel_id)
+            if (ramdisk_id!=None):
+                image_service.show(context, ramdisk_id)
 
         if security_group is None:
             security_group = ['default']
@@ -97,11 +109,12 @@ class ComputeAPI(base.Base):
             key_data = key_pair['public_key']
 
         type_data = instance_types.INSTANCE_TYPES[instance_type]
+        #Salvatore TODO: PV or HVM
         base_options = {
             'reservation_id': utils.generate_uid('r'),
             'image_id': image_id,
-            'kernel_id': kernel_id,
-            'ramdisk_id': ramdisk_id,
+            'kernel_id': kernel_id or '',
+            'ramdisk_id': ramdisk_id or '',
             'state_description': 'scheduling',
             'user_id': context.user_id,
             'project_id': context.project_id,
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index a2679e0fc..06b4bf825 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -26,7 +26,7 @@ from nova import flags
 FLAGS = flags.FLAGS
 INSTANCE_TYPES = {
     'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
-    'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
+    'm1.small': dict(memory_mb=1024, vcpus=1, local_gb=20, flavorid=2),
     'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
     'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
     'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index dd9649054..5ab982860 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -43,7 +43,7 @@ def is_admin_context(context):
     if not context:
         warnings.warn('Use of empty request context is deprecated',
                       DeprecationWarning)
-        raise Exception('die')
+        #raise Exception('die')
     return context.is_admin
 
 
diff --git a/nova/flags.py b/nova/flags.py
index 1f94feb08..1cb846c15 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -234,6 +234,13 @@ DEFINE_string('default_ramdisk', 'ari-11111',
               'default ramdisk to use, testing only')
 DEFINE_string('default_instance_type', 'm1.small',
               'default instance type to use, testing only')
+DEFINE_string('null_kernel', 'aki-00000000',
+              'kernel image that indicates not to use a kernel, '
+              ' but to use a raw disk image instead')
+DEFINE_string('null_kernel_pv', 'aki-00000001',
+              'kernel image that indicates not to use a kernel, '
+              ' but to use a raw disk image for a paravirtualized guest')
+
 
 DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server')
 DEFINE_string('vpn_key_suffix',
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')

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')

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')

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/compute/api.py          |  7 +------
 nova/flags.py                |  4 ----
 nova/virt/xenapi/vm_utils.py | 13 ++++---------
 3 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 829dfdaa5..1f54a4f96 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -75,12 +75,7 @@ class ComputeAPI(base.Base):
             if ramdisk_id is None:
                 ramdisk_id = image.get('ramdiskId', FLAGS.default_ramdisk)
             #Salvatore - No kernel and ramdisk for raw images
-            pv_kernel=None
-            if (kernel_id == str(FLAGS.null_kernel) or kernel_id == str(FLAGS.null_kernel_pv)):
-                if kernel_id == str(FLAGS.null_kernel):
-                    pv_kernel=False
-                else:
-                    pv_kernel=True
+            if (kernel_id == str(FLAGS.null_kernel)):
                 kernel_id = None
                 ramdisk_id = None
                 logging.debug("Creating a raw instance (no kernel and ramdisk) - Paravirtualization:%s" %str(pv_kernel))
diff --git a/nova/flags.py b/nova/flags.py
index 1cb846c15..bd2fe4b99 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -237,10 +237,6 @@ DEFINE_string('default_instance_type', 'm1.small',
 DEFINE_string('null_kernel', 'aki-00000000',
               'kernel image that indicates not to use a kernel, '
               ' but to use a raw disk image instead')
-DEFINE_string('null_kernel_pv', 'aki-00000001',
-              'kernel image that indicates not to use a kernel, '
-              ' but to use a raw disk image for a paravirtualized guest')
-
 
 DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server')
 DEFINE_string('vpn_key_suffix',
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/compute/api.py          | 2 +-
 nova/virt/xenapi/vm_utils.py | 1 -
 nova/virt/xenapi/vmops.py    | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 1f54a4f96..a9f301d4d 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -78,7 +78,7 @@ class ComputeAPI(base.Base):
             if (kernel_id == str(FLAGS.null_kernel)):
                 kernel_id = None
                 ramdisk_id = None
-                logging.debug("Creating a raw instance (no kernel and ramdisk) - Paravirtualization:%s" %str(pv_kernel))
+                logging.debug("Creating a raw instance")
 
             # Make sure we have access to kernel and ramdisk (as long as we want them)
             if (kernel_id!=None):
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/compute/api.py          |  6 +++---
 nova/virt/libvirt_conn.py    | 15 +++++++--------
 nova/virt/xenapi/vm_utils.py | 42 +++++++++++++++++++++---------------------
 nova/virt/xenapi/vmops.py    | 16 ++++++++--------
 4 files changed, 39 insertions(+), 40 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index a9f301d4d..556aef7f9 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -80,10 +80,10 @@ class ComputeAPI(base.Base):
                 ramdisk_id = None
                 logging.debug("Creating a raw instance")
 
-            # Make sure we have access to kernel and ramdisk (as long as we want them)
-            if (kernel_id!=None):
+            # Make sure we have access to kernel and ramdisk (if not raw)
+            if (kernel_id != None):
                 image_service.show(context, kernel_id)
-            if (ramdisk_id!=None):
+            if (ramdisk_id != None):
                 image_service.show(context, ramdisk_id)
 
         if security_group is None:
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 4a451f96ba4a2ef9d061a491b97b61780c28a252 Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Thu, 16 Dec 2010 12:09:51 +0000
Subject: Restore code which was changed for testing reasons to the original
 state. Kudos to Armando for spotting this.

---
 nova/compute/instance_types.py | 2 +-
 nova/db/sqlalchemy/api.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index ed292ff8d..6e47170bd 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -27,7 +27,7 @@ from nova import exception
 FLAGS = flags.FLAGS
 INSTANCE_TYPES = {
     'm1.tiny': dict(memory_mb=512, vcpus=1, local_gb=0, flavorid=1),
-    'm1.small': dict(memory_mb=1024, vcpus=1, local_gb=20, flavorid=2),
+    'm1.small': dict(memory_mb=2048, vcpus=1, local_gb=20, flavorid=2),
     'm1.medium': dict(memory_mb=4096, vcpus=2, local_gb=40, flavorid=3),
     'm1.large': dict(memory_mb=8192, vcpus=4, local_gb=80, flavorid=4),
     'm1.xlarge': dict(memory_mb=16384, vcpus=8, local_gb=160, flavorid=5)}
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 036019443..55036d1d1 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -43,7 +43,7 @@ def is_admin_context(context):
     if not context:
         warnings.warn('Use of empty request context is deprecated',
                       DeprecationWarning)
-        #raise Exception('die')
+        raise Exception('die')
     return context.is_admin
 
 
-- 
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')

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 7f2cae4d63d1fb9c351d88ad911166f55e89c2f4 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 16 Dec 2010 18:01:21 +0000
Subject: fixed up openstack api images index and detail

---
 nova/api/openstack/images.py | 58 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 12 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 4a0a8e6f1..3a9bdea64 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -27,6 +27,40 @@ from nova.api.openstack import faults
 
 FLAGS = flags.FLAGS
 
+def _entity_list(entities):
+    """ Coerces a list of images into proper dictionary format
+        entities is a list of entities (dicts) """
+    return dict(images=entities)
+
+def _entity_detail(inst):
+    """ Maps everything to Rackspace-like attributes for return
+        also pares down attributes to those we want
+        inst is a single entity (dict) """
+    status_mapping = {
+        'pending': 'queued',
+        'decrypting': 'preparing',
+        'untarring': 'saving',
+        'available': 'active',
+    new_inst = {}
+    mapped_keys = {status:'imageState', id:'imageId', name:'imageLocation'}
+
+    for k,v in mapped_keys.iteritems():
+        new_inst[k] = inst[v]
+
+    new_inst['status'] = status_mapping[inew_inst['status']]
+
+    return new_inst
+
+def _entity_inst(inst):
+    """ Filters all model attributes save for id and name
+        inst is a single entity (dict) """
+    return _filter_keys(inst, ['id','name'])
+
+def _filter_keys(inst, keys):
+    """ Filters all model attributes for keys
+        inst is a single entity (dict) """
+    return dict( (k,v) for k,v in inst.iteritems() if k in keys)
+
 
 class Controller(wsgi.Controller):
 
@@ -40,24 +74,24 @@ class Controller(wsgi.Controller):
         self._service = utils.import_object(FLAGS.image_service)
 
     def index(self, req):
-        """Return all public images in brief."""
-        return dict(images=[dict(id=img['id'], name=img['name'])
-                            for img in self.detail(req)['images']])
+        """ Return all public images in brief """
+        items = self._service.index(req.environ['nova.context'])
+        items = nova.api.openstack.limited(items, req)
+        items = [_entity_inst(item) for item in items]
+        return dict(images=items)
 
     def detail(self, req):
-        """Return all public images in detail."""
+        """ Return all public images in detail """
         try:
-            images = self._service.detail(req.environ['nova.context'])
-            images = nova.api.openstack.limited(images, req)
+            items = self._service.detail(req.environ['nova.context'])
         except NotImplementedError:
-            # Emulate detail() using repeated calls to show()
-            images = self._service.index(ctxt)
-            images = nova.api.openstack.limited(images, req)
-            images = [self._service.show(ctxt, i['id']) for i in images]
-        return dict(images=images)
+            items = self._service.index(req.environ['nova.context'])
+        items = nova.api.openstack.limited(items, req)
+        items = [_entity_detail(item) for item in items]
+        return dict(images=items)
 
     def show(self, req, id):
-        """Return data about the given image id."""
+        """ Return data about the given image id """
         return dict(image=self._service.show(req.environ['nova.context'], id))
 
     def delete(self, req, id):
-- 
cgit 


From 7b0c5b3f06328ec9dbb02b2def306d671353354e Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 16 Dec 2010 18:09:25 +0000
Subject: typo

---
 nova/api/openstack/images.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 3a9bdea64..78c07abde 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -40,7 +40,7 @@ def _entity_detail(inst):
         'pending': 'queued',
         'decrypting': 'preparing',
         'untarring': 'saving',
-        'available': 'active',
+        'available': 'active'}
     new_inst = {}
     mapped_keys = {status:'imageState', id:'imageId', name:'imageLocation'}
 
-- 
cgit 


From fc1354a639edb1c3a7f979f58bb90918c63695ab Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 16 Dec 2010 18:17:53 +0000
Subject: fixed a couple of more syntax errors

---
 nova/api/openstack/images.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 78c07abde..7f2be5472 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -41,15 +41,15 @@ def _entity_detail(inst):
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    new_inst = {}
-    mapped_keys = {status:'imageState', id:'imageId', name:'imageLocation'}
+    mapped_inst = {}
+    mapped_keys = {'status':'imageState', 'id':'imageId', 'name':'imageLocation'}
 
     for k,v in mapped_keys.iteritems():
-        new_inst[k] = inst[v]
+        mapped_inst[k] = inst[v]
 
-    new_inst['status'] = status_mapping[inew_inst['status']]
+    mapped_inst['status'] = status_mapping[mapped_inst['status']]
 
-    return new_inst
+    return mapped_inst
 
 def _entity_inst(inst):
     """ Filters all model attributes save for id and name
-- 
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/compute/api.py          | 7 +++----
 nova/virt/xenapi/vm_utils.py | 4 ++--
 nova/virt/xenapi/vmops.py    | 8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index a84056dee..262a8819d 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -78,14 +78,14 @@ class ComputeAPI(base.Base):
             if ramdisk_id is None:
                 ramdisk_id = image.get('ramdiskId', FLAGS.default_ramdisk)
             #Salvatore - No kernel and ramdisk for raw images
-            if (kernel_id == str(FLAGS.null_kernel)):
+            if kernel_id == str(FLAGS.null_kernel):
                 kernel_id = None
                 ramdisk_id = None
                 logging.debug("Creating a raw instance")
             # Make sure we have access to kernel and ramdisk (if not raw)
-            if (kernel_id != None):
+            if kernel_id:
                 image_service.show(context, kernel_id)
-            if (ramdisk_id != None):
+            if ramdisk_id:
                 image_service.show(context, ramdisk_id)
             # Make sure we have access to kernel and ramdisk
             self.image_service.show(context, kernel_id)
@@ -109,7 +109,6 @@ class ComputeAPI(base.Base):
             key_data = key_pair['public_key']
 
         type_data = instance_types.INSTANCE_TYPES[instance_type]
-        #Salvatore TODO: PV or HVM
         base_options = {
             'reservation_id': utils.generate_uid('r'),
             'image_id': image_id,
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/compute/api.py          |  7 ++-----
 nova/virt/xenapi/vm_utils.py | 10 +++-------
 2 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 262a8819d..4c4b82272 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -84,12 +84,9 @@ class ComputeAPI(base.Base):
                 logging.debug("Creating a raw instance")
             # Make sure we have access to kernel and ramdisk (if not raw)
             if kernel_id:
-                image_service.show(context, kernel_id)
+                self.image_service.show(context, kernel_id)
             if ramdisk_id:
-                image_service.show(context, ramdisk_id)
-            # Make sure we have access to kernel and ramdisk
-            self.image_service.show(context, kernel_id)
-            self.image_service.show(context, ramdisk_id)
+                self.image_service.show(context, ramdisk_id)
 
         if security_group is None:
             security_group = ['default']
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 d71b9a34c3f76f95227da0f7a746cc5a1a76da24 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Sun, 19 Dec 2010 23:51:17 +0000
Subject: small clean up

---
 nova/api/openstack/images.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 7f2be5472..df5e1530f 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -41,9 +41,14 @@ def _entity_detail(inst):
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    mapped_inst = {}
-    mapped_keys = {'status':'imageState', 'id':'imageId', 'name':'imageLocation'}
 
+    # TODO(tr3buchet): this map is specific to s3 object store,
+    # fix once the local image service is working
+    mapped_keys = {'status':'imageState',
+                   'id':'imageId',
+                   'name':'imageLocation'}
+
+    mapped_inst = {}
     for k,v in mapped_keys.iteritems():
         mapped_inst[k] = inst[v]
 
@@ -54,9 +59,9 @@ def _entity_detail(inst):
 def _entity_inst(inst):
     """ Filters all model attributes save for id and name
         inst is a single entity (dict) """
-    return _filter_keys(inst, ['id','name'])
+    return _select_keys(inst, ['id','name'])
 
-def _filter_keys(inst, keys):
+def _select_keys(inst, keys):
     """ Filters all model attributes for keys
         inst is a single entity (dict) """
     return dict( (k,v) for k,v in inst.iteritems() if k in keys)
-- 
cgit 


From c7dada9b2f5811afbc7a181636d6be3ab8ab98cc Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Mon, 20 Dec 2010 15:41:43 +0000
Subject: Fixed pep8 errors

---
 nova/compute/disk.py        |  2 ++
 nova/tests/virt_unittest.py | 43 ++++++++++++++++++++-----------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

(limited to 'nova')

diff --git a/nova/compute/disk.py b/nova/compute/disk.py
index 3d5e07724..0169a9831 100644
--- a/nova/compute/disk.py
+++ b/nova/compute/disk.py
@@ -105,12 +105,14 @@ def partition(infile, outfile, local_bytes=0, resize=True,
         execute('parted --script %s mkpartfs primary %s %ds %ds'
                 % (outfile, local_type, local_first, local_last))
 
+
 def extend(image, size, execute):
     file_size = os.path.getsize(image)
     if file_size >= size:
         return
     return execute('truncate -s size %s' % (image,))
 
+
 def inject_data(image, key=None, net=None, partition=None, execute=None):
     """Injects a ssh key and optionally net data into a disk image.
 
diff --git a/nova/tests/virt_unittest.py b/nova/tests/virt_unittest.py
index 9bbba4ba9..e5d5f00c8 100644
--- a/nova/tests/virt_unittest.py
+++ b/nova/tests/virt_unittest.py
@@ -129,44 +129,41 @@ class LibvirtConnTestCase(test.TestCase):
                 check_list.append(check)
             else:
                 if expect_kernel:
-                    check = (lambda t: t.find('./os/kernel').text.split('/'
-                                       )[1], 'kernel')
+                    check = (lambda t: t.find('./os/kernel').text.split('/')
+                             [1], 'kernel')
                 else:
                     check = (lambda t: t.find('./os/kernel'), None)
                 check_list.append(check)
 
                 if expect_ramdisk:
-                    check = (lambda t: t.find('./os/initrd').text.split('/'
-                                       )[1], 'ramdisk')
+                    check = (lambda t: t.find('./os/initrd').text.split('/')
+                             [1], 'ramdisk')
                 else:
                     check = (lambda t: t.find('./os/initrd'), None)
                 check_list.append(check)
 
         common_checks = [
             (lambda t: t.find('.').tag, 'domain'),
-            (lambda t: t.find('./devices/interface/filterref/parameter'
-                        ).get('name'), 'IP'),
-            (lambda t: t.find('./devices/interface/filterref/parameter'
-                       ).get('value'), '10.11.12.13'),
-            (lambda t: t.findall('./devices/interface/filterref/parameter'
-                        )[1].get('name'), 'DHCPSERVER'),
-            (lambda t: t.findall('./devices/interface/filterref/parameter'
-                       )[1].get('value'), '10.0.0.1'),
-            (lambda t: t.find('./devices/serial/source').get('path'
-                       ).split('/')[1], 'console.log'),
+            (lambda t: t.find('./devices/interface/filterref/parameter')
+             .get('name'), 'IP'),
+            (lambda t: t.find('./devices/interface/filterref/parameter')
+             .get('value'), '10.11.12.13'),
+            (lambda t: t.findall('./devices/interface/filterref/parameter')
+             [1].get('name'), 'DHCPSERVER'),
+            (lambda t: t.findall('./devices/interface/filterref/parameter')
+             [1].get('value'), '10.0.0.1'),
+            (lambda t: t.find('./devices/serial/source').get('path')
+             .split('/')[1], 'console.log'),
             (lambda t: t.find('./memory').text, '2097152')]
 
         if rescue:
-            common_checks += [(lambda t: t.findall('./devices/disk/source'
-                                         )[0].get('file').split('/')[1],
-                               'rescue-disk'),
-                              (lambda t: t.findall('./devices/disk/source'
-                                         )[1].get('file').split('/')[1],
-                               'disk')]
+            common_checks += [(lambda t: t.findall('./devices/disk/source')
+                               [0].get('file').split('/')[1], 'rescue-disk'),
+                              (lambda t: t.findall('./devices/disk/source')
+                               [1].get('file').split('/')[1], 'disk')]
         else:
-            common_checks += [(lambda t: t.findall('./devices/disk/source'
-                                         )[0].get('file').split('/')[1],
-                               'disk')]
+            common_checks += [(lambda t: t.findall('./devices/disk/source')
+                               [0].get('file').split('/')[1], 'disk')]
 
         for (libvirt_type, (expected_uri, checks)) in type_uri_map.iteritems():
             FLAGS.libvirt_type = libvirt_type
-- 
cgit 


From b5756f6abf582b04a5fe6744d6a139b12440e35a Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 20 Dec 2010 21:12:20 +0000
Subject: fixed some pep8 business

---
 nova/api/openstack/images.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index df5e1530f..0f808a6bf 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -27,11 +27,13 @@ from nova.api.openstack import faults
 
 FLAGS = flags.FLAGS
 
+
 def _entity_list(entities):
     """ Coerces a list of images into proper dictionary format
         entities is a list of entities (dicts) """
     return dict(images=entities)
 
+
 def _entity_detail(inst):
     """ Maps everything to Rackspace-like attributes for return
         also pares down attributes to those we want
@@ -44,27 +46,29 @@ def _entity_detail(inst):
 
     # TODO(tr3buchet): this map is specific to s3 object store,
     # fix once the local image service is working
-    mapped_keys = {'status':'imageState',
-                   'id':'imageId',
-                   'name':'imageLocation'}
+    mapped_keys = {'status': 'imageState',
+                   'id': 'imageId',
+                   'name': 'imageLocation'}
 
     mapped_inst = {}
-    for k,v in mapped_keys.iteritems():
+    for k, v in mapped_keys.iteritems():
         mapped_inst[k] = inst[v]
 
     mapped_inst['status'] = status_mapping[mapped_inst['status']]
 
     return mapped_inst
 
+
 def _entity_inst(inst):
     """ Filters all model attributes save for id and name
         inst is a single entity (dict) """
-    return _select_keys(inst, ['id','name'])
+    return _select_keys(inst, ['id', 'name'])
+
 
 def _select_keys(inst, keys):
     """ Filters all model attributes for keys
         inst is a single entity (dict) """
-    return dict( (k,v) for k,v in inst.iteritems() if k in keys)
+    return dict((k, v) for k, v in inst.iteritems() if k in keys)
 
 
 class Controller(wsgi.Controller):
-- 
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/api/openstack/__init__.py           |  2 ++
 nova/api/openstack/servers.py            | 22 ++++++++++++++++++++++
 nova/compute/api.py                      | 18 ++++++++++++++++++
 nova/compute/manager.py                  | 32 ++++++++++++++++++++++++++++++++
 nova/tests/api/openstack/test_servers.py | 32 ++++++++++++++++++++++++++++++--
 nova/tests/compute_unittest.py           |  8 ++++++++
 nova/virt/fake.py                        |  8 ++++++++
 nova/virt/libvirt_conn.py                |  8 ++++++++
 nova/virt/xenapi/vmops.py                | 23 +++++++++++++++++++++--
 nova/virt/xenapi_conn.py                 |  8 ++++++++
 10 files changed, 157 insertions(+), 4 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 210df8d24..2553313e4 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -176,6 +176,8 @@ class APIRouter(wsgi.Router):
             logging.debug("Including admin operations in API.")
             server_members['pause'] = 'POST'
             server_members['unpause'] = 'POST'
+            server_members['suspend'] = 'POST'
+            server_members['resume'] = 'POST'
 
         mapper.resource("server", "servers", controller=servers.Controller(),
                         collection={'detail': 'GET'},
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 5c3322f7c..e6700ee96 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -195,3 +195,25 @@ class Controller(wsgi.Controller):
             logging.error("Compute.api::unpause %s", readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
+
+    def suspend(self, req, id):
+        """permit admins to suspend the server"""
+        context = req.environ['nova.context']
+        try:
+            self.compute_api.suspend(context, id)
+        except:
+            readable = traceback.format_exc()
+            logging.error("compute.api::suspend %s", readable)
+            return faults.Fault(exc.HTTPUnprocessableEntity())
+        return exc.HTTPAccepted()
+
+    def resume(self, req, id):
+        """permit admins to resume the server from suspend"""
+        context = req.environ['nova.context']
+        try:
+            self.compute_api.resume(context, id)
+        except:
+            readable = traceback.format_exc()
+            logging.error("compute.api::resume %s", readable)
+            return faults.Fault(exc.HTTPUnprocessableEntity())
+        return exc.HTTPAccepted()
diff --git a/nova/compute/api.py b/nova/compute/api.py
index c740814da..bb144d12f 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -298,6 +298,24 @@ class ComputeAPI(base.Base):
                  {"method": "unpause_instance",
                   "args": {"instance_id": instance['id']}})
 
+    def suspend(self, context, instance_id):
+        """suspend the instance with instance_id"""
+        instance = self.db.instance_get_by_internal_id(context, instance_id)
+        host = instance['host']
+        rpc.cast(context,
+                 self.db.queue_get_for(context, FLAGS.compute_topic, host),
+                 {"method": "suspend_instance",
+                  "args": {"instance_id": instance['id']}})
+
+    def resume(self, context, instance_id):
+        """resume the instance with instance_id"""
+        instance = self.db.instance_get_by_internal_id(context, instance_id)
+        host = instance['host']
+        rpc.cast(context,
+                 self.db.queue_get_for(context, FLAGS.compute_topic, host),
+                 {"method": "resume_instance",
+                  "args": {"instance_id": instance['id']}})
+
     def rescue(self, context, instance_id):
         """Rescue the given instance."""
         instance = self.db.instance_get_by_internal_id(context, instance_id)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index a84af6bb9..b1ac2db88 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -227,6 +227,38 @@ class ComputeManager(manager.Manager):
                                                        instance_id,
                                                        result))
 
+    @exception.wrap_exception
+    def suspend_instance(self, context, instance_id):
+        """suspend the instance with instance_id"""
+        context = context.elevated()
+        instance_ref = self.db.instance_get(context, instance_id)
+
+        logging.debug('instance %s: suspending', instance_ref['internal_id'])
+        self.db.instance_set_state(context, instance_id,
+                                            power_state.NOSTATE,
+                                            'suspending')
+        self.driver.suspend(instance_ref,
+            lambda result: self._update_state_callback(self,
+                                                       context,
+                                                       instance_id,
+                                                       result))
+
+    @exception.wrap_exception
+    def resume_instance(self, context, instance_id):
+        """resume the suspended instance with instance_id"""
+        context = context.elevated()
+        instance_ref = self.db.instance_get(context, instance_id)
+
+        logging.debug('instance %s: resuming', instance_ref['internal_id'])
+        self.db.instance_set_state(context, instance_id,
+                                            power_state.NOSTATE,
+                                            'resuming')
+        self.driver.resume(instance_ref,
+            lambda result: self._update_state_callback(self,
+                                                       context,
+                                                       instance_id,
+                                                       result))
+
     @exception.wrap_exception
     def get_console_output(self, context, instance_id):
         """Send the console output for an instance."""
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 3820f5f27..5d23db588 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -88,9 +88,13 @@ class ServersTest(unittest.TestCase):
         self.stubs.Set(nova.db.api, 'instance_get_floating_address',
                        instance_address)
         self.stubs.Set(nova.compute.api.ComputeAPI, 'pause',
-            fake_compute_api)
+                       fake_compute_api)
         self.stubs.Set(nova.compute.api.ComputeAPI, 'unpause',
-            fake_compute_api)
+                       fake_compute_api)
+        self.stubs.Set(nova.compute.api.ComputeAPI, 'suspend',
+                       fake_compute_api)
+        self.stubs.Set(nova.compute.api.ComputeAPI, 'resume',
+                       fake_compute_api)
         self.allow_admin = FLAGS.allow_admin_api
 
     def tearDown(self):
@@ -246,6 +250,30 @@ class ServersTest(unittest.TestCase):
         res = req.get_response(nova.api.API('os'))
         self.assertEqual(res.status_int, 202)
 
+    def test_server_suspend(self):
+        FLAGS.allow_admin_api = True
+        body = dict(server=dict(
+            name='server_test', imageId=2, flavorId=2, metadata={},
+            personality={}))
+        req = webob.Request.blank('/v1.0/servers/1/suspend')
+        req.method = 'POST'
+        req.content_type = 'application/json'
+        req.body = json.dumps(body)
+        res = req.get_response(nova.api.API('os'))
+        self.assertEqual(res.status_int, 202)
+
+    def test_server_resume(self):
+        FLAGS.allow_admin_api = True
+        body = dict(server=dict(
+            name='server_test', imageId=2, flavorId=2, metadata={},
+            personality={}))
+        req = webob.Request.blank('/v1.0/servers/1/resume')
+        req.method = 'POST'
+        req.content_type = 'application/json'
+        req.body = json.dumps(body)
+        res = req.get_response(nova.api.API('os'))
+        self.assertEqual(res.status_int, 202)
+
     def test_server_reboot(self):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py
index 187ca31de..111a43cdc 100644
--- a/nova/tests/compute_unittest.py
+++ b/nova/tests/compute_unittest.py
@@ -135,6 +135,14 @@ class ComputeTestCase(test.TestCase):
         self.compute.unpause_instance(self.context, instance_id)
         self.compute.terminate_instance(self.context, instance_id)
 
+    def test_suspend(self):
+        """ensure instance can be suspended"""
+        instance_id = self._create_instance()
+        self.compute.run_instance(self.context, instance_id)
+        self.compute.suspend_instance(self.context, instance_id)
+        self.compute.resume_instance(self.context, instance_id)
+        self.compute.terminate_instance(self.context, instance_id)
+
     def test_reboot(self):
         """Ensure instance can be rebooted"""
         instance_id = self._create_instance()
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')

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/api/openstack/servers.py | 3 ++-
 nova/compute/power_state.py   | 4 +++-
 nova/virt/xenapi/vm_utils.py  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index e6700ee96..9ee52ef2f 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -45,7 +45,8 @@ def _entity_detail(inst):
         power_state.NOSTATE: 'build',
         power_state.RUNNING: 'active',
         power_state.BLOCKED: 'active',
-        power_state.PAUSED: 'suspended',
+        power_state.SUSPENDED: 'suspended',
+        power_state.PAUSED: 'error',
         power_state.SHUTDOWN: 'active',
         power_state.SHUTOFF: 'active',
         power_state.CRASHED: 'error'}
diff --git a/nova/compute/power_state.py b/nova/compute/power_state.py
index cefdf2d9e..37039d2ec 100644
--- a/nova/compute/power_state.py
+++ b/nova/compute/power_state.py
@@ -26,6 +26,7 @@ PAUSED = 0x03
 SHUTDOWN = 0x04
 SHUTOFF = 0x05
 CRASHED = 0x06
+SUSPENDED = 0x07
 
 
 def name(code):
@@ -36,5 +37,6 @@ def name(code):
         PAUSED: 'paused',
         SHUTDOWN: 'shutdown',
         SHUTOFF: 'shutdown',
-        CRASHED: 'crashed'}
+        CRASHED: 'crashed',
+        SUSPENDED: 'suspended'}
     return d[code]
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')

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/api/openstack/servers.py  | 8 ++++----
 nova/compute/manager.py        | 4 ++--
 nova/tests/compute_unittest.py | 4 ++--
 nova/virt/fake.py              | 8 ++++++--
 nova/virt/xenapi/vm_utils.py   | 4 ++--
 5 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 9ee52ef2f..d3e5badea 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -182,7 +182,7 @@ class Controller(wsgi.Controller):
             self.compute_api.pause(ctxt, id)
         except:
             readable = traceback.format_exc()
-            logging.error("Compute.api::pause %s", readable)
+            logging.error(_("Compute.api::pause %s"), readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
@@ -193,7 +193,7 @@ class Controller(wsgi.Controller):
             self.compute_api.unpause(ctxt, id)
         except:
             readable = traceback.format_exc()
-            logging.error("Compute.api::unpause %s", readable)
+            logging.error(_("Compute.api::unpause %s"), readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
@@ -204,7 +204,7 @@ class Controller(wsgi.Controller):
             self.compute_api.suspend(context, id)
         except:
             readable = traceback.format_exc()
-            logging.error("compute.api::suspend %s", readable)
+            logging.error(_("compute.api::suspend %s"), readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
@@ -215,6 +215,6 @@ class Controller(wsgi.Controller):
             self.compute_api.resume(context, id)
         except:
             readable = traceback.format_exc()
-            logging.error("compute.api::resume %s", readable)
+            logging.error(_("compute.api::resume %s"), readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index b1ac2db88..f96f0ca9c 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -233,7 +233,7 @@ class ComputeManager(manager.Manager):
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
 
-        logging.debug('instance %s: suspending', instance_ref['internal_id'])
+        logging.debug(_('instance %s: suspending'), instance_ref['internal_id'])
         self.db.instance_set_state(context, instance_id,
                                             power_state.NOSTATE,
                                             'suspending')
@@ -249,7 +249,7 @@ class ComputeManager(manager.Manager):
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
 
-        logging.debug('instance %s: resuming', instance_ref['internal_id'])
+        logging.debug(_('instance %s: resuming'), instance_ref['internal_id'])
         self.db.instance_set_state(context, instance_id,
                                             power_state.NOSTATE,
                                             'resuming')
diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py
index 111a43cdc..14954c3a2 100644
--- a/nova/tests/compute_unittest.py
+++ b/nova/tests/compute_unittest.py
@@ -100,13 +100,13 @@ class ComputeTestCase(test.TestCase):
         self.compute.run_instance(self.context, instance_id)
 
         instances = db.instance_get_all(context.get_admin_context())
-        logging.info("Running instances: %s", instances)
+        logging.info(_("Running instances: %s"), instances)
         self.assertEqual(len(instances), 1)
 
         self.compute.terminate_instance(self.context, instance_id)
 
         instances = db.instance_get_all(context.get_admin_context())
-        logging.info("After terminating instances: %s", instances)
+        logging.info(_("After terminating instances: %s"), instances)
         self.assertEqual(len(instances), 0)
 
     def test_run_terminate_timestamps(self):
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 8e1122997867a16c161954004b5f1722282a97ef Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 21:45:01 +0000
Subject: fixed error occuring when tests used glance attributes, fixed
 docstrings

---
 nova/api/openstack/images.py | 51 +++++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 15 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 0f808a6bf..4f16b0ed4 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -29,15 +29,21 @@ FLAGS = flags.FLAGS
 
 
 def _entity_list(entities):
-    """ Coerces a list of images into proper dictionary format
-        entities is a list of entities (dicts) """
+    """
+    Coerces a list of images into proper dictionary format
+    entities is a list of entities (dicts)
+
+    """
     return dict(images=entities)
 
 
 def _entity_detail(inst):
-    """ Maps everything to Rackspace-like attributes for return
-        also pares down attributes to those we want
-        inst is a single entity (dict) """
+    """
+    Maps everything to Rackspace-like attributes for return
+    also pares down attributes to those we want
+    inst is a single entity (dict)
+
+    """
     status_mapping = {
         'pending': 'queued',
         'decrypting': 'preparing',
@@ -45,14 +51,23 @@ def _entity_detail(inst):
         'available': 'active'}
 
     # TODO(tr3buchet): this map is specific to s3 object store,
-    # fix once the local image service is working
+    # replace with a list of keys for _select_keys later
     mapped_keys = {'status': 'imageState',
                    'id': 'imageId',
                    'name': 'imageLocation'}
 
     mapped_inst = {}
-    for k, v in mapped_keys.iteritems():
-        mapped_inst[k] = inst[v]
+    # TODO(tr3buchet):
+    # this chunk of code works with s3 and the local image service/glance
+    # when we switch to glance/local image service it can be replaced with
+    # a call to _select_keys, and mapped_keys can be changed to a list
+    try:
+        for k, v in mapped_keys.iteritems():
+            # map s3 fields
+            mapped_inst[k] = inst[v]
+    except KeyError:
+        mapped_inst = _select_keys(inst, mapped_keys.keys())
+
 
     mapped_inst['status'] = status_mapping[mapped_inst['status']]
 
@@ -60,14 +75,20 @@ def _entity_detail(inst):
 
 
 def _entity_inst(inst):
-    """ Filters all model attributes save for id and name
-        inst is a single entity (dict) """
+    """
+    Filters all model attributes save for id and name
+    inst is a single entity (dict)
+
+    """
     return _select_keys(inst, ['id', 'name'])
 
 
 def _select_keys(inst, keys):
-    """ Filters all model attributes for keys
-        inst is a single entity (dict) """
+    """
+    Filters all model attributes except for keys
+    inst is a single entity (dict)
+
+    """
     return dict((k, v) for k, v in inst.iteritems() if k in keys)
 
 
@@ -83,14 +104,14 @@ class Controller(wsgi.Controller):
         self._service = utils.import_object(FLAGS.image_service)
 
     def index(self, req):
-        """ Return all public images in brief """
+        """Return all public images in brief"""
         items = self._service.index(req.environ['nova.context'])
         items = nova.api.openstack.limited(items, req)
         items = [_entity_inst(item) for item in items]
         return dict(images=items)
 
     def detail(self, req):
-        """ Return all public images in detail """
+        """Return all public images in detail"""
         try:
             items = self._service.detail(req.environ['nova.context'])
         except NotImplementedError:
@@ -100,7 +121,7 @@ class Controller(wsgi.Controller):
         return dict(images=items)
 
     def show(self, req, id):
-        """ Return data about the given image id """
+        """Return data about the given image id"""
         return dict(image=self._service.show(req.environ['nova.context'], id))
 
     def delete(self, req, id):
-- 
cgit 


From 1c26d2b2ce824dbc64525eea699efbfa8bf04617 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 21:48:14 +0000
Subject: updated since dietz moved the limited function

---
 nova/api/openstack/images.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 4f16b0ed4..132afc5fc 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -106,7 +106,7 @@ class Controller(wsgi.Controller):
     def index(self, req):
         """Return all public images in brief"""
         items = self._service.index(req.environ['nova.context'])
-        items = nova.api.openstack.limited(items, req)
+        items = common.limited(images, req)
         items = [_entity_inst(item) for item in items]
         return dict(images=items)
 
@@ -116,7 +116,7 @@ class Controller(wsgi.Controller):
             items = self._service.detail(req.environ['nova.context'])
         except NotImplementedError:
             items = self._service.index(req.environ['nova.context'])
-        items = nova.api.openstack.limited(items, req)
+        items = common.limited(images, req)
         items = [_entity_detail(item) for item in items]
         return dict(images=items)
 
-- 
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')

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 6df8d6827d48572ba4cc7cf13fd69286f0dcafe1 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 22:00:44 +0000
Subject: fixed typo

---
 nova/api/openstack/images.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 515fd4423..787e23acc 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -108,7 +108,7 @@ class Controller(wsgi.Controller):
     def index(self, req):
         """Return all public images in brief"""
         items = self._service.index(req.environ['nova.context'])
-        items = common.limited(images, req)
+        items = common.limited(items, req)
         items = [_entity_inst(item) for item in items]
         return dict(images=items)
 
@@ -118,7 +118,7 @@ class Controller(wsgi.Controller):
             items = self._service.detail(req.environ['nova.context'])
         except NotImplementedError:
             items = self._service.index(req.environ['nova.context'])
-        items = common.limited(images, req)
+        items = common.limited(items, req)
         items = [_entity_detail(item) for item in items]
         return dict(images=items)
 
-- 
cgit 


From 257da8a0e5fd949f62232bf2eef9d91f36fc41ce Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 23:09:58 +0000
Subject: fixed the os api image test for glance

---
 nova/tests/api/openstack/test_images.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index f610cbf9c..e849b5ea6 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -223,6 +223,21 @@ class ImageControllerWithGlanceServiceTest(unittest.TestCase):
         res = req.get_response(nova.api.API('os'))
         res_dict = json.loads(res.body)
 
+        def _is_equivalent_subset(x, y):
+            if set(x) <= set(y):
+                for k, v in x.iteritems():
+                    if x[k] != y[k]:
+                        return False
+                return True
+            return False
+
         for image in res_dict['images']:
-            self.assertEquals(1, self.IMAGE_FIXTURES.count(image),
-                              "image %s not in fixtures!" % str(image))
+            for image_fixture in IMAGE_FIXTURES:
+                if _is_equivalent_subset(image, image_fixture):
+                    break
+            else:
+                self.assertFalse("image %s not in fixtures!" % str(image))
+
+#        for image in res_dict['images']:
+#            self.assertEquals(1, self.IMAGE_FIXTURES.count(image),
+#                              "image %s not in fixtures!" % str(image))
-- 
cgit 


From 391ab4dd63297afcc9449059bcadfe6ac5008b5f Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 23:13:03 +0000
Subject: typo

---
 nova/tests/api/openstack/test_images.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index e849b5ea6..1986a2b5f 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -232,7 +232,7 @@ class ImageControllerWithGlanceServiceTest(unittest.TestCase):
             return False
 
         for image in res_dict['images']:
-            for image_fixture in IMAGE_FIXTURES:
+            for image_fixture in self.IMAGE_FIXTURES:
                 if _is_equivalent_subset(image, image_fixture):
                     break
             else:
-- 
cgit 


From d8d66d4c2c25d25892289e08ca52720f9d123d88 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 23:19:24 +0000
Subject: trying again

---
 nova/tests/api/openstack/test_images.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index 1986a2b5f..16a910a3f 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -236,7 +236,7 @@ class ImageControllerWithGlanceServiceTest(unittest.TestCase):
                 if _is_equivalent_subset(image, image_fixture):
                     break
             else:
-                self.assertFalse("image %s not in fixtures!" % str(image))
+                self.assertEquals(1,2,"image %s not in fixtures!" % str(image))
 
 #        for image in res_dict['images']:
 #            self.assertEquals(1, self.IMAGE_FIXTURES.count(image),
-- 
cgit 


From 26a8afd85233e142f97fdcc802c41b9a765efb32 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 23:27:39 +0000
Subject: applied power state conversion to test

---
 nova/tests/api/openstack/test_images.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nova')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index 16a910a3f..ec0119bfe 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -227,6 +227,8 @@ class ImageControllerWithGlanceServiceTest(unittest.TestCase):
             if set(x) <= set(y):
                 for k, v in x.iteritems():
                     if x[k] != y[k]:
+                        if x[k] == 'active' and y[k] == 'available':
+                            next
                         return False
                 return True
             return False
-- 
cgit 


From f793e186910c1aec10759f5d05e305cf6889a02f Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 23:52:33 +0000
Subject: another typo

---
 nova/tests/api/openstack/test_images.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index ec0119bfe..d9845eb71 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -228,7 +228,7 @@ class ImageControllerWithGlanceServiceTest(unittest.TestCase):
                 for k, v in x.iteritems():
                     if x[k] != y[k]:
                         if x[k] == 'active' and y[k] == 'available':
-                            next
+                            continue
                         return False
                 return True
             return False
-- 
cgit 


From 59c3e5bf0dda0c0c1b77307a339f3102c7179885 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Thu, 23 Dec 2010 18:09:52 -0600
Subject: Faked out handling for shared ip groups so they return something

---
 nova/api/openstack/ratelimiting/__init__.py |  4 ++--
 nova/api/openstack/sharedipgroups.py        | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/ratelimiting/__init__.py b/nova/api/openstack/ratelimiting/__init__.py
index 91a8b2e55..cbb4b897e 100644
--- a/nova/api/openstack/ratelimiting/__init__.py
+++ b/nova/api/openstack/ratelimiting/__init__.py
@@ -64,9 +64,9 @@ class RateLimitingMiddleware(wsgi.Middleware):
         If the request should be rate limited, return a 413 status with a
         Retry-After header giving the time when the request would succeed.
         """
-        return self.limited_request(req, self.application)
+        return self.rate_limited_request(req, self.application)
 
-    def limited_request(self, req, application):
+    def rate_limited_request(self, req, application):
         """Rate limit the request.
 
         If the request should be rate limited, return a 413 status with a
diff --git a/nova/api/openstack/sharedipgroups.py b/nova/api/openstack/sharedipgroups.py
index 75d02905c..4f4bb1016 100644
--- a/nova/api/openstack/sharedipgroups.py
+++ b/nova/api/openstack/sharedipgroups.py
@@ -15,6 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from webob import exc
+
 from nova import wsgi
 
 
@@ -22,19 +24,25 @@ class Controller(wsgi.Controller):
     """ The Shared IP Groups Controller for the Openstack API """
 
     def index(self, req):
-        raise NotImplementedError
+        """ Returns a list of Shared IP Groups for the user """
+        return dict(sharedipgroups=[])
 
     def show(self, req, id):
-        raise NotImplementedError
+        """ Shows in-depth information on a specific Shared IP Group """
+        return dict(sharedipgroup={})
 
     def update(self, req, id):
-        raise NotImplementedError
+        """ You can't update a Shared IP Group """
+        raise faults.Fault(exc.HTTPNotImplemented())
 
     def delete(self, req, id):
-        raise NotImplementedError
+        """ Deletes a Shared IP Group """
+        raise faults.Fault(exc.HTTPNotFound())
 
-    def detail(self, req):
-        raise NotImplementedError
+    def detail(self, req, id):
+        """ Returns a complete list of Shared IP Groups """
+        return dict(sharedipgroups=[]) 
 
     def create(self, req):
-        raise NotImplementedError
+        """ Creates a new Shared IP group """
+        raise faults.Fault(exc.HTTPNotFound())
-- 
cgit 


From f361891d100bbc9a5fb0f2ffd5424b6c69100133 Mon Sep 17 00:00:00 2001
From: Armando Migliaccio <armando.migliaccio@citrix.com>
Date: Fri, 24 Dec 2010 19:17:02 +0000
Subject: remove requirement of sudo on tests

---
 nova/tests/test_xenapi.py  |  1 +
 nova/tests/xenapi/stubs.py | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index b5d3ea395..ed2e4ffde 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -48,6 +48,7 @@ class XenAPIVolumeTestCase(test.TestCase):
         FLAGS.xenapi_connection_url = 'test_url'
         FLAGS.xenapi_connection_password = 'test_pass'
         fakes.stub_out_db_instance_api(self.stubs)
+        stubs.stub_out_get_target(self.stubs)
         fake.reset()
         self.values = {'name': 1, 'id': 1,
                   'project_id': 'fake',
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 1dacad6a3..a7e592fee 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -18,12 +18,13 @@
 
 from nova.virt import xenapi_conn
 from nova.virt.xenapi import fake
+from nova.virt.xenapi import volume_utils
 
 
 def stubout_session(stubs, cls):
-    """ Stubs out two methods from XenAPISession """
+    """Stubs out two methods from XenAPISession"""
     def fake_import(self):
-        """ Stubs out get_imported_xenapi of XenAPISession """
+        """Stubs out get_imported_xenapi of XenAPISession"""
         fake_module = 'nova.virt.xenapi.fake'
         from_list = ['fake']
         return __import__(fake_module, globals(), locals(), from_list, -1)
@@ -34,6 +35,14 @@ def stubout_session(stubs, cls):
                        fake_import)
 
 
+def stub_out_get_target(stubs):
+    """Stubs out _get_target in volume_utils"""
+    def fake_get_target(volume_id):
+        return (None, None)
+
+    stubs.Set(volume_utils, '_get_target', fake_get_target)
+
+
 class FakeSessionForVMTests(fake.SessionBase):
     """ Stubs out a XenAPISession for VM tests """
     def __init__(self, uri):
-- 
cgit 


From 1c00947aa86597d918d651b5385a6a4d72671c10 Mon Sep 17 00:00:00 2001
From: Armando Migliaccio <armando.migliaccio@citrix.com>
Date: Sun, 26 Dec 2010 14:08:38 +0000
Subject: logs inner exception in nova/utils.py->import_class

---
 nova/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/utils.py b/nova/utils.py
index b9045a50c..15112faa2 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -48,7 +48,8 @@ def import_class(import_str):
     try:
         __import__(mod_str)
         return getattr(sys.modules[mod_str], class_str)
-    except (ImportError, ValueError, AttributeError):
+    except (ImportError, ValueError, AttributeError), exc:
+        logging.debug(_('Inner Exception: %s'), exc)
         raise exception.NotFound(_('Class %s cannot be found') % class_str)
 
 
-- 
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')

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 4b271b9e25ac2573cbb82f4b89434d608a91a8c7 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 16:41:41 +0000
Subject: couple of pep8s

---
 nova/api/openstack/images.py            | 1 -
 nova/tests/api/openstack/test_images.py | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 787e23acc..e848a2e3e 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -70,7 +70,6 @@ def _entity_detail(inst):
     except KeyError:
         mapped_inst = _select_keys(inst, mapped_keys.keys())
 
-
     mapped_inst['status'] = status_mapping[mapped_inst['status']]
 
     return mapped_inst
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index d9845eb71..ae11f7531 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -238,7 +238,8 @@ class ImageControllerWithGlanceServiceTest(unittest.TestCase):
                 if _is_equivalent_subset(image, image_fixture):
                     break
             else:
-                self.assertEquals(1,2,"image %s not in fixtures!" % str(image))
+                self.assertEquals(1, 2, "image %s not in fixtures!" % \
+                                                            str(image))
 
 #        for image in res_dict['images']:
 #            self.assertEquals(1, self.IMAGE_FIXTURES.count(image),
-- 
cgit 


From 404015903646a00901ad1310c2a7731f960fae75 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 17:18:43 +0000
Subject: removed \

---
 nova/tests/api/openstack/test_images.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index ae11f7531..f2c8bc935 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -238,7 +238,7 @@ class ImageControllerWithGlanceServiceTest(unittest.TestCase):
                 if _is_equivalent_subset(image, image_fixture):
                     break
             else:
-                self.assertEquals(1, 2, "image %s not in fixtures!" % \
+                self.assertEquals(1, 2, "image %s not in fixtures!" %
                                                             str(image))
 
 #        for image in res_dict['images']:
-- 
cgit 


From 3490fde00fd8bfb00834b1085de62d86c9c9d061 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 27 Dec 2010 12:08:22 -0600
Subject: A few fixes

---
 nova/api/openstack/backup_schedules.py | 5 ++++-
 nova/api/openstack/servers.py          | 3 ++-
 nova/api/openstack/sharedipgroups.py   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index fc70b5c6c..c484023e0 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -24,12 +24,14 @@ import nova.image.service
 
 
 class Controller(wsgi.Controller):
+    """ The backup schedule API controller for the Openstack API """
 
     def __init__(self):
         pass
 
     def index(self, req, server_id):
-        return faults.Fault(exc.HTTPNotFound())
+        """ Returns the list of backup schedules for a given instance """
+        return dict(backup_schedules=[])
 
     def create(self, req, server_id):
         """ No actual update method required, since the existing API allows
@@ -37,4 +39,5 @@ class Controller(wsgi.Controller):
         return faults.Fault(exc.HTTPNotFound())
 
     def delete(self, req, server_id, id):
+        """ Deletes an existing backup schedule """
         return faults.Fault(exc.HTTPNotFound())
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 8d60e2cab..c8851387d 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -43,6 +43,7 @@ def _entity_list(entities):
 def _entity_detail(inst):
     """ Maps everything to Rackspace-like attributes for return"""
     power_mapping = {
+        None: 'build',
         power_state.NOSTATE: 'build',
         power_state.RUNNING: 'active',
         power_state.BLOCKED: 'active',
@@ -153,7 +154,7 @@ class Controller(wsgi.Controller):
 
         try:
             self.compute_api.update_instance(req.environ['nova.context'],
-                                             instance['id'],
+                                             inst_dict['id'],
                                              **update_dict)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
diff --git a/nova/api/openstack/sharedipgroups.py b/nova/api/openstack/sharedipgroups.py
index 4f4bb1016..7e98b0712 100644
--- a/nova/api/openstack/sharedipgroups.py
+++ b/nova/api/openstack/sharedipgroups.py
@@ -18,6 +18,7 @@
 from webob import exc
 
 from nova import wsgi
+from nova.api.openstack import faults
 
 
 class Controller(wsgi.Controller):
-- 
cgit 


From b879c746049241837af3785adc3068fbe35f199d Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 27 Dec 2010 13:20:37 -0600
Subject: backup schedule changes

---
 nova/api/openstack/__init__.py         |  2 +-
 nova/api/openstack/backup_schedules.py | 10 +++++++++-
 nova/api/openstack/servers.py          |  6 ++++--
 nova/api/openstack/sharedipgroups.py   | 27 ++++++++++++++++++++++++---
 4 files changed, 38 insertions(+), 7 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index c49399f28..1f78820c8 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -98,7 +98,7 @@ class APIRouter(wsgi.Router):
                         collection={'detail': 'GET'},
                         member=server_members)
 
-        mapper.resource("backup_schedule", "backup_schedules",
+        mapper.resource("backup_schedule", "backup_schedule",
                         controller=backup_schedules.Controller(),
                         parent_resource=dict(member_name='server',
                         collection_name='servers'))
diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index c484023e0..a8b0fbbb9 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -22,16 +22,24 @@ from nova import wsgi
 from nova.api.openstack import faults
 import nova.image.service
 
+def _entity_inst(inst):
+    """ Coerces the backup schedule into proper dictionary format """
+    return dict(backupSchedule=inst)
 
 class Controller(wsgi.Controller):
     """ The backup schedule API controller for the Openstack API """
 
+    _serialization_metadata = {
+        'application/xml': {
+            'attributes': {
+                'backupSchedule': []}}}
+
     def __init__(self):
         pass
 
     def index(self, req, server_id):
         """ Returns the list of backup schedules for a given instance """
-        return dict(backup_schedules=[])
+        return _entity_inst({})
 
     def create(self, req, server_id):
         """ No actual update method required, since the existing API allows
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index c8851387d..7abf5ec53 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -153,8 +153,10 @@ class Controller(wsgi.Controller):
             update_dict['display_name'] = inst_dict['server']['name']
 
         try:
-            self.compute_api.update_instance(req.environ['nova.context'],
-                                             inst_dict['id'],
+            ctxt = req.environ['nova.context']
+            inst_ref = self.compute_api.get_instance(ctxt, id)
+            self.compute_api.update_instance(ctxt,
+                                             id,
                                              **update_dict)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
diff --git a/nova/api/openstack/sharedipgroups.py b/nova/api/openstack/sharedipgroups.py
index 7e98b0712..32ebfa45a 100644
--- a/nova/api/openstack/sharedipgroups.py
+++ b/nova/api/openstack/sharedipgroups.py
@@ -21,16 +21,37 @@ from nova import wsgi
 from nova.api.openstack import faults
 
 
+def _entity_list(entities):
+    """ Coerces a list of shared IP groups into proper dictionary format """
+    return dict(sharedIpGroups=entities)
+
+
+def _entity_inst(inst):
+    """ Coerces a shared IP group instance into proper dictionary format """
+    return dict(sharedIpGroup=inst)
+
+
+def _entity_detail(inst):
+    """ Coerces a shared IP group instance into proper dictionary format with
+    correctly mapped attributes """
+    return dict(sharedIpGroup=inst)
+
+
 class Controller(wsgi.Controller):
     """ The Shared IP Groups Controller for the Openstack API """
 
+    _serialization_metadata = {
+        'application/xml': {
+            'attributes': {
+                'sharedIpGroup': []}}}
+
     def index(self, req):
         """ Returns a list of Shared IP Groups for the user """
-        return dict(sharedipgroups=[])
+        return _entity_list([])
 
     def show(self, req, id):
         """ Shows in-depth information on a specific Shared IP Group """
-        return dict(sharedipgroup={})
+        return _entity_inst({})
 
     def update(self, req, id):
         """ You can't update a Shared IP Group """
@@ -42,7 +63,7 @@ class Controller(wsgi.Controller):
 
     def detail(self, req, id):
         """ Returns a complete list of Shared IP Groups """
-        return dict(sharedipgroups=[]) 
+        return _entity_detail({})
 
     def create(self, req):
         """ Creates a new Shared IP group """
-- 
cgit 


From d2ec717f7f819503f977c7a6f35e96867cc6c512 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 20:06:45 +0000
Subject: renaming things to be a bit more descriptive

---
 nova/api/openstack/images.py            | 60 ++++++++++++++++-----------------
 nova/tests/api/openstack/test_images.py |  4 ---
 2 files changed, 29 insertions(+), 35 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index e848a2e3e..ea22b07ba 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -30,30 +30,18 @@ from nova.api.openstack import faults
 FLAGS = flags.FLAGS
 
 
-def _entity_list(entities):
+def _translate_keys(inst):
     """
-    Coerces a list of images into proper dictionary format
-    entities is a list of entities (dicts)
-
-    """
-    return dict(images=entities)
-
-
-def _entity_detail(inst):
-    """
-    Maps everything to Rackspace-like attributes for return
+    Maps key names to Rackspace-like attributes for return
     also pares down attributes to those we want
-    inst is a single entity (dict)
+    inst is a single item (dict)
 
-    """
-    status_mapping = {
-        'pending': 'queued',
-        'decrypting': 'preparing',
-        'untarring': 'saving',
-        'available': 'active'}
+    Note: should be removed when the set of keys expected by the api
+    and the set of keys returned by the image service are equivalent
 
+    """
     # TODO(tr3buchet): this map is specific to s3 object store,
-    # replace with a list of keys for _select_keys later
+    # replace with a list of keys for _filter_keys later
     mapped_keys = {'status': 'imageState',
                    'id': 'imageId',
                    'name': 'imageLocation'}
@@ -62,32 +50,41 @@ def _entity_detail(inst):
     # TODO(tr3buchet):
     # this chunk of code works with s3 and the local image service/glance
     # when we switch to glance/local image service it can be replaced with
-    # a call to _select_keys, and mapped_keys can be changed to a list
+    # a call to _filter_keys, and mapped_keys can be changed to a list
     try:
         for k, v in mapped_keys.iteritems():
             # map s3 fields
             mapped_inst[k] = inst[v]
     except KeyError:
-        mapped_inst = _select_keys(inst, mapped_keys.keys())
-
-    mapped_inst['status'] = status_mapping[mapped_inst['status']]
+        # return only the fields api expects
+        mapped_inst = _filter_keys(inst, mapped_keys.keys())
 
     return mapped_inst
 
 
-def _entity_inst(inst):
+def _translate_status(inst):
     """
-    Filters all model attributes save for id and name
-    inst is a single entity (dict)
+    Translates status of image to match current Rackspace api bindings
+    inst is a single item (dict)
+
+    Note: should be removed when the set of statuses expected by the api
+    and the set of statuses returned by the image service are equivalent
 
     """
-    return _select_keys(inst, ['id', 'name'])
+    mapped_inst = {}
+    status_mapping = {
+        'pending': 'queued',
+        'decrypting': 'preparing',
+        'untarring': 'saving',
+        'available': 'active'}
+    mapped_inst['status'] = status_mapping[mapped_inst['status']]
+    return mapped_inst
 
 
-def _select_keys(inst, keys):
+def _filter_keys(inst, keys):
     """
     Filters all model attributes except for keys
-    inst is a single entity (dict)
+    inst is a single item (dict)
 
     """
     return dict((k, v) for k, v in inst.iteritems() if k in keys)
@@ -108,7 +105,7 @@ class Controller(wsgi.Controller):
         """Return all public images in brief"""
         items = self._service.index(req.environ['nova.context'])
         items = common.limited(items, req)
-        items = [_entity_inst(item) for item in items]
+        items = [_filter_keys(item, ('id', 'name')) for item in items]
         return dict(images=items)
 
     def detail(self, req):
@@ -118,7 +115,8 @@ class Controller(wsgi.Controller):
         except NotImplementedError:
             items = self._service.index(req.environ['nova.context'])
         items = common.limited(items, req)
-        items = [_entity_detail(item) for item in items]
+        items = [_translate_keys(item) for item in items]
+        items = [_translate_status(item) for item in items]
         return dict(images=items)
 
     def show(self, req, id):
diff --git a/nova/tests/api/openstack/test_images.py b/nova/tests/api/openstack/test_images.py
index f2c8bc935..1b4031217 100644
--- a/nova/tests/api/openstack/test_images.py
+++ b/nova/tests/api/openstack/test_images.py
@@ -240,7 +240,3 @@ class ImageControllerWithGlanceServiceTest(unittest.TestCase):
             else:
                 self.assertEquals(1, 2, "image %s not in fixtures!" %
                                                             str(image))
-
-#        for image in res_dict['images']:
-#            self.assertEquals(1, self.IMAGE_FIXTURES.count(image),
-#                              "image %s not in fixtures!" % str(image))
-- 
cgit 


From 0c983d1f3cba82f992fc128985f4f794fb76190f Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 20:11:36 +0000
Subject: syntax error

---
 nova/api/openstack/images.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index ea22b07ba..8a16bcb0f 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -77,7 +77,7 @@ def _translate_status(inst):
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    mapped_inst['status'] = status_mapping[mapped_inst['status']]
+    mapped_inst['status'] = status_mapping[inst['status']]
     return mapped_inst
 
 
-- 
cgit 


From e86f765181a9d0a75486a98e827cc8505b7c4111 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 20:17:53 +0000
Subject: inst -> item

---
 nova/api/openstack/images.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 8a16bcb0f..77625bab5 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -30,11 +30,11 @@ from nova.api.openstack import faults
 FLAGS = flags.FLAGS
 
 
-def _translate_keys(inst):
+def _translate_keys(item):
     """
     Maps key names to Rackspace-like attributes for return
     also pares down attributes to those we want
-    inst is a single item (dict)
+    item is a dict
 
     Note: should be removed when the set of keys expected by the api
     and the set of keys returned by the image service are equivalent
@@ -46,7 +46,7 @@ def _translate_keys(inst):
                    'id': 'imageId',
                    'name': 'imageLocation'}
 
-    mapped_inst = {}
+    mapped_item = {}
     # TODO(tr3buchet):
     # this chunk of code works with s3 and the local image service/glance
     # when we switch to glance/local image service it can be replaced with
@@ -54,40 +54,40 @@ def _translate_keys(inst):
     try:
         for k, v in mapped_keys.iteritems():
             # map s3 fields
-            mapped_inst[k] = inst[v]
+            mapped_item[k] = item[v]
     except KeyError:
         # return only the fields api expects
-        mapped_inst = _filter_keys(inst, mapped_keys.keys())
+        mapped_item = _filter_keys(item, mapped_keys.keys())
 
-    return mapped_inst
+    return mapped_item
 
 
-def _translate_status(inst):
+def _translate_status(item):
     """
     Translates status of image to match current Rackspace api bindings
-    inst is a single item (dict)
+    item is a dict
 
     Note: should be removed when the set of statuses expected by the api
     and the set of statuses returned by the image service are equivalent
 
     """
-    mapped_inst = {}
+    mapped_item = {}
     status_mapping = {
         'pending': 'queued',
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    mapped_inst['status'] = status_mapping[inst['status']]
-    return mapped_inst
+    mapped_item['status'] = status_mapping[item['status']]
+    return mapped_item
 
 
-def _filter_keys(inst, keys):
+def _filter_keys(item, keys):
     """
     Filters all model attributes except for keys
-    inst is a single item (dict)
+    item is a dict
 
     """
-    return dict((k, v) for k, v in inst.iteritems() if k in keys)
+    return dict((k, v) for k, v in item.iteritems() if k in keys)
 
 
 class Controller(wsgi.Controller):
-- 
cgit 


From 243ba12a903b2eac30dd99305a92f76e430cfb49 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 20:39:48 +0000
Subject: translate status was returning the wrong item

---
 nova/api/openstack/images.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 77625bab5..ba35fbc78 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -71,14 +71,13 @@ def _translate_status(item):
     and the set of statuses returned by the image service are equivalent
 
     """
-    mapped_item = {}
     status_mapping = {
         'pending': 'queued',
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    mapped_item['status'] = status_mapping[item['status']]
-    return mapped_item
+    item['status'] = status_mapping[item['status']]
+    return item
 
 
 def _filter_keys(item, keys):
-- 
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')

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 


From 431c54ba76a2a85ff55658c571f68378b47ce39d Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 27 Dec 2010 17:29:45 -0600
Subject: Renamed based on feedback from another branch

---
 nova/api/openstack/backup_schedules.py |  2 ++
 nova/api/openstack/servers.py          | 27 ++++++++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index a8b0fbbb9..9b8e605f6 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -22,10 +22,12 @@ from nova import wsgi
 from nova.api.openstack import faults
 import nova.image.service
 
+
 def _entity_inst(inst):
     """ Coerces the backup schedule into proper dictionary format """
     return dict(backupSchedule=inst)
 
+
 class Controller(wsgi.Controller):
     """ The backup schedule API controller for the Openstack API """
 
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 7abf5ec53..9369f6516 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -35,13 +35,9 @@ LOG = logging.getLogger('server')
 LOG.setLevel(logging.DEBUG)
 
 
-def _entity_list(entities):
-    """ Coerces a list of servers into proper dictionary format """
-    return dict(servers=entities)
-
-
-def _entity_detail(inst):
-    """ Maps everything to Rackspace-like attributes for return"""
+def _translate_detail_keys(inst):
+    """ Coerces into dictionary format, mapping everything to Rackspace-like
+    attributes for return"""
     power_mapping = {
         None: 'build',
         power_state.NOSTATE: 'build',
@@ -67,8 +63,9 @@ def _entity_detail(inst):
     return dict(server=inst_dict)
 
 
-def _entity_inst(inst):
-    """ Filters all model attributes save for id and name """
+def _translate_keys(inst):
+    """ Coerces into dictionary format, excluding all model attributes
+    save for id and name """
     return dict(server=dict(id=inst['internal_id'], name=inst['display_name']))
 
 
@@ -87,29 +84,29 @@ class Controller(wsgi.Controller):
 
     def index(self, req):
         """ Returns a list of server names and ids for a given user """
-        return self._items(req, entity_maker=_entity_inst)
+        return self._items(req, entity_maker=_translte_keys)
 
     def detail(self, req):
         """ Returns a list of server details for a given user """
-        return self._items(req, entity_maker=_entity_detail)
+        return self._items(req, entity_maker=_translate_detail_keys)
 
     def _items(self, req, entity_maker):
         """Returns a list of servers for a given user.
 
-        entity_maker - either _entity_detail or _entity_inst
+        entity_maker - either _translate_detail_keys or _translate_keys
         """
         instance_list = self.compute_api.get_instances(
             req.environ['nova.context'])
         limited_list = common.limited(instance_list, req)
         res = [entity_maker(inst)['server'] for inst in limited_list]
-        return _entity_list(res)
+        return dict(servers=res)
 
     def show(self, req, id):
         """ Returns server details by server id """
         try:
             instance = self.compute_api.get_instance(
                 req.environ['nova.context'], int(id))
-            return _entity_detail(instance)
+            return _translate_detail_keys(instance)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
 
@@ -138,7 +135,7 @@ class Controller(wsgi.Controller):
             description=env['server']['name'],
             key_name=key_pair['name'],
             key_data=key_pair['public_key'])
-        return _entity_inst(instances[0])
+        return _translate_keys(instances[0])
 
     def update(self, req, id):
         """ Updates the server name or password """
-- 
cgit 


From 31d3aed581302e73b3f155b1dd72586324433e91 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 27 Dec 2010 17:35:59 -0600
Subject: Typo fix

---
 nova/api/openstack/servers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 9369f6516..d18889563 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -84,7 +84,7 @@ class Controller(wsgi.Controller):
 
     def index(self, req):
         """ Returns a list of server names and ids for a given user """
-        return self._items(req, entity_maker=_translte_keys)
+        return self._items(req, entity_maker=_translate_keys)
 
     def detail(self, req):
         """ Returns a list of server details for a given user """
-- 
cgit 


From eab0ce934e6296910b26c087e4268a65dc233a55 Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor@citrix.com>
Date: Tue, 28 Dec 2010 01:37:04 +0000
Subject: Bug #694880: nova-compute now depends upon Cheetah even when not
 using libvirt

Only import Cheetah when needed, as we do already with libvirt and libxml2.
This ensures that users of other virt backends don't need Cheetah to run
nova-compute.
---
 nova/tests/test_virt.py   |  1 +
 nova/virt/libvirt_conn.py | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'nova')

diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 1c155abe4..4aa489d08 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -33,6 +33,7 @@ flags.DECLARE('instances_path', 'nova.compute.manager')
 class LibvirtConnTestCase(test.TestCase):
     def setUp(self):
         super(LibvirtConnTestCase, self).setUp()
+        libvirt_conn._late_load_cheetah()
         self.flags(fake_call=True)
         self.manager = manager.AuthManager()
         self.user = self.manager.create_user('fake', 'fake', 'fake',
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 67b9fc47e..8b67b937f 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -58,10 +58,9 @@ from nova.compute import instance_types
 from nova.compute import power_state
 from nova.virt import images
 
-from Cheetah.Template import Template
-
 libvirt = None
 libxml2 = None
+Template = None
 
 
 FLAGS = flags.FLAGS
@@ -88,14 +87,23 @@ flags.DEFINE_bool('allow_project_net_traffic',
 def get_connection(read_only):
     # These are loaded late so that there's no need to install these
     # libraries when not using libvirt.
+    # Cheetah is separate because the unit tests want to load Cheetah,
+    # but not libvirt.
     global libvirt
     global libxml2
     if libvirt is None:
         libvirt = __import__('libvirt')
     if libxml2 is None:
         libxml2 = __import__('libxml2')
+    _late_load_cheetah()
     return LibvirtConnection(read_only)
 
+def _late_load_cheetah():
+    global Template
+    if Template is None:
+        t = __import__('Cheetah.Template', globals(), locals(), ['Template'],
+                       -1)
+        Template = t.Template
 
 def _get_net_and_mask(cidr):
     net = IPy.IP(cidr)
-- 
cgit 


From 32bfe6acdf8e462f90c72c9230b77c8c6fdca93b Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Tue, 28 Dec 2010 05:14:21 +0000
Subject: fixed a line length

---
 nova/compute/manager.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index d5e0c38b0..70b175e7c 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -302,7 +302,8 @@ class ComputeManager(manager.Manager):
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
 
-        logging.debug(_('instance %s: suspending'), instance_ref['internal_id'])
+        logging.debug(_('instance %s: suspending'),
+                      instance_ref['internal_id'])
         self.db.instance_set_state(context, instance_id,
                                             power_state.NOSTATE,
                                             'suspending')
-- 
cgit 


From 902df6eb4968743dd451e54cde27ce88fc83ddaa Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Tue, 28 Dec 2010 15:48:48 -0600
Subject: Whoops

---
 nova/api/openstack/backup_schedules.py |  4 ++--
 nova/api/openstack/sharedipgroups.py   | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index 9b8e605f6..fcc07bdd3 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -23,7 +23,7 @@ from nova.api.openstack import faults
 import nova.image.service
 
 
-def _entity_inst(inst):
+def _translate_keys(inst):
     """ Coerces the backup schedule into proper dictionary format """
     return dict(backupSchedule=inst)
 
@@ -41,7 +41,7 @@ class Controller(wsgi.Controller):
 
     def index(self, req, server_id):
         """ Returns the list of backup schedules for a given instance """
-        return _entity_inst({})
+        return _translate_keys({})
 
     def create(self, req, server_id):
         """ No actual update method required, since the existing API allows
diff --git a/nova/api/openstack/sharedipgroups.py b/nova/api/openstack/sharedipgroups.py
index 32ebfa45a..845f5bead 100644
--- a/nova/api/openstack/sharedipgroups.py
+++ b/nova/api/openstack/sharedipgroups.py
@@ -21,17 +21,12 @@ from nova import wsgi
 from nova.api.openstack import faults
 
 
-def _entity_list(entities):
-    """ Coerces a list of shared IP groups into proper dictionary format """
-    return dict(sharedIpGroups=entities)
-
-
-def _entity_inst(inst):
+def _translate_keys(inst):
     """ Coerces a shared IP group instance into proper dictionary format """
     return dict(sharedIpGroup=inst)
 
 
-def _entity_detail(inst):
+def _translate_detail_keys(inst):
     """ Coerces a shared IP group instance into proper dictionary format with
     correctly mapped attributes """
     return dict(sharedIpGroup=inst)
@@ -47,11 +42,11 @@ class Controller(wsgi.Controller):
 
     def index(self, req):
         """ Returns a list of Shared IP Groups for the user """
-        return _entity_list([])
+        return dict(sharedIpGroups=[])
 
     def show(self, req, id):
         """ Shows in-depth information on a specific Shared IP Group """
-        return _entity_inst({})
+        return _translate_keys({})
 
     def update(self, req, id):
         """ You can't update a Shared IP Group """
@@ -63,7 +58,7 @@ class Controller(wsgi.Controller):
 
     def detail(self, req, id):
         """ Returns a complete list of Shared IP Groups """
-        return _entity_detail({})
+        return _translate_detail_keys({})
 
     def create(self, req):
         """ Creates a new Shared IP group """
-- 
cgit 


From 8ee15b6e93b5666b4645f2cefef357b0af3d26d0 Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren@linux2go.dk>
Date: Tue, 28 Dec 2010 23:25:50 +0100
Subject: Address bug #695157 by using a blank request class and setting an
 empty request path.

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

(limited to 'nova')

diff --git a/nova/wsgi.py b/nova/wsgi.py
index c7ee9ed14..b5d6b96c1 100644
--- a/nova/wsgi.py
+++ b/nova/wsgi.py
@@ -270,7 +270,7 @@ class Serializer(object):
         needed to serialize a dictionary to that type.
         """
         self.metadata = metadata or {}
-        req = webob.Request(environ)
+        req = webob.Request.blank('', environ)
         suffix = req.path_info.split('.')[-1].lower()
         if suffix == 'json':
             self.handler = self._to_json
-- 
cgit 


From 99a228a8ef3ee2760774fbafd136f137bd578dba Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Tue, 28 Dec 2010 17:34:51 -0600
Subject: removed superfluous line

---
 nova/api/openstack/servers.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 2232d24b2..845183258 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -152,7 +152,6 @@ class Controller(wsgi.Controller):
 
         try:
             ctxt = req.environ['nova.context']
-            inst_ref = self.compute_api.get_instance(ctxt, id)
             self.compute_api.update_instance(ctxt,
                                              id,
                                              **update_dict)
-- 
cgit 


From 380b28f89481c52dbcda0b54fd7409b6bc72bb56 Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor@citrix.com>
Date: Wed, 29 Dec 2010 01:58:04 +0000
Subject: Fix pep8 violations.

---
 nova/virt/libvirt_conn.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nova')

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 8b67b937f..e9c6c2713 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -98,6 +98,7 @@ def get_connection(read_only):
     _late_load_cheetah()
     return LibvirtConnection(read_only)
 
+
 def _late_load_cheetah():
     global Template
     if Template is None:
@@ -105,6 +106,7 @@ def _late_load_cheetah():
                        -1)
         Template = t.Template
 
+
 def _get_net_and_mask(cidr):
     net = IPy.IP(cidr)
     return str(net.net()), str(net.netmask())
-- 
cgit