From 31a1c59ec2aa45400ded83d228af54b433910b8d Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Tue, 7 Dec 2010 14:36:49 +0000
Subject: first test commit

---
 plugins/xenapi/etc/xapi.d/plugins/objectstore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore
index 271e7337f..cbae1e552 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/objectstore
+++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore
@@ -77,6 +77,7 @@ def get_vdi(session, args):
 def get_vdi_(proto, netloc, url_path, username, password, add_partition,
              virtual_size, dest):
 
+    #Salvatore: vdi should not be partitioned for raw images
     if add_partition:
         write_partition(virtual_size, dest)
 
-- 
cgit 


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 ++++++---
 plugins/xenapi/etc/xapi.d/plugins/objectstore |  9 +++--
 9 files changed, 135 insertions(+), 44 deletions(-)

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)
diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore
index cbae1e552..071494160 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/objectstore
+++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore
@@ -48,6 +48,7 @@ def get_vdi(session, args):
     src_url = exists(args, 'src_url')
     username = exists(args, 'username')
     password = exists(args, 'password')
+    raw_image=validate_bool(args, 'raw', 'false')
     add_partition = validate_bool(args, 'add_partition', 'false')
 
     (proto, netloc, url_path, _, _, _) = urlparse.urlparse(src_url)
@@ -69,19 +70,19 @@ def get_vdi(session, args):
     vdi = create_vdi(session, sr, src_url, vdi_size, False)
     with_vdi_in_dom0(session, vdi, False,
                      lambda dev: get_vdi_(proto, netloc, url_path,
-                                          username, password, add_partition,
+                                          username, password, add_partition,raw_image,
                                           virtual_size, '/dev/%s' % dev))
     return session.xenapi.VDI.get_uuid(vdi)
 
 
-def get_vdi_(proto, netloc, url_path, username, password, add_partition,
+def get_vdi_(proto, netloc, url_path, username, password, add_partition,raw_image,
              virtual_size, dest):
 
     #Salvatore: vdi should not be partitioned for raw images
-    if add_partition:
+    if (add_partition and not raw_image):
         write_partition(virtual_size, dest)
 
-    offset = add_partition and MBR_SIZE_BYTES or 0
+    offset = (add_partition and MBR_SIZE_BYTES and not raw_image) or 0
     get(proto, netloc, url_path, username, password, dest, offset)
 
 
-- 
cgit 


From e33cce1b76d5e0752c49b51cdc24c3368d12125f Mon Sep 17 00:00:00 2001
From: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date: Mon, 13 Dec 2010 16:11:12 +0000
Subject: only needs work for distinguishing pv from hvm

---
 .project                     | 17 +++++++++++++++++
 .pydevproject                | 10 ++++++++++
 cuba-ubuntu.16501            |  0
 nova-api.pid                 |  1 +
 nova-api.pid.lock            |  0
 nova-manage.conf             | 26 ++++++++++++++++++++++++++
 nova-network.pid             |  1 +
 nova-objectstore.pid         |  1 +
 nova-scheduler.pid           |  1 +
 nova/virt/xenapi/vm_utils.py | 14 +++++++++-----
 10 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 .project
 create mode 100644 .pydevproject
 create mode 100644 cuba-ubuntu.16501
 create mode 100644 nova-api.pid
 create mode 100644 nova-api.pid.lock
 create mode 100644 nova-manage.conf
 create mode 100644 nova-network.pid
 create mode 100644 nova-objectstore.pid
 create mode 100644 nova-scheduler.pid

diff --git a/.project b/.project
new file mode 100644
index 000000000..1213c940a
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Openstack-xs_raw_disk_images</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 000000000..8030d8e44
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?>
+
+<pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
+<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
+<path>/home/salvatore/xenapi</path>
+</pydev_pathproperty>
+</pydev_project>
diff --git a/cuba-ubuntu.16501 b/cuba-ubuntu.16501
new file mode 100644
index 000000000..e69de29bb
diff --git a/nova-api.pid b/nova-api.pid
new file mode 100644
index 000000000..9bcd7ef16
--- /dev/null
+++ b/nova-api.pid
@@ -0,0 +1 @@
+16501
diff --git a/nova-api.pid.lock b/nova-api.pid.lock
new file mode 100644
index 000000000..e69de29bb
diff --git a/nova-manage.conf b/nova-manage.conf
new file mode 100644
index 000000000..6942b8cc6
--- /dev/null
+++ b/nova-manage.conf
@@ -0,0 +1,26 @@
+--verbose
+--nodaemon
+--FAKE_subdomain=ec2
+--ca_path=/home/salvatore/openstack/nova/CA
+--keys_path=/home/salvatore/openstack/nova/keys
+--networks_path=/home/salvatore/openstack/nova/networks
+--images_path=/home/salvatore/openstack/nova/images
+--buckets_path=/home/salvatore/openstack/nova/buckets
+--logdir=/home/salvatore/openstack/nova
+#--libvirt_type=qemu
+--connection_type=xenapi
+--xenapi_connection_url=http://camctxlabs-svr05.cam.eu.citrix.com
+--xenapi_connection_password=_car0pet_
+--auth_driver=nova.auth.dbdriver.DbDriver
+--sql_connection=mysql://root:nova@10.70.177.19/nova
+--s3_host=10.70.177.19
+--network_manager=nova.network.manager.FlatManager
+#--network_manager=nova.network.manager.VlanManager
+--fixed_range=192.168.1.240/28 
+--routing_source_ip=10.70.177.19
+--flat_network_bridge=xenbr0
+--flat_network_gateway=192.168.1.1 
+--flat_network_netmask=255.255.255.0 
+--flat_network_network=192.168.1.0 
+--flat_network_ips=192.168.1.220,192.168.1.221,192.168.1.222
+--flat_network_broadcast=192.168.1.255
diff --git a/nova-network.pid b/nova-network.pid
new file mode 100644
index 000000000..b81b10821
--- /dev/null
+++ b/nova-network.pid
@@ -0,0 +1 @@
+16479
\ No newline at end of file
diff --git a/nova-objectstore.pid b/nova-objectstore.pid
new file mode 100644
index 000000000..0967315fe
--- /dev/null
+++ b/nova-objectstore.pid
@@ -0,0 +1 @@
+16469
\ No newline at end of file
diff --git a/nova-scheduler.pid b/nova-scheduler.pid
new file mode 100644
index 000000000..d6bb441a4
--- /dev/null
+++ b/nova-scheduler.pid
@@ -0,0 +1 @@
+16490
\ No newline at end of file
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 3ab4581c4..320869ae2 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -79,7 +79,7 @@ class VMHelper():
             'platform': {},
             'PCI_bus': '',
             'recommendations': '',
-            'affinity': '',
+            'affinity': '',  
             'user_version': '0',
             'other_config': {},
             }
@@ -98,6 +98,7 @@ class VMHelper():
             #TODO: Windows needs a platform flag... 
             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)
@@ -162,18 +163,21 @@ 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)
-- 
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 +++--
 plugins/xenapi/etc/xapi.d/plugins/objectstore | 30 ++++++++++++++----
 3 files changed, 63 insertions(+), 20 deletions(-)

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,
diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore
index 071494160..bc9e783cf 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/objectstore
+++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore
@@ -43,25 +43,42 @@ SECTOR_SIZE = 512
 MBR_SIZE_SECTORS = 63
 MBR_SIZE_BYTES = MBR_SIZE_SECTORS * SECTOR_SIZE
 
-
+def is_vdi_pv(session,args):
+    logging.debug("Checking wheter VDI has PV kernel")
+    vdi = exists(args, 'vdi-ref')
+    pv=False
+    pv=with_vdi_in_dom0(session, vdi, False,
+                     lambda dev: _is_vdi_pv('/dev/%s' % dev))
+    return pv
+
+def _is_vdi_pv(dest):
+    logging.debug("Running pygrub against %s",dest)
+    output=os.popen('pygrub -qn %s' % dest)
+    pv=False
+    for line in output.readlines():
+        logging.debug("line:",line)
+        #try to find kernel string
+        m=re.search('(?<=kernel:)/.*(?:>)',line)
+        if (m<>None):
+            if m.group(0).find('xen')<>-1:
+                pv=True
+    logging.debug("PV:%d",pv)
+    return pv 
+        
 def get_vdi(session, args):
     src_url = exists(args, 'src_url')
     username = exists(args, 'username')
     password = exists(args, 'password')
     raw_image=validate_bool(args, 'raw', 'false')
     add_partition = validate_bool(args, 'add_partition', 'false')
-
     (proto, netloc, url_path, _, _, _) = urlparse.urlparse(src_url)
-
     sr = find_sr(session)
     if sr is None:
         raise Exception('Cannot find SR to write VDI to')
-
     virtual_size = \
         get_content_length(proto, netloc, url_path, username, password)
     if virtual_size < 0:
         raise Exception('Cannot get VDI size')
-
     vdi_size = virtual_size
     if add_partition:
         # Make room for MBR.
@@ -230,4 +247,5 @@ def download_all(response, length, dest_file, offset):
 
 if __name__ == '__main__':
     XenAPIPlugin.dispatch({'get_vdi': get_vdi,
-                           'get_kernel': get_kernel})
+                           'get_kernel': get_kernel, 
+                           'is_vdi_pv': is_vdi_pv})
-- 
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 +
 plugins/xenapi/etc/xapi.d/plugins/objectstore | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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)
diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore
index bc9e783cf..e748742b1 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/objectstore
+++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore
@@ -49,20 +49,26 @@ def is_vdi_pv(session,args):
     pv=False
     pv=with_vdi_in_dom0(session, vdi, False,
                      lambda dev: _is_vdi_pv('/dev/%s' % dev))
+    logging.debug("HERE - bye bye")
     return pv
 
 def _is_vdi_pv(dest):
     logging.debug("Running pygrub against %s",dest)
     output=os.popen('pygrub -qn %s' % dest)
+    logging.debug("HERE - 1")
     pv=False
+    logging.debug("HERE - 2")
     for line in output.readlines():
-        logging.debug("line:",line)
+        #logging.debug("line:",line)
+        logging.debug("HERE - loop")
         #try to find kernel string
         m=re.search('(?<=kernel:)/.*(?:>)',line)
         if (m<>None):
             if m.group(0).find('xen')<>-1:
                 pv=True
+    logging.debug("HERE - 3")
     logging.debug("PV:%d",pv)
+    logging.debug("HERE - 4")
     return pv 
         
 def get_vdi(session, args):
-- 
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 +++++-
 plugins/xenapi/etc/xapi.d/plugins/objectstore | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

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)
 
diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore
index e748742b1..af653c495 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/objectstore
+++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore
@@ -50,7 +50,10 @@ def is_vdi_pv(session,args):
     pv=with_vdi_in_dom0(session, vdi, False,
                      lambda dev: _is_vdi_pv('/dev/%s' % dev))
     logging.debug("HERE - bye bye")
-    return pv
+    if (pv):
+        return 'true'
+    else:
+        return 'false'
 
 def _is_vdi_pv(dest):
     logging.debug("Running pygrub against %s",dest)
-- 
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 ++++---------
 plugins/xenapi/etc/xapi.d/plugins/objectstore |  7 -------
 4 files changed, 5 insertions(+), 26 deletions(-)

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)
diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore
index af653c495..c78f0b1d8 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/objectstore
+++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore
@@ -46,10 +46,8 @@ MBR_SIZE_BYTES = MBR_SIZE_SECTORS * SECTOR_SIZE
 def is_vdi_pv(session,args):
     logging.debug("Checking wheter VDI has PV kernel")
     vdi = exists(args, 'vdi-ref')
-    pv=False
     pv=with_vdi_in_dom0(session, vdi, False,
                      lambda dev: _is_vdi_pv('/dev/%s' % dev))
-    logging.debug("HERE - bye bye")
     if (pv):
         return 'true'
     else:
@@ -58,20 +56,15 @@ def is_vdi_pv(session,args):
 def _is_vdi_pv(dest):
     logging.debug("Running pygrub against %s",dest)
     output=os.popen('pygrub -qn %s' % dest)
-    logging.debug("HERE - 1")
     pv=False
-    logging.debug("HERE - 2")
     for line in output.readlines():
         #logging.debug("line:",line)
-        logging.debug("HERE - loop")
         #try to find kernel string
         m=re.search('(?<=kernel:)/.*(?:>)',line)
         if (m<>None):
             if m.group(0).find('xen')<>-1:
                 pv=True
-    logging.debug("HERE - 3")
     logging.debug("PV:%d",pv)
-    logging.debug("HERE - 4")
     return pv 
         
 def get_vdi(session, args):
