Merging in latest boto.

boto/ec2/image.py

 # Copyright (c) 2006-2010 Mitch Garnaat http://garnaat.org/
 # Copyright (c) 2010, Eucalyptus Systems, Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
@@ skipping 133 matching lines @@
         """
         rs = self.connection.get_all_images([self.id])
         if len(rs) > 0:
             img = rs[0]
             if img.id == self.id:
                 self._update(img)
         elif validate:
             raise ValueError('%s is not a valid Image ID' % self.id)
         return self.state
 
-    def run(self, min_count=1, max_count=1, key_name=None,
+    def run(self, min_count=1, max_count=1, key_name=None, 
             security_groups=None, user_data=None,
             addressing_type=None, instance_type='m1.small', placement=None,
             kernel_id=None, ramdisk_id=None,
             monitoring_enabled=False, subnet_id=None,
             block_device_map=None,
             disable_api_termination=False,
             instance_initiated_shutdown_behavior=None,
             private_ip_address=None,
-            placement_group=None):
+            placement_group=None, security_group_ids=None):
         """
         Runs this instance.
         
         :type min_count: int
         :param min_count: The minimum number of instances to start
         
         :type max_count: int
         :param max_count: The maximum number of instances to start
         
         :type key_name: string
@@ skipping 39 matching lines @@
         :param block_device_map: A BlockDeviceMapping data structure
                                  describing the EBS volumes associated
                                  with the Image.
 
         :type disable_api_termination: bool
         :param disable_api_termination: If True, the instances will be locked
                                         and will not be able to be terminated
                                         via the API.
 
         :type instance_initiated_shutdown_behavior: string
-        :param instance_initiated_shutdown_behavior: Specifies whether the instance's
-                                                     EBS volumes are stopped (i.e. detached)
-                                                     or terminated (i.e. deleted) when
-                                                     the instance is shutdown by the
-                                                     owner.  Valid values are:
+        :param instance_initiated_shutdown_behavior: Specifies whether the instance
+                                                     stops or terminates on instance-initiated
+                                                     shutdown. Valid values are:
                                                      stop | terminate
 
         :type placement_group: string
         :param placement_group: If specified, this is the name of the placement
                                 group in which the instance(s) will be launched.
 
         :rtype: Reservation
         :return: The :class:`boto.ec2.instance.Reservation` associated with the request for machines
+
+        :type security_group_ids: 
+        :param security_group_ids:
         """
+
         return self.connection.run_instances(self.id, min_count, max_count,
                                              key_name, security_groups,
                                              user_data, addressing_type,
                                              instance_type, placement,
                                              kernel_id, ramdisk_id,
                                              monitoring_enabled, subnet_id,
                                              block_device_map, disable_api_termination,
                                              instance_initiated_shutdown_behavior,
-                                             private_ip_address,
-                                             placement_group)
+                                             private_ip_address, placement_group, 
+                                             security_group_ids=security_group_ids)
 
-    def deregister(self):
-        return self.connection.deregister_image(self.id)
+    def deregister(self, delete_snapshot=False):
+        return self.connection.deregister_image(self.id, delete_snapshot)
 
     def get_launch_permissions(self):
         img_attrs = self.connection.get_image_attribute(self.id,
                                                         'launchPermission')
         return img_attrs.attrs
 
     def set_launch_permissions(self, user_ids=None, group_names=None):
         return self.connection.modify_image_attribute(self.id,
                                                       'launchPermission',
                                                       'add',
@@ skipping 53 matching lines @@
             else:
                 self.attrs['product_codes'] = [value]
         elif name == 'imageId':
             self.image_id = value
         elif name == 'kernel':
             self.kernel = value
         elif name == 'ramdisk':
             self.ramdisk = value
         else:
             setattr(self, name, value)