[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 331b656f36a8725867527eb153a493ac8f77236d
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed May 15 11:14:04 2013 -0700

    Rename vmType -> instanceType

diff --git a/bin/euca-describe-instance-types b/bin/euca-describe-instance-types
index 016cddb..14b0d64 100755
--- a/bin/euca-describe-instance-types
+++ b/bin/euca-describe-instance-types
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 
-import euca2ools.commands.euca.describevmtypes
+import euca2ools.commands.euca.describeinstancetypes
 
 if __name__ == '__main__':
-    euca2ools.commands.euca.describevmtypes.DescribeVmTypes.run()
+    euca2ools.commands.euca.describeinstancetypes.DescribeInstanceTypes.run()
diff --git a/bin/euca-modify-instance-type b/bin/euca-modify-instance-type
index 34297d8..1488cca 100755
--- a/bin/euca-modify-instance-type
+++ b/bin/euca-modify-instance-type
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 
-import euca2ools.commands.euca.modifyvmtypeattribute
+import euca2ools.commands.euca.modifyinstancetypeattribute
 
 if __name__ == '__main__':
-    euca2ools.commands.euca.modifyvmtypeattribute.ModifyVmTypeAttribute.run()
+    euca2ools.commands.euca.modifyinstancetypeattribute.ModifyInstanceTypeAttribute.run()
diff --git a/euca2ools/commands/euca/describevmtypes.py b/euca2ools/commands/euca/describeinstancetypes.py
similarity index 95%
rename from euca2ools/commands/euca/describevmtypes.py
rename to euca2ools/commands/euca/describeinstancetypes.py
index f344de3..b475c1b 100644
--- a/euca2ools/commands/euca/describevmtypes.py
+++ b/euca2ools/commands/euca/describeinstancetypes.py
@@ -33,16 +33,16 @@ from requestbuilder import Arg
 from requestbuilder.mixins import TabifyingMixin
 
 
-class DescribeVmTypes(EucalyptusRequest, TabifyingMixin):
+class DescribeInstanceTypes(EucalyptusRequest, TabifyingMixin):
     DESCRIPTION = '[Eucalyptus only] Show information about instance types'
-    ARGS = [Arg('VmTypes', metavar='INSTANCETYPE', nargs='*',
+    ARGS = [Arg('InstanceType', metavar='INSTANCETYPE', nargs='*',
                 help='limit results to specific instance types'),
             Arg('--by-zone', dest='by_zone', action='store_true',
                 route_to=None,
                 help='show info for each availability zone separately'),
             Arg('--show-capacity', dest='Availability', action='store_true',
                 help='show info about instance capacity')]
-    LIST_TAGS = ['vmTypeDetails', 'availability']
+    LIST_TAGS = ['instanceTypeDetails', 'availability']
 
     def configure(self):
         EucalyptusRequest.configure(self)
@@ -55,7 +55,7 @@ class DescribeVmTypes(EucalyptusRequest, TabifyingMixin):
                            # of OrderedDict
         vmtypes = {}  # vmtype -> info and total capacity
         zones = {}  # zone -> vmtype -> info and zone capacity
-        for vmtype in result.get('vmTypeDetails', []):
+        for vmtype in result.get('instanceTypeDetails', []):
             vmtype_names.append(vmtype['name'])
             vmtypes[vmtype['name']] = {'cpu': vmtype.get('cpu'),
                                        'memory': vmtype.get('memory'),
diff --git a/euca2ools/commands/euca/modifyvmtypeattribute.py b/euca2ools/commands/euca/modifyinstancetypeattribute.py
similarity index 96%
rename from euca2ools/commands/euca/modifyvmtypeattribute.py
rename to euca2ools/commands/euca/modifyinstancetypeattribute.py
index 9fcaa18..c95eb40 100644
--- a/euca2ools/commands/euca/modifyvmtypeattribute.py
+++ b/euca2ools/commands/euca/modifyinstancetypeattribute.py
@@ -34,7 +34,7 @@ from requestbuilder.exceptions import ArgumentError
 from requestbuilder.mixins import TabifyingMixin
 
 
-class ModifyVmTypeAttribute(EucalyptusRequest, TabifyingMixin):
+class ModifyInstanceTypeAttribute(EucalyptusRequest, TabifyingMixin):
     DESCRIPTION = '[Eucalyptus cloud admin only] Modify an instance type'
     ARGS = [Arg('Name', metavar='INSTANCETYPE',
                 help='name of the instance type to modify (required)'),
@@ -57,7 +57,7 @@ class ModifyVmTypeAttribute(EucalyptusRequest, TabifyingMixin):
                                     'instance type attributes')
 
     def print_result(self, result):
-        newtype = result.get('vmType', {})
+        newtype = result.get('instanceType', {})
         print self.tabify(('INSTANCETYPE', newtype.get('name'),
                            newtype.get('cpu'), newtype.get('memory'),
                            newtype.get('disk')))

-- 
managing cloud instances for Eucalyptus