-- 
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 +-
 plugins/xenapi/etc/xapi.d/plugins/objectstore | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

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,
diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore
index c78f0b1d8..e17f1ba13 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/objectstore
+++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore
@@ -101,7 +101,7 @@ def get_vdi_(proto, netloc, url_path, username, password, add_partition,raw_imag
     if (add_partition and not raw_image):
         write_partition(virtual_size, dest)
 
-    offset = (add_partition and MBR_SIZE_BYTES and not raw_image) or 0
+    offset = (add_partition and not raw_image and MBR_SIZE_BYTES) or 0
     get(proto, netloc, url_path, username, password, dest, offset)
 
 
-- 
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(-)

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

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

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

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

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

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 e601ab4a1068029b2f0b79789ed506fda1332404 Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Thu, 16 Dec 2010 20:59:27 -0600
Subject: XenAPI Snapshots first cut

---
 nova/compute/manager.py                  |  30 ++++++++-
 nova/virt/libvirt_conn.py                |   7 ++
 nova/virt/xenapi/vm_utils.py             |  91 ++++++++++++++++++++++++++
 nova/virt/xenapi/vmops.py                |  43 ++++++++++--
 nova/virt/xenapi_conn.py                 |   7 ++
 plugins/xenapi/etc/xapi.d/plugins/glance | 108 +++++++++++++++++++++++++++++++
 6 files changed, 278 insertions(+), 8 deletions(-)
 create mode 100644 plugins/xenapi/etc/xapi.d/plugins/glance

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 7eb60e262..8fc8d5e1a 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -134,8 +134,10 @@ class ComputeManager(manager.Manager):
         # TODO(ja): should we keep it in a terminated state for a bit?
         self.db.instance_destroy(context, instance_id)
 
+    #FIXME(sirp): Hacking reboot to snapshot
     @exception.wrap_exception
-    def reboot_instance(self, context, instance_id):
+    def XXreboot_instance(self, context, instance_id):
+    #def reboot_instance(self, context, instance_id):
         """Reboot an instance on this server."""
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
@@ -156,6 +158,32 @@ class ComputeManager(manager.Manager):
         self.driver.reboot(instance_ref)
         self._update_state(context, instance_id)
 
+    #FIXME(sirp): Hacking reboot to snapshot
+    @exception.wrap_exception
+    def reboot_instance(self, context, instance_id):
+    #def snapshot_instance(self, context, instance_id):
+        """Snapshot an instance on this server."""
+        context = context.elevated()
+        instance_ref = self.db.instance_get(context, instance_id)
+
+        #FIXME(sirp): update_state currently only refreshes the state field
+        # if we add is_snapshotting, we will need this refreshed too,
+        # potentially?
+        self._update_state(context, instance_id)
+
+        #TODO(sirp): check for is_snapshotting=True here?
+        if instance_ref['state'] != power_state.RUNNING:
+            logging.warn('trying to snapshot a non-running '
+                         'instance: %s (state: %s excepted: %s)',
+                         instance_ref['internal_id'],
+                         instance_ref['state'],
+                         power_state.RUNNING)
+
+        logging.debug('instance %s: snapshotting', instance_ref['name'])
+        #TODO(sirp): set is_snapshotting=True here?
+        self.driver.snapshot(instance_ref)
+        #self._update_state(context, instance_id)
+
     @exception.wrap_exception
     def rescue_instance(self, context, instance_id):
         """Rescue an instance on this server."""
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 5a8c71850..112ac7d37 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -265,6 +265,13 @@ class LibvirtConnection(object):
             raise exception.NotFound("No disk at %s" % mount_device)
         virt_dom.detachDevice(xml)
 
+    @exception.wrap_exception
+    def snapshot(self, instance):
+        """ Create snapshot from a running VM instance """
+        #TODO(sirp): only exists for XenAPI driver for now
+        raise NotImplementedError(
+            "Instance snapshotting is not supported for libvirt at this time")
+
     @exception.wrap_exception
     def reboot(self, instance):
         self.destroy(instance, False)
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 2f5d78e75..c3e8b30b7 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -19,6 +19,7 @@ Helper methods for operations related to the management of VM records and
 their attributes like VDIs, VIFs, as well as their lookup functions.
 """
 
+import time #FIXME(sirp): take this out, replace with greenthread.sleep
 import logging
 import urllib
 from xml.dom import minidom
@@ -148,6 +149,63 @@ class VMHelper():
                       vm_ref, network_ref)
         return vif_ref
 
+
+    @classmethod
+    def create_snapshot(cls, session, vm_ref, label):
+        logging.debug("Snapshotting VM %s with label '%s'...", vm_ref, label)
+        
+        #TODO(sirp): Add quiesce and VSS locking support when Windows support
+        # is added
+
+        #TODO(sirp): Make safe_lookup_vdi for assert?
+        vdi_refs = VMHelper.lookup_vm_vdis(session, vm_ref)
+        if vdi_refs is None or len(vdi_refs) != 1:
+            raise Exception("Unexpected number of VDIs (%s) found for VM %s"
+                            % (len(vdi_refs), vm_ref)) 
+        vdi_ref = vdi_refs[0]
+        vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
+        vdi_uuid = vdi_rec["uuid"]
+
+        #NOTE(sirp): We may need to wait for our parent to coalese with his 
+        # parent
+        original_parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
+
+        task = session.call_xenapi('Async.VM.snapshot', vm_ref, label)
+        template_vm_ref = session.wait_for_task(task)
+        logging.debug('Created snapshot %s from VM %s.', template_vm_ref,
+                      vm_ref)
+
+        #NOTE(sirp): wait for any coalescing
+        #NOTE(sirp): for some reason re-scan wasn't occuring automatically on 
+        # XS5.6
+        #TODO(sirp): clean this up, perhaps use LoopingCall
+        sr_ref = vdi_rec["SR"]
+        scan_sr(session, sr_ref)
+        parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
+        time.sleep(5)
+        while original_parent_uuid and (parent_uuid != original_parent_uuid):
+            scan_sr(session, sr_ref)
+            logging.debug(
+                "Parent %s doesn't match original parent %s, "
+                "waiting for coalesce...", parent_uuid, original_parent_uuid)
+            #TODO(sirp): make this non-blocking
+            time.sleep(5)
+            parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
+
+        vdi_uuids = [vdi_uuid, parent_uuid]
+        return template_vm_ref, vdi_uuids
+
+
+    @classmethod
+    def upload_image(cls, session, vdi_uuids, glance_label):
+        logging.debug("Asking xapi to upload %s as '%s'", vdi_uuids,
+                      glance_label)
+        kwargs = {'vdi_uuids': ','.join(vdi_uuids), 
+                  'glance_label': glance_label}
+        task = session.async_call_plugin('glance', 'put_vdis', kwargs)
+        session.wait_for_task(task)
+
+
     @classmethod
     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
@@ -258,3 +316,36 @@ def get_rrd(host, uuid):
         return xml.read()
     except IOError:
         return None
+
+
+#TODO(sirp): This code comes from XS5.6 pluginlib.py, we should refactor to
+# use that implmenetation
+def get_vhd_parent(session, vdi_rec):
+    """
+    Returns the VHD parent of the given VDI record, as a (ref, rec) pair.
+    Returns None if we're at the root of the tree.
+    """
+    if 'vhd-parent' in vdi_rec['sm_config']:
+        parent_uuid = vdi_rec['sm_config']['vhd-parent']
+        #NOTE(sirp): changed xenapi -> get_xenapi()
+        parent_ref = session.get_xenapi().VDI.get_by_uuid(parent_uuid)
+        parent_rec = session.get_xenapi().VDI.get_record(parent_ref)
+        #NOTE(sirp): changed log -> logging
+        logging.debug("VHD %s has parent %s", vdi_rec['uuid'], parent_ref)
+        return parent_ref, parent_rec
+    else:
+        return None
+
+def get_vhd_parent_uuid(session, vdi_ref):
+    vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
+    ret = get_vhd_parent(session, vdi_rec)
+    if ret:
+        parent_ref, parent_rec = ret
+        return parent_rec["uuid"]
+    else:
+        return None
+
+def scan_sr(session, sr_ref):
+    logging.debug("Re-scanning SR %s", sr_ref)
+    task = session.call_xenapi('Async.SR.scan', sr_ref)
+    session.wait_for_task(task)
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 3034df9e1..50b5ec3d6 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -78,6 +78,31 @@ class VMOps(object):
         self._session.call_xenapi('VM.start', vm_ref, False, False)
         logging.info('Spawning VM %s created %s.', instance.name,
                      vm_ref)
+    
+    def snapshot(self, instance):
+        """ Create snapshot from a running VM instance """
+        #TODO(sirp): Add quiesce and VSS locking support when Windows support
+        # is added
+        vm_ref = VMHelper.lookup(self._session, instance.name)
+
+        #TODO(sirp): this is the label in Xen, we need to add a human friendly
+        # label that we store in paralalx
+        label = "%s-snapshot" % instance.name
+        glance_name = "MySnapshot"
+    
+        try:
+            template_vm_ref, template_vdi_uuids = VMHelper.create_snapshot(
+                self._session, vm_ref, label)
+        except XenAPI.Failure, exc:
+            logging.error("Unable to Snapshot %s: %s", vm_ref, exc)
+            return
+        
+        try:
+            # call plugin to ship snapshot off to glance
+            VMHelper.upload_image(
+                self._session, template_vdi_uuids, glance_name)
+        finally:
+            self._destroy(template_vm_ref, shutdown=False)
 
     def reboot(self, instance):
         """ Reboot VM instance """
@@ -89,20 +114,24 @@ class VMOps(object):
         self._session.wait_for_task(task)
 
     def destroy(self, instance):
-        """ Destroy VM instance """
         vm = VMHelper.lookup(self._session, instance.name)
+        return self._destroy(vm, shutdown=True)
+
+    def _destroy(self, vm, shutdown=True):
+        """ Destroy VM instance """
         if vm is None:
             # Don't complain, just return.  This lets us clean up instances
             # that have already disappeared from the underlying platform.
             return
         # Get the VDIs related to the VM
         vdis = VMHelper.lookup_vm_vdis(self._session, vm)
-        try:
-            task = self._session.call_xenapi('Async.VM.hard_shutdown',
-                                                   vm)
-            self._session.wait_for_task(task)
-        except XenAPI.Failure, exc:
-            logging.warn(exc)
+        if shutdown:
+            try:
+                task = self._session.call_xenapi('Async.VM.hard_shutdown',
+                                                       vm)
+                self._session.wait_for_task(task)
+            except XenAPI.Failure, exc:
+                logging.warn(exc)
         # Disk clean-up
         if vdis:
             for vdi in vdis:
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 6beb08f5e..8aacec507 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -115,6 +115,13 @@ class XenAPIConnection(object):
         """ Create VM instance """
         self._vmops.spawn(instance)
 
+
+    def snapshot(self, instance):
+        """ Create snapshot from a running VM instance """
+        #TODO(sirp): Add quiesce and VSS locking support when Windows support
+        # is added
+        self._vmops.snapshot(instance)
+
     def reboot(self, instance):
         """ Reboot VM instance """
         self._vmops.reboot(instance)
diff --git a/plugins/xenapi/etc/xapi.d/plugins/glance b/plugins/xenapi/etc/xapi.d/plugins/glance
new file mode 100644
index 000000000..55d71b79e
--- /dev/null
+++ b/plugins/xenapi/etc/xapi.d/plugins/glance
@@ -0,0 +1,108 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2010 Citrix Systems, Inc.
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+#
+# XenAPI plugin for putting images into glance
+#
+
+import base64
+import errno
+import hmac
+import os
+import os.path
+import sha
+import subprocess
+import time
+import urlparse
+
+import XenAPIPlugin
+
+#FIXME(sirp): should this use pluginlib from 5.6?
+from pluginlib_nova import *
+configure_logging('glance')
+
+#FIXME(sirp): Should this just be 64K like elsewhere
+CHUNK_SIZE = 4096
+
+FILE_SR_PATH = '/var/run/sr-mount'
+
+#TODO(sirp): use get_vhd_parent code from Citrix guys
+#TODO(sirp): look for Citrix guys get VDI from VM_ref (does this exist in
+#pluginlib?
+# Need to add glance client to plugins (how do we get this onto XenServer
+# machine?)
+# WHen do we cleanup unused VDI's in SR
+
+def put_vdis(session, args):
+    vdi_uuids = exists(args, 'vdi_uuids').split(',')
+    glance_label = exists(args, 'glance_label')
+    
+    sr_path = get_sr_path(session)
+    tar_cmd = ['tar', '-zc', '--directory=%s' % sr_path]
+    paths = [ "%s.vhd" % vdi_uuid for vdi_uuid in vdi_uuids ]
+    tar_cmd.extend(paths)
+    logging.debug("Bundling image with cmd: %s", tar_cmd)
+    tar_proc = subprocess.Popen(tar_cmd, stdout=subprocess.PIPE)
+  
+    test_file = "%s.tar.gz" % os.path.join('/tmp', glance_label) 
+    logging.debug("Writing to test file %s", test_file) 
+    bundle = tar_proc.stdout
+    f = open(test_file, 'w')
+    try:
+        chunk = bundle.read(CHUNK_SIZE)
+        while chunk:
+            f.write(chunk)
+            chunk = bundle.read(CHUNK_SIZE)
+    finally:
+        f.close()
+
+    return "" # FIXME(sirp): return anything useful here?
+
+
+def get_sr_path(session):
+    sr_ref = find_sr(session)
+
+    if sr_ref is None:
+        raise Exception('Cannot find SR to read VDI from')
+
+    sr_rec = session.xenapi.SR.get_record(sr_ref)
+    sr_uuid = sr_rec["uuid"]
+    sr_path = os.path.join(FILE_SR_PATH, sr_uuid)
+    return sr_path
+
+
+#TODO(sirp): both objectstore and glance need this, should this be refactored
+#into common lib
+def find_sr(session):
+    host = get_this_host(session)
+    srs = session.xenapi.SR.get_all()
+    for sr in srs:
+        sr_rec = session.xenapi.SR.get_record(sr)
+        if not ('i18n-key' in sr_rec['other_config'] and
+                sr_rec['other_config']['i18n-key'] == 'local-storage'):
+            continue
+        for pbd in sr_rec['PBDs']:
+            pbd_rec = session.xenapi.PBD.get_record(pbd)
+            if pbd_rec['host'] == host:
+                return sr
+    return None
+
+
+if __name__ == '__main__':
+    XenAPIPlugin.dispatch({'put_vdis': put_vdis})
-- 
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 ++++----
 plugins/xenapi/etc/xapi.d/plugins/objectstore | 7 +++----
 4 files changed, 12 insertions(+), 14 deletions(-)

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,
diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore
index e17f1ba13..8ee2f748d 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/objectstore
+++ b/plugins/xenapi/etc/xapi.d/plugins/objectstore
@@ -48,7 +48,7 @@ def is_vdi_pv(session,args):
     vdi = exists(args, 'vdi-ref')
     pv=with_vdi_in_dom0(session, vdi, False,
                      lambda dev: _is_vdi_pv('/dev/%s' % dev))
-    if (pv):
+    if pv:
         return 'true'
     else:
         return 'false'
@@ -58,11 +58,10 @@ def _is_vdi_pv(dest):
     output=os.popen('pygrub -qn %s' % dest)
     pv=False
     for line in output.readlines():
-        #logging.debug("line:",line)
         #try to find kernel string
         m=re.search('(?<=kernel:)/.*(?:>)',line)
-        if (m<>None):
-            if m.group(0).find('xen')<>-1:
+        if m:
+            if m.group(0).find('xen')!=-1:
                 pv=True
     logging.debug("PV:%d",pv)
     return pv 
-- 
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(-)

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 ae54d5bdf3e0615c5be9ebe4f03f7256f22484ee Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Fri, 17 Dec 2010 14:21:03 -0600
Subject: Add wait_for_vhd_coalesce

---
 nova/virt/xenapi/vm_utils.py | 52 +++++++++++++++++++++++++++++---------------
 nova/virt/xenapi/vmops.py    |  3 +++
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index c3e8b30b7..1b18b0a01 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -175,26 +175,12 @@ class VMHelper():
         logging.debug('Created snapshot %s from VM %s.', template_vm_ref,
                       vm_ref)
 
-        #NOTE(sirp): wait for any coalescing
-        #NOTE(sirp): for some reason re-scan wasn't occuring automatically on 
-        # XS5.6
-        #TODO(sirp): clean this up, perhaps use LoopingCall
         sr_ref = vdi_rec["SR"]
-        scan_sr(session, sr_ref)
-        parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
-        time.sleep(5)
-        while original_parent_uuid and (parent_uuid != original_parent_uuid):
-            scan_sr(session, sr_ref)
-            logging.debug(
-                "Parent %s doesn't match original parent %s, "
-                "waiting for coalesce...", parent_uuid, original_parent_uuid)
-            #TODO(sirp): make this non-blocking
-            time.sleep(5)
-            parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
-
-        vdi_uuids = [vdi_uuid, parent_uuid]
-        return template_vm_ref, vdi_uuids
+        parent_uuid = wait_for_vhd_coalesce(
+            session, sr_ref, vdi_ref, original_parent_uuid) 
 
+        #TODO(sirp): we need to assert only one parent, not parents two deep
+        return template_vm_ref, [vdi_uuid, parent_uuid]
 
     @classmethod
     def upload_image(cls, session, vdi_uuids, glance_label):
@@ -336,6 +322,7 @@ def get_vhd_parent(session, vdi_rec):
     else:
         return None
 
+
 def get_vhd_parent_uuid(session, vdi_ref):
     vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
     ret = get_vhd_parent(session, vdi_rec)
@@ -345,7 +332,36 @@ def get_vhd_parent_uuid(session, vdi_ref):
     else:
         return None
 
+
 def scan_sr(session, sr_ref):
     logging.debug("Re-scanning SR %s", sr_ref)
     task = session.call_xenapi('Async.SR.scan', sr_ref)
     session.wait_for_task(task)
+
+
+def wait_for_vhd_coalesce(session, sr_ref, vdi_ref, original_parent_uuid):
+    """ TODO Explain why coalescing has to occur here """
+    #TODO(sirp): we need to timeout this req after a while
+    #NOTE(sirp): for some reason re-scan wasn't occuring automatically on 
+    # XS5.6
+    #TODO(sirp): clean this up, perhaps use LoopingCall
+    def _get_vhd_parent_uuid_with_refresh(first_time):
+        if not first_time:
+            #TODO(sirp): should this interval be a gflag?
+            #TODO(sirp): make this non-blocking
+            time.sleep(5)
+        scan_sr(session, sr_ref)
+        return get_vhd_parent_uuid(session, vdi_ref)
+
+    parent_uuid = _get_vhd_parent_uuid_with_refresh(first_time=True)
+    logging.debug(
+        "Parent %s doesn't match original parent %s, "
+        "waiting for coalesce...", parent_uuid, original_parent_uuid)
+    while original_parent_uuid and (parent_uuid != original_parent_uuid):
+        logging.debug(
+            "Parent %s doesn't match original parent %s, "
+            "waiting for coalesce...", parent_uuid, original_parent_uuid)
+        parent_uuid = _get_vhd_parent_uuid_with_refresh(first_time=False)
+
+    return parent_uuid
+
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 50b5ec3d6..988c54d6d 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -81,6 +81,7 @@ class VMOps(object):
     
     def snapshot(self, instance):
         """ Create snapshot from a running VM instance """
+        logging.debug("Starting snapshot for VM %s", instance)
         #TODO(sirp): Add quiesce and VSS locking support when Windows support
         # is added
         vm_ref = VMHelper.lookup(self._session, instance.name)
@@ -104,6 +105,8 @@ class VMOps(object):
         finally:
             self._destroy(template_vm_ref, shutdown=False)
 
+        logging.debug("Finished snapshot and upload for VM %s", instance)
+
     def reboot(self, instance):
         """ Reboot VM instance """
         instance_name = instance.name
-- 
cgit 


From 650a0cdbc854d37fd62348ce34a14ef91ccbabad Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Fri, 17 Dec 2010 19:17:39 -0600
Subject: Cleaned up TODOs, using flags now

---
 nova/compute/manager.py                  |  3 +-
 nova/flags.py                            |  3 ++
 nova/virt/xenapi/vm_utils.py             | 50 +++++++++++----------
 nova/virt/xenapi/vmops.py                | 15 +++----
 nova/virt/xenapi_conn.py                 |  9 ++--
 plugins/xenapi/etc/xapi.d/plugins/glance | 76 ++++++++++++++++++++++----------
 6 files changed, 95 insertions(+), 61 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 8fc8d5e1a..b2584773a 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -181,7 +181,8 @@ class ComputeManager(manager.Manager):
 
         logging.debug('instance %s: snapshotting', instance_ref['name'])
         #TODO(sirp): set is_snapshotting=True here?
-        self.driver.snapshot(instance_ref)
+        glance_name = "MySnapshot3"
+        self.driver.snapshot(instance_ref, glance_name)
         #self._update_state(context, instance_id)
 
     @exception.wrap_exception
diff --git a/nova/flags.py b/nova/flags.py
index 87444565a..3318af058 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -212,6 +212,9 @@ DEFINE_string('aws_access_key_id', 'admin', 'AWS Access ID')
 DEFINE_string('aws_secret_access_key', 'admin', 'AWS Access Key')
 DEFINE_integer('s3_port', 3333, 's3 port')
 DEFINE_string('s3_host', '127.0.0.1', 's3 host')
+DEFINE_integer('glance_port', 9292, 'glance port')
+DEFINE_string('glance_host', '127.0.0.1', 'glance host')
+DEFINE_string('glance_storage_location', 'swift://username:api_key@auth.api.rackspacecloud.com/v1.0/cloudservers', 'glance storage location')
 DEFINE_string('compute_topic', 'compute', 'the topic compute nodes listen on')
 DEFINE_string('scheduler_topic', 'scheduler',
               'the topic scheduler nodes listen on')
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 1b18b0a01..729f0daaf 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -19,11 +19,12 @@ Helper methods for operations related to the management of VM records and
 their attributes like VDIs, VIFs, as well as their lookup functions.
 """
 
-import time #FIXME(sirp): take this out, replace with greenthread.sleep
 import logging
+import pickle
 import urllib
 from xml.dom import minidom
 
+from eventlet import event
 from nova import flags
 from nova import utils
 from nova.auth.manager import AuthManager
@@ -166,8 +167,6 @@ class VMHelper():
         vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
         vdi_uuid = vdi_rec["uuid"]
 
-        #NOTE(sirp): We may need to wait for our parent to coalese with his 
-        # parent
         original_parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
 
         task = session.call_xenapi('Async.VM.snapshot', vm_ref, label)
@@ -186,8 +185,14 @@ class VMHelper():
     def upload_image(cls, session, vdi_uuids, glance_label):
         logging.debug("Asking xapi to upload %s as '%s'", vdi_uuids,
                       glance_label)
-        kwargs = {'vdi_uuids': ','.join(vdi_uuids), 
-                  'glance_label': glance_label}
+
+        params = {'vdi_uuids': vdi_uuids, 
+                  'glance_label': glance_label,
+                  'glance_storage_location': FLAGS.glance_storage_location,
+                  'glance_host': FLAGS.glance_host,
+                  'glance_port': FLAGS.glance_port}
+
+        kwargs = {'params': pickle.dumps(params)}
         task = session.async_call_plugin('glance', 'put_vdis', kwargs)
         session.wait_for_task(task)
 
@@ -341,27 +346,24 @@ def scan_sr(session, sr_ref):
 
 def wait_for_vhd_coalesce(session, sr_ref, vdi_ref, original_parent_uuid):
     """ TODO Explain why coalescing has to occur here """
-    #TODO(sirp): we need to timeout this req after a while
     #NOTE(sirp): for some reason re-scan wasn't occuring automatically on 
     # XS5.6
-    #TODO(sirp): clean this up, perhaps use LoopingCall
-    def _get_vhd_parent_uuid_with_refresh(first_time):
-        if not first_time:
-            #TODO(sirp): should this interval be a gflag?
-            #TODO(sirp): make this non-blocking
-            time.sleep(5)
-        scan_sr(session, sr_ref)
-        return get_vhd_parent_uuid(session, vdi_ref)
-
-    parent_uuid = _get_vhd_parent_uuid_with_refresh(first_time=True)
-    logging.debug(
-        "Parent %s doesn't match original parent %s, "
-        "waiting for coalesce...", parent_uuid, original_parent_uuid)
-    while original_parent_uuid and (parent_uuid != original_parent_uuid):
-        logging.debug(
-            "Parent %s doesn't match original parent %s, "
-            "waiting for coalesce...", parent_uuid, original_parent_uuid)
-        parent_uuid = _get_vhd_parent_uuid_with_refresh(first_time=False)
+    #TODO(sirp): we need to timeout this req after a while
 
+    def _poll_vhds():
+        scan_sr(session, sr_ref)
+        parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
+        if original_parent_uuid and (parent_uuid != original_parent_uuid):
+            logging.debug(
+                "Parent %s doesn't match original parent %s, "
+                "waiting for coalesce...", parent_uuid, original_parent_uuid)
+        else:
+            done.send(parent_uuid)
+ 
+    done = event.Event()
+    loop = utils.LoopingCall(_poll_vhds)
+    loop.start(FLAGS.xenapi_vhd_coalesce_poll_interval, now=True)
+    parent_uuid = done.wait()
+    loop.stop()
     return parent_uuid
 
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 988c54d6d..a44492d57 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -79,29 +79,26 @@ class VMOps(object):
         logging.info('Spawning VM %s created %s.', instance.name,
                      vm_ref)
     
-    def snapshot(self, instance):
+    def snapshot(self, instance, name):
         """ Create snapshot from a running VM instance """
-        logging.debug("Starting snapshot for VM %s", instance)
+
         #TODO(sirp): Add quiesce and VSS locking support when Windows support
         # is added
+
+        logging.debug("Starting snapshot for VM %s", instance)
         vm_ref = VMHelper.lookup(self._session, instance.name)
 
-        #TODO(sirp): this is the label in Xen, we need to add a human friendly
-        # label that we store in paralalx
         label = "%s-snapshot" % instance.name
-        glance_name = "MySnapshot"
-    
         try:
             template_vm_ref, template_vdi_uuids = VMHelper.create_snapshot(
                 self._session, vm_ref, label)
         except XenAPI.Failure, exc:
             logging.error("Unable to Snapshot %s: %s", vm_ref, exc)
             return
-        
+       
         try:
             # call plugin to ship snapshot off to glance
-            VMHelper.upload_image(
-                self._session, template_vdi_uuids, glance_name)
+            VMHelper.upload_image(self._session, template_vdi_uuids, name) 
         finally:
             self._destroy(template_vm_ref, shutdown=False)
 
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 8aacec507..92e66d32d 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -77,7 +77,10 @@ flags.DEFINE_float('xenapi_task_poll_interval',
                    'The interval used for polling of remote tasks '
                    '(Async.VM.start, etc).  Used only if '
                    'connection_type=xenapi.')
-
+flags.DEFINE_float('xenapi_vhd_coalesce_poll_interval',
+                   5.0,
+                   'The interval used for polling of coalescing vhds.'
+                   '  Used only if connection_type=xenapi.')
 XenAPI = None
 
 
@@ -116,11 +119,11 @@ class XenAPIConnection(object):
         self._vmops.spawn(instance)
 
 
-    def snapshot(self, instance):
+    def snapshot(self, instance, name):
         """ Create snapshot from a running VM instance """
         #TODO(sirp): Add quiesce and VSS locking support when Windows support
         # is added
-        self._vmops.snapshot(instance)
+        self._vmops.snapshot(instance, name)
 
     def reboot(self, instance):
         """ Reboot VM instance """
diff --git a/plugins/xenapi/etc/xapi.d/plugins/glance b/plugins/xenapi/etc/xapi.d/plugins/glance
index 55d71b79e..13e79ff9f 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenapi/etc/xapi.d/plugins/glance
@@ -24,8 +24,10 @@
 import base64
 import errno
 import hmac
+import httplib
 import os
 import os.path
+import pickle
 import sha
 import subprocess
 import time
@@ -37,43 +39,69 @@ import XenAPIPlugin
 from pluginlib_nova import *
 configure_logging('glance')
 
-#FIXME(sirp): Should this just be 64K like elsewhere
-CHUNK_SIZE = 4096
-
+CHUNK_SIZE = 8192
 FILE_SR_PATH = '/var/run/sr-mount'
 
-#TODO(sirp): use get_vhd_parent code from Citrix guys
-#TODO(sirp): look for Citrix guys get VDI from VM_ref (does this exist in
-#pluginlib?
-# Need to add glance client to plugins (how do we get this onto XenServer
-# machine?)
-# WHen do we cleanup unused VDI's in SR
-
 def put_vdis(session, args):
-    vdi_uuids = exists(args, 'vdi_uuids').split(',')
-    glance_label = exists(args, 'glance_label')
+    params = pickle.loads(exists(args, 'params'))
+    vdi_uuids = params["vdi_uuids"]
+    glance_label = params["glance_label"]
+    glance_host = params["glance_host"]
+    glance_port = params["glance_port"]
+    glance_storage_location = params["glance_storage_location"]
     
     sr_path = get_sr_path(session)
-    tar_cmd = ['tar', '-zc', '--directory=%s' % sr_path]
+    #FIXME(sirp): writing to a temp file until Glance supports chunked-PUTs
+    tmp_file = "%s.tar.gz" % os.path.join('/tmp', glance_label) 
+    tar_cmd = ['tar', '-zcf', tmp_file, '--directory=%s' % sr_path]
     paths = [ "%s.vhd" % vdi_uuid for vdi_uuid in vdi_uuids ]
     tar_cmd.extend(paths)
     logging.debug("Bundling image with cmd: %s", tar_cmd)
-    tar_proc = subprocess.Popen(tar_cmd, stdout=subprocess.PIPE)
-  
-    test_file = "%s.tar.gz" % os.path.join('/tmp', glance_label) 
-    logging.debug("Writing to test file %s", test_file) 
-    bundle = tar_proc.stdout
-    f = open(test_file, 'w')
+    subprocess.call(tar_cmd)
+    logging.debug("Writing to test file %s", tmp_file) 
+    put_bundle_in_glance(tmp_file, glance_label, glance_storage_location,
+                         glance_host, glance_port)
+    return "" # FIXME(sirp): return anything useful here?
+
+
+def put_bundle_in_glance(tmp_file, glance_label, glance_storage_location,
+                         glance_host, glance_port):
+
+    size = os.path.getsize(tmp_file) 
+
+    basename = os.path.basename(tmp_file)
+    location = os.path.join(glance_storage_location, basename)
+
+    bundle = open(tmp_file, 'r')
     try:
+        headers = {
+            'x-image-meta-is_public': 'True',
+            'x-image-meta-name': glance_label,
+            'x-image-meta-location': location,
+            'x-image-meta-size': size,
+            'content-length': size,
+         }
+        conn = httplib.HTTPConnection(glance_host, glance_port)
+        #NOTE(sirp): httplib under python2.4 won't accept a file-like object
+        # to request
+        conn.putrequest('POST', '/images')
+
+        for header, value in headers.iteritems():
+            conn.putheader(header, value)
+        conn.endheaders()
+        
         chunk = bundle.read(CHUNK_SIZE)
         while chunk:
-            f.write(chunk)
+            conn.send(chunk)
             chunk = bundle.read(CHUNK_SIZE)
-    finally:
-        f.close()
-
-    return "" # FIXME(sirp): return anything useful here?
+        
 
+        res = conn.getresponse()
+        #FIXME(sirp): should this be 201 Created?
+        if res.status != httplib.OK:
+            raise Exception("Unexpected response from Glance %i" % res.status)
+    finally:
+        bundle.close()
 
 def get_sr_path(session):
     sr_ref = find_sr(session)
-- 
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(-)

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

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 2462eab6f02105b15f4686a6183eb043d7b1a5e3 Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Mon, 20 Dec 2010 10:56:10 -0600
Subject: initial commit of xenserver host protections

---
 plugins/xenserver/networking/etc/init.d/host-rules | 83 ++++++++++++++++++++++
 .../etc/xensource/scripts/vif_5.6-fp1.patch        | 22 ++++++
 .../networking/etc/xensource/scripts/vif_rules.py  | 72 +++++++++++++++++++
 3 files changed, 177 insertions(+)
 create mode 100755 plugins/xenserver/networking/etc/init.d/host-rules
 create mode 100644 plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
 create mode 100755 plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py

diff --git a/plugins/xenserver/networking/etc/init.d/host-rules b/plugins/xenserver/networking/etc/init.d/host-rules
new file mode 100755
index 000000000..980396bae
--- /dev/null
+++ b/plugins/xenserver/networking/etc/init.d/host-rules
@@ -0,0 +1,83 @@
+#!/bin/bash
+#
+# host-rules          Start/Stop the networking host rules
+#
+# chkconfig: 2345 85 15
+# description: Networking Host Rules for Multi Tenancy Protections
+
+iptables-up()
+{
+        iptables -P FORWARD DROP
+        iptables -A FORWARD -m physdev --physdev-in eth0 -j ACCEPT
+        iptables -A FORWARD -m physdev --physdev-in eth1 -j ACCEPT
+}
+
+ebtables-up()
+{
+        ebtables -P FORWARD DROP
+        ebtables -A FORWARD -o eth0 -j ACCEPT
+        ebtables -A FORWARD -o eth1 -j ACCEPT
+}
+
+arptables-up()
+{
+        arptables -P FORWARD DROP
+        arptables -A FORWARD --opcode Request --in-interface eth0 -j ACCEPT
+        arptables -A FORWARD --opcode Reply --in-interface eth0 -j ACCEPT
+        arptables -A FORWARD --opcode Request --in-interface eth1 -j ACCEPT
+        arptables -A FORWARD --opcode Reply --in-interface eth1 -j ACCEPT
+}
+
+iptables-down()
+{
+        iptables -P FORWARD ACCEPT
+        iptables -D FORWARD -m physdev --physdev-in eth0 -j ACCEPT
+        iptables -D FORWARD -m physdev --physdev-in eth1 -j ACCEPT
+}
+
+ebtables-down()
+{
+        ebtables -P FORWARD ACCEPT
+        ebtables -D FORWARD -o eth0 -j ACCEPT
+        ebtables -D FORWARD -o eth1 -j ACCEPT
+}
+
+arptables-down()
+{
+        arptables -P FORWARD ACCEPT
+        arptables -D FORWARD --opcode Request --in-interface eth0 -j ACCEPT
+        arptables -D FORWARD --opcode Reply --in-interface eth0 -j ACCEPT
+        arptables -D FORWARD --opcode Request --in-interface eth1 -j ACCEPT
+        arptables -D FORWARD --opcode Reply --in-interface eth1 -j ACCEPT
+}
+
+start()
+{
+        iptables-up
+        ebtables-up
+        arptables-up
+}
+
+stop()
+{
+        iptables-down
+        ebtables-down
+        arptables-down
+}
+
+case "$1" in
+        start)
+                start
+                ;;
+        stop)
+                stop
+                ;;
+        restart)
+                stop
+                start
+                ;;
+        *)
+                echo $"Usage: $0 {start|stop|restart}"
+                exit 1
+esac
+exit 0
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch b/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
new file mode 100644
index 000000000..142096ff1
--- /dev/null
+++ b/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
@@ -0,0 +1,22 @@
+--- vif     2010-12-20 16:39:46.000000000 +0000
++++ vif_modified 2010-11-19 23:24:37.000000000 +0000
+@@ -213,6 +213,7 @@
+ 
+         # xs-xen.pq.hq:91e986b8e49f netback-wait-for-hotplug
+         xenstore-write "/local/domain/0/backend/vif/${DOMID}/${DEVID}/hotplug-status" "connected"
++       python /etc/xensource/scripts/vif_rules.py ${DOMID} online 2>&1 >> /dev/null
+     fi
+     ;;
+ 
+@@ -224,9 +225,11 @@
+ 
+ remove)
+     if [ "${TYPE}" = "vif" ] ;then
++       python /etc/xensource/scripts/vif_rules.py ${DOMID} offline 2>&1 >> /dev/null
+         xenstore-rm "${HOTPLUG}/hotplug"
+     fi
+     logger -t scripts-vif "${dev} has been removed"
+     remove_from_bridge
+     ;;
+ esac
++
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py
new file mode 100755
index 000000000..05141630b
--- /dev/null
+++ b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+from os import system, popen4
+import sys
+import simplejson as json
+from itertools import chain
+
+# order is important, mmmkay? 1 is domid, 2  command, 3 is vif
+# when we add rules, we delete first, to make sure we only keep the one rule we need
+
+def main():
+  fin,fout = popen4("/usr/bin/xenstore-ls /local/domain/%s/vm-data/networking" % sys.argv[1] )
+  macs = fout.read().split("\n")[0:-1]
+
+  for mac in macs:
+    m = mac.split("=")[0].strip()
+    fin,fout = popen4("/usr/bin/xenstore-read /local/domain/%s/vm-data/networking/%s" % (sys.argv[1],m))
+    mjson = json.loads(fout.read())
+    for ip in mjson['ips']:
+      if mjson["label"] == "public":
+        label = 0
+      else:
+        label = 1
+
+      VIF = "vif%s.%s" % (sys.argv[1],label)
+        
+      if (len(sys.argv) == 4 and sys.argv[3] == VIF) or (len(sys.argv) == 3):
+        run_rules(
+          IP = ip['ip'], 
+          VIF = VIF, 
+          MAC = mjson['mac'], 
+          STATUS = (sys.argv[2] == 'online') and '-A' or '-D' 
+        )
+
+def run_rules(**kwargs):
+  map(system, chain(ebtables(**kwargs), arptables(**kwargs), iptables(**kwargs) ))
+
+def iptables(**kwargs):
+  return [
+    "/sbin/iptables -D FORWARD -m physdev --physdev-in %s -s %s -j ACCEPT 2>&1 > /dev/null" % ( kwargs['VIF'], kwargs['IP']),
+    "/sbin/iptables %s FORWARD -m physdev --physdev-in %s -s %s -j ACCEPT" % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP'])
+  ]
+  
+def arptables(**kwargs):
+  return [
+    "/sbin/arptables -D FORWARD --opcode Request --in-interface %s --source-ip %s --source-mac %s -j ACCEPT 2>&1 > /dev/null" % (kwargs['VIF'], kwargs['IP'], kwargs['MAC']),
+    "/sbin/arptables -D FORWARD --opcode Reply --in-interface %s --source-ip %s --source-mac %s -j ACCEPT 2>&1 > /dev/null" % (kwargs['VIF'], kwargs['IP'], kwargs['MAC']),
+    "/sbin/arptables %s FORWARD --opcode Request --in-interface %s --source-ip %s --source-mac %s -j ACCEPT" % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP'], kwargs['MAC']),
+    "/sbin/arptables %s FORWARD --opcode Reply --in-interface %s --source-ip %s --source-mac %s -j ACCEPT" % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP'], kwargs['MAC'])
+  ]
+
+def ebtables(**kwargs):
+  cmds = [
+    "/sbin/ebtables -D FORWARD -p 0806 -o %s --arp-ip-dst %s -j ACCEPT 2>&1 >> /dev/null" % (kwargs['VIF'], kwargs['IP']),
+    "/sbin/ebtables -D FORWARD -p 0800 -o %s --ip-dst %s -j ACCEPT 2>&1 >> /dev/null" % (kwargs['VIF'], kwargs['IP']),
+    "/sbin/ebtables %s FORWARD -p 0806 -o %s --arp-ip-dst %s -j ACCEPT 2>&1 " % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP']),
+    "/sbin/ebtables %s FORWARD -p 0800 -o %s --ip-dst %s -j ACCEPT 2>&1 " % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP'])
+  ]
+  if kwargs['STATUS'] == "-A":
+    cmds.append("/sbin/ebtables -D FORWARD -s ! %s -i %s -j DROP 2>&1 > /dev/null" % (kwargs['MAC'], kwargs['VIF']))
+    cmds.append("/sbin/ebtables -I FORWARD 1 -s ! %s -i %s -j DROP" % (kwargs['MAC'], kwargs['VIF']))
+  else:
+    cmds.append("/sbin/ebtables %s FORWARD -s ! %s -i %s -j DROP" % (kwargs['STATUS'], kwargs['MAC'], kwargs['VIF']))
+  return cmds
+
+def usage():
+  print "Usage: slice_vifs.py <DOMID> <online|offline> optional: <vif>"
+
+if __name__ == "__main__":
+  if len(sys.argv) < 3:
+    usage()
+  else:
+    main()
-- 
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(-)

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 ab0cba603d96e25ee151222bb5fcf550459cfc7a Mon Sep 17 00:00:00 2001
From: Cory Wright <cory.wright@rackspace.com>
Date: Mon, 20 Dec 2010 17:24:08 -0500
Subject: Rewrite of vif_rules.py to meet coding standards and be more pythonic
 in general.  Use absolute paths for iptables/ebtables/arptables in
 host-rules.

---
 plugins/xenserver/networking/etc/init.d/host-rules |  54 ++++---
 .../etc/xensource/scripts/vif_5.6-fp1.patch        |   4 +-
 .../networking/etc/xensource/scripts/vif_rules.py  | 180 +++++++++++++--------
 3 files changed, 146 insertions(+), 92 deletions(-)

diff --git a/plugins/xenserver/networking/etc/init.d/host-rules b/plugins/xenserver/networking/etc/init.d/host-rules
index 980396bae..385c59629 100755
--- a/plugins/xenserver/networking/etc/init.d/host-rules
+++ b/plugins/xenserver/networking/etc/init.d/host-rules
@@ -5,50 +5,54 @@
 # chkconfig: 2345 85 15
 # description: Networking Host Rules for Multi Tenancy Protections
 
+IPTABLES=/sbin/iptables
+EBTABLES=/sbin/ebtables
+ARPTABLES=/sbin/arptables
+
 iptables-up()
 {
-        iptables -P FORWARD DROP
-        iptables -A FORWARD -m physdev --physdev-in eth0 -j ACCEPT
-        iptables -A FORWARD -m physdev --physdev-in eth1 -j ACCEPT
+        $IPTABLES -P FORWARD DROP
+        $IPTABLES -A FORWARD -m physdev --physdev-in eth0 -j ACCEPT
+        $IPTABLES -A FORWARD -m physdev --physdev-in eth1 -j ACCEPT
 }
 
 ebtables-up()
 {
-        ebtables -P FORWARD DROP
-        ebtables -A FORWARD -o eth0 -j ACCEPT
-        ebtables -A FORWARD -o eth1 -j ACCEPT
+        $EBTABLES -P FORWARD DROP
+        $EBTABLES -A FORWARD -o eth0 -j ACCEPT
+        $EBTABLES -A FORWARD -o eth1 -j ACCEPT
 }
 
 arptables-up()
 {
-        arptables -P FORWARD DROP
-        arptables -A FORWARD --opcode Request --in-interface eth0 -j ACCEPT
-        arptables -A FORWARD --opcode Reply --in-interface eth0 -j ACCEPT
-        arptables -A FORWARD --opcode Request --in-interface eth1 -j ACCEPT
-        arptables -A FORWARD --opcode Reply --in-interface eth1 -j ACCEPT
+        $ARPTABLES -P FORWARD DROP
+        $ARPTABLES -A FORWARD --opcode Request --in-interface eth0 -j ACCEPT
+        $ARPTABLES -A FORWARD --opcode Reply --in-interface eth0 -j ACCEPT
+        $ARPTABLES -A FORWARD --opcode Request --in-interface eth1 -j ACCEPT
+        $ARPTABLES -A FORWARD --opcode Reply --in-interface eth1 -j ACCEPT
 }
 
 iptables-down()
 {
-        iptables -P FORWARD ACCEPT
-        iptables -D FORWARD -m physdev --physdev-in eth0 -j ACCEPT
-        iptables -D FORWARD -m physdev --physdev-in eth1 -j ACCEPT
+        $IPTABLES -P FORWARD ACCEPT
+        $IPTABLES -D FORWARD -m physdev --physdev-in eth0 -j ACCEPT
+        $IPTABLES -D FORWARD -m physdev --physdev-in eth1 -j ACCEPT
 }
 
 ebtables-down()
 {
-        ebtables -P FORWARD ACCEPT
-        ebtables -D FORWARD -o eth0 -j ACCEPT
-        ebtables -D FORWARD -o eth1 -j ACCEPT
+        $EBTABLES -P FORWARD ACCEPT
+        $EBTABLES -D FORWARD -o eth0 -j ACCEPT
+        $EBTABLES -D FORWARD -o eth1 -j ACCEPT
 }
 
 arptables-down()
 {
-        arptables -P FORWARD ACCEPT
-        arptables -D FORWARD --opcode Request --in-interface eth0 -j ACCEPT
-        arptables -D FORWARD --opcode Reply --in-interface eth0 -j ACCEPT
-        arptables -D FORWARD --opcode Request --in-interface eth1 -j ACCEPT
-        arptables -D FORWARD --opcode Reply --in-interface eth1 -j ACCEPT
+        $ARPTABLES -P FORWARD ACCEPT
+        $ARPTABLES -D FORWARD --opcode Request --in-interface eth0 -j ACCEPT
+        $ARPTABLES -D FORWARD --opcode Reply --in-interface eth0 -j ACCEPT
+        $ARPTABLES -D FORWARD --opcode Request --in-interface eth1 -j ACCEPT
+        $ARPTABLES -D FORWARD --opcode Reply --in-interface eth1 -j ACCEPT
 }
 
 start()
