Sophie

Sophie

distrib > Fedora > 18 > i386 > by-pkgid > 6271f993f8f84cfb87b0e066940579a5 > files > 2

euca2ools-2.1.4-1.fc18.src.rpm

Index: euca2ools-2.1.4/euca2ools/commands/euca/register.py
===================================================================
--- euca2ools-2.1.4.orig/euca2ools/commands/euca/register.py
+++ euca2ools-2.1.4/euca2ools/commands/euca/register.py
@@ -37,7 +37,7 @@ import sys
 from boto.roboto.param import Param
 
 class Register(euca2ools.commands.eucacommand.EucaCommand):
-
+    APIVersion = '2010-06-15'
     Description = 'Registers a manifest for use with the cloud.'
     Options = [Param(name='block_device_mapping',
                      short_name='b', long_name='block-device-mapping',
@@ -67,7 +67,12 @@ class Register(euca2ools.commands.eucaco
                      doc='The root device name (e.g., /dev/sda1, or xvda).'),
                Param(name='snapshot', short_name='s', long_name='snapshot',
                      optional=True, ptype='string',
-                     doc='The snapshot ID to use as the root device.')]
+                     doc='The snapshot ID to use as the root device.'),
+               Param(name='virtualization_type',
+                     long_name='virtualization-type', optional=True,
+                     ptype='string',
+                     doc=('[Privileged only] type of virtualization to '
+                          'register the image with'))]
     Args = [Param(name='image_location',
                   optional=True, ptype='string',
                   doc="""Path to the uploaded image (bucket/manifest).
@@ -104,7 +109,8 @@ class Register(euca2ools.commands.eucaco
                                      kernel_id=self.kernel,
                                      ramdisk_id=self.ramdisk,
                                      root_device_name=self.root_device_name,
-                                     block_device_map=self.block_device_mapping)
+                                     block_device_map=self.block_device_mapping,
+                                     virtualization_type=self.virtualization_type)
 
     def main_cli(self):
         image_id = self.main()
Index: euca2ools-2.1.4/euca2ools/commands/eustore/installimage.py
===================================================================
--- euca2ools-2.1.4.orig/euca2ools/commands/eustore/installimage.py
+++ euca2ools-2.1.4/euca2ools/commands/eustore/installimage.py
@@ -240,6 +240,7 @@ class InstallImage(AWSQueryRequest):
         obj.root_device_name=None
         obj.kernel=kernel_id
         obj.ramdisk=ramdisk_id
+        obj.virtualization_type=None
         return obj.main()
 
     def bundleAll(self, file, prefix, description, arch):