@@ -68,16 +72,20 @@ stop()
 case "$1" in
         start)
                 start
+                RETVAL=$?
                 ;;
         stop)
                 stop
+                RETVAL=$?
                 ;;
         restart)
                 stop
                 start
+                RETVAL=$?
                 ;;
         *)
                 echo $"Usage: $0 {start|stop|restart}"
                 exit 1
+                ;;
 esac
-exit 0
+exit $RETVAL
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch b/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
index 142096ff1..feaf1312d 100644
--- a/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
+++ b/plugins/xenserver/networking/etc/xensource/scripts/vif_5.6-fp1.patch
@@ -4,7 +4,7 @@
  
          # xs-xen.pq.hq:91e986b8e49f netback-wait-for-hotplug
          xenstore-write "/local/domain/0/backend/vif/${DOMID}/${DEVID}/hotplug-status" "connected"
-+       python /etc/xensource/scripts/vif_rules.py ${DOMID} online 2>&1 >> /dev/null
++       python /etc/xensource/scripts/vif_rules.py ${DOMID} online 2>&1 > /dev/null
      fi
      ;;
  
@@ -12,7 +12,7 @@
  
  remove)
      if [ "${TYPE}" = "vif" ] ;then
-+       python /etc/xensource/scripts/vif_rules.py ${DOMID} offline 2>&1 >> /dev/null
++       python /etc/xensource/scripts/vif_rules.py ${DOMID} offline 2>&1 > /dev/null
          xenstore-rm "${HOTPLUG}/hotplug"
      fi
      logger -t scripts-vif "${dev} has been removed"
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py
index 05141630b..dd27d3c6b 100755
--- a/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py
+++ b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py
@@ -1,72 +1,118 @@
 #!/usr/bin/env python
-from os import system, popen4
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 OpenStack LLC.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+This script is used to configure iptables, ebtables, and arptables rules for
+XenServer instances.
+"""
+
+import os
+import subprocess
 import sys
+
+# This is written to Python 2.4, since that is what is available on XenServer
 import simplejson as json
-from itertools import chain
-
-# order is important, mmmkay? 1 is domid, 2  command, 3 is vif
-# when we add rules, we delete first, to make sure we only keep the one rule we need
-
-def main():
-  fin,fout = popen4("/usr/bin/xenstore-ls /local/domain/%s/vm-data/networking" % sys.argv[1] )
-  macs = fout.read().split("\n")[0:-1]
-
-  for mac in macs:
-    m = mac.split("=")[0].strip()
-    fin,fout = popen4("/usr/bin/xenstore-read /local/domain/%s/vm-data/networking/%s" % (sys.argv[1],m))
-    mjson = json.loads(fout.read())
-    for ip in mjson['ips']:
-      if mjson["label"] == "public":
-        label = 0
-      else:
-        label = 1
-
-      VIF = "vif%s.%s" % (sys.argv[1],label)
-        
-      if (len(sys.argv) == 4 and sys.argv[3] == VIF) or (len(sys.argv) == 3):
-        run_rules(
-          IP = ip['ip'], 
-          VIF = VIF, 
-          MAC = mjson['mac'], 
-          STATUS = (sys.argv[2] == 'online') and '-A' or '-D' 
-        )
-
-def run_rules(**kwargs):
-  map(system, chain(ebtables(**kwargs), arptables(**kwargs), iptables(**kwargs) ))
-
-def iptables(**kwargs):
-  return [
-    "/sbin/iptables -D FORWARD -m physdev --physdev-in %s -s %s -j ACCEPT 2>&1 > /dev/null" % ( kwargs['VIF'], kwargs['IP']),
-    "/sbin/iptables %s FORWARD -m physdev --physdev-in %s -s %s -j ACCEPT" % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP'])
-  ]
-  
-def arptables(**kwargs):
-  return [
-    "/sbin/arptables -D FORWARD --opcode Request --in-interface %s --source-ip %s --source-mac %s -j ACCEPT 2>&1 > /dev/null" % (kwargs['VIF'], kwargs['IP'], kwargs['MAC']),
-    "/sbin/arptables -D FORWARD --opcode Reply --in-interface %s --source-ip %s --source-mac %s -j ACCEPT 2>&1 > /dev/null" % (kwargs['VIF'], kwargs['IP'], kwargs['MAC']),
-    "/sbin/arptables %s FORWARD --opcode Request --in-interface %s --source-ip %s --source-mac %s -j ACCEPT" % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP'], kwargs['MAC']),
-    "/sbin/arptables %s FORWARD --opcode Reply --in-interface %s --source-ip %s --source-mac %s -j ACCEPT" % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP'], kwargs['MAC'])
-  ]
-
-def ebtables(**kwargs):
-  cmds = [
-    "/sbin/ebtables -D FORWARD -p 0806 -o %s --arp-ip-dst %s -j ACCEPT 2>&1 >> /dev/null" % (kwargs['VIF'], kwargs['IP']),
-    "/sbin/ebtables -D FORWARD -p 0800 -o %s --ip-dst %s -j ACCEPT 2>&1 >> /dev/null" % (kwargs['VIF'], kwargs['IP']),
-    "/sbin/ebtables %s FORWARD -p 0806 -o %s --arp-ip-dst %s -j ACCEPT 2>&1 " % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP']),
-    "/sbin/ebtables %s FORWARD -p 0800 -o %s --ip-dst %s -j ACCEPT 2>&1 " % (kwargs['STATUS'], kwargs['VIF'], kwargs['IP'])
-  ]
-  if kwargs['STATUS'] == "-A":
-    cmds.append("/sbin/ebtables -D FORWARD -s ! %s -i %s -j DROP 2>&1 > /dev/null" % (kwargs['MAC'], kwargs['VIF']))
-    cmds.append("/sbin/ebtables -I FORWARD 1 -s ! %s -i %s -j DROP" % (kwargs['MAC'], kwargs['VIF']))
-  else:
-    cmds.append("/sbin/ebtables %s FORWARD -s ! %s -i %s -j DROP" % (kwargs['STATUS'], kwargs['MAC'], kwargs['VIF']))
-  return cmds
-
-def usage():
-  print "Usage: slice_vifs.py <DOMID> <online|offline> optional: <vif>"
+
+
+def main(dom_id, command, only_this_vif=None):
+    xsls = execute("/usr/bin/xenstore-ls /local/domain/%s/vm-data/networking" \
+                  % dom_id, True)
+    macs = [line.split("=")[0].strip() for line in xsls.splitlines()]
+
+    for mac in macs:
+        xsr = "/usr/bin/xenstore-read /local/domain/%s/vm-data/networking/%s"
+        xsread = execute(xsr % (dom_id, mac), True)
+        data = json.loads(xsread)
+        for ip in data['ips']:
+            if data["label"] == "public":
+                vif = "vif%s.0" % dom_id
+            else:
+                vif = "vif%s.1" % dom_id
+
+            if (only_this_vif is None) or (vif == only_this_vif):
+                params = dict(IP=ip['ip'], VIF=vif, MAC=data['mac'])
+                apply_ebtables_rules(command, params)
+                apply_arptables_rules(command, params)
+                apply_iptables_rules(command, params)
+
+
+def execute(command, return_stdout=False):
+    devnull = open(os.devnull, 'w')
+    proc = subprocess.Popen(command, shell=True, close_fds=True,
+                            stdout=subprocess.PIPE, stderr=devnull)
+    if return_stdout:
+        return proc.stdout.read()
+    else:
+        return None
+
+# A note about adding rules:
+#   Whenever we add any rule to iptables, arptables or ebtables we first
+#   delete the same rule to ensure the rule only exists once.
+
+
+def apply_iptables_rules(command, params):
+    iptables = lambda rule: execute("/sbin/iptables %s" % rule)
+
+    iptables("-D FORWARD -m physdev --physdev-in %(VIF)s -s %(IP)s \
+              -j ACCEPT" % params)
+    if command == 'online':
+        iptables("-A FORWARD -m physdev --physdev-in %(VIF)s -s %(IP)s \
+                  -j ACCEPT" % params)
+
+
+def apply_arptables_rules(command, params):
+    arptables = lambda rule: execute("/sbin/arptables %s" % rule)
+
+    arptables("-D FORWARD --opcode Request --in-interface %(VIF)s \
+               --source-ip %(IP)s --source-mac %(MAC)s -j ACCEPT" % params)
+    arptables("-D FORWARD --opcode Reply --in-interface %(VIF)s \
+               --source-ip %(IP)s --source-mac %(MAC)s -j ACCEPT" % params)
+    if command == 'online':
+        arptables("-A FORWARD --opcode Request --in-interface %(VIF)s \
+                  --source-ip %(IP)s --source-mac %(MAC)s -j ACCEPT" % params)
+        arptables("-A FORWARD --opcode Reply --in-interface %(VIF)s \
+                  --source-ip %(IP)s --source-mac %(MAC)s -j ACCEPT" % params)
+
+
+def apply_ebtables_rules(command, params):
+    ebtables = lambda rule: execute("/sbin/ebtables %s" % rule)
+
+    ebtables("-D FORWARD -p 0806 -o %(VIF)s --arp-ip-dst %(IP)s -j ACCEPT" %
+             params)
+    ebtables("-D FORWARD -p 0800 -o %(VIF)s --ip-dst %(IP)s -j ACCEPT" %
+             params)
+    if command == 'online':
+        ebtables("-A FORWARD -p 0806 -o %(VIF)s --arp-ip-dst %(IP)s \
+                  -j ACCEPT" % params)
+        ebtables("-A FORWARD -p 0800 -o %(VIF)s --ip-dst %(IP)s \
+                  -j ACCEPT" % params)
+
+    ebtables("-D FORWARD -s ! %(MAC)s -i %(VIF)s -j DROP" % params)
+    if command == 'online':
+        ebtables("-I FORWARD 1 -s ! %(MAC)s -i %(VIF)s -j DROP" % params)
+
 
 if __name__ == "__main__":
-  if len(sys.argv) < 3:
-    usage()
-  else:
-    main()
+    if len(sys.argv) < 3:
+        print "usage: %s dom_id online|offline [vif]" % \
+               os.path.basename(sys.argv[0])
+        sys.exit(1)
+    else:
+        dom_id, command = sys.argv[1:3]
+        vif = len(sys.argv) == 4 and sys.argv[3] or None
+        main(dom_id, command, vif)
-- 
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(-)

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 1b47ef95fff4d8419e27a7cc247178806cc065ff Mon Sep 17 00:00:00 2001
From: Cory Wright <cory.wright@rackspace.com>
Date: Mon, 20 Dec 2010 18:15:40 -0500
Subject: Close devnull filehandle

---
 plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py
index dd27d3c6b..d60816ce7 100755
--- a/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py
+++ b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py
@@ -17,8 +17,8 @@
 #    under the License.
 
 """
-This script is used to configure iptables, ebtables, and arptables rules for
-XenServer instances.
+This script is used to configure iptables, ebtables, and arptables rules on
+XenServer hosts.
 """
 
 import os
@@ -55,6 +55,7 @@ def execute(command, return_stdout=False):
     devnull = open(os.devnull, 'w')
     proc = subprocess.Popen(command, shell=True, close_fds=True,
                             stdout=subprocess.PIPE, stderr=devnull)
+    devnull.close()
     if return_stdout:
         return proc.stdout.read()
     else:
-- 
cgit 


From 40c8a8a1a1e834c4e5bb61c853397a90475d83ff Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Mon, 20 Dec 2010 17:36:10 -0600
Subject: Typo fix, stubbing out to use admin project for now

---
 nova/api/openstack/__init__.py | 4 +++-
 nova/api/openstack/images.py   | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index b9ecbd9b8..178838dfd 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -89,7 +89,9 @@ class AuthMiddleware(wsgi.Middleware):
         if not user:
             return faults.Fault(webob.exc.HTTPUnauthorized())
 
-        req.environ['nova.context'] = context.RequestContext(user, user)
+        #FIXME(sirp): stubbing project to admin for now
+        project = manager.AuthManager().get_project('admin')
+        req.environ['nova.context'] = context.RequestContext(user, project)
         return self.application
 
 
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 4a0a8e6f1..78849223d 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -46,8 +46,9 @@ class Controller(wsgi.Controller):
 
     def detail(self, req):
         """Return all public images in detail."""
+        ctxt = req.environ['nova.context']
         try:
-            images = self._service.detail(req.environ['nova.context'])
+            images = self._service.detail(ctxt)
             images = nova.api.openstack.limited(images, req)
         except NotImplementedError:
             # Emulate detail() using repeated calls to show()
-- 
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(-)

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 130d75a8b240068a6251188da68296496c2c1564 Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Wed, 22 Dec 2010 11:27:23 -0600
Subject: Moved xenapi into xenserver specific directory

---
 plugins/xenapi/README                              |   6 -
 plugins/xenapi/etc/xapi.d/plugins/objectstore      | 231 ---------------------
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    | 216 -------------------
 plugins/xenserver/xenapi/README                    |   6 +
 .../xenapi/etc/xapi.d/plugins/objectstore          | 231 +++++++++++++++++++++
 .../xenapi/etc/xapi.d/plugins/pluginlib_nova.py    | 216 +++++++++++++++++++
 6 files changed, 453 insertions(+), 453 deletions(-)
 delete mode 100644 plugins/xenapi/README
 delete mode 100644 plugins/xenapi/etc/xapi.d/plugins/objectstore
 delete mode 100755 plugins/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
 create mode 100644 plugins/xenserver/xenapi/README
 create mode 100644 plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore
 create mode 100755 plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py

diff --git a/plugins/xenapi/README b/plugins/xenapi/README
deleted file mode 100644
index fbd471035..000000000
--- a/plugins/xenapi/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This directory contains files that are required for the XenAPI support.  They
-should be installed in the XenServer / Xen Cloud Platform domain 0.
-
-Also, you need to
-
-chmod u+x /etc/xapi.d/plugins/objectstore
diff --git a/plugins/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenapi/etc/xapi.d/plugins/objectstore
deleted file mode 100644
index 271e7337f..000000000
--- a/plugins/xenapi/etc/xapi.d/plugins/objectstore
+++ /dev/null
@@ -1,231 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2010 Citrix Systems, Inc.
-# Copyright 2010 United States Government as represented by the
-# Administrator of the National Aeronautics and Space Administration.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-#
-# XenAPI plugin for fetching images from nova-objectstore.
-#
-
-import base64
-import errno
-import hmac
-import os
-import os.path
-import sha
-import time
-import urlparse
-
-import XenAPIPlugin
-
-from pluginlib_nova import *
-configure_logging('objectstore')
-
-
-KERNEL_DIR = '/boot/guest'
-
-DOWNLOAD_CHUNK_SIZE = 2 * 1024 * 1024
-SECTOR_SIZE = 512
-MBR_SIZE_SECTORS = 63
-MBR_SIZE_BYTES = MBR_SIZE_SECTORS * SECTOR_SIZE
-
-
-def get_vdi(session, args):
-    src_url = exists(args, 'src_url')
-    username = exists(args, 'username')
-    password = exists(args, 'password')
-    add_partition = validate_bool(args, 'add_partition', 'false')
-
-    (proto, netloc, url_path, _, _, _) = urlparse.urlparse(src_url)
-
-    sr = find_sr(session)
-    if sr is None:
-        raise Exception('Cannot find SR to write VDI to')
-
-    virtual_size = \
-        get_content_length(proto, netloc, url_path, username, password)
-    if virtual_size < 0:
-        raise Exception('Cannot get VDI size')
-
-    vdi_size = virtual_size
-    if add_partition:
-        # Make room for MBR.
-        vdi_size += MBR_SIZE_BYTES
-
-    vdi = create_vdi(session, sr, src_url, vdi_size, False)
-    with_vdi_in_dom0(session, vdi, False,
-                     lambda dev: get_vdi_(proto, netloc, url_path,
-                                          username, password, add_partition,
-                                          virtual_size, '/dev/%s' % dev))
-    return session.xenapi.VDI.get_uuid(vdi)
-
-
-def get_vdi_(proto, netloc, url_path, username, password, add_partition,
-             virtual_size, dest):
-
-    if add_partition:
-        write_partition(virtual_size, dest)
-
-    offset = add_partition and MBR_SIZE_BYTES or 0
-    get(proto, netloc, url_path, username, password, dest, offset)
-
-
-def write_partition(virtual_size, dest):
-    mbr_last = MBR_SIZE_SECTORS - 1
-    primary_first = MBR_SIZE_SECTORS
-    primary_last = MBR_SIZE_SECTORS + (virtual_size / SECTOR_SIZE) - 1
-
-    logging.debug('Writing partition table %d %d to %s...',
-                  primary_first, primary_last, dest)
-
-    result = os.system('parted --script %s mklabel msdos' % dest)
-    if result != 0:
-        raise Exception('Failed to mklabel')
-    result = os.system('parted --script %s mkpart primary %ds %ds' %
-                       (dest, primary_first, primary_last))
-    if result != 0:
-        raise Exception('Failed to mkpart')
-
-    logging.debug('Writing partition table %s done.', dest)
-
-
-def find_sr(session):
-    host = get_this_host(session)
-    srs = session.xenapi.SR.get_all()
-    for sr in srs:
-        sr_rec = session.xenapi.SR.get_record(sr)
-        if not ('i18n-key' in sr_rec['other_config'] and
-                sr_rec['other_config']['i18n-key'] == 'local-storage'):
-            continue
-        for pbd in sr_rec['PBDs']:
-            pbd_rec = session.xenapi.PBD.get_record(pbd)
-            if pbd_rec['host'] == host:
-                return sr
-    return None
-
-
-def get_kernel(session, args):
-    src_url = exists(args, 'src_url')
-    username = exists(args, 'username')
-    password = exists(args, 'password')
-
-    (proto, netloc, url_path, _, _, _) = urlparse.urlparse(src_url)
-    
-    dest = os.path.join(KERNEL_DIR, url_path[1:])
-
-    # Paranoid check against people using ../ to do rude things.
-    if os.path.commonprefix([KERNEL_DIR, dest]) != KERNEL_DIR:
-        raise Exception('Illegal destination %s %s', (url_path, dest))
-
-    dirname = os.path.dirname(dest)
-    try:
-        os.makedirs(dirname)
-    except os.error, e: 
-        if e.errno != errno.EEXIST: 
-            raise
-        if not os.path.isdir(dirname):
-            raise Exception('Cannot make directory %s', dirname)
-
-    try:
-        os.remove(dest)
-    except:
-        pass
-
-    get(proto, netloc, url_path, username, password, dest, 0)
-
-    return dest
-
-
-def get_content_length(proto, netloc, url_path, username, password):
-    headers = make_headers('HEAD', url_path, username, password)
-    return with_http_connection(
-        proto, netloc,
-        lambda conn: get_content_length_(url_path, headers, conn))
-
-
-def get_content_length_(url_path, headers, conn):
-    conn.request('HEAD', url_path, None, headers)
-    response = conn.getresponse()
-    if response.status != 200:
-        raise Exception('%d %s' % (response.status, response.reason))
-
-    return long(response.getheader('Content-Length', -1))
-
-
-def get(proto, netloc, url_path, username, password, dest, offset):
-    headers = make_headers('GET', url_path, username, password)
-    download(proto, netloc, url_path, headers, dest, offset)
-
-
-def make_headers(verb, url_path, username, password):
-    headers = {}
-    headers['Date'] = \
-        time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime())
-    headers['Authorization'] = \
-        'AWS %s:%s' % (username,
-                       s3_authorization(verb, url_path, password, headers))
-    return headers
-
-
-def s3_authorization(verb, path, password, headers):
-    sha1 = hmac.new(password, digestmod=sha)
-    sha1.update(plaintext(verb, path, headers))
-    return base64.encodestring(sha1.digest()).strip()
-
-
-def plaintext(verb, path, headers):
-    return '%s\n\n\n%s\n%s' % (verb,
-                           "\n".join([headers[h] for h in headers]),
-                           path)
-
-
-def download(proto, netloc, url_path, headers, dest, offset):
-    with_http_connection(
-        proto, netloc,
-        lambda conn: download_(url_path, dest, offset, headers, conn))
-
-
-def download_(url_path, dest, offset, headers, conn):
-    conn.request('GET', url_path, None, headers)
-    response = conn.getresponse()
-    if response.status != 200:
-        raise Exception('%d %s' % (response.status, response.reason))
-
-    length = response.getheader('Content-Length', -1)
-
-    with_file(
-        dest, 'a',
-        lambda dest_file: download_all(response, length, dest_file, offset))
-
-
-def download_all(response, length, dest_file, offset):
-    dest_file.seek(offset)
-    i = 0
-    while True:
-        buf = response.read(DOWNLOAD_CHUNK_SIZE)
-        if buf:
-            dest_file.write(buf)
-        else:
-            return
-        i += len(buf)
-        if length != -1 and i >= length:
-            return
-
-
-if __name__ == '__main__':
-    XenAPIPlugin.dispatch({'get_vdi': get_vdi,
-                           'get_kernel': get_kernel})
diff --git a/plugins/xenapi/etc/xapi.d/plugins/pluginlib_nova.py b/plugins/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
deleted file mode 100755
index 2d323a016..000000000
--- a/plugins/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright (c) 2010 Citrix Systems, Inc.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-#
-# Helper functions for the Nova xapi plugins.  In time, this will merge
-# with the pluginlib.py shipped with xapi, but for now, that file is not
-# very stable, so it's easiest just to have a copy of all the functions
-# that we need.
-#
-
-import httplib
-import logging
-import logging.handlers
-import re
-import time
-
-
-##### Logging setup
-
-def configure_logging(name):
-    log = logging.getLogger()
-    log.setLevel(logging.DEBUG)
-    sysh = logging.handlers.SysLogHandler('/dev/log')
-    sysh.setLevel(logging.DEBUG)
-    formatter = logging.Formatter('%s: %%(levelname)-8s %%(message)s' % name)
-    sysh.setFormatter(formatter)
-    log.addHandler(sysh)
-
-
-##### Exceptions
-
-class PluginError(Exception):
-    """Base Exception class for all plugin errors."""
-    def __init__(self, *args):
-        Exception.__init__(self, *args)
-
-class ArgumentError(PluginError):
-    """Raised when required arguments are missing, argument values are invalid,
-    or incompatible arguments are given.
-    """
-    def __init__(self, *args):
-        PluginError.__init__(self, *args)
-
-
-##### Helpers
-
-def ignore_failure(func, *args, **kwargs):
-    try:
-        return func(*args, **kwargs)
-    except XenAPI.Failure, e:
-        logging.error('Ignoring XenAPI.Failure %s', e)
-        return None
-
-
-##### Argument validation
-
-ARGUMENT_PATTERN = re.compile(r'^[a-zA-Z0-9_:\.\-,]+$')
-
-def validate_exists(args, key, default=None):
-    """Validates that a string argument to a RPC method call is given, and
-    matches the shell-safe regex, with an optional default value in case it
-    does not exist.
-
-    Returns the string.
-    """
-    if key in args:
-        if len(args[key]) == 0:
-            raise ArgumentError('Argument %r value %r is too short.' % (key, args[key]))
-        if not ARGUMENT_PATTERN.match(args[key]):
-            raise ArgumentError('Argument %r value %r contains invalid characters.' % (key, args[key]))
-        if args[key][0] == '-':
-            raise ArgumentError('Argument %r value %r starts with a hyphen.' % (key, args[key]))
-        return args[key]
-    elif default is not None:
-        return default
-    else:
-        raise ArgumentError('Argument %s is required.' % key)
-
-def validate_bool(args, key, default=None):
-    """Validates that a string argument to a RPC method call is a boolean string,
-    with an optional default value in case it does not exist.
-
-    Returns the python boolean value.
-    """
-    value = validate_exists(args, key, default)
-    if value.lower() == 'true':
-        return True
-    elif value.lower() == 'false':
-        return False
-    else:
-        raise ArgumentError("Argument %s may not take value %r. Valid values are ['true', 'false']." % (key, value))
-
-def exists(args, key):
-    """Validates that a freeform string argument to a RPC method call is given.
-    Returns the string.
-    """
-    if key in args:
-        return args[key]
-    else:
-        raise ArgumentError('Argument %s is required.' % key)
-
-def optional(args, key):
-    """If the given key is in args, return the corresponding value, otherwise
-    return None"""
-    return key in args and args[key] or None
-
-
-def get_this_host(session):
-    return session.xenapi.session.get_this_host(session.handle)
-
-
-def get_domain_0(session):
-    this_host_ref = get_this_host(session)
-    expr = 'field "is_control_domain" = "true" and field "resident_on" = "%s"' % this_host_ref
-    return session.xenapi.VM.get_all_records_where(expr).keys()[0]
-
-
-def create_vdi(session, sr_ref, name_label, virtual_size, read_only):
-    vdi_ref = session.xenapi.VDI.create(
-        { 'name_label': name_label,
-          'name_description': '',
-          'SR': sr_ref,
-          'virtual_size': str(virtual_size),
-          'type': 'User',
-          'sharable': False,
-          'read_only': read_only,
-          'xenstore_data': {},
-          'other_config': {},
-          'sm_config': {},
-          'tags': [] })
-    logging.debug('Created VDI %s (%s, %s, %s) on %s.', vdi_ref, name_label,
-                  virtual_size, read_only, sr_ref)
-    return vdi_ref
-
-
-def with_vdi_in_dom0(session, vdi, read_only, f):
-    dom0 = get_domain_0(session)
-    vbd_rec = {}
-    vbd_rec['VM'] = dom0
-    vbd_rec['VDI'] = vdi
-    vbd_rec['userdevice'] = 'autodetect'
-    vbd_rec['bootable'] = False
-    vbd_rec['mode'] = read_only and 'RO' or 'RW'
-    vbd_rec['type'] = 'disk'
-    vbd_rec['unpluggable'] = True
-    vbd_rec['empty'] = False
-    vbd_rec['other_config'] = {}
-    vbd_rec['qos_algorithm_type'] = ''
-    vbd_rec['qos_algorithm_params'] = {}
-    vbd_rec['qos_supported_algorithms'] = []
-    logging.debug('Creating VBD for VDI %s ... ', vdi)
-    vbd = session.xenapi.VBD.create(vbd_rec)
-    logging.debug('Creating VBD for VDI %s done.', vdi)
-    try:
-        logging.debug('Plugging VBD %s ... ', vbd)
-        session.xenapi.VBD.plug(vbd)
-        logging.debug('Plugging VBD %s done.', vbd)
-        return f(session.xenapi.VBD.get_device(vbd))
-    finally:
-        logging.debug('Destroying VBD for VDI %s ... ', vdi)
-        vbd_unplug_with_retry(session, vbd)
-        ignore_failure(session.xenapi.VBD.destroy, vbd)
-        logging.debug('Destroying VBD for VDI %s done.', vdi)
-
-
-def vbd_unplug_with_retry(session, vbd):
-    """Call VBD.unplug on the given VBD, with a retry if we get
-    DEVICE_DETACH_REJECTED.  For reasons which I don't understand, we're
-    seeing the device still in use, even when all processes using the device
-    should be dead."""
-    while True:
-        try:
-            session.xenapi.VBD.unplug(vbd)
-            logging.debug('VBD.unplug successful first time.')
-            return
-        except XenAPI.Failure, e:
-            if (len(e.details) > 0 and
-                e.details[0] == 'DEVICE_DETACH_REJECTED'):
-                logging.debug('VBD.unplug rejected: retrying...')
-                time.sleep(1)
-            elif (len(e.details) > 0 and
-                  e.details[0] == 'DEVICE_ALREADY_DETACHED'):
-                logging.debug('VBD.unplug successful eventually.')
-                return
-            else:
-                logging.error('Ignoring XenAPI.Failure in VBD.unplug: %s', e)
-                return
-
-
-def with_http_connection(proto, netloc, f):
-    conn = (proto == 'https' and
-            httplib.HTTPSConnection(netloc) or
-            httplib.HTTPConnection(netloc))
-    try:
-        return f(conn)
-    finally:
-        conn.close()
-
-
-def with_file(dest_path, mode, f):
-    dest = open(dest_path, mode)
-    try:
-        return f(dest)
-    finally:
-        dest.close()
diff --git a/plugins/xenserver/xenapi/README b/plugins/xenserver/xenapi/README
new file mode 100644
index 000000000..fbd471035
--- /dev/null
+++ b/plugins/xenserver/xenapi/README
@@ -0,0 +1,6 @@
+This directory contains files that are required for the XenAPI support.  They
+should be installed in the XenServer / Xen Cloud Platform domain 0.
+
+Also, you need to
+
+chmod u+x /etc/xapi.d/plugins/objectstore
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore
new file mode 100644
index 000000000..271e7337f
--- /dev/null
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore
@@ -0,0 +1,231 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2010 Citrix Systems, Inc.
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+#
+# XenAPI plugin for fetching images from nova-objectstore.
+#
+
+import base64
+import errno
+import hmac
+import os
+import os.path
+import sha
+import time
+import urlparse
+
+import XenAPIPlugin
+
+from pluginlib_nova import *
+configure_logging('objectstore')
+
+
+KERNEL_DIR = '/boot/guest'
+
+DOWNLOAD_CHUNK_SIZE = 2 * 1024 * 1024
+SECTOR_SIZE = 512
+MBR_SIZE_SECTORS = 63
+MBR_SIZE_BYTES = MBR_SIZE_SECTORS * SECTOR_SIZE
+
+
+def get_vdi(session, args):
+    src_url = exists(args, 'src_url')
+    username = exists(args, 'username')
+    password = exists(args, 'password')
+    add_partition = validate_bool(args, 'add_partition', 'false')
+
+    (proto, netloc, url_path, _, _, _) = urlparse.urlparse(src_url)
+
+    sr = find_sr(session)
+    if sr is None:
+        raise Exception('Cannot find SR to write VDI to')
+
+    virtual_size = \
+        get_content_length(proto, netloc, url_path, username, password)
+    if virtual_size < 0:
+        raise Exception('Cannot get VDI size')
+
+    vdi_size = virtual_size
+    if add_partition:
+        # Make room for MBR.
+        vdi_size += MBR_SIZE_BYTES
+
+    vdi = create_vdi(session, sr, src_url, vdi_size, False)
+    with_vdi_in_dom0(session, vdi, False,
+                     lambda dev: get_vdi_(proto, netloc, url_path,
+                                          username, password, add_partition,
+                                          virtual_size, '/dev/%s' % dev))
+    return session.xenapi.VDI.get_uuid(vdi)
+
+
+def get_vdi_(proto, netloc, url_path, username, password, add_partition,
+             virtual_size, dest):
+
+    if add_partition:
+        write_partition(virtual_size, dest)
+
+    offset = add_partition and MBR_SIZE_BYTES or 0
+    get(proto, netloc, url_path, username, password, dest, offset)
+
+
+def write_partition(virtual_size, dest):
+    mbr_last = MBR_SIZE_SECTORS - 1
+    primary_first = MBR_SIZE_SECTORS
+    primary_last = MBR_SIZE_SECTORS + (virtual_size / SECTOR_SIZE) - 1
+
+    logging.debug('Writing partition table %d %d to %s...',
+                  primary_first, primary_last, dest)
+
+    result = os.system('parted --script %s mklabel msdos' % dest)
+    if result != 0:
+        raise Exception('Failed to mklabel')
+    result = os.system('parted --script %s mkpart primary %ds %ds' %
+                       (dest, primary_first, primary_last))
+    if result != 0:
+        raise Exception('Failed to mkpart')
+
+    logging.debug('Writing partition table %s done.', dest)
+
+
+def find_sr(session):
+    host = get_this_host(session)
+    srs = session.xenapi.SR.get_all()
+    for sr in srs:
+        sr_rec = session.xenapi.SR.get_record(sr)
+        if not ('i18n-key' in sr_rec['other_config'] and
+                sr_rec['other_config']['i18n-key'] == 'local-storage'):
+            continue
+        for pbd in sr_rec['PBDs']:
+            pbd_rec = session.xenapi.PBD.get_record(pbd)
+            if pbd_rec['host'] == host:
+                return sr
+    return None
+
+
+def get_kernel(session, args):
+    src_url = exists(args, 'src_url')
+    username = exists(args, 'username')
+    password = exists(args, 'password')
+
+    (proto, netloc, url_path, _, _, _) = urlparse.urlparse(src_url)
+    
+    dest = os.path.join(KERNEL_DIR, url_path[1:])
+
+    # Paranoid check against people using ../ to do rude things.
+    if os.path.commonprefix([KERNEL_DIR, dest]) != KERNEL_DIR:
+        raise Exception('Illegal destination %s %s', (url_path, dest))
+
+    dirname = os.path.dirname(dest)
+    try:
+        os.makedirs(dirname)
+    except os.error, e: 
+        if e.errno != errno.EEXIST: 
+            raise
+        if not os.path.isdir(dirname):
+            raise Exception('Cannot make directory %s', dirname)
+
+    try:
+        os.remove(dest)
+    except:
+        pass
+
+    get(proto, netloc, url_path, username, password, dest, 0)
+
+    return dest
+
+
+def get_content_length(proto, netloc, url_path, username, password):
+    headers = make_headers('HEAD', url_path, username, password)
+    return with_http_connection(
+        proto, netloc,
+        lambda conn: get_content_length_(url_path, headers, conn))
+
+
+def get_content_length_(url_path, headers, conn):
+    conn.request('HEAD', url_path, None, headers)
+    response = conn.getresponse()
+    if response.status != 200:
+        raise Exception('%d %s' % (response.status, response.reason))
+
+    return long(response.getheader('Content-Length', -1))
+
+
+def get(proto, netloc, url_path, username, password, dest, offset):
+    headers = make_headers('GET', url_path, username, password)
+    download(proto, netloc, url_path, headers, dest, offset)
+
+
+def make_headers(verb, url_path, username, password):
+    headers = {}
+    headers['Date'] = \
+        time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime())
+    headers['Authorization'] = \
+        'AWS %s:%s' % (username,
+                       s3_authorization(verb, url_path, password, headers))
+    return headers
+
+
+def s3_authorization(verb, path, password, headers):
+    sha1 = hmac.new(password, digestmod=sha)
+    sha1.update(plaintext(verb, path, headers))
+    return base64.encodestring(sha1.digest()).strip()
+
+
+def plaintext(verb, path, headers):
+    return '%s\n\n\n%s\n%s' % (verb,
+                           "\n".join([headers[h] for h in headers]),
+                           path)
+
+
+def download(proto, netloc, url_path, headers, dest, offset):
+    with_http_connection(
+        proto, netloc,
+        lambda conn: download_(url_path, dest, offset, headers, conn))
+
+
+def download_(url_path, dest, offset, headers, conn):
+    conn.request('GET', url_path, None, headers)
+    response = conn.getresponse()
+    if response.status != 200:
+        raise Exception('%d %s' % (response.status, response.reason))
+
+    length = response.getheader('Content-Length', -1)
+
+    with_file(
+        dest, 'a',
+        lambda dest_file: download_all(response, length, dest_file, offset))
+
+
+def download_all(response, length, dest_file, offset):
+    dest_file.seek(offset)
+    i = 0
+    while True:
+        buf = response.read(DOWNLOAD_CHUNK_SIZE)
+        if buf:
+            dest_file.write(buf)
+        else:
+            return
+        i += len(buf)
+        if length != -1 and i >= length:
+            return
+
+
+if __name__ == '__main__':
+    XenAPIPlugin.dispatch({'get_vdi': get_vdi,
+                           'get_kernel': get_kernel})
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
new file mode 100755
index 000000000..2d323a016
--- /dev/null
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
@@ -0,0 +1,216 @@
+# Copyright (c) 2010 Citrix Systems, Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+#
+# Helper functions for the Nova xapi plugins.  In time, this will merge
+# with the pluginlib.py shipped with xapi, but for now, that file is not
+# very stable, so it's easiest just to have a copy of all the functions
+# that we need.
+#
+
+import httplib
+import logging
+import logging.handlers
+import re
+import time
+
+
+##### Logging setup
+
+def configure_logging(name):
+    log = logging.getLogger()
+    log.setLevel(logging.DEBUG)
+    sysh = logging.handlers.SysLogHandler('/dev/log')
+    sysh.setLevel(logging.DEBUG)
+    formatter = logging.Formatter('%s: %%(levelname)-8s %%(message)s' % name)
+    sysh.setFormatter(formatter)
+    log.addHandler(sysh)
+
+
+##### Exceptions
+
+class PluginError(Exception):
+    """Base Exception class for all plugin errors."""
+    def __init__(self, *args):
+        Exception.__init__(self, *args)
+
+class ArgumentError(PluginError):
+    """Raised when required arguments are missing, argument values are invalid,
+    or incompatible arguments are given.
+    """
+    def __init__(self, *args):
+        PluginError.__init__(self, *args)
+
+
+##### Helpers
+
+def ignore_failure(func, *args, **kwargs):
+    try:
+        return func(*args, **kwargs)
+    except XenAPI.Failure, e:
+        logging.error('Ignoring XenAPI.Failure %s', e)
+        return None
+
+
+##### Argument validation
+
+ARGUMENT_PATTERN = re.compile(r'^[a-zA-Z0-9_:\.\-,]+$')
+
+def validate_exists(args, key, default=None):
+    """Validates that a string argument to a RPC method call is given, and
+    matches the shell-safe regex, with an optional default value in case it
+    does not exist.
+
+    Returns the string.
+    """
+    if key in args:
+        if len(args[key]) == 0:
+            raise ArgumentError('Argument %r value %r is too short.' % (key, args[key]))
+        if not ARGUMENT_PATTERN.match(args[key]):
+            raise ArgumentError('Argument %r value %r contains invalid characters.' % (key, args[key]))
+        if args[key][0] == '-':
+            raise ArgumentError('Argument %r value %r starts with a hyphen.' % (key, args[key]))
+        return args[key]
+    elif default is not None:
+        return default
+    else:
+        raise ArgumentError('Argument %s is required.' % key)
+
+def validate_bool(args, key, default=None):
+    """Validates that a string argument to a RPC method call is a boolean string,
+    with an optional default value in case it does not exist.
+
+    Returns the python boolean value.
+    """
+    value = validate_exists(args, key, default)
+    if value.lower() == 'true':
+        return True
+    elif value.lower() == 'false':
+        return False
+    else:
+        raise ArgumentError("Argument %s may not take value %r. Valid values are ['true', 'false']." % (key, value))
+
+def exists(args, key):
+    """Validates that a freeform string argument to a RPC method call is given.
+    Returns the string.
+    """
+    if key in args:
+        return args[key]
+    else:
+        raise ArgumentError('Argument %s is required.' % key)
+
+def optional(args, key):
+    """If the given key is in args, return the corresponding value, otherwise
+    return None"""
+    return key in args and args[key] or None
+
+
+def get_this_host(session):
+    return session.xenapi.session.get_this_host(session.handle)
+
+
+def get_domain_0(session):
+    this_host_ref = get_this_host(session)
+    expr = 'field "is_control_domain" = "true" and field "resident_on" = "%s"' % this_host_ref
+    return session.xenapi.VM.get_all_records_where(expr).keys()[0]
+
+
+def create_vdi(session, sr_ref, name_label, virtual_size, read_only):
+    vdi_ref = session.xenapi.VDI.create(
+        { 'name_label': name_label,
+          'name_description': '',
+          'SR': sr_ref,
+          'virtual_size': str(virtual_size),
+          'type': 'User',
+          'sharable': False,
+          'read_only': read_only,
+          'xenstore_data': {},
+          'other_config': {},
+          'sm_config': {},
+          'tags': [] })
+    logging.debug('Created VDI %s (%s, %s, %s) on %s.', vdi_ref, name_label,
+                  virtual_size, read_only, sr_ref)
+    return vdi_ref
+
+
+def with_vdi_in_dom0(session, vdi, read_only, f):
+    dom0 = get_domain_0(session)
+    vbd_rec = {}
+    vbd_rec['VM'] = dom0
+    vbd_rec['VDI'] = vdi
+    vbd_rec['userdevice'] = 'autodetect'
+    vbd_rec['bootable'] = False
+    vbd_rec['mode'] = read_only and 'RO' or 'RW'
+    vbd_rec['type'] = 'disk'
+    vbd_rec['unpluggable'] = True
+    vbd_rec['empty'] = False
+    vbd_rec['other_config'] = {}
+    vbd_rec['qos_algorithm_type'] = ''
+    vbd_rec['qos_algorithm_params'] = {}
+    vbd_rec['qos_supported_algorithms'] = []
+    logging.debug('Creating VBD for VDI %s ... ', vdi)
+    vbd = session.xenapi.VBD.create(vbd_rec)
+    logging.debug('Creating VBD for VDI %s done.', vdi)
+    try:
+        logging.debug('Plugging VBD %s ... ', vbd)
+        session.xenapi.VBD.plug(vbd)
+        logging.debug('Plugging VBD %s done.', vbd)
+        return f(session.xenapi.VBD.get_device(vbd))
+    finally:
+        logging.debug('Destroying VBD for VDI %s ... ', vdi)
+        vbd_unplug_with_retry(session, vbd)
+        ignore_failure(session.xenapi.VBD.destroy, vbd)
+        logging.debug('Destroying VBD for VDI %s done.', vdi)
+
+
+def vbd_unplug_with_retry(session, vbd):
+    """Call VBD.unplug on the given VBD, with a retry if we get
+    DEVICE_DETACH_REJECTED.  For reasons which I don't understand, we're
+    seeing the device still in use, even when all processes using the device
+    should be dead."""
+    while True:
+        try:
+            session.xenapi.VBD.unplug(vbd)
+            logging.debug('VBD.unplug successful first time.')
+            return
+        except XenAPI.Failure, e:
+            if (len(e.details) > 0 and
+                e.details[0] == 'DEVICE_DETACH_REJECTED'):
+                logging.debug('VBD.unplug rejected: retrying...')
+                time.sleep(1)
+            elif (len(e.details) > 0 and
+                  e.details[0] == 'DEVICE_ALREADY_DETACHED'):
+                logging.debug('VBD.unplug successful eventually.')
+                return
+            else:
+                logging.error('Ignoring XenAPI.Failure in VBD.unplug: %s', e)
+                return
+
+
+def with_http_connection(proto, netloc, f):
+    conn = (proto == 'https' and
+            httplib.HTTPSConnection(netloc) or
+            httplib.HTTPConnection(netloc))
+    try:
+        return f(conn)
+    finally:
+        conn.close()
+
+
+def with_file(dest_path, mode, f):
+    dest = open(dest_path, mode)
+    try:
+        return f(dest)
+    finally:
+        dest.close()
-- 
cgit 


From a653173c75fdd3810ce75c3d5de5ea491d5d6922 Mon Sep 17 00:00:00 2001
From: Antony Messerli <amesserl@rackspace.com>
Date: Wed, 22 Dec 2010 11:28:08 -0600
Subject: Added networking protections readme

---
 plugins/xenserver/networking/README | 126 ++++++++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 plugins/xenserver/networking/README

diff --git a/plugins/xenserver/networking/README b/plugins/xenserver/networking/README
new file mode 100644
index 000000000..b59de16b8
--- /dev/null
+++ b/plugins/xenserver/networking/README
@@ -0,0 +1,126 @@
+Multi Tenancy Networking Protections in XenServer
+=================================================
+
+The purpose of the vif_rules script is to allow multi-tenancy on a XenServer
+host.  In a multi-tenant cloud environment a host machine needs to be able to
+enforce network isolation amongst guest instances, at both layer two and layer
+three. The rules prevent guests from taking and using unauthorized IP addresses,
+sniffing other guests traffic, and prevents ARP poisoning attacks.  This current
+revision only supports IPv4, but will support IPv6 in the future.
+
+Kernel Requirements
+===================
+
+- physdev module
+- arptables support
+- ebtables support
+- iptables support
+
+If the kernel doesn't support these, you will need to obtain the Source RPMS for
+the proper version of XenServer to recompile the dom0 kernel.
+
+XenServer Requirements (32-bit dom0)
+====================================
+
+- arptables 32-bit rpm 
+- ebtables 32-bit rpm
+- python-simplejson
+
+XenServer Environment Specific Notes 
+====================================
+
+- XenServer 5.5 U1 based on the 2.6.18 kernel didn't include physdev module
+  support.  Support for this had to be recompiled into the kernel.
+- XenServer 5.6 based on the 2.6.27 kernel didn't include physdev, ebtables, or
+  arptables.
+- XenServer 5.6 FP1 didn't include physdev, ebtables, or arptables but they do
+  have a Cloud Supplemental pack available to partners which swaps out the
+  kernels for kernels that support the networking rules.  
+
+How it works - tl;dr
+====================
+
+iptables, ebtables, and arptables drop rules are applied to all forward chains
+on the host.  These are applied at boot time with an init script.  They ensure
+all forwarded packets are dropped by default.  Allow rules are then applied to
+the instances to ensure they have permission to talk on the internet.
+
+How it works - Long
+===================
+
+Any time an underprivileged domain or domU is started or stopped, it gets a
+unique domain id (dom_id).  This dom_id is utilized in a number of places, one
+of which is it's assigned to the virtual interface (vif).  The vifs are attached
+to the bridge that is attached to the physical network.  For instance, if you
+had a public bridge attached to eth0 and your domain id was 5, your vif would be
+vif5.0.  
+
+The networking rules are applied to the VIF directly so they apply at the lowest
+level of the networking stack.  Because the VIF changes along with the domain id
+on any start, stop, or reboot of the instance, the rules need to be removed and
+re-added any time that occurs.   
+
+Because the dom_id can change often, the vif_rules script is hooked into the
+/etc/xensource/scripts/vif script that gets called anytime an instance is
+started, or stopped, which includes pauses and resumes.
+
+Examples of the rules ran for the host on boot:
+
+iptables -P FORWARD DROP iptables -A FORWARD -m physdev --physdev-in eth0 -j
+ACCEPT ebtables -P FORWARD DROP ebtables -A FORWARD -o eth0 -j ACCEPT arptables
+-P FORWARD DROP arptables -A FORWARD --opcode Request --in-interface eth0 -j
+ACCEPT arptables -A FORWARD --opcode Reply --in-interface eth0 -j ACCEPT
+
+Examples of the rules that are ran per instance state change:
+
+iptables -A FORWARD -m physdev --physdev-in vif1.0 -s 10.1.135.22/32 -j ACCEPT
+arptables -A FORWARD --opcode Request --in-interface "vif1.0" --source-ip
+10.1.135.22 -j ACCEPT arptables -A FORWARD --opcode Reply --in-interface
+"vif1.0" --source-ip 10.1.135.22 --source-mac 9e:6e:cc:19:7f:fe -j ACCEPT
+ebtables -A FORWARD -p 0806 -o vif1.0 --arp-ip-dst 10.1.135.22 -j ACCEPT
+ebtables -A FORWARD -p 0800 -o vif1.0 --ip-dst 10.1.135.22 -j ACCEPT ebtables -I
+FORWARD 1 -s ! 9e:6e:cc:19:7f:fe -i vif1.0 -j DROP
+
+Typically when you see a vif, it'll look like vif<domain id>.<network bridge>.
+vif2.1 for example would be domain 2 on the second interface.
+
+The vif_rules.py script needs to pull information about the IPs and MAC
+addresses assigned to the instance.  The current implementation assumes that
+information is put into the VM Record into the xenstore-data key in a JSON
+string.  The vif_rules.py script reads out of the JSON string to determine the
+IPs, and MAC addresses to protect.  
+
+An example format is given below:
+
+xe vm-param-get uuid=<uuid> param-name=xenstore-data xenstore-data (MRW):
+vm-data/networking/4040fa7292e4:
+{"label":"public","ips":[{"netmask":"255.255.255.0", "enabled":"1", 
+"ip":"173.200.100.10"}], "mac":"40:40:fa:72:92:e4", "gateway":"173.200.100.1", 
+"vm_id":"123456", "dns":["72.3.128.240","72.3.128.241"]};
+vm-data/networking/40402321c9b8:
+{"label":"private","ips":[{"netmask":"255.255.224.0","enabled":"1", 
+"ip":"10.177.10.10"}], "routes":[{"route":"10.176.0.0","netmask":"255.248.0.0",
+"gateway":"10.177.10.1"}, {"route":"10.191.192.0", "netmask":"255.255.192.0", 
+"gateway":"10.177.10.1"}], "mac":"40:40:23:21:c9:b8"}
+
+The key is used for two purposes.  One, the vif_rules.py script will read from
+it to apply the rules needed after parsing the JSON.  The second is that because
+it's put into the xenstore-data field, the xenstore will be populated with this
+data on boot.  This allows a guest agent the ability to read out data about the
+instance and apply configurations as needed.  
+
+Installation
+============
+
+- Copy host-rules into /etc/init.d/ and make sure to chmod +x host-rules.
+- Run 'chkconfig host-rules on' to add the init script to start up.
+- Copy vif_rules.py into /etc/xensource/scripts
+- Patch /etc/xensource/scripts/vif using the supplied patch file.  It may vary
+  for different versions of XenServer but it should be pretty self explanitory.
+  It calls the vif_rules.py script on domain creation and tear down.
+- Run '/etc/init.d/host-rules start' to start up the host based rules.
+- The instance rules will then fire on creation of the VM as long as the correct
+  JSON is in place.
+- You can check to see if the rules are in place with: iptables --list,
+  arptables --list, or ebtables --list
+
-- 
cgit 


From 1f9f997ae342ea16d0640c3e406402950b1d2a9b Mon Sep 17 00:00:00 2001
From: Cory Wright <cory.wright@rackspace.com>
Date: Wed, 22 Dec 2010 13:27:51 -0500
Subject: Adding myself and Antony Messerli to the Authors file

---
 Authors | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Authors b/Authors
index fa38ef0b1..6e873acf3 100644
--- a/Authors
+++ b/Authors
@@ -1,9 +1,11 @@
 Andy Smith <code@term.ie>
 Anne Gentle <anne@openstack.org>
 Anthony Young <sleepsonthefloor@gmail.com>
+Antony Messerli <ant@openstack.org>
 Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
 Chris Behrens <cbehrens@codestud.com>
 Chmouel Boudjnah <chmouel@chmouel.com>
+Cory Wright <corywright@gmail.com>
 Dean Troyer <dtroyer@gmail.com>
 Devin Carlen <devin.carlen@gmail.com>
 Ed Leafe <ed@leafe.com>
-- 
cgit 


From af4d6e84c67b8f59f63ef0275778fa897dac9e95 Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Wed, 22 Dec 2010 13:01:33 -0600
Subject: Getting Snapshots to work with cloudservers command-line tool

---
 nova/api/openstack/__init__.py           |  3 +--
 nova/api/openstack/images.py             |  8 +++++---
 nova/compute/api.py                      |  9 +++++++++
 nova/compute/manager.py                  | 11 +++--------
 nova/flags.py                            |  2 +-
 nova/image/glance.py                     |  5 ++++-
 nova/virt/xenapi/vm_utils.py             |  8 +++-----
 plugins/xenapi/etc/xapi.d/plugins/glance | 20 ++++++++------------
 8 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 44f3aafec..dba008111 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -89,8 +89,7 @@ class AuthMiddleware(wsgi.Middleware):
         if not user:
             return faults.Fault(webob.exc.HTTPUnauthorized())
 
-        #FIXME(sirp): stubbing project to admin for now
-        project = manager.AuthManager().get_project('admin')
+        project = manager.AuthManager().get_project(FLAGS.default_project)
         req.environ['nova.context'] = context.RequestContext(user, project)
         return self.application
 
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 78849223d..de072b28f 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -66,9 +66,11 @@ class Controller(wsgi.Controller):
         raise faults.Fault(exc.HTTPNotFound())
 
     def create(self, req):
-        # Only public images are supported for now, so a request to
-        # make a backup of a server cannot be supproted.
-        raise faults.Fault(exc.HTTPNotFound())
+        ctxt = req.environ['nova.context']
+        env = self._deserialize(req.body, req)
+        data = {'instance_id': env["image"]["serverId"],
+                'name': env["image"]["name"] }
+        return dict(image=self._service.create(ctxt, data))
 
     def update(self, req, id):
         # Users may not modify public images, and that's all that
diff --git a/nova/compute/api.py b/nova/compute/api.py
index c740814da..6864e694e 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -271,6 +271,15 @@ class ComputeAPI(base.Base):
     def get_instance(self, context, instance_id):
         return self.db.instance_get_by_internal_id(context, instance_id)
 
+    def snapshot(self, context, instance_id, name):
+        """Snapshot the given instance."""
+        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": "snapshot_instance",
+                  "args": {"instance_id": instance['id'], "name": name}})
+
     def reboot(self, context, instance_id):
         """Reboot 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 56b11c4ed..f74eacaf5 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -134,10 +134,8 @@ class ComputeManager(manager.Manager):
         # TODO(ja): should we keep it in a terminated state for a bit?
         self.db.instance_destroy(context, instance_id)
 
-    #FIXME(sirp): Hacking reboot to snapshot
     @exception.wrap_exception
-    def XXreboot_instance(self, context, instance_id):
-    #def reboot_instance(self, context, instance_id):
+    def reboot_instance(self, context, instance_id):
         """Reboot an instance on this server."""
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
@@ -158,10 +156,8 @@ class ComputeManager(manager.Manager):
         self.driver.reboot(instance_ref)
         self._update_state(context, instance_id)
 
-    #FIXME(sirp): Hacking reboot to snapshot
     @exception.wrap_exception
-    def reboot_instance(self, context, instance_id):
-    #def snapshot_instance(self, context, instance_id):
+    def snapshot_instance(self, context, instance_id, name):
         """Snapshot an instance on this server."""
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
@@ -181,8 +177,7 @@ class ComputeManager(manager.Manager):
 
         logging.debug('instance %s: snapshotting', instance_ref['name'])
         #TODO(sirp): set is_snapshotting=True here?
-        glance_name = "MySnapshot3"
-        self.driver.snapshot(instance_ref, glance_name)
+        self.driver.snapshot(instance_ref, name)
         #self._update_state(context, instance_id)
 
     @exception.wrap_exception
diff --git a/nova/flags.py b/nova/flags.py
index 51956d5cf..cf4614b8d 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -214,7 +214,6 @@ DEFINE_integer('s3_port', 3333, 's3 port')
 DEFINE_string('s3_host', '127.0.0.1', 's3 host')
 DEFINE_integer('glance_port', 9292, 'glance port')
 DEFINE_string('glance_host', '127.0.0.1', 'glance host')
-DEFINE_string('glance_storage_location', 'swift://username:api_key@auth.api.rackspacecloud.com/v1.0/cloudservers', 'glance storage location')
 DEFINE_string('compute_topic', 'compute', 'the topic compute nodes listen on')
 DEFINE_string('scheduler_topic', 'scheduler',
               'the topic scheduler nodes listen on')
@@ -236,6 +235,7 @@ DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to')
 DEFINE_string('ec2_url', 'http://127.0.0.1:8773/services/Cloud',
               'Url to ec2 api server')
 
+DEFINE_string('default_project', 'openstack', 'default project for openstack')
 DEFINE_string('default_image', 'ami-11111',
               'default image to use, testing only')
 DEFINE_string('default_instance_type', 'm1.small',
diff --git a/nova/image/glance.py b/nova/image/glance.py
index 1ca6cf2eb..84e4eaa7d 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -24,6 +24,7 @@ import urlparse
 
 import webob.exc
 
+from nova.compute import api as compute_api
 from nova import utils
 from nova import flags
 from nova import exception
@@ -202,7 +203,9 @@ class GlanceImageService(nova.image.service.BaseImageService):
         :raises AlreadyExists if the image already exist.
 
         """
-        return self.parallax.add_image_metadata(data)
+        instance_id = data["instance_id"]
+        name = data["name"]
+        compute_api.ComputeAPI().snapshot(context, instance_id, name)
 
     def update(self, context, image_id, data):
         """Replace the contents of the given image with the new data.
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index a4501cdbb..7a93c44c7 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -183,13 +183,11 @@ class VMHelper():
         return template_vm_ref, [vdi_uuid, parent_uuid]
 
     @classmethod
-    def upload_image(cls, session, vdi_uuids, glance_label):
-        logging.debug("Asking xapi to upload %s as '%s'", vdi_uuids,
-                      glance_label)
+    def upload_image(cls, session, vdi_uuids, image_name):
+        logging.debug("Asking xapi to upload %s as '%s'", vdi_uuids, image_name)
 
         params = {'vdi_uuids': vdi_uuids, 
-                  'glance_label': glance_label,
-                  'glance_storage_location': FLAGS.glance_storage_location,
+                  'image_name': image_name,
                   'glance_host': FLAGS.glance_host,
                   'glance_port': FLAGS.glance_port}
 
diff --git a/plugins/xenapi/etc/xapi.d/plugins/glance b/plugins/xenapi/etc/xapi.d/plugins/glance
index 13e79ff9f..5e648b970 100644
--- a/plugins/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenapi/etc/xapi.d/plugins/glance
@@ -45,41 +45,37 @@ FILE_SR_PATH = '/var/run/sr-mount'
 def put_vdis(session, args):
     params = pickle.loads(exists(args, 'params'))
     vdi_uuids = params["vdi_uuids"]
-    glance_label = params["glance_label"]
+    image_name = params["image_name"]
     glance_host = params["glance_host"]
     glance_port = params["glance_port"]
-    glance_storage_location = params["glance_storage_location"]
     
     sr_path = get_sr_path(session)
     #FIXME(sirp): writing to a temp file until Glance supports chunked-PUTs
-    tmp_file = "%s.tar.gz" % os.path.join('/tmp', glance_label) 
+    tmp_file = "%s.tar.gz" % os.path.join('/tmp', image_name) 
     tar_cmd = ['tar', '-zcf', tmp_file, '--directory=%s' % sr_path]
     paths = [ "%s.vhd" % vdi_uuid for vdi_uuid in vdi_uuids ]
     tar_cmd.extend(paths)
     logging.debug("Bundling image with cmd: %s", tar_cmd)
     subprocess.call(tar_cmd)
     logging.debug("Writing to test file %s", tmp_file) 
-    put_bundle_in_glance(tmp_file, glance_label, glance_storage_location,
-                         glance_host, glance_port)
+    put_bundle_in_glance(tmp_file, image_name, glance_host, glance_port)
     return "" # FIXME(sirp): return anything useful here?
 
 
-def put_bundle_in_glance(tmp_file, glance_label, glance_storage_location,
-                         glance_host, glance_port):
-
+def put_bundle_in_glance(tmp_file, image_name, glance_host, glance_port):
     size = os.path.getsize(tmp_file) 
-
     basename = os.path.basename(tmp_file)
-    location = os.path.join(glance_storage_location, basename)
 
     bundle = open(tmp_file, 'r')
     try:
         headers = {
+            'x-image-meta-store': 'file',
             'x-image-meta-is_public': 'True',
-            'x-image-meta-name': glance_label,
-            'x-image-meta-location': location,
+            'x-image-meta-type': 'raw',
+            'x-image-meta-name': image_name,
             'x-image-meta-size': size,
             'content-length': size,
+            'content-type': 'application/octet-stream',
          }
         conn = httplib.HTTPConnection(glance_host, glance_port)
         #NOTE(sirp): httplib under python2.4 won't accept a file-like object
-- 
cgit 


From 7c03b9aa49b390e13cfbe8315a62c660778ef854 Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Wed, 22 Dec 2010 14:00:31 -0600
Subject: i18n support for xs-snaps

---
 nova/compute/manager.py      | 11 ++++------
 nova/flags.py                |  2 +-
 nova/virt/libvirt_conn.py    |  4 ++--
 nova/virt/xenapi/vm_utils.py | 50 +++++++++++++++++++++++++-------------------
 nova/virt/xenapi/vmops.py    | 26 +++++++++++++----------
 nova/virt/xenapi_conn.py     |  2 --
 6 files changed, 51 insertions(+), 44 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index f9124aa6c..cf459d96a 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -162,23 +162,20 @@ class ComputeManager(manager.Manager):
         context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
 
-        #FIXME(sirp): update_state currently only refreshes the state field
+        #NOTE(sirp): update_state currently only refreshes the state field
         # if we add is_snapshotting, we will need this refreshed too,
         # potentially?
         self._update_state(context, instance_id)
 
-        #TODO(sirp): check for is_snapshotting=True here?
+        logging.debug(_('instance %s: snapshotting'), instance_ref['name'])
         if instance_ref['state'] != power_state.RUNNING:
-            logging.warn('trying to snapshot a non-running '
-                         'instance: %s (state: %s excepted: %s)',
+            logging.warn(_('trying to snapshot a non-running '
+                           'instance: %s (state: %s excepted: %s)'),
                          instance_ref['internal_id'],
                          instance_ref['state'],
                          power_state.RUNNING)
 
-        logging.debug('instance %s: snapshotting', instance_ref['name'])
-        #TODO(sirp): set is_snapshotting=True here?
         self.driver.snapshot(instance_ref, name)
-        #self._update_state(context, instance_id)
 
     @exception.wrap_exception
     def rescue_instance(self, context, instance_id):
diff --git a/nova/flags.py b/nova/flags.py
index b61447c76..d773a7e4c 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -213,7 +213,7 @@ DEFINE_string('connection_type', 'libvirt', 'libvirt, xenapi or fake')
 DEFINE_string('aws_access_key_id', 'admin', 'AWS Access ID')
 DEFINE_string('aws_secret_access_key', 'admin', 'AWS Access Key')
 DEFINE_integer('glance_port', 9292, 'glance port')
-DEFINE_string('glance_host', utils.get_my_ip(),, 'glance host')
+DEFINE_string('glance_host', utils.get_my_ip(), 'glance host')
 DEFINE_integer('s3_port', 3333, 's3 port')
 DEFINE_string('s3_host', utils.get_my_ip(), 's3 host (for infrastructure)')
 DEFINE_string('s3_dmz', utils.get_my_ip(), 's3 dmz ip (for instances)')
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 3b5954b3b..c8d0aa306 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -239,9 +239,9 @@ class LibvirtConnection(object):
     @exception.wrap_exception
     def snapshot(self, instance):
         """ Create snapshot from a running VM instance """
-        #TODO(sirp): only exists for XenAPI driver for now
         raise NotImplementedError(
-            "Instance snapshotting is not supported for libvirt at this time")
+            _("Instance snapshotting is not supported for libvirt"
+              "at this time"))
 
     @exception.wrap_exception
     def reboot(self, instance):
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index f4e608e4d..5b1c36418 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -153,17 +153,22 @@ class VMHelper():
 
 
     @classmethod
-    def create_snapshot(cls, session, vm_ref, label):
-        logging.debug("Snapshotting VM %s with label '%s'...", vm_ref, label)
+    def create_snapshot(cls, session, instance_id, vm_ref, label):
+        logging.debug(_("Snapshotting VM %s with label '%s'..."), vm_ref, label)
         
         #TODO(sirp): Add quiesce and VSS locking support when Windows support
         # is added
 
         #TODO(sirp): Make safe_lookup_vdi for assert?
         vdi_refs = VMHelper.lookup_vm_vdis(session, vm_ref)
-        if vdi_refs is None or len(vdi_refs) != 1:
-            raise Exception("Unexpected number of VDIs (%s) found for VM %s"
-                            % (len(vdi_refs), vm_ref)) 
+        if vdi_refs is None:
+            raise Exception(_("No VDIs found for VM %s") % vm_ref)
+        else:
+            num_vdis = len(vdi_refs)
+            if num_vdis != 1:
+                raise Exception(_("Unexpected number of VDIs (%s) found for "
+                                   "VM %s") % (num_vdis, vm_ref)) 
+
         vdi_ref = vdi_refs[0]
         vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
         vdi_uuid = vdi_rec["uuid"]
@@ -171,20 +176,21 @@ class VMHelper():
         original_parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
 
         task = session.call_xenapi('Async.VM.snapshot', vm_ref, label)
-        template_vm_ref = session.wait_for_task(task)
-        logging.debug('Created snapshot %s from VM %s.', template_vm_ref,
+        template_vm_ref = session.wait_for_task(instance_id, task)
+        logging.debug(_('Created snapshot %s from VM %s.'), template_vm_ref,
                       vm_ref)
 
         sr_ref = vdi_rec["SR"]
         parent_uuid = wait_for_vhd_coalesce(
-            session, sr_ref, vdi_ref, original_parent_uuid) 
+            session, instance_id, sr_ref, vdi_ref, original_parent_uuid) 
 
         #TODO(sirp): we need to assert only one parent, not parents two deep
         return template_vm_ref, [vdi_uuid, parent_uuid]
 
     @classmethod
-    def upload_image(cls, session, vdi_uuids, image_name):
-        logging.debug("Asking xapi to upload %s as '%s'", vdi_uuids, image_name)
+    def upload_image(cls, session, instance_id, vdi_uuids, image_name):
+        logging.debug(_("Asking xapi to upload %s as '%s'"),
+                      vdi_uuids, image_name)
 
         params = {'vdi_uuids': vdi_uuids, 
                   'image_name': image_name,
@@ -193,11 +199,11 @@ class VMHelper():
 
         kwargs = {'params': pickle.dumps(params)}
         task = session.async_call_plugin('glance', 'put_vdis', kwargs)
-        session.wait_for_task(task)
+        session.wait_for_task(instance_id, task)
 
 
     @classmethod
-    def fetch_image(cls, session, image, user, project, use_sr):
+    def fetch_image(cls, session, instance_id, 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).
@@ -214,7 +220,7 @@ class VMHelper():
         if use_sr:
             args['add_partition'] = 'true'
         task = session.async_call_plugin('objectstore', fn, args)
-        uuid = session.wait_for_task(task)
+        uuid = session.wait_for_task(instance_id, task)
         return uuid
 
     @classmethod
@@ -317,7 +323,7 @@ def get_vhd_parent(session, vdi_rec):
         parent_ref = session.get_xenapi().VDI.get_by_uuid(parent_uuid)
         parent_rec = session.get_xenapi().VDI.get_record(parent_ref)
         #NOTE(sirp): changed log -> logging
-        logging.debug("VHD %s has parent %s", vdi_rec['uuid'], parent_ref)
+        logging.debug(_("VHD %s has parent %s"), vdi_rec['uuid'], parent_ref)
         return parent_ref, parent_rec
     else:
         return None
@@ -333,25 +339,27 @@ def get_vhd_parent_uuid(session, vdi_ref):
         return None
 
 
-def scan_sr(session, sr_ref):
-    logging.debug("Re-scanning SR %s", sr_ref)
+def scan_sr(session, instance_id, sr_ref):
+    logging.debug(_("Re-scanning SR %s"), sr_ref)
     task = session.call_xenapi('Async.SR.scan', sr_ref)
-    session.wait_for_task(task)
+    session.wait_for_task(instance_id, task)
 
 
-def wait_for_vhd_coalesce(session, sr_ref, vdi_ref, original_parent_uuid):
+def wait_for_vhd_coalesce(session, instance_id, sr_ref, vdi_ref,
+                          original_parent_uuid):
     """ TODO Explain why coalescing has to occur here """
     #NOTE(sirp): for some reason re-scan wasn't occuring automatically on 
     # XS5.6
     #TODO(sirp): we need to timeout this req after a while
 
     def _poll_vhds():
-        scan_sr(session, sr_ref)
+        scan_sr(session, instance_id, sr_ref)
         parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
         if original_parent_uuid and (parent_uuid != original_parent_uuid):
             logging.debug(
-                "Parent %s doesn't match original parent %s, "
-                "waiting for coalesce...", parent_uuid, original_parent_uuid)
+                _("Parent %s doesn't match original parent %s, "
+                  "waiting for coalesce..."),
+                parent_uuid, original_parent_uuid)
         else:
             done.send(parent_uuid)
  
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index d011f4489..787f959a5 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -67,11 +67,14 @@ class VMOps(object):
         user = AuthManager().get_user(instance.user_id)
         project = AuthManager().get_project(instance.project_id)
         vdi_uuid = VMHelper.fetch_image(
-                self._session, instance.image_id, user, project, True)
+                self._session, instance.id, instance.image_id, user, project,
+                True)
         kernel = VMHelper.fetch_image(
-                self._session, instance.kernel_id, user, project, False)
+                self._session, instance.id, instance.kernel_id, user, project,
+                False)
         ramdisk = VMHelper.fetch_image(
-                self._session, instance.ramdisk_id, user, project, False)
+                self._session, instance.id, instance.ramdisk_id, user, project,
+                False)
         vdi_ref = self._session.call_xenapi('VDI.get_by_uuid', vdi_uuid)
         vm_ref = VMHelper.create_vm(
                 self._session, instance, kernel, ramdisk)
@@ -90,24 +93,25 @@ class VMOps(object):
         #TODO(sirp): Add quiesce and VSS locking support when Windows support
         # is added
 
-        logging.debug("Starting snapshot for VM %s", instance)
+        logging.debug(_("Starting snapshot for VM %s"), instance)
         vm_ref = VMHelper.lookup(self._session, instance.name)
 
         label = "%s-snapshot" % instance.name
         try:
             template_vm_ref, template_vdi_uuids = VMHelper.create_snapshot(
-                self._session, vm_ref, label)
+                self._session, instance.id, vm_ref, label)
         except XenAPI.Failure, exc:
-            logging.error("Unable to Snapshot %s: %s", vm_ref, exc)
+            logging.error(_("Unable to Snapshot %s: %s"), vm_ref, exc)
             return
        
         try:
             # call plugin to ship snapshot off to glance
-            VMHelper.upload_image(self._session, template_vdi_uuids, name) 
+            VMHelper.upload_image(
+                self._session, instance.id, template_vdi_uuids, name) 
         finally:
-            self._destroy(template_vm_ref, shutdown=False)
+            self._destroy(instance, template_vm_ref, shutdown=False)
 
-        logging.debug("Finished snapshot and upload for VM %s", instance)
+        logging.debug(_("Finished snapshot and upload for VM %s"), instance)
 
     def reboot(self, instance):
         """Reboot VM instance"""
@@ -121,9 +125,9 @@ class VMOps(object):
     def destroy(self, instance):
         """Destroy VM instance"""
         vm = VMHelper.lookup(self._session, instance.name)
-        return self._destroy(vm, shutdown=True)
+        return self._destroy(instance, vm, shutdown=True)
 
-    def _destroy(self, vm, shutdown=True):
+    def _destroy(self, instance, vm, shutdown=True):
         """ Destroy VM instance """
         if vm is None:
             # Don't complain, just return.  This lets us clean up instances
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index e6bc80d6e..58ad6ca6a 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -124,8 +124,6 @@ class XenAPIConnection(object):
 
     def snapshot(self, instance, name):
         """ Create snapshot from a running VM instance """
-        #TODO(sirp): Add quiesce and VSS locking support when Windows support
-        # is added
         self._vmops.snapshot(instance, name)
 
     def reboot(self, instance):
-- 
cgit 


From f31395c30c835201372802e9cdf9293dcbabdb5c Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Wed, 22 Dec 2010 14:54:02 -0600
Subject: Adding more comments regarding XS snapshots

---
 Authors                        |  1 +
 nova/tests/compute_unittest.py |  8 ++++++++
 nova/virt/fake.py              | 16 ++++++++++++++++
 nova/virt/libvirt_conn.py      |  2 +-
 nova/virt/xenapi/vm_utils.py   | 20 +++++++++++++++++---
 nova/virt/xenapi/vmops.py      | 22 +++++++++++++++++++++-
 nova/virt/xenapi_conn.py       |  1 -
 7 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/Authors b/Authors
index 0b048becb..d353b58ff 100644
--- a/Authors
+++ b/Authors
@@ -24,6 +24,7 @@ Michael Gundlach <michael.gundlach@rackspace.com>
 Monty Taylor <mordred@inaugust.com>
 Paul Voccio <paul@openstack.org>
 Rick Clark <rick@openstack.org>
+Rick Harris <rconradharris@gmail.com>
 Ryan Lucio <rlucio@internap.com>
 Sandy Walsh <sandy.walsh@rackspace.com>
 Soren Hansen <soren.hansen@rackspace.com>
diff --git a/nova/tests/compute_unittest.py b/nova/tests/compute_unittest.py
index 187ca31de..025291a92 100644
--- a/nova/tests/compute_unittest.py
+++ b/nova/tests/compute_unittest.py
@@ -142,6 +142,14 @@ class ComputeTestCase(test.TestCase):
         self.compute.reboot_instance(self.context, instance_id)
         self.compute.terminate_instance(self.context, instance_id)
 
+    def test_snapshot(self):
+        """Ensure instance can be snapshotted"""
+        instance_id = self._create_instance()
+        name = "myfakesnapshot"
+        self.compute.run_instance(self.context, instance_id)
+        self.compute.snapshot_instance(self.context, instance_id, name)
+        self.compute.terminate_instance(self.context, instance_id)
+
     def test_console_output(self):
         """Make sure we can get console output from instance"""
         instance_id = self._create_instance()
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 73e273edd..c6db66aa6 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -106,6 +106,22 @@ class FakeConnection(object):
         self.instances[instance.name] = fake_instance
         fake_instance._state = power_state.RUNNING
 
+
+    def snapshot(self, instance, name):
+        """
+        Snapshots the specified instance.
+
+        The given parameter is an instance of nova.compute.service.Instance,
+        and so the instance is being specified as instance.name.
+
+        The second parameter is the name of the snapshot.
+
+        The work will be done asynchronously.  This function returns a
+        Deferred that allows the caller to detect when it is complete.
+        """
+        pass
+
+
     def reboot(self, instance):
         """
         Reboot the specified instance.
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index c8d0aa306..ad1a35643 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -237,7 +237,7 @@ class LibvirtConnection(object):
         virt_dom.detachDevice(xml)
 
     @exception.wrap_exception
-    def snapshot(self, instance):
+    def snapshot(self, instance, name):
         """ Create snapshot from a running VM instance """
         raise NotImplementedError(
             _("Instance snapshotting is not supported for libvirt"
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 5b1c36418..b7e20121c 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -154,6 +154,9 @@ class VMHelper():
 
     @classmethod
     def create_snapshot(cls, session, instance_id, vm_ref, label):
+        """ Creates Snapshot (Template) VM, Snapshot VBD, Snapshot VDI,
+        Snapshot VHD
+        """
         logging.debug(_("Snapshotting VM %s with label '%s'..."), vm_ref, label)
         
         #TODO(sirp): Add quiesce and VSS locking support when Windows support
@@ -189,6 +192,9 @@ class VMHelper():
 
     @classmethod
     def upload_image(cls, session, instance_id, vdi_uuids, image_name):
+        """ Requests that the Glance plugin bundle the specified VDIs and
+        push them into Glance using the specified human-friendly name.
+        """
         logging.debug(_("Asking xapi to upload %s as '%s'"),
                       vdi_uuids, image_name)
 
@@ -347,9 +353,17 @@ def scan_sr(session, instance_id, sr_ref):
 
 def wait_for_vhd_coalesce(session, instance_id, sr_ref, vdi_ref,
                           original_parent_uuid):
-    """ TODO Explain why coalescing has to occur here """
-    #NOTE(sirp): for some reason re-scan wasn't occuring automatically on 
-    # XS5.6
+    """ Spin until the parent VHD is coalesced into its parent VHD
+  
+    Before coalesce:
+        * original_parent_vhd
+            * parent_vhd
+                snapshot
+
+    Atter coalesce:
+        * parent_vhd
+            snapshot
+    """
     #TODO(sirp): we need to timeout this req after a while
 
     def _poll_vhds():
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 787f959a5..dd6243dd5 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -88,7 +88,27 @@ class VMOps(object):
                      vm_ref)
     
     def snapshot(self, instance, name):
-        """ Create snapshot from a running VM instance """
+        """ Create snapshot from a running VM instance
+      
+        :param instance: instance to be snapshotted
+        :param name: name/label to be given to the snapshot
+
+        Steps involved in a XenServer snapshot:
+
+        1. XAPI-Snapshot: Snapshotting the instance using XenAPI. This
+            creates: Snapshot (Template) VM, Snapshot VBD, Snapshot VDI,
+            Snapshot VHD
+    
+        2. Wait-for-coalesce: The Snapshot VDI and Instance VDI both point to
+            a 'base-copy' VDI.  The base_copy is immutable and may be chained
+            with other base_copies.  If chained, the base_copies
+            coalesce together, so, we must wait for this coalescing to occur to
+            get a stable representation of the data on disk.
+
+        3. Push-to-glance: Once coalesced, we call a plugin on the XenServer
+            that will bundle the VHDs together and then push the bundle into
+            Glance.
+        """
 
         #TODO(sirp): Add quiesce and VSS locking support when Windows support
         # is added
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 58ad6ca6a..816b92a0f 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -121,7 +121,6 @@ class XenAPIConnection(object):
         """Create VM instance"""
         self._vmops.spawn(instance)
 
-
     def snapshot(self, instance, name):
         """ Create snapshot from a running VM instance """
         self._vmops.snapshot(instance, name)
-- 
cgit 


From 749af384c0b7ca36bdd8c511f02b819a65e5dae0 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Wed, 22 Dec 2010 17:09:46 -0600
Subject: Modified InstanceDiagnostics and truncate action

---
 nova/api/openstack/__init__.py |  1 +
 nova/api/openstack/servers.py  |  4 ++++
 nova/db/sqlalchemy/models.py   | 10 ++--------
 nova/virt/xenapi_conn.py       |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index de95ee548..d8cd86116 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -176,6 +176,7 @@ class APIRouter(wsgi.Router):
             logging.debug("Including admin operations in API.")
             server_members['pause'] = 'POST'
             server_members['unpause'] = 'POST'
+            server_members["diagnostics"] = "GET"
 
         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..65e371a90 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -195,3 +195,7 @@ class Controller(wsgi.Controller):
             logging.error("Compute.api::unpause %s", readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
+
+    def diagnostics(self, req, id):
+        """Permit Admins to retrieve server diagnostics."""
+        return {}
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index eac6a304e..600943005 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -22,7 +22,7 @@ SQLAlchemy models for nova data.
 import datetime
 
 from sqlalchemy.orm import relationship, backref, object_mapper
-from sqlalchemy import Column, Integer, Float, String, schema
+from sqlalchemy import Column, Integer, String, schema
 from sqlalchemy import ForeignKey, DateTime, Boolean, Text
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.declarative import declarative_base
@@ -232,13 +232,7 @@ class InstanceDiagnostics(BASE, NovaBase):
     id = Column(Integer, primary_key=True)
     instance_id = Column(Integer, ForeignKey('instances.id'))
 
-    memory_available = Column(Float)
-    memory_free = Column(Float)
-    cpu_load = Column(Float)
-    disk_read = Column(Float)
-    disk_write = Column(Float)
-    net_tx = Column(Float)
-    net_rx = Column(Float)
+    diagnostics = Column(Text)
 
 
 class InstanceActions(BASE, NovaBase):
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 146e2f153..7870a21ac 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -204,7 +204,7 @@ class XenAPISession(object):
             status = self._session.xenapi.task.get_status(task)
             action = dict(
                 instance_id=int(instance_id),
-                action=name,
+                action=name[0:255],  # Ensure action is never > 255
                 error=None)
             if status == "pending":
                 return
-- 
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(-)

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(+)

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 358961f3cf259487a2ff9bbb225defdc7cd9e7a7 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 23 Dec 2010 11:22:51 -0600
Subject: Fixed trunk and PEP8 cleanup

---
 nova/virt/libvirt_conn.py | 16 +++++++++-------
 nova/virt/xenapi_conn.py  |  4 ++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 651b2af93..809a484dc 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -512,9 +512,11 @@ 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 +802,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 +816,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_conn.py b/nova/virt/xenapi_conn.py
index 7870a21ac..af16fcdf3 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -110,6 +110,10 @@ class XenAPIConnection(object):
         self._vmops = VMOps(session)
         self._volumeops = VolumeOps(session)
 
+    def init_host(self):
+        """Initialize anything that is necessary for the driver to function"""
+        return
+
     def list_instances(self):
         """List VM instances"""
         return self._vmops.list_instances()
-- 
cgit 


From 55a80811a5982cb9af5b80e7ac3e925334a1b22d Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 23 Dec 2010 12:23:28 -0600
Subject: Working diagnostics API; removed diagnostics DB model - not needed

---
 nova/api/openstack/servers.py |  3 ++-
 nova/compute/api.py           |  9 +++++++++
 nova/compute/manager.py       | 11 +++++++++++
 nova/db/sqlalchemy/models.py  | 11 +----------
 nova/virt/xenapi/vmops.py     |  6 +++---
 nova/virt/xenapi_conn.py      |  4 ++--
 6 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 65e371a90..f758b252a 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -198,4 +198,5 @@ class Controller(wsgi.Controller):
 
     def diagnostics(self, req, id):
         """Permit Admins to retrieve server diagnostics."""
-        return {}
+        ctxt = req.environ["nova.context"]
+        return self.compute_api.diagnostics(ctxt, id)
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 4953fe559..1c24c6634 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -283,6 +283,15 @@ class ComputeAPI(base.Base):
                  {"method": "unpause_instance",
                   "args": {"instance_id": instance['id']}})
 
+    def diagnostics(self, context, instance_id):
+        """Retrieve diagnostics for the given instance."""
+        instance = self.db.instance_get_by_internal_id(context, instance_id)
+        host = instance["host"]
+        return rpc.call(context,
+            self.db.queue_get_for(context, FLAGS.compute_topic, host),
+            {"method": "get_diagnostics",
+             "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 ff8202cca..3a5677bc5 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -296,6 +296,17 @@ class ComputeManager(manager.Manager):
                                                        instance_id,
                                                        result))
 
+    @exception.wrap_exception
+    def get_diagnostics(self, context, instance_id):
+        """Retrieve diagnostics for an instance on this server."""
+        context = context.elevated()
+        instance_ref = self.db.instance_get(context, instance_id)
+
+        if instance_ref["state"] == power_state.RUNNING:
+            logging.debug(_("instance %s: retrieving diagnostics"),
+                instance_ref["internal_id"])
+            return self.driver.get_diagnostics(instance_ref)
+
     @exception.wrap_exception
     def get_console_output(self, context, instance_id):
         """Send the console output for an instance."""
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 163d2470b..d93dd64c5 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -236,15 +236,6 @@ class Instance(BASE, NovaBase):
     #                     'shutdown', 'shutoff', 'crashed'])
 
 
-class InstanceDiagnostics(BASE, NovaBase):
-    """Represents a guest VM's diagnostics"""
-    __tablename__ = "instance_diagnostics"
-    id = Column(Integer, primary_key=True)
-    instance_id = Column(Integer, ForeignKey('instances.id'))
-
-    diagnostics = Column(Text)
-
-
 class InstanceActions(BASE, NovaBase):
     """Represents a guest VM's actions and results"""
     __tablename__ = "instance_actions"
@@ -555,7 +546,7 @@ def register_models():
     it will never need to be called explicitly elsewhere.
     """
     from sqlalchemy import create_engine
-    models = (Service, Instance, InstanceDiagnostics, InstanceActions,
+    models = (Service, Instance, InstanceActions,
               Volume, ExportDevice, IscsiTarget, FixedIp, FloatingIp,
               Network, SecurityGroup, SecurityGroupIngressRule,
               SecurityGroupInstanceAssociation, AuthToken, User,
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 4d897af35..50e20bff4 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -156,11 +156,11 @@ class VMOps(object):
         rec = self._session.get_xenapi().VM.get_record(vm)
         return VMHelper.compile_info(rec)
 
-    def get_diagnostics(self, instance_id):
+    def get_diagnostics(self, instance):
         """Return data about VM diagnostics"""
-        vm = VMHelper.lookup(self._session, instance_id)
+        vm = VMHelper.lookup(self._session, instance.name)
         if vm is None:
-            raise Exception("instance not present %s" % instance_id)
+            raise Exception("instance not present %s" % instance.name)
         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 af16fcdf3..5c746a08f 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -142,9 +142,9 @@ class XenAPIConnection(object):
         """Return data about VM instance"""
         return self._vmops.get_info(instance_id)
 
-    def get_diagnostics(self, instance_id):
+    def get_diagnostics(self, instance):
         """Return data about VM diagnostics"""
-        return self._vmops.get_diagnostics(instance_id)
+        return self._vmops.get_diagnostics(instance)
 
     def get_console_output(self, instance):
         """Return snapshot of console"""
-- 
cgit 


From 13e8c8d83b8fc44cff343ea751a98f66857d1865 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 23 Dec 2010 13:14:56 -0600
Subject: Resolved merge conflict

---
 nova/virt/xenapi_conn.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 4ea8a6737..2bf29b295 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -225,13 +225,8 @@ class XenAPISession(object):
             name = self._session.xenapi.task.get_name_label(task)
             status = self._session.xenapi.task.get_status(task)
             action = dict(
-<<<<<<< TREE
-                instance_id=int(instance_id),
+                instance_id=int(id),
                 action=name[0:255],  # Ensure action is never > 255
-=======
-                id=int(id),
-                action=name,
->>>>>>> MERGE-SOURCE
                 error=None)
             if status == "pending":
                 return
-- 
cgit 


From bd46ab4a721da856da5743c9f55ab5e50ec9b60f Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 23 Dec 2010 13:36:01 -0600
Subject: PEP8 fix

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

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 5039913ba..7571fe2e4 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -186,7 +186,8 @@ class VMOps(object):
         """Return data about VM diagnostics"""
         vm = VMHelper.lookup(self._session, instance.name)
         if vm is None:
-            raise exception.NotFound(_("Instance not found %s") % instance.name)
+            raise exception.NotFound(_("Instance not found %s") %
+                instance.name)
         rec = self._session.get_xenapi().VM.get_record(vm)
         return VMHelper.compile_diagnostics(self._session, rec)
 
-- 
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(-)

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

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

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

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

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

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

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

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(+)

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

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

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

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

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

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 002bbfa7a648a1117e14713eab3ee3ee4b2b6d8e Mon Sep 17 00:00:00 2001
From: Cory Wright <cory.wright@rackspace.com>
Date: Mon, 27 Dec 2010 12:06:36 -0500
Subject: Moving README to doc/networking.rst per recommendation from Jay Pipes

---
 plugins/xenserver/doc/networking.rst | 144 +++++++++++++++++++++++++++++++++++
 plugins/xenserver/networking/README  | 144 -----------------------------------
 2 files changed, 144 insertions(+), 144 deletions(-)
 create mode 100644 plugins/xenserver/doc/networking.rst
 delete mode 100644 plugins/xenserver/networking/README

diff --git a/plugins/xenserver/doc/networking.rst b/plugins/xenserver/doc/networking.rst
new file mode 100644
index 000000000..67f2d9af3
--- /dev/null
+++ b/plugins/xenserver/doc/networking.rst
@@ -0,0 +1,144 @@
+Multi Tenancy Networking Protections in XenServer
+=================================================
+
+The purpose of the vif_rules script is to allow multi-tenancy on a XenServer
+host.  In a multi-tenant cloud environment a host machine needs to be able to
+enforce network isolation amongst guest instances, at both layer two and layer
+three. The rules prevent guests from taking and using unauthorized IP addresses,
+sniffing other guests traffic, and prevents ARP poisoning attacks.  This current
+revision only supports IPv4, but will support IPv6 in the future.
+
+Kernel Requirements
+===================
+
+- physdev module
+- arptables support
+- ebtables support
+- iptables support
+
+If the kernel doesn't support these, you will need to obtain the Source RPMS for
+the proper version of XenServer to recompile the dom0 kernel.
+
+XenServer Requirements (32-bit dom0)
+====================================
+
+- arptables 32-bit rpm 
+- ebtables 32-bit rpm
+- python-simplejson
+
+XenServer Environment Specific Notes 
+====================================
+
+- XenServer 5.5 U1 based on the 2.6.18 kernel didn't include physdev module
+  support.  Support for this had to be recompiled into the kernel.
+- XenServer 5.6 based on the 2.6.27 kernel didn't include physdev, ebtables, or
+  arptables.
+- XenServer 5.6 FP1 didn't include physdev, ebtables, or arptables but they do
+  have a Cloud Supplemental pack available to partners which swaps out the
+  kernels for kernels that support the networking rules.  
+
+How it works - tl;dr
+====================
+
+iptables, ebtables, and arptables drop rules are applied to all forward chains
+on the host.  These are applied at boot time with an init script.  They ensure
+all forwarded packets are dropped by default.  Allow rules are then applied to
+the instances to ensure they have permission to talk on the internet.
+
+How it works - Long
+===================
+
+Any time an underprivileged domain or domU is started or stopped, it gets a
+unique domain id (dom_id).  This dom_id is utilized in a number of places, one
+of which is it's assigned to the virtual interface (vif).  The vifs are attached
+to the bridge that is attached to the physical network.  For instance, if you
+had a public bridge attached to eth0 and your domain id was 5, your vif would be
+vif5.0.  
+
+The networking rules are applied to the VIF directly so they apply at the lowest
+level of the networking stack.  Because the VIF changes along with the domain id
+on any start, stop, or reboot of the instance, the rules need to be removed and
+re-added any time that occurs.   
+
+Because the dom_id can change often, the vif_rules script is hooked into the
+/etc/xensource/scripts/vif script that gets called anytime an instance is
+started, or stopped, which includes pauses and resumes.
+
+Examples of the rules ran for the host on boot:
+
+iptables -P FORWARD DROP 
+iptables -A FORWARD -m physdev --physdev-in eth0 -j ACCEPT
+ebtables -P FORWARD DROP
+ebtables -A FORWARD -o eth0 -j ACCEPT
+arptables -P FORWARD DROP 
+arptables -A FORWARD --opcode Request --in-interface eth0 -j ACCEPT
+arptables -A FORWARD --opcode Reply --in-interface eth0 -j ACCEPT
+
+Examples of the rules that are ran per instance state change:
+
+iptables -A FORWARD -m physdev --physdev-in vif1.0 -s 10.1.135.22/32 -j ACCEPT
+arptables -A FORWARD --opcode Request --in-interface "vif1.0" \
+          --source-ip 10.1.135.22 -j ACCEPT
+arptables -A FORWARD --opcode Reply --in-interface "vif1.0" \
+          --source-ip 10.1.135.22 --source-mac 9e:6e:cc:19:7f:fe -j ACCEPT
+ebtables -A FORWARD -p 0806 -o vif1.0 --arp-ip-dst 10.1.135.22 -j ACCEPT
+ebtables -A FORWARD -p 0800 -o vif1.0 --ip-dst 10.1.135.22 -j ACCEPT 
+ebtables -I FORWARD 1 -s ! 9e:6e:cc:19:7f:fe -i vif1.0 -j DROP
+
+Typically when you see a vif, it'll look like vif<domain id>.<network bridge>.
+vif2.1 for example would be domain 2 on the second interface.
+
+The vif_rules.py script needs to pull information about the IPs and MAC
+addresses assigned to the instance.  The current implementation assumes that
+information is put into the VM Record into the xenstore-data key in a JSON
+string.  The vif_rules.py script reads out of the JSON string to determine the
+IPs, and MAC addresses to protect.  
+
+An example format is given below:
+
+# xe vm-param-get uuid=<uuid> param-name=xenstore-data 
+xenstore-data (MRW):
+vm-data/networking/4040fa7292e4:
+{"label": "public",
+ "ips": [{"netmask":"255.255.255.0", 
+          "enabled":"1", 
+          "ip":"173.200.100.10"}], 
+ "mac":"40:40:fa:72:92:e4",
+ "gateway":"173.200.100.1", 
+ "vm_id":"123456",
+ "dns":["72.3.128.240","72.3.128.241"]};
+
+vm-data/networking/40402321c9b8:
+{"label":"private",
+ "ips":[{"netmask":"255.255.224.0",
+         "enabled":"1", 
+         "ip":"10.177.10.10"}],
+ "routes":[{"route":"10.176.0.0",
+            "netmask":"255.248.0.0",
+            "gateway":"10.177.10.1"},
+           {"route":"10.191.192.0",
+            "netmask":"255.255.192.0",
+            "gateway":"10.177.10.1"}],
+ "mac":"40:40:23:21:c9:b8"}
+
+The key is used for two purposes.  One, the vif_rules.py script will read from
+it to apply the rules needed after parsing the JSON.  The second is that because
+it's put into the xenstore-data field, the xenstore will be populated with this
+data on boot.  This allows a guest agent the ability to read out data about the
+instance and apply configurations as needed.  
+
+Installation
+============
+
+- Copy host-rules into /etc/init.d/ and make sure to chmod +x host-rules.
+- Run 'chkconfig host-rules on' to add the init script to start up.
+- Copy vif_rules.py into /etc/xensource/scripts
+- Patch /etc/xensource/scripts/vif using the supplied patch file.  It may vary
+  for different versions of XenServer but it should be pretty self explanatory.
+  It calls the vif_rules.py script on domain creation and tear down.
+- Run '/etc/init.d/host-rules start' to start up the host based rules.
+- The instance rules will then fire on creation of the VM as long as the correct
+  JSON is in place.
+- You can check to see if the rules are in place with: iptables --list,
+  arptables --list, or ebtables --list
+
diff --git a/plugins/xenserver/networking/README b/plugins/xenserver/networking/README
deleted file mode 100644
index 67f2d9af3..000000000
--- a/plugins/xenserver/networking/README
+++ /dev/null
@@ -1,144 +0,0 @@
-Multi Tenancy Networking Protections in XenServer
-=================================================
-
-The purpose of the vif_rules script is to allow multi-tenancy on a XenServer
-host.  In a multi-tenant cloud environment a host machine needs to be able to
-enforce network isolation amongst guest instances, at both layer two and layer
-three. The rules prevent guests from taking and using unauthorized IP addresses,
-sniffing other guests traffic, and prevents ARP poisoning attacks.  This current
-revision only supports IPv4, but will support IPv6 in the future.
-
-Kernel Requirements
-===================
-
-- physdev module
-- arptables support
-- ebtables support
-- iptables support
-
-If the kernel doesn't support these, you will need to obtain the Source RPMS for
-the proper version of XenServer to recompile the dom0 kernel.
-
-XenServer Requirements (32-bit dom0)
-====================================
-
-- arptables 32-bit rpm 
-- ebtables 32-bit rpm
-- python-simplejson
-
-XenServer Environment Specific Notes 
-====================================
-
-- XenServer 5.5 U1 based on the 2.6.18 kernel didn't include physdev module
-  support.  Support for this had to be recompiled into the kernel.
-- XenServer 5.6 based on the 2.6.27 kernel didn't include physdev, ebtables, or
-  arptables.
-- XenServer 5.6 FP1 didn't include physdev, ebtables, or arptables but they do
-  have a Cloud Supplemental pack available to partners which swaps out the
-  kernels for kernels that support the networking rules.  
-
-How it works - tl;dr
-====================
-
-iptables, ebtables, and arptables drop rules are applied to all forward chains
-on the host.  These are applied at boot time with an init script.  They ensure
-all forwarded packets are dropped by default.  Allow rules are then applied to
-the instances to ensure they have permission to talk on the internet.
-
-How it works - Long
-===================
-
-Any time an underprivileged domain or domU is started or stopped, it gets a
-unique domain id (dom_id).  This dom_id is utilized in a number of places, one
-of which is it's assigned to the virtual interface (vif).  The vifs are attached
-to the bridge that is attached to the physical network.  For instance, if you
-had a public bridge attached to eth0 and your domain id was 5, your vif would be
-vif5.0.  
-
-The networking rules are applied to the VIF directly so they apply at the lowest
-level of the networking stack.  Because the VIF changes along with the domain id
-on any start, stop, or reboot of the instance, the rules need to be removed and
-re-added any time that occurs.   
-
-Because the dom_id can change often, the vif_rules script is hooked into the
-/etc/xensource/scripts/vif script that gets called anytime an instance is
-started, or stopped, which includes pauses and resumes.
-
-Examples of the rules ran for the host on boot:
-
-iptables -P FORWARD DROP 
-iptables -A FORWARD -m physdev --physdev-in eth0 -j ACCEPT
-ebtables -P FORWARD DROP
-ebtables -A FORWARD -o eth0 -j ACCEPT
-arptables -P FORWARD DROP 
-arptables -A FORWARD --opcode Request --in-interface eth0 -j ACCEPT
-arptables -A FORWARD --opcode Reply --in-interface eth0 -j ACCEPT
-
-Examples of the rules that are ran per instance state change:
-
-iptables -A FORWARD -m physdev --physdev-in vif1.0 -s 10.1.135.22/32 -j ACCEPT
-arptables -A FORWARD --opcode Request --in-interface "vif1.0" \
-          --source-ip 10.1.135.22 -j ACCEPT
-arptables -A FORWARD --opcode Reply --in-interface "vif1.0" \
-          --source-ip 10.1.135.22 --source-mac 9e:6e:cc:19:7f:fe -j ACCEPT
-ebtables -A FORWARD -p 0806 -o vif1.0 --arp-ip-dst 10.1.135.22 -j ACCEPT
-ebtables -A FORWARD -p 0800 -o vif1.0 --ip-dst 10.1.135.22 -j ACCEPT 
-ebtables -I FORWARD 1 -s ! 9e:6e:cc:19:7f:fe -i vif1.0 -j DROP
-
-Typically when you see a vif, it'll look like vif<domain id>.<network bridge>.
-vif2.1 for example would be domain 2 on the second interface.
-
-The vif_rules.py script needs to pull information about the IPs and MAC
-addresses assigned to the instance.  The current implementation assumes that
-information is put into the VM Record into the xenstore-data key in a JSON
-string.  The vif_rules.py script reads out of the JSON string to determine the
-IPs, and MAC addresses to protect.  
-
-An example format is given below:
-
-# xe vm-param-get uuid=<uuid> param-name=xenstore-data 
-xenstore-data (MRW):
-vm-data/networking/4040fa7292e4:
-{"label": "public",
- "ips": [{"netmask":"255.255.255.0", 
-          "enabled":"1", 
-          "ip":"173.200.100.10"}], 
- "mac":"40:40:fa:72:92:e4",
- "gateway":"173.200.100.1", 
- "vm_id":"123456",
- "dns":["72.3.128.240","72.3.128.241"]};
-
-vm-data/networking/40402321c9b8:
-{"label":"private",
- "ips":[{"netmask":"255.255.224.0",
-         "enabled":"1", 
-         "ip":"10.177.10.10"}],
- "routes":[{"route":"10.176.0.0",
-            "netmask":"255.248.0.0",
-            "gateway":"10.177.10.1"},
-           {"route":"10.191.192.0",
-            "netmask":"255.255.192.0",
-            "gateway":"10.177.10.1"}],
- "mac":"40:40:23:21:c9:b8"}
-
-The key is used for two purposes.  One, the vif_rules.py script will read from
-it to apply the rules needed after parsing the JSON.  The second is that because
-it's put into the xenstore-data field, the xenstore will be populated with this
-data on boot.  This allows a guest agent the ability to read out data about the
-instance and apply configurations as needed.  
-
-Installation
-============
-
-- Copy host-rules into /etc/init.d/ and make sure to chmod +x host-rules.
-- Run 'chkconfig host-rules on' to add the init script to start up.
-- Copy vif_rules.py into /etc/xensource/scripts
-- Patch /etc/xensource/scripts/vif using the supplied patch file.  It may vary
-  for different versions of XenServer but it should be pretty self explanatory.
-  It calls the vif_rules.py script on domain creation and tear down.
-- Run '/etc/init.d/host-rules start' to start up the host based rules.
-- The instance rules will then fire on creation of the VM as long as the correct
-  JSON is in place.
-- You can check to see if the rules are in place with: iptables --list,
-  arptables --list, or ebtables --list
-
-- 
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(-)

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

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

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

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

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

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 748aa8089eabfd15425199c2318079e9bf84578f Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Mon, 27 Dec 2010 14:23:53 -0600
Subject: Fixing bad merge

---
 nova/virt/xenapi/vmops.py | 48 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index a0497b3e2..23531348e 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -96,7 +96,30 @@ class VMOps(object):
         self._session.call_xenapi('VM.start', vm_ref, False, False)
         logging.info(_('Spawning VM %s created %s.'), instance.name,
                      vm_ref)
-    
+
+        # NOTE(armando): Do we really need to do this in virt?
+        timer = utils.LoopingCall(f=None)
+
+        def _wait_for_boot():
+            try:
+                state = self.get_info(instance['name'])['state']
+                db.instance_set_state(context.get_admin_context(),
+                                      instance['id'], state)
+                if state == power_state.RUNNING:
+                    logging.debug(_('Instance %s: booted'), instance['name'])
+                    timer.stop()
+            except Exception, exc:
+                logging.warn(exc)
+                logging.exception(_('instance %s: failed to boot'),
+                                  instance['name'])
+                db.instance_set_state(context.get_admin_context(),
+                                      instance['id'],
+                                      power_state.SHUTDOWN)
+                timer.stop()
+
+        timer.f = _wait_for_boot
+        return timer.start(interval=0.5, now=True)
+
     def snapshot(self, instance, name):
         """ Create snapshot from a running VM instance
       
@@ -143,29 +166,6 @@ class VMOps(object):
 
         logging.debug(_("Finished snapshot and upload for VM %s"), instance)
 
-        # NOTE(armando): Do we really need to do this in virt?
-        timer = utils.LoopingCall(f=None)
-
-        def _wait_for_boot():
-            try:
-                state = self.get_info(instance['name'])['state']
-                db.instance_set_state(context.get_admin_context(),
-                                      instance['id'], state)
-                if state == power_state.RUNNING:
-                    logging.debug(_('Instance %s: booted'), instance['name'])
-                    timer.stop()
-            except Exception, exc:
-                logging.warn(exc)
-                logging.exception(_('instance %s: failed to boot'),
-                                  instance['name'])
-                db.instance_set_state(context.get_admin_context(),
-                                      instance['id'],
-                                      power_state.SHUTDOWN)
-                timer.stop()
-
-        timer.f = _wait_for_boot
-        return timer.start(interval=0.5, now=True)
-
     def reboot(self, instance):
         """Reboot VM instance"""
         instance_name = instance.name
-- 
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(-)

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 8d522838ace090a7325d930df08c37f1e9d9803e Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Mon, 27 Dec 2010 15:42:30 -0600
Subject: Fixing snapshots, pep8 fixes

---
 nova/api/openstack/images.py      |  2 +-
 nova/tests/api/openstack/fakes.py |  1 +
 nova/virt/fake.py                 |  2 --
 nova/virt/xenapi/vm_utils.py      | 58 +++++++++++++++++++++------------------
 nova/virt/xenapi/vmops.py         | 16 +++++------
 nova/virt/xenapi_conn.py          |  2 +-
 6 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 8a6772fa5..3a95e3961 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -71,7 +71,7 @@ class Controller(wsgi.Controller):
         ctxt = req.environ['nova.context']
         env = self._deserialize(req.body, req)
         data = {'instance_id': env["image"]["serverId"],
-                'name': env["image"]["name"] }
+                'name': env["image"]["name"]}
         return dict(image=self._service.create(ctxt, data))
 
     def update(self, req, id):
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index e1ed6a6a8..961431154 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -115,6 +115,7 @@ def stub_out_compute_api_snapshot(stubs):
         return 123
     stubs.Set(nova.compute.api.ComputeAPI, 'snapshot', snapshot)
 
+
 def stub_out_glance(stubs, initial_fixtures=[]):
 
     class FakeParallaxClient:
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 6d3cef268..0f456aef6 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -112,7 +112,6 @@ class FakeConnection(object):
         self.instances[instance.name] = fake_instance
         fake_instance._state = power_state.RUNNING
 
-
     def snapshot(self, instance, name):
         """
         Snapshots the specified instance.
@@ -127,7 +126,6 @@ class FakeConnection(object):
         """
         pass
 
-
     def reboot(self, instance):
         """
         Reboot the specified instance.
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 2b76afc62..f4195cb1b 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -27,6 +27,7 @@ from xml.dom import minidom
 from eventlet import event
 from nova import exception
 from nova import flags
+from nova import utils
 from nova.auth.manager import AuthManager
 from nova.compute import instance_types
 from nova.compute import power_state
@@ -205,44 +206,34 @@ class VMHelper(HelperBase):
                       vm_ref, network_ref)
         return vif_ref
 
- 
     @classmethod
     def create_snapshot(cls, session, instance_id, vm_ref, label):
         """ Creates Snapshot (Template) VM, Snapshot VBD, Snapshot VDI,
         Snapshot VHD
         """
-        logging.debug(_("Snapshotting VM %s with label '%s'..."), vm_ref, label)
-        
+        logging.debug(_("Snapshotting VM %s with label '%s'..."),
+                      vm_ref, label)
         #TODO(sirp): Add quiesce and VSS locking support when Windows support
         # is added
-
-        #TODO(sirp): Make safe_lookup_vdi for assert?
-        vdi_refs = VMHelper.lookup_vm_vdis(session, vm_ref)
-        if vdi_refs is None:
-            raise Exception(_("No VDIs found for VM %s") % vm_ref)
-        else:
-            num_vdis = len(vdi_refs)
-            if num_vdis != 1:
-                raise Exception(_("Unexpected number of VDIs (%s) found for "
-                                   "VM %s") % (num_vdis, vm_ref)) 
-
-        vdi_ref = vdi_refs[0]
-        vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
-        vdi_uuid = vdi_rec["uuid"]
-
-        original_parent_uuid = get_vhd_parent_uuid(session, vdi_ref)
+        vm_vdi_ref, vm_vdi_rec = get_vdi_for_vm_safely(session, vm_ref)
+        vm_vdi_uuid = vm_vdi_rec["uuid"]
+        original_parent_uuid = get_vhd_parent_uuid(session, vm_vdi_ref)
 
         task = session.call_xenapi('Async.VM.snapshot', vm_ref, label)
         template_vm_ref = session.wait_for_task(instance_id, task)
+        template_vdi_ref, template_vdi_rec = get_vdi_for_vm_safely(
+            session, template_vm_ref)
+
+        template_vdi_uuid = template_vdi_rec["uuid"]
         logging.debug(_('Created snapshot %s from VM %s.'), template_vm_ref,
                       vm_ref)
 
-        sr_ref = vdi_rec["SR"]
+        sr_ref = vm_vdi_rec["SR"]
         parent_uuid = wait_for_vhd_coalesce(
-            session, instance_id, sr_ref, vdi_ref, original_parent_uuid) 
+            session, instance_id, sr_ref, vm_vdi_ref, original_parent_uuid)
 
         #TODO(sirp): we need to assert only one parent, not parents two deep
-        return template_vm_ref, [vdi_uuid, parent_uuid]
+        return template_vm_ref, [template_vdi_uuid, parent_uuid]
 
     @classmethod
     def upload_image(cls, session, instance_id, vdi_uuids, image_name):
@@ -252,7 +243,7 @@ class VMHelper(HelperBase):
         logging.debug(_("Asking xapi to upload %s as '%s'"),
                       vdi_uuids, image_name)
 
-        params = {'vdi_uuids': vdi_uuids, 
+        params = {'vdi_uuids': vdi_uuids,
                   'image_name': image_name,
                   'glance_host': FLAGS.glance_host,
                   'glance_port': FLAGS.glance_port}
@@ -261,7 +252,6 @@ class VMHelper(HelperBase):
         task = session.async_call_plugin('glance', 'put_vdis', kwargs)
         session.wait_for_task(instance_id, task)
 
-
     @classmethod
     def fetch_image(cls, session, instance_id, image, user, project, type):
         """
@@ -418,7 +408,7 @@ def scan_sr(session, instance_id, sr_ref):
 def wait_for_vhd_coalesce(session, instance_id, sr_ref, vdi_ref,
                           original_parent_uuid):
     """ Spin until the parent VHD is coalesced into its parent VHD
-  
+
     Before coalesce:
         * original_parent_vhd
             * parent_vhd
@@ -440,7 +430,7 @@ def wait_for_vhd_coalesce(session, instance_id, sr_ref, vdi_ref,
                 parent_uuid, original_parent_uuid)
         else:
             done.send(parent_uuid)
- 
+
     done = event.Event()
     loop = utils.LoopingCall(_poll_vhds)
     loop.start(FLAGS.xenapi_vhd_coalesce_poll_interval, now=True)
@@ -448,3 +438,19 @@ def wait_for_vhd_coalesce(session, instance_id, sr_ref, vdi_ref,
     loop.stop()
     return parent_uuid
 
+
+def get_vdi_for_vm_safely(session, vm_ref):
+    """Returns (vdi_ref, vdi_uuid)"""
+    #TODO(sirp): Make safe_lookup_vdi for assert?
+    vdi_refs = VMHelper.lookup_vm_vdis(session, vm_ref)
+    if vdi_refs is None:
+        raise Exception(_("No VDIs found for VM %s") % vm_ref)
+    else:
+        num_vdis = len(vdi_refs)
+        if num_vdis != 1:
+            raise Exception(_("Unexpected number of VDIs (%s) found for "
+                               "VM %s") % (num_vdis, vm_ref))
+
+    vdi_ref = vdi_refs[0]
+    vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
+    return vdi_ref, vdi_rec
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 23531348e..2cc36ad54 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -122,7 +122,7 @@ class VMOps(object):
 
     def snapshot(self, instance, name):
         """ Create snapshot from a running VM instance
-      
+
         :param instance: instance to be snapshotted
         :param name: name/label to be given to the snapshot
 
@@ -131,7 +131,7 @@ class VMOps(object):
         1. XAPI-Snapshot: Snapshotting the instance using XenAPI. This
             creates: Snapshot (Template) VM, Snapshot VBD, Snapshot VDI,
             Snapshot VHD
-    
+
         2. Wait-for-coalesce: The Snapshot VDI and Instance VDI both point to
             a 'base-copy' VDI.  The base_copy is immutable and may be chained
             with other base_copies.  If chained, the base_copies
@@ -153,14 +153,14 @@ class VMOps(object):
         try:
             template_vm_ref, template_vdi_uuids = VMHelper.create_snapshot(
                 self._session, instance.id, vm_ref, label)
-        except XenAPI.Failure, exc:
+        except self.XenAPI.Failure, exc:
             logging.error(_("Unable to Snapshot %s: %s"), vm_ref, exc)
             return
-       
+
         try:
             # call plugin to ship snapshot off to glance
             VMHelper.upload_image(
-                self._session, instance.id, template_vdi_uuids, name) 
+                self._session, instance.id, template_vdi_uuids, name)
         finally:
             self._destroy(instance, template_vm_ref, shutdown=False)
 
@@ -193,7 +193,7 @@ class VMOps(object):
             try:
                 task = self._session.call_xenapi('Async.VM.hard_shutdown', vm)
                 self._session.wait_for_task(instance.id, task)
-            except XenAPI.Failure, exc:
+            except self.XenAPI.Failure, exc:
                 logging.warn(exc)
 
         # Disk clean-up
@@ -202,13 +202,13 @@ class VMOps(object):
                 try:
                     task = self._session.call_xenapi('Async.VDI.destroy', vdi)
                     self._session.wait_for_task(instance.id, task)
-                except XenAPI.Failure, exc:
+                except self.XenAPI.Failure, exc:
                     logging.warn(exc)
         # VM Destroy
         try:
             task = self._session.call_xenapi('Async.VM.destroy', vm)
             self._session.wait_for_task(instance.id, task)
-        except XenAPI.Failure, exc:
+        except self.XenAPI.Failure, exc:
             logging.warn(exc)
 
     def _wait_with_callback(self, instance_id, task, callback):
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 1a3dc9f16..abd2a02ee 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -233,7 +233,7 @@ class XenAPISession(object):
             name = self._session.xenapi.task.get_name_label(task)
             status = self._session.xenapi.task.get_status(task)
             action = dict(
-                id=int(id),
+                instance_id=int(id),
                 action=name,
                 error=None)
             if status == "pending":
-- 
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(-)

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

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

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 821fc6b5bce393e584d2c0f93243beb43ff547a5 Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor@citrix.com>
Date: Tue, 28 Dec 2010 01:09:42 +0000
Subject: Bug #694890: run_tests.sh sometimes doesn't pass arguments to
 nosetest

Change the argument parsing in run_tests.sh so that we explicitly gather
the arguments that aren't meant for run_tests.sh, and pass them on to
nosetests.
---
 run_tests.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/run_tests.sh b/run_tests.sh
index 67214996d..ffb0b6295 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -21,6 +21,7 @@ function process_option {
     -V|--virtual-env) let always_venv=1; let never_venv=0;;
     -N|--no-virtual-env) let always_venv=0; let never_venv=1;;
     -f|--force) let force=1;;
+    *) noseargs="$noseargs $1"
   esac
 }
 
@@ -29,15 +30,18 @@ with_venv=tools/with_venv.sh
 always_venv=0
 never_venv=0
 force=0
+noseargs=
 
 for arg in "$@"; do
   process_option $arg
 done
 
+NOSETESTS="nosetests -v $noseargs"
+
 if [ $never_venv -eq 1 ]; then
   # Just run the test suites in current environment
   rm -f nova.sqlite
-  nosetests -v
+  $NOSETESTS
   exit
 fi
 
@@ -49,7 +53,7 @@ fi
 
 if [ -e ${venv} ]; then
   ${with_venv} rm -f nova.sqlite
-  ${with_venv} nosetests -v $@
+  ${with_venv} $NOSETESTS
 else  
   if [ $always_venv -eq 1 ]; then
     # Automatically install the virtualenv
@@ -62,10 +66,10 @@ else
       python tools/install_venv.py
     else
       rm -f nova.sqlite
-      nosetests -v
+      $NOSETESTS
       exit
     fi
   fi
   ${with_venv} rm -f nova.sqlite
-  ${with_venv} nosetests -v $@
+  ${with_venv} $NOSETESTS
 fi
-- 
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(-)

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

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 7e469690f04b06f2371650fdf419ba028388c5e9 Mon Sep 17 00:00:00 2001
From: termie <code@term.ie>
Date: Tue, 28 Dec 2010 01:40:24 -0800
Subject: Output of run_tests.sh to be closer to trial

---
 run_tests.py | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 run_tests.sh | 10 +++++----
 2 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 run_tests.py

diff --git a/run_tests.py b/run_tests.py
new file mode 100644
index 000000000..56a8bffe7
--- /dev/null
+++ b/run_tests.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+import os
+import unittest
+import sys
+
+from nose import config
+from nose import result
+from nose import core
+
+
+class NovaTestResult(result.TextTestResult):
+    def __init__(self, *args, **kw):
+        result.TextTestResult.__init__(self, *args, **kw)
+        self._last_case = None
+
+    def getDescription(self, test):
+        return str(test)
+
+    def startTest(self, test):
+        unittest.TestResult.startTest(self, test)
+        current_case = test.test.__class__.__name__
+
+        if self.showAll:
+            if current_case != self._last_case:
+                self.stream.writeln(current_case)
+                self._last_case = current_case
+
+            self.stream.write(
+                '    %s' % str(test.test._testMethodName).ljust(60))
+            self.stream.flush()
+
+
+class NovaTestRunner(core.TextTestRunner):
+    def _makeResult(self):
+        return NovaTestResult(self.stream,
+                              self.descriptions,
+                              self.verbosity,
+                              self.config)
+
+
+if __name__ == '__main__':
+    c = config.Config(stream=sys.stdout,
+                      env=os.environ,
+                      verbosity=3)
+
+    runner = NovaTestRunner(stream=c.stream,
+                            verbosity=c.verbosity,
+                            config=c)
+    sys.exit(core.run(config=c, testRunner=runner))
diff --git a/run_tests.sh b/run_tests.sh
index 67214996d..2e536a636 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -30,6 +30,7 @@ always_venv=0
 never_venv=0
 force=0
 
+
 for arg in "$@"; do
   process_option $arg
 done
@@ -37,7 +38,7 @@ done
 if [ $never_venv -eq 1 ]; then
   # Just run the test suites in current environment
   rm -f nova.sqlite
-  nosetests -v
+  python run_tests.py $@ 2> run_tests.err.log
   exit
 fi
 
@@ -49,7 +50,7 @@ fi
 
 if [ -e ${venv} ]; then
   ${with_venv} rm -f nova.sqlite
-  ${with_venv} nosetests -v $@
+  ${with_venv} python run_tests.py $@ 2> run_tests.err.log
 else  
   if [ $always_venv -eq 1 ]; then
     # Automatically install the virtualenv
@@ -62,10 +63,11 @@ else
       python tools/install_venv.py
     else
       rm -f nova.sqlite
-      nosetests -v
+      #nosetests -v
+      python run_tests.py 2> run_tests.err.log
       exit
     fi
   fi
   ${with_venv} rm -f nova.sqlite
-  ${with_venv} nosetests -v $@
+  ${with_venv} python run_tests.py $@ 2> run_tests.err.log
 fi
-- 
cgit 


From 0fb37c5a08db4b2631ff687cb0fc6af43ba20190 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Tue, 28 Dec 2010 11:49:07 -0600
Subject: Added InstanceAction DB functions

---
 nova/db/api.py            | 5 +++++
 nova/db/sqlalchemy/api.py | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/nova/db/api.py b/nova/db/api.py
index fde3f0852..127f15478 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -383,6 +383,11 @@ def instance_action_create(context, values):
     return IMPL.instance_action_create(context, values)
 
 
+def instance_get_actions(context, instance_id):
+    """Get instance actions by instance id."""
+    return IMPL.instance_get_actions(context, instance_id)
+
+
 ###################
 
 
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 7e945e4cb..d2127989c 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -856,6 +856,15 @@ def instance_action_create(context, values):
     return action_ref
 
 
+@require_context
+def instance_get_actions(context, instance_id):
+    """Return the actions associated to the given instance id"""
+    session = get_session()
+    return session.query(models.InstanceActions).\
+        filter_by(instance_id=instance_id).\
+        all()
+
+
 ###################
 
 
-- 
cgit 


From 7ddd833bc61252061b3dfd2449765a93f750bffa Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Tue, 28 Dec 2010 12:19:25 -0600
Subject: Added get_diagnostics placeholders to libvirt and fake

---
 nova/virt/fake.py         | 3 +++
 nova/virt/libvirt_conn.py | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 706888b0d..880772b22 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -202,6 +202,9 @@ class FakeConnection(object):
                 'num_cpu': 2,
                 'cpu_time': 0}
 
+    def get_diagnostics(self, instance_name):
+        pass
+
     def list_disks(self, instance_name):
         """
         Return the IDs of all the virtual disks attached to the specified
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 65cf65098..06ace7457 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -567,6 +567,9 @@ class LibvirtConnection(object):
                 'num_cpu': num_cpu,
                 'cpu_time': cpu_time}
 
+    def get_diagnostics(self, instance_name):
+        raise exception.APIError("diagnostics not supported for libvirt")
+
     def get_disks(self, instance_name):
         """
         Note that this function takes an instance name, not an Instance, so
-- 
cgit 


From 96384b689953e381f2210d4a78f1b5239a78e507 Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Tue, 28 Dec 2010 12:53:32 -0600
Subject: Add some basic snapshot tests

---
 nova/tests/test_xenapi.py    | 106 +++++++++++++++++++++++++++++--------------
 nova/tests/xenapi/stubs.py   |  66 +++++++++++++++++++++++++++
 nova/virt/xenapi/fake.py     |  64 ++++++++++++++++++++++++--
 nova/virt/xenapi/vm_utils.py |  15 +++---
 4 files changed, 206 insertions(+), 45 deletions(-)

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index ed2e4ffde..f0d84e9aa 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -29,9 +29,9 @@ from nova.auth import manager
 from nova.compute import instance_types
 from nova.compute import power_state
 from nova.virt import xenapi_conn
-from nova.virt.xenapi import fake
+from nova.virt.xenapi import fake as xenapi_fake
 from nova.virt.xenapi import volume_utils
-from nova.tests.db import fakes
+from nova.tests.db import fakes as db_fakes
 from nova.tests.xenapi import stubs
 
 FLAGS = flags.FLAGS
@@ -47,9 +47,9 @@ class XenAPIVolumeTestCase(test.TestCase):
         FLAGS.target_host = '127.0.0.1'
         FLAGS.xenapi_connection_url = 'test_url'
         FLAGS.xenapi_connection_password = 'test_pass'
-        fakes.stub_out_db_instance_api(self.stubs)
+        db_fakes.stub_out_db_instance_api(self.stubs)
         stubs.stub_out_get_target(self.stubs)
-        fake.reset()
+        xenapi_fake.reset()
         self.values = {'name': 1, 'id': 1,
                   'project_id': 'fake',
                   'user_id': 'fake',
@@ -83,7 +83,7 @@ class XenAPIVolumeTestCase(test.TestCase):
         label = 'SR-%s' % vol['ec2_id']
         description = 'Test-SR'
         sr_ref = helper.create_iscsi_storage(session, info, label, description)
-        srs = fake.get_all('SR')
+        srs = xenapi_fake.get_all('SR')
         self.assertEqual(sr_ref, srs[0])
         db.volume_destroy(context.get_admin_context(), vol['id'])
 
@@ -107,17 +107,17 @@ class XenAPIVolumeTestCase(test.TestCase):
         conn = xenapi_conn.get_connection(False)
         volume = self._create_volume()
         instance = db.instance_create(self.values)
-        fake.create_vm(instance.name, 'Running')
+        xenapi_fake.create_vm(instance.name, 'Running')
         result = conn.attach_volume(instance.name, volume['ec2_id'],
                                     '/dev/sdc')
 
         def check():
             # check that the VM has a VBD attached to it
             # Get XenAPI reference for the VM
-            vms = fake.get_all('VM')
+            vms = xenapi_fake.get_all('VM')
             # Get XenAPI record for VBD
-            vbds = fake.get_all('VBD')
-            vbd = fake.get_record('VBD', vbds[0])
+            vbds = xenapi_fake.get_all('VBD')
+            vbd = xenapi_fake.get_record('VBD', vbds[0])
             vm_ref = vbd['VM']
             self.assertEqual(vm_ref, vms[0])
 
@@ -130,7 +130,7 @@ class XenAPIVolumeTestCase(test.TestCase):
         conn = xenapi_conn.get_connection(False)
         volume = self._create_volume()
         instance = db.instance_create(self.values)
-        fake.create_vm(instance.name, 'Running')
+        xenapi_fake.create_vm(instance.name, 'Running')
         self.assertRaises(Exception,
                           conn.attach_volume,
                           instance.name,
@@ -156,41 +156,66 @@ class XenAPIVMTestCase(test.TestCase):
         self.stubs = stubout.StubOutForTesting()
         FLAGS.xenapi_connection_url = 'test_url'
         FLAGS.xenapi_connection_password = 'test_pass'
-        fake.reset()
-        fakes.stub_out_db_instance_api(self.stubs)
-        fake.create_network('fake', FLAGS.flat_network_bridge)
+        xenapi_fake.reset()
+        db_fakes.stub_out_db_instance_api(self.stubs)
+        xenapi_fake.create_network('fake', FLAGS.flat_network_bridge)
+        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
+        self.conn = xenapi_conn.get_connection(False)
 
     def test_list_instances_0(self):
-        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
-        conn = xenapi_conn.get_connection(False)
-        instances = conn.list_instances()
+        instances = self.conn.list_instances()
         self.assertEquals(instances, [])
 
+    def test_instance_snapshot(self):
+        stubs.stubout_instance_snapshot(self.stubs)
+        instance = self._create_instance()
+
+        name = "MySnapshot"
+        template_vm_ref = self.conn.snapshot(instance, name)
+
+        def ensure_vm_was_torn_down():
+            vm_labels = []
+            for vm_ref in xenapi_fake.get_all('VM'):
+                vm_rec = xenapi_fake.get_record('VM', vm_ref)
+                if not vm_rec["is_control_domain"]:
+                    vm_labels.append(vm_rec["name_label"])
+
+            self.assertEquals(vm_labels, [1])
+
+        def ensure_vbd_was_torn_down():
+            vbd_labels = []
+            for vbd_ref in xenapi_fake.get_all('VBD'):
+                vbd_rec = xenapi_fake.get_record('VBD', vbd_ref)
+                vbd_labels.append(vbd_rec["vm_name_label"])
+
+            self.assertEquals(vbd_labels, [1])
+
+        def ensure_vdi_was_torn_down():
+            for vdi_ref in xenapi_fake.get_all('VDI'):
+                vdi_rec = xenapi_fake.get_record('VDI', vdi_ref)
+                name_label = vdi_rec["name_label"]
+                self.assert_(not name_label.endswith('snapshot'))
+
+        def check():
+            ensure_vm_was_torn_down()
+            ensure_vbd_was_torn_down()
+            ensure_vdi_was_torn_down()
+
+        check()
+
     def test_spawn(self):
-        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
-        values = {'name': 1, 'id': 1,
-                  'project_id': self.project.id,
-                  'user_id': self.user.id,
-                  'image_id': 1,
-                  'kernel_id': 2,
-                  'ramdisk_id': 3,
-                  'instance_type': 'm1.large',
-                  'mac_address': 'aa:bb:cc:dd:ee:ff',
-                  }
-        conn = xenapi_conn.get_connection(False)
-        instance = db.instance_create(values)
-        conn.spawn(instance)
+        instance = self._create_instance()
 
         def check():
-            instances = conn.list_instances()
+            instances = self.conn.list_instances()
             self.assertEquals(instances, [1])
 
             # Get Nova record for VM
-            vm_info = conn.get_info(1)
+            vm_info = self.conn.get_info(1)
 
             # Get XenAPI record for VM
-            vms = fake.get_all('VM')
-            vm = fake.get_record('VM', vms[0])
+            vms = xenapi_fake.get_all('VM')
+            vm = xenapi_fake.get_record('VM', vms[0])
 
             # Check that m1.large above turned into the right thing.
             instance_type = instance_types.INSTANCE_TYPES['m1.large']
@@ -218,3 +243,18 @@ class XenAPIVMTestCase(test.TestCase):
         self.manager.delete_project(self.project)
         self.manager.delete_user(self.user)
         self.stubs.UnsetAll()
+
+    def _create_instance(self):
+        """Creates and spawns a test instance"""
+        values = {'name': 1, 'id': 1,
+                  'project_id': self.project.id,
+                  'user_id': self.user.id,
+                  'image_id': 1,
+                  'kernel_id': 2,
+                  'ramdisk_id': 3,
+                  'instance_type': 'm1.large',
+                  'mac_address': 'aa:bb:cc:dd:ee:ff',
+                  }
+        instance = db.instance_create(values)
+        self.conn.spawn(instance)
+        return instance
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index a7e592fee..55f751f11 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -19,6 +19,54 @@
 from nova.virt import xenapi_conn
 from nova.virt.xenapi import fake
 from nova.virt.xenapi import volume_utils
+from nova.virt.xenapi import vm_utils
+
+
+def stubout_instance_snapshot(stubs):
+    @classmethod
+    def fake_fetch_image(cls, session, instance_id, image, user, project,
+                         type):
+        # Stubout wait_for_task
+        def fake_wait_for_task(self, id, task):
+            class FakeEvent:
+
+                def send(self, value):
+                    self.rv = value
+
+                def wait(self):
+                    return self.rv
+
+            done = FakeEvent()
+            self._poll_task(id, task, done)
+            rv = done.wait()
+            return rv
+
+        stubs.Set(xenapi_conn.XenAPISession, 'wait_for_task',
+                  fake_wait_for_task)
+
+        from nova.virt.xenapi.fake import create_vdi
+        name_label = "instance-%s" % instance_id
+        #TODO: create fake SR record
+        sr_ref = "fakesr"
+        vdi_ref = create_vdi(name_label=name_label, read_only=False,
+                             sr_ref=sr_ref, sharable=False)
+        vdi_rec = session.get_xenapi().VDI.get_record(vdi_ref)
+        vdi_uuid = vdi_rec['uuid']
+        return vdi_uuid
+
+    stubs.Set(vm_utils.VMHelper, 'fetch_image', fake_fetch_image)
+
+    def fake_parse_xmlrpc_value(val):
+        return val
+
+    stubs.Set(xenapi_conn, '_parse_xmlrpc_value', fake_parse_xmlrpc_value)
+
+    def fake_wait_for_vhd_coalesce(session, instance_id, sr_ref, vdi_ref,
+                              original_parent_uuid):
+        #TODO(sirp): Should we actually fake out the data here
+        return "fakeparent"
+
+    stubs.Set(vm_utils, 'wait_for_vhd_coalesce', fake_wait_for_vhd_coalesce)
 
 
 def stubout_session(stubs, cls):
@@ -63,6 +111,24 @@ class FakeSessionForVMTests(fake.SessionBase):
         vm['is_a_template'] = False
         vm['is_control_domain'] = False
 
+    def VM_snapshot(self, session_ref, vm_ref, label):
+        status = "Running"
+        template_vm_ref = fake.create_vm(label, status, is_a_template=True,
+            is_control_domain=False)
+
+        sr_ref = "fakesr"
+        template_vdi_ref = fake.create_vdi(label, read_only=True,
+            sr_ref=sr_ref, sharable=False)
+
+        template_vbd_ref = fake.create_vbd(template_vm_ref, template_vdi_ref)
+        return template_vm_ref
+
+    def VDI_destroy(self, session_ref, vdi_ref):
+        fake.destroy_vdi(vdi_ref)
+
+    def VM_destroy(self, session_ref, vm_ref):
+        fake.destroy_vm(vm_ref)
+
 
 class FakeSessionForVolumeTests(fake.SessionBase):
     """ Stubs out a XenAPISession for Volume tests """
diff --git a/nova/virt/xenapi/fake.py b/nova/virt/xenapi/fake.py
index 1eaf31c25..aa4026f97 100644
--- a/nova/virt/xenapi/fake.py
+++ b/nova/virt/xenapi/fake.py
@@ -55,6 +55,8 @@ import datetime
 import logging
 import uuid
 
+from pprint import pformat
+
 from nova import exception
 
 
@@ -64,6 +66,10 @@ _CLASSES = ['host', 'network', 'session', 'SR', 'VBD',\
 _db_content = {}
 
 
+def log_db_contents(msg=None):
+    logging.debug(_("%s: _db_content => %s"), msg or "", pformat(_db_content))
+
+
 def reset():
     for c in _CLASSES:
         _db_content[c] = {}
@@ -93,6 +99,24 @@ def create_vm(name_label, status,
         })
 
 
+def destroy_vm(vm_ref):
+    vm_rec = _db_content['VM'][vm_ref]
+
+    vbd_refs = vm_rec['VBDs']
+    for vbd_ref in vbd_refs:
+        destroy_vbd(vbd_ref)
+
+    del _db_content['VM'][vm_ref]
+
+
+def destroy_vbd(vbd_ref):
+    del _db_content['VBD'][vbd_ref]
+
+
+def destroy_vdi(vdi_ref):
+    del _db_content['VDI'][vdi_ref]
+
+
 def create_vdi(name_label, read_only, sr_ref, sharable):
     return _create_object('VDI', {
         'name_label': name_label,
@@ -109,6 +133,23 @@ def create_vdi(name_label, read_only, sr_ref, sharable):
         })
 
 
+def create_vbd(vm_ref, vdi_ref):
+    vbd_rec = {'VM': vm_ref, 'VDI': vdi_ref}
+    vbd_ref = _create_object('VBD', vbd_rec)
+    after_VBD_create(vbd_ref, vbd_rec)
+    return vbd_ref
+
+
+def after_VBD_create(vbd_ref, vbd_rec):
+    """Create backref from VM to VBD when VBD is created"""
+    vm_ref = vbd_rec['VM']
+    vm_rec = _db_content['VM'][vm_ref]
+    vm_rec['VBDs'] = [vbd_ref]
+
+    vm_name_label = _db_content['VM'][vm_ref]['name_label']
+    vbd_rec['vm_name_label'] = vm_name_label
+
+
 def create_pbd(config, sr_ref, attached):
     return _create_object('PBD', {
         'device-config': config,
@@ -277,11 +318,12 @@ class SessionBase(object):
             self._check_arg_count(params, 2)
             return get_record(cls, params[1])
 
-        if (func == 'get_by_name_label' or
-            func == 'get_by_uuid'):
+        if func in ('get_by_name_label', 'get_by_uuid'):
             self._check_arg_count(params, 2)
+            return_singleton = (func == 'get_by_uuid')
             return self._get_by_field(
-                _db_content[cls], func[len('get_by_'):], params[1])
+                _db_content[cls], func[len('get_by_'):], params[1],
+                return_singleton=return_singleton)
 
         if len(params) == 2:
             field = func[len('get_'):]
@@ -324,6 +366,13 @@ class SessionBase(object):
         (cls, _) = name.split('.')
         ref = is_sr_create and \
             _create_sr(cls, params) or _create_object(cls, params[1])
+
+        # Call hook to provide any fixups needed (ex. creating backrefs)
+        try:
+            globals()["after_%s_create" % cls](ref, params[1])
+        except KeyError:
+            pass
+
         obj = get_record(cls, ref)
 
         # Add RO fields
@@ -359,11 +408,18 @@ class SessionBase(object):
             raise Failure(['MESSAGE_PARAMETER_COUNT_MISMATCH',
                                   expected, actual])
 
-    def _get_by_field(self, recs, k, v):
+    def _get_by_field(self, recs, k, v, return_singleton):
         result = []
         for ref, rec in recs.iteritems():
             if rec.get(k) == v:
                 result.append(ref)
+
+        if return_singleton:
+            try:
+                return result[0]
+            except IndexError:
+                return None
+
         return result
 
 
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index f4195cb1b..68da807fc 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -211,24 +211,25 @@ class VMHelper(HelperBase):
         """ Creates Snapshot (Template) VM, Snapshot VBD, Snapshot VDI,
         Snapshot VHD
         """
-        logging.debug(_("Snapshotting VM %s with label '%s'..."),
-                      vm_ref, label)
         #TODO(sirp): Add quiesce and VSS locking support when Windows support
         # is added
+        logging.debug(_("Snapshotting VM %s with label '%s'..."),
+                      vm_ref, label)
+
         vm_vdi_ref, vm_vdi_rec = get_vdi_for_vm_safely(session, vm_ref)
         vm_vdi_uuid = vm_vdi_rec["uuid"]
+        sr_ref = vm_vdi_rec["SR"]
+
         original_parent_uuid = get_vhd_parent_uuid(session, vm_vdi_ref)
 
         task = session.call_xenapi('Async.VM.snapshot', vm_ref, label)
         template_vm_ref = session.wait_for_task(instance_id, task)
-        template_vdi_ref, template_vdi_rec = get_vdi_for_vm_safely(
-            session, template_vm_ref)
-
+        template_vdi_rec = get_vdi_for_vm_safely(session, template_vm_ref)[1]
         template_vdi_uuid = template_vdi_rec["uuid"]
+
         logging.debug(_('Created snapshot %s from VM %s.'), template_vm_ref,
                       vm_ref)
 
-        sr_ref = vm_vdi_rec["SR"]
         parent_uuid = wait_for_vhd_coalesce(
             session, instance_id, sr_ref, vm_vdi_ref, original_parent_uuid)
 
@@ -440,8 +441,6 @@ def wait_for_vhd_coalesce(session, instance_id, sr_ref, vdi_ref,
 
 
 def get_vdi_for_vm_safely(session, vm_ref):
-    """Returns (vdi_ref, vdi_uuid)"""
-    #TODO(sirp): Make safe_lookup_vdi for assert?
     vdi_refs = VMHelper.lookup_vm_vdis(session, vm_ref)
     if vdi_refs is None:
         raise Exception(_("No VDIs found for VM %s") % vm_ref)
-- 
cgit 


From 7811a77753943ee87f3c3b10f37d22e61c5119d0 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Tue, 28 Dec 2010 14:32:45 -0600
Subject: Make action log available through Admin API

---
 nova/api/openstack/__init__.py |  1 +
 nova/api/openstack/servers.py  |  5 +++++
 nova/compute/api.py            |  9 +++++++++
 nova/compute/manager.py        | 10 ++++++++++
 nova/db/sqlalchemy/api.py      |  9 ++++++---
 nova/virt/fake.py              |  3 +++
 nova/virt/libvirt_conn.py      |  5 ++++-
 nova/virt/xenapi/vmops.py      |  8 ++++++++
 nova/virt/xenapi_conn.py       |  4 ++++
 9 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index be342b670..412e16315 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -94,6 +94,7 @@ class APIRouter(wsgi.Router):
             server_members['pause'] = 'POST'
             server_members['unpause'] = 'POST'
             server_members["diagnostics"] = "GET"
+            server_members["actions"] = "GET"
             server_members['suspend'] = 'POST'
             server_members['resume'] = 'POST'
 
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index c00aa26ce..0091a9bd2 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -224,3 +224,8 @@ class Controller(wsgi.Controller):
         """Permit Admins to retrieve server diagnostics."""
         ctxt = req.environ["nova.context"]
         return self.compute_api.diagnostics(ctxt, id)
+
+    def actions(self, req, id):
+        """Permit Admins to retrieve server actions."""
+        ctxt = req.environ["nova.context"]
+        return self.compute_api.actions(ctxt, id)
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 68919442a..3d9728c77 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -293,6 +293,15 @@ class ComputeAPI(base.Base):
             {"method": "get_diagnostics",
              "args": {"instance_id": instance["id"]}})
 
+    def actions(self, context, instance_id):
+        """Retrieve actions for the given instance."""
+        instance = self.db.instance_get_by_internal_id(context, instance_id)
+        host = instance["host"]
+        return rpc.call(context,
+            self.db.queue_get_for(context, FLAGS.compute_topic, host),
+            {"method": "get_actions",
+             "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)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 7dea04132..924b72004 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -307,6 +307,16 @@ class ComputeManager(manager.Manager):
                 instance_ref["internal_id"])
             return self.driver.get_diagnostics(instance_ref)
 
+    @exception.wrap_exception
+    def get_actions(self, context, instance_id):
+        """Retrieve actions for an instance on this server."""
+        context = context.elevated()
+        instance_ref = self.db.instance_get(context, instance_id)
+
+        logging.debug(_("instance %s: retrieving actions"),
+            instance_ref["internal_id"])
+        return self.driver.get_actions(instance_ref)
+
     def suspend_instance(self, context, instance_id):
         """suspend the instance with instance_id"""
         context = context.elevated()
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index d2127989c..5fd928a79 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -856,13 +856,16 @@ def instance_action_create(context, values):
     return action_ref
 
 
-@require_context
+@require_admin_context
 def instance_get_actions(context, instance_id):
     """Return the actions associated to the given instance id"""
     session = get_session()
-    return session.query(models.InstanceActions).\
+    actions = {}
+    for action in session.query(models.InstanceActions).\
         filter_by(instance_id=instance_id).\
-        all()
+        all():
+        actions[action.action] = action.error
+    return actions 
 
 
 ###################
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 880772b22..e9d1e4bd7 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -205,6 +205,9 @@ class FakeConnection(object):
     def get_diagnostics(self, instance_name):
         pass
 
+    def get_actions(self, instance_name):
+        pass
+
     def list_disks(self, instance_name):
         """
         Return the IDs of all the virtual disks attached to the specified
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 06ace7457..9c8aa1fae 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -568,7 +568,10 @@ class LibvirtConnection(object):
                 'cpu_time': cpu_time}
 
     def get_diagnostics(self, instance_name):
-        raise exception.APIError("diagnostics not supported for libvirt")
+        raise exception.APIError("diagnostics are not supported for libvirt")
+
+    def get_actions(self, instance_name):
+        raise exception.APIError("actions are not supported for libvirt")
 
     def get_disks(self, instance_name):
         """
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 332e603db..93f7f7695 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -226,6 +226,14 @@ class VMOps(object):
         rec = self._session.get_xenapi().VM.get_record(vm)
         return VMHelper.compile_diagnostics(self._session, rec)
 
+    def get_actions(self, instance):
+        """Return VM action history"""
+        vm = VMHelper.lookup(self._session, instance.name)
+        if vm is None:
+            raise exception.NotFound(_("Instance not found %s") %
+                instance.name)
+        return db.instance_get_actions(context.get_admin_context(), instance.id)
+
     def get_console_output(self, instance):
         """Return snapshot of console"""
         # TODO: implement this to fix pylint!
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index a7ec22012..92274daf9 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -163,6 +163,10 @@ class XenAPIConnection(object):
         """Return data about VM diagnostics"""
         return self._vmops.get_diagnostics(instance)
 
+    def get_actions(self, instance):
+        """Return VM action history"""
+        return self._vmops.get_actions(instance)
+
     def get_console_output(self, instance):
         """Return snapshot of console"""
         return self._vmops.get_console_output(instance)
-- 
cgit 


From 8d03539e15bf4ac168af550e27a81353a896df54 Mon Sep 17 00:00:00 2001
From: Cory Wright <cory.wright@rackspace.com>
Date: Tue, 28 Dec 2010 16:35:56 -0500
Subject: Update .mailmap with both email addresses for Ant and myself

---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 9ab7db743..9e7fb1ec0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,3 +27,5 @@
 <vishvananda@gmail.com> <root@ubuntu>
 <sleepsonthefloor@gmail.com> <root@tonbuntu>
 <rlane@wikimedia.org> <laner@controller>
+<corywright@gmail.com> <cory.wright@rackspace.com>
+<ant@openstack.org> <amesserl@rackspace.com>
-- 
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(-)

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

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

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(+)

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 


From cc906e48c13012da552cc346146d9586afc6092e Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Wed, 29 Dec 2010 10:35:29 -0600
Subject: Updating Authors

---
 .mailmap | 1 +
 Authors  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 9ab7db743..9ac8f2efd 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,3 +27,4 @@
 <vishvananda@gmail.com> <root@ubuntu>
 <sleepsonthefloor@gmail.com> <root@tonbuntu>
 <rlane@wikimedia.org> <laner@controller>
+<rick.harris@rackspace.com> <rconradharris@gmail.com>
diff --git a/Authors b/Authors
index 299114dad..407b407c8 100644
--- a/Authors
+++ b/Authors
@@ -25,7 +25,7 @@ Michael Gundlach <michael.gundlach@rackspace.com>
 Monty Taylor <mordred@inaugust.com>
 Paul Voccio <paul@openstack.org>
 Rick Clark <rick@openstack.org>
-Rick Harris <rick.harris@rackspace.com>
+Rick Harris <rconradharris@gmail.com>
 Ryan Lane <rlane@wikimedia.org>
 Ryan Lucio <rlucio@internap.com>
 Salvatore Orlando <salvatore.orlando@eu.citrix.com>
-- 
cgit 


From 34f5bed4d9c99af58c83b82b499f898c270124a8 Mon Sep 17 00:00:00 2001
From: Ryan Lucio <rlucio@internap.com>
Date: Wed, 29 Dec 2010 11:24:42 -0800
Subject: Re-added flag definition for injected_network_template.  Tested &
 verified fix in the same env as the original bug.

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

diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index f6a218fa4..39215c4e1 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -68,6 +68,9 @@ FLAGS = flags.FLAGS
 flags.DEFINE_string('rescue_image_id', 'ami-rescue', 'Rescue ami image')
 flags.DEFINE_string('rescue_kernel_id', 'aki-rescue', 'Rescue aki image')
 flags.DEFINE_string('rescue_ramdisk_id', 'ari-rescue', 'Rescue ari image')
+flags.DEFINE_string('injected_network_template',
+                    utils.abspath('virt/interfaces.template'),
+                    'Template file for injected network')
 flags.DEFINE_string('libvirt_xml_template',
                     utils.abspath('virt/libvirt.xml.template'),
                     'Libvirt XML Template')
-- 
cgit 


From 823c5fc1ff3c37acbfe9b30d7057f53b050b93c6 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Wed, 29 Dec 2010 14:02:57 -0600
Subject: Added tests

---
 nova/tests/api/openstack/test_servers.py | 16 ++++++++++++++++
 nova/tests/test_compute.py               | 16 ++++++++++++++--
 nova/tests/test_xenapi.py                | 30 ++++++++++++++++++++----------
 nova/virt/xenapi/vm_utils.py             |  4 ++++
 4 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 5d23db588..321ddceee 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -95,6 +95,10 @@ class ServersTest(unittest.TestCase):
                        fake_compute_api)
         self.stubs.Set(nova.compute.api.ComputeAPI, 'resume',
                        fake_compute_api)
+        self.stubs.Set(nova.compute.api.ComputeAPI, "diagnostics",
+                       fake_compute_api)
+        self.stubs.Set(nova.compute.api.ComputeAPI, "actions",
+                       fake_compute_api)
         self.allow_admin = FLAGS.allow_admin_api
 
     def tearDown(self):
@@ -274,6 +278,18 @@ class ServersTest(unittest.TestCase):
         res = req.get_response(nova.api.API('os'))
         self.assertEqual(res.status_int, 202)
 
+    def test_server_diagnostics(self):
+        req = webob.Request.blank("/v1.0/servers/1/diagnostics")
+        req.method = "GET"
+        res = req.get_response(nova.api.API("os"))
+        self.assertEqual(res.status_int, 404)
+
+    def test_server_actions(self):
+        req = webob.Request.blank("/v1.0/servers/1/actions")
+        req.method = "GET"
+        res = req.get_response(nova.api.API("os"))
+        self.assertEqual(res.status_int, 404)
+
     def test_server_reboot(self):
         body = dict(server=dict(
             name='server_test', imageId=2, flavorId=2, metadata={},
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index bcb8a1526..757b1f462 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -102,13 +102,15 @@ class ComputeTestCase(test.TestCase):
 
         instances = db.instance_get_all(context.get_admin_context())
         logging.info(_("Running instances: %s"), instances)
-        self.assertEqual(len(instances), 1)
+
+        instance_count = len(instances)
+        self.assertNotEqual(instance_count, 0)
 
         self.compute.terminate_instance(self.context, instance_id)
 
         instances = db.instance_get_all(context.get_admin_context())
         logging.info(_("After terminating instances: %s"), instances)
-        self.assertEqual(len(instances), 0)
+        self.assertEqual(instance_count, len(instances) + 1)
 
     def test_run_terminate_timestamps(self):
         """Make sure timestamps are set for launched and destroyed"""
@@ -151,6 +153,16 @@ class ComputeTestCase(test.TestCase):
         self.compute.reboot_instance(self.context, instance_id)
         self.compute.terminate_instance(self.context, instance_id)
 
+    def test_diagnostics(self):
+        """Ensure instance diagnostics are available"""
+        instance_id = self._create_instance()
+        self.compute.get_diagnostics(self.context, instance_id)
+
+    def test_actions(self):
+        """Ensure instance actions are available"""
+        instance_id = self._create_instance()
+        self.compute.get_actions(self.context, instance_id)
+
     def test_console_output(self):
         """Make sure we can get console output from instance"""
         instance_id = self._create_instance()
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index ed2e4ffde..11baead8b 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -159,6 +159,16 @@ class XenAPIVMTestCase(test.TestCase):
         fake.reset()
         fakes.stub_out_db_instance_api(self.stubs)
         fake.create_network('fake', FLAGS.flat_network_bridge)
+        self.values = {
+            "name": 1,
+            "id": 1,
+            "project_id": self.project.id,
+            "user_id": self.user.id,
+            "image_id": 1,
+            "kernel_id": 2,
+            "ramdisk_id": 3,
+            "instance_type": "m1.large",
+            "mac_address": "aa:bb:cc:dd:ee:ff"}
 
     def test_list_instances_0(self):
         stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
@@ -166,19 +176,19 @@ class XenAPIVMTestCase(test.TestCase):
         instances = conn.list_instances()
         self.assertEquals(instances, [])
 
+    def test_get_diagnostics(self):
+        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
+        conn = xenapi_conn.get_connection(False)
+
+        instance = db.instance_create(self.values)
+        conn.spawn(instance)
+
+        conn.get_diagnostics(instance)
+
     def test_spawn(self):
         stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
-        values = {'name': 1, 'id': 1,
-                  'project_id': self.project.id,
-                  'user_id': self.user.id,
-                  'image_id': 1,
-                  'kernel_id': 2,
-                  'ramdisk_id': 3,
-                  'instance_type': 'm1.large',
-                  'mac_address': 'aa:bb:cc:dd:ee:ff',
-                  }
         conn = xenapi_conn.get_connection(False)
-        instance = db.instance_create(values)
+        instance = db.instance_create(self.values)
         conn.spawn(instance)
 
         def check():
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 47fb6db53..cca7c1476 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -299,6 +299,10 @@ class VMHelper(HelperBase):
         try:
             host = session.get_xenapi_host()
             host_ip = session.get_xenapi().host.get_record(host)["address"]
+        except (cls.XenAPI.Failure, KeyError) as e:
+            return {"Unable to retrieve diagnostics": e}
+
+        try:
             diags = {}
             xml = get_rrd(host_ip, record["uuid"])
             if xml:
-- 
cgit 


From 5b8137b2f50a4ed3eb105e38cefa280927f1c2ea Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Wed, 29 Dec 2010 14:15:04 -0600
Subject: PEP8 cleanup

---
 nova/db/sqlalchemy/api.py | 2 +-
 nova/virt/xenapi/vmops.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index 5fd928a79..8e68d12a4 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -865,7 +865,7 @@ def instance_get_actions(context, instance_id):
         filter_by(instance_id=instance_id).\
         all():
         actions[action.action] = action.error
-    return actions 
+    return actions
 
 
 ###################
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 93f7f7695..1dfb9005c 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -232,7 +232,9 @@ class VMOps(object):
         if vm is None:
             raise exception.NotFound(_("Instance not found %s") %
                 instance.name)
-        return db.instance_get_actions(context.get_admin_context(), instance.id)
+        return db.instance_get_actions(
+            context.get_admin_context(),
+            instance.id)
 
     def get_console_output(self, instance):
         """Return snapshot of console"""
-- 
cgit 


From e7be0b485e2d6c7cd95d1f5b7e6a401032f437e6 Mon Sep 17 00:00:00 2001
From: Todd Willey <todd@ansolabs.com>
Date: Wed, 29 Dec 2010 17:01:34 -0500
Subject: Fix scheduler testcase so it knows all flags and can run in
 isolation.

---
 nova/tests/test_scheduler.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/tests/test_scheduler.py b/nova/tests/test_scheduler.py
index 91517cc5d..78e4a1c77 100644
--- a/nova/tests/test_scheduler.py
+++ b/nova/tests/test_scheduler.py
@@ -33,6 +33,7 @@ from nova.scheduler import driver
 
 FLAGS = flags.FLAGS
 flags.DECLARE('max_cores', 'nova.scheduler.simple')
+flags.DECLARE('stub_network', 'nova.compute.manager')
 
 
 class TestDriver(driver.Scheduler):
-- 
cgit 


From 601b19291a7cf1bcda7bcd4ebf27e4eefe3e28fd Mon Sep 17 00:00:00 2001
From: Rick Harris <rick.harris@rackspace.com>
Date: Thu, 30 Dec 2010 14:09:16 -0600
Subject: Calling compute api directly from OpenStack image create

---
 nova/api/openstack/images.py | 10 +++++-----
 nova/image/glance.py         |  4 ----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 2ee73480f..867ee5a7e 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -25,7 +25,7 @@ import nova.image.service
 
 from nova.api.openstack import common
 from nova.api.openstack import faults
-
+from nova.compute import api as compute_api
 
 FLAGS = flags.FLAGS
 
@@ -127,11 +127,11 @@ class Controller(wsgi.Controller):
         raise faults.Fault(exc.HTTPNotFound())
 
     def create(self, req):
-        ctxt = req.environ['nova.context']
+        context = req.environ['nova.context']
         env = self._deserialize(req.body, req)
-        data = {'instance_id': env["image"]["serverId"],
-                'name': env["image"]["name"]}
-        return dict(image=self._service.create(ctxt, data))
+        instance_id = env["image"]["serverId"]
+        name = env["image"]["name"]
+        return compute_api.ComputeAPI().snapshot(context, instance_id, name)
 
     def update(self, req, id):
         # Users may not modify public images, and that's all that
diff --git a/nova/image/glance.py b/nova/image/glance.py
index b61cba10e..cc3192e7c 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -203,10 +203,6 @@ class GlanceImageService(nova.image.service.BaseImageService):
         :raises AlreadyExists if the image already exist.
 
         """
-        instance_id = data["instance_id"]
-        name = data["name"]
-        compute_api.ComputeAPI().snapshot(context, instance_id, name)
-        # FIXME(sirp): This needs to be reworked for new-style glance
         return self.parallax.add_image_metadata(data)
 
     def update(self, context, image_id, data):
-- 
cgit 


From 42f6a993bcc4d0bc8823e4d039b1f59a6d6758a8 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 30 Dec 2010 15:13:32 -0600
Subject: Implemented review feedback

---
 nova/compute/manager.py   |  6 +++---
 nova/virt/fake.py         |  3 ---
 nova/virt/libvirt_conn.py |  3 ---
 nova/virt/xenapi/vmops.py | 10 ----------
 nova/virt/xenapi_conn.py  |  4 ----
 5 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 924b72004..d2ade8f52 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -299,7 +299,6 @@ class ComputeManager(manager.Manager):
     @exception.wrap_exception
     def get_diagnostics(self, context, instance_id):
         """Retrieve diagnostics for an instance on this server."""
-        context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
 
         if instance_ref["state"] == power_state.RUNNING:
@@ -310,12 +309,13 @@ class ComputeManager(manager.Manager):
     @exception.wrap_exception
     def get_actions(self, context, instance_id):
         """Retrieve actions for an instance on this server."""
-        context = context.elevated()
         instance_ref = self.db.instance_get(context, instance_id)
 
         logging.debug(_("instance %s: retrieving actions"),
             instance_ref["internal_id"])
-        return self.driver.get_actions(instance_ref)
+        return self.db.instance_get_actions(
+            context,
+            instance_id)
 
     def suspend_instance(self, context, instance_id):
         """suspend the instance with instance_id"""
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index e9d1e4bd7..880772b22 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -205,9 +205,6 @@ class FakeConnection(object):
     def get_diagnostics(self, instance_name):
         pass
 
-    def get_actions(self, instance_name):
-        pass
-
     def list_disks(self, instance_name):
         """
         Return the IDs of all the virtual disks attached to the specified
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 8407938c6..cf45ac13b 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -583,9 +583,6 @@ class LibvirtConnection(object):
     def get_diagnostics(self, instance_name):
         raise exception.APIError("diagnostics are not supported for libvirt")
 
-    def get_actions(self, instance_name):
-        raise exception.APIError("actions are not supported for libvirt")
-
     def get_disks(self, instance_name):
         """
         Note that this function takes an instance name, not an Instance, so
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 1dfb9005c..332e603db 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -226,16 +226,6 @@ class VMOps(object):
         rec = self._session.get_xenapi().VM.get_record(vm)
         return VMHelper.compile_diagnostics(self._session, rec)
 
-    def get_actions(self, instance):
-        """Return VM action history"""
-        vm = VMHelper.lookup(self._session, instance.name)
-        if vm is None:
-            raise exception.NotFound(_("Instance not found %s") %
-                instance.name)
-        return db.instance_get_actions(
-            context.get_admin_context(),
-            instance.id)
-
     def get_console_output(self, instance):
         """Return snapshot of console"""
         # TODO: implement this to fix pylint!
diff --git a/nova/virt/xenapi_conn.py b/nova/virt/xenapi_conn.py
index 92274daf9..a7ec22012 100644
--- a/nova/virt/xenapi_conn.py
+++ b/nova/virt/xenapi_conn.py
@@ -163,10 +163,6 @@ class XenAPIConnection(object):
         """Return data about VM diagnostics"""
         return self._vmops.get_diagnostics(instance)
 
-    def get_actions(self, instance):
-        """Return VM action history"""
-        return self._vmops.get_actions(instance)
-
     def get_console_output(self, instance):
         """Return snapshot of console"""
         return self._vmops.get_console_output(instance)
-- 
cgit 


From 384da35986ff174e63272b41d3ba383378abf1ab Mon Sep 17 00:00:00 2001
From: termie <code@term.ie>
Date: Thu, 30 Dec 2010 13:31:56 -0800
Subject: change exit code

---
 run_tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run_tests.py b/run_tests.py
index 56a8bffe7..5b8617f63 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -65,4 +65,4 @@ if __name__ == '__main__':
     runner = NovaTestRunner(stream=c.stream,
                             verbosity=c.verbosity,
                             config=c)
-    sys.exit(core.run(config=c, testRunner=runner))
+    sys.exit(not core.run(config=c, testRunner=runner))
-- 
cgit 


From 00abbb4401c87cca9f1540d7be1c0119fc7aee44 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 30 Dec 2010 16:06:48 -0600
Subject: Review feedback

---
 nova/compute/api.py        |  6 +-----
 nova/compute/manager.py    | 11 -----------
 nova/tests/test_compute.py | 11 ++---------
 nova/tests/test_xenapi.py  | 31 ++++++-------------------------
 4 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 4fcefb384..3f700349a 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -305,11 +305,7 @@ class ComputeAPI(base.Base):
     def actions(self, context, instance_id):
         """Retrieve actions for the given instance."""
         instance = self.db.instance_get_by_internal_id(context, instance_id)
-        host = instance["host"]
-        return rpc.call(context,
-            self.db.queue_get_for(context, FLAGS.compute_topic, host),
-            {"method": "get_actions",
-             "args": {"instance_id": instance["id"]}})
+        return self.db.instance_get_actions(context, instance["id"])
 
     def suspend(self, context, instance_id):
         """suspend the instance with instance_id"""
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index c4768d266..c9aff75ac 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -327,17 +327,6 @@ class ComputeManager(manager.Manager):
                 instance_ref["internal_id"])
             return self.driver.get_diagnostics(instance_ref)
 
-    @exception.wrap_exception
-    def get_actions(self, context, instance_id):
-        """Retrieve actions for an instance on this server."""
-        instance_ref = self.db.instance_get(context, instance_id)
-
-        logging.debug(_("instance %s: retrieving actions"),
-            instance_ref["internal_id"])
-        return self.db.instance_get_actions(
-            context,
-            instance_id)
-
     def suspend_instance(self, context, instance_id):
         """suspend the instance with instance_id"""
         context = context.elevated()
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index e3679b6b6..2664adc0d 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -102,15 +102,13 @@ class ComputeTestCase(test.TestCase):
 
         instances = db.instance_get_all(context.get_admin_context())
         logging.info(_("Running instances: %s"), instances)
-
-        instance_count = len(instances)
-        self.assertNotEqual(instance_count, 0)
+        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)
-        self.assertEqual(instance_count, len(instances) + 1)
+        self.assertEqual(len(instances), 0)
 
     def test_run_terminate_timestamps(self):
         """Make sure timestamps are set for launched and destroyed"""
@@ -158,11 +156,6 @@ class ComputeTestCase(test.TestCase):
         instance_id = self._create_instance()
         self.compute.get_diagnostics(self.context, instance_id)
 
-    def test_actions(self):
-        """Ensure instance actions are available"""
-        instance_id = self._create_instance()
-        self.compute.get_actions(self.context, instance_id)
-
     def test_snapshot(self):
         """Ensure instance can be snapshotted"""
         instance_id = self._create_instance()
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 3528d7bfe..a09750672 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -156,10 +156,11 @@ class XenAPIVMTestCase(test.TestCase):
         self.stubs = stubout.StubOutForTesting()
         FLAGS.xenapi_connection_url = 'test_url'
         FLAGS.xenapi_connection_password = 'test_pass'
-
-        fake.reset()
-        fakes.stub_out_db_instance_api(self.stubs)
-        fake.create_network('fake', FLAGS.flat_network_bridge)
+        xenapi_fake.reset()
+        db_fakes.stub_out_db_instance_api(self.stubs)
+        xenapi_fake.create_network('fake', FLAGS.flat_network_bridge)
+        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
+        self.conn = xenapi_conn.get_connection(False)
         self.values = {
             "name": 1,
             "id": 1,
@@ -171,12 +172,6 @@ class XenAPIVMTestCase(test.TestCase):
             "instance_type": "m1.large",
             "mac_address": "aa:bb:cc:dd:ee:ff"}
 
-        xenapi_fake.reset()
-        db_fakes.stub_out_db_instance_api(self.stubs)
-        xenapi_fake.create_network('fake', FLAGS.flat_network_bridge)
-        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
-        self.conn = xenapi_conn.get_connection(False)
-
     def test_list_instances_0(self):
         instances = self.conn.list_instances()
         self.assertEquals(instances, [])
@@ -228,11 +223,6 @@ class XenAPIVMTestCase(test.TestCase):
         check()
 
     def test_spawn(self):
-        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
-        conn = xenapi_conn.get_connection(False)
-        instance = db.instance_create(self.values)
-        conn.spawn(instance)
-
         instance = self._create_instance()
 
         def check():
@@ -275,15 +265,6 @@ class XenAPIVMTestCase(test.TestCase):
 
     def _create_instance(self):
         """Creates and spawns a test instance"""
-        values = {'name': 1, 'id': 1,
-                  'project_id': self.project.id,
-                  'user_id': self.user.id,
-                  'image_id': 1,
-                  'kernel_id': 2,
-                  'ramdisk_id': 3,
-                  'instance_type': 'm1.large',
-                  'mac_address': 'aa:bb:cc:dd:ee:ff',
-                  }
-        instance = db.instance_create(values)
+        instance = db.instance_create(self.values)
         self.conn.spawn(instance)
         return instance
-- 
cgit 


From 5c34edb3fc215a519f1a00e8c3ff6223ee050041 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Thu, 30 Dec 2010 16:13:42 -0600
Subject: Fail

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

diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 693db8d23..baa743765 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -452,7 +452,7 @@ class AuthToken(BASE, NovaBase):
     """
     __tablename__ = 'auth_tokens'
     token_hash = Column(String(255), primary_key=True)
-    user_id = Column(Integer)
+    user_id = Column(String(255))
     server_manageent_url = Column(String(255))
     storage_url = Column(String(255))
     cdn_management_url = Column(String(255))
-- 
cgit 


From d89b3a4b5c1f6bfe1f59da6c33cb469da589e866 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 30 Dec 2010 16:27:31 -0600
Subject: Make compute.api methods verbs

---
 nova/api/openstack/servers.py | 4 ++--
 nova/compute/api.py           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index e1c2d36ea..c5cbe21ef 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -222,9 +222,9 @@ class Controller(wsgi.Controller):
     def diagnostics(self, req, id):
         """Permit Admins to retrieve server diagnostics."""
         ctxt = req.environ["nova.context"]
-        return self.compute_api.diagnostics(ctxt, id)
+        return self.compute_api.get_diagnostics(ctxt, id)
 
     def actions(self, req, id):
         """Permit Admins to retrieve server actions."""
         ctxt = req.environ["nova.context"]
-        return self.compute_api.actions(ctxt, id)
+        return self.compute_api.get_actions(ctxt, id)
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 3f700349a..28189e4a9 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -293,7 +293,7 @@ class ComputeAPI(base.Base):
                  {"method": "unpause_instance",
                   "args": {"instance_id": instance['id']}})
 
-    def diagnostics(self, context, instance_id):
+    def get_diagnostics(self, context, instance_id):
         """Retrieve diagnostics for the given instance."""
         instance = self.db.instance_get_by_internal_id(context, instance_id)
         host = instance["host"]
@@ -302,7 +302,7 @@ class ComputeAPI(base.Base):
             {"method": "get_diagnostics",
              "args": {"instance_id": instance["id"]}})
 
-    def actions(self, context, instance_id):
+    def get_actions(self, context, instance_id):
         """Retrieve actions for the given instance."""
         instance = self.db.instance_get_by_internal_id(context, instance_id)
         return self.db.instance_get_actions(context, instance["id"])
-- 
cgit 


From d1129fa4b14d9edba8d6c4c3cb2d13e7c66c1391 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 30 Dec 2010 17:02:16 -0600
Subject: Oopsies

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

diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index 321ddceee..70ff714e6 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -95,9 +95,9 @@ class ServersTest(unittest.TestCase):
                        fake_compute_api)
         self.stubs.Set(nova.compute.api.ComputeAPI, 'resume',
                        fake_compute_api)
-        self.stubs.Set(nova.compute.api.ComputeAPI, "diagnostics",
+        self.stubs.Set(nova.compute.api.ComputeAPI, "get_diagnostics",
                        fake_compute_api)
-        self.stubs.Set(nova.compute.api.ComputeAPI, "actions",
+        self.stubs.Set(nova.compute.api.ComputeAPI, "get_actions",
                        fake_compute_api)
         self.allow_admin = FLAGS.allow_admin_api
 
-- 
cgit 


From e453e2761daee6e96da9575a860e694a065c68c0 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 30 Dec 2010 18:12:10 -0600
Subject: Removed problematic test

---
 nova/tests/test_compute.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index 2664adc0d..1fb9143f1 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -151,11 +151,6 @@ class ComputeTestCase(test.TestCase):
         self.compute.reboot_instance(self.context, instance_id)
         self.compute.terminate_instance(self.context, instance_id)
 
-    def test_diagnostics(self):
-        """Ensure instance diagnostics are available"""
-        instance_id = self._create_instance()
-        self.compute.get_diagnostics(self.context, instance_id)
-
     def test_snapshot(self):
         """Ensure instance can be snapshotted"""
         instance_id = self._create_instance()
-- 
cgit 


From f55991c01421350434893200db8f01ca3911d957 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 30 Dec 2010 18:56:12 -0600
Subject: Improved test

---
 nova/tests/test_xenapi.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index a09750672..539d132bd 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -180,9 +180,7 @@ class XenAPIVMTestCase(test.TestCase):
         stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
         conn = xenapi_conn.get_connection(False)
 
-        instance = db.instance_create(self.values)
-        conn.spawn(instance)
-
+        instance = self._create_instance()
         conn.get_diagnostics(instance)
 
     def test_instance_snapshot(self):
-- 
cgit 


From ffaf32b9ac9a3e71ac25f68eb593bbf16a11946a Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh.kearney@rackspace.com>
Date: Thu, 30 Dec 2010 19:07:20 -0600
Subject: Cleanup

---
 nova/tests/test_xenapi.py | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 539d132bd..c95a53af3 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -161,27 +161,14 @@ class XenAPIVMTestCase(test.TestCase):
         xenapi_fake.create_network('fake', FLAGS.flat_network_bridge)
         stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
         self.conn = xenapi_conn.get_connection(False)
-        self.values = {
-            "name": 1,
-            "id": 1,
-            "project_id": self.project.id,
-            "user_id": self.user.id,
-            "image_id": 1,
-            "kernel_id": 2,
-            "ramdisk_id": 3,
-            "instance_type": "m1.large",
-            "mac_address": "aa:bb:cc:dd:ee:ff"}
 
     def test_list_instances_0(self):
         instances = self.conn.list_instances()
         self.assertEquals(instances, [])
 
     def test_get_diagnostics(self):
-        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
-        conn = xenapi_conn.get_connection(False)
-
         instance = self._create_instance()
-        conn.get_diagnostics(instance)
+        self.conn.get_diagnostics(instance)
 
     def test_instance_snapshot(self):
         stubs.stubout_instance_snapshot(self.stubs)
@@ -263,6 +250,15 @@ class XenAPIVMTestCase(test.TestCase):
 
     def _create_instance(self):
         """Creates and spawns a test instance"""
-        instance = db.instance_create(self.values)
+        values = {'name': 1, 'id': 1,
+                  'project_id': self.project.id,
+                  'user_id': self.user.id,
+                  'image_id': 1,
+                  'kernel_id': 2,
+                  'ramdisk_id': 3,
+                  'instance_type': 'm1.large',
+                  'mac_address': 'aa:bb:cc:dd:ee:ff'
+                  }
+        instance = db.instance_create(values)
         self.conn.spawn(instance)
         return instance
-- 
cgit