[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a
Garrett Holmstrom
gholms at fedoraproject.org
Sun Jun 16 02:29:58 UTC 2013
The following commit has been merged in the master branch:
commit cbba5f24155068352a5f01703c1bc7949387981a
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Sat Jan 26 21:46:20 2013 -0600
Rename Description -> DESCRIPTION
diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index 4fa91f7..1ae2fda 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -34,7 +34,7 @@ from .. import Euca2oolsRequest
class Euare(requestbuilder.service.BaseService):
Name = 'iam'
- Description = 'Eucalyptus User, Authorization and Reporting Environment'
+ DESCRIPTION = 'Eucalyptus User, Authorization and Reporting Environment'
API_VERSION = '2010-05-08'
EnvURL = 'EUARE_URL'
diff --git a/euca2ools/commands/euare/addusertogroup.py b/euca2ools/commands/euare/addusertogroup.py
index a050c0e..f3254e0 100644
--- a/euca2ools/commands/euare/addusertogroup.py
+++ b/euca2ools/commands/euare/addusertogroup.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EuareRequest, DELEGATE
class AddUserToGroup(EuareRequest):
- Description = 'Add a user to a group'
+ DESCRIPTION = 'Add a user to a group'
ARGS = [Arg('-g', '--group-name', dest='GroupName', required=True,
help='group to add the user to'),
Arg('-u', '--user-name', dest='UserName', required=True,
diff --git a/euca2ools/commands/euare/createaccesskey.py b/euca2ools/commands/euare/createaccesskey.py
index 962d1a2..decc924 100644
--- a/euca2ools/commands/euare/createaccesskey.py
+++ b/euca2ools/commands/euare/createaccesskey.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EuareRequest, DELEGATE
class CreateAccessKey(EuareRequest):
- Description = 'Create a new access key for a user'
+ DESCRIPTION = 'Create a new access key for a user'
ARGS = [Arg('-u', '--user-name', dest='UserName', help='''user the new key
will belong to (default: calling user)'''),
DELEGATE]
diff --git a/euca2ools/commands/euare/createuser.py b/euca2ools/commands/euare/createuser.py
index ca5cbb2..f3d58dc 100644
--- a/euca2ools/commands/euare/createuser.py
+++ b/euca2ools/commands/euare/createuser.py
@@ -34,7 +34,7 @@ from .addusertogroup import AddUserToGroup
from .createaccesskey import CreateAccessKey
class CreateUser(EuareRequest):
- Description = '''Create a new user and optionally add the user to a group
+ DESCRIPTION = '''Create a new user and optionally add the user to a group
or generate an access key for the user'''
ARGS = [Arg('-u', '--user-name', dest='UserName', required=True,
help='name of the new user'),
diff --git a/euca2ools/commands/euare/deleteloginprofile.py b/euca2ools/commands/euare/deleteloginprofile.py
index 792328a..b8e6338 100644
--- a/euca2ools/commands/euare/deleteloginprofile.py
+++ b/euca2ools/commands/euare/deleteloginprofile.py
@@ -35,7 +35,7 @@ from requestbuilder import Arg
from . import EuareRequest, DELEGATE
class DeleteLoginProfile(EuareRequest):
- Description = "Delete a user's login profile"
+ DESCRIPTION = "Delete a user's login profile"
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
required=True, help='''name of the user whose login profile
should be deleted (required)'''),
diff --git a/euca2ools/commands/euare/listusers.py b/euca2ools/commands/euare/listusers.py
index 7e9eb05..b5bcf6e 100644
--- a/euca2ools/commands/euare/listusers.py
+++ b/euca2ools/commands/euare/listusers.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EuareRequest, DELEGATE
class ListUsers(EuareRequest):
- Description = 'List users under a specific path prefix'
+ DESCRIPTION = 'List users under a specific path prefix'
ARGS = [Arg('-p', '--path-prefix', dest='PathPrefix', metavar='PREFIX',
help='''limit results to users who begin with a given path
(default: list all users)'''),
diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 6cb5ae1..7f84b49 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -42,7 +42,7 @@ from .. import Euca2oolsRequest
class Eucalyptus(requestbuilder.service.BaseService):
Name = 'ec2'
- Description = 'Eucalyptus compute cloud service'
+ DESCRIPTION = 'Eucalyptus compute cloud service'
API_VERSION = '2009-11-30'
EnvURL = 'EC2_URL'
diff --git a/euca2ools/commands/euca/associateaddress.py b/euca2ools/commands/euca/associateaddress.py
index 5b11c38..9a54a06 100644
--- a/euca2ools/commands/euca/associateaddress.py
+++ b/euca2ools/commands/euca/associateaddress.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class AssociateAddress(EucalyptusRequest):
- Description = 'Associate an elastic IP address with a running instance'
+ DESCRIPTION = 'Associate an elastic IP address with a running instance'
ARGS = [Arg('-i', '--instance', dest='InstanceId', metavar='INSTANCE',
required=True, help='instance to associate the address with'),
Arg('PublicIp', metavar='ADDRESS', help='IP address to associate')]
diff --git a/euca2ools/commands/euca/attachvolume.py b/euca2ools/commands/euca/attachvolume.py
index f6925a3..8a4e558 100644
--- a/euca2ools/commands/euca/attachvolume.py
+++ b/euca2ools/commands/euca/attachvolume.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class AttachVolume(EucalyptusRequest):
- Description = 'Attach an EBS volume to an instance'
+ DESCRIPTION = 'Attach an EBS volume to an instance'
ARGS = [Arg('-i', '--instance', dest='InstanceId', metavar='INSTANCE',
required=True, help='instance to attach the folume to'),
Arg('-d', '--device', dest='Device', required=True,
diff --git a/euca2ools/commands/euca/bundleinstance.py b/euca2ools/commands/euca/bundleinstance.py
index 2fa5a80..4813478 100644
--- a/euca2ools/commands/euca/bundleinstance.py
+++ b/euca2ools/commands/euca/bundleinstance.py
@@ -38,7 +38,7 @@ import textwrap
from . import EucalyptusRequest
class BundleInstance(EucalyptusRequest):
- Description = 'Bundle an S3-backed Windows instance'
+ DESCRIPTION = 'Bundle an S3-backed Windows instance'
ARGS = [Arg('InstanceId', metavar='INSTANCE', help='instance to bundle'),
Arg('-b', '--bucket', dest='Storage.S3.Bucket', metavar='BUCKET',
required=True,
diff --git a/euca2ools/commands/euca/cancelbundletask.py b/euca2ools/commands/euca/cancelbundletask.py
index 41bc964..e402f15 100644
--- a/euca2ools/commands/euca/cancelbundletask.py
+++ b/euca2ools/commands/euca/cancelbundletask.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class CancelBundleTask(EucalyptusRequest):
- Description = 'Cancel an instance bundling operation'
+ DESCRIPTION = 'Cancel an instance bundling operation'
ARGS = [Arg('BundleId', metavar='TASK-ID',
help='ID of the bundle task to cancel')]
diff --git a/euca2ools/commands/euca/confirmproductinstance.py b/euca2ools/commands/euca/confirmproductinstance.py
index 4b0b0d6..55edbbb 100644
--- a/euca2ools/commands/euca/confirmproductinstance.py
+++ b/euca2ools/commands/euca/confirmproductinstance.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class ConfirmProductInstance(EucalyptusRequest):
- Description = 'Verify if a product code is associated with an instance'
+ DESCRIPTION = 'Verify if a product code is associated with an instance'
ARGS = [Arg('ProductCode', metavar='CODE', help='product code to confirm'),
Arg('-i', '--instance', dest='InstanceId', metavar='INSTANCE',
required=True, help='instance to confirm')]
diff --git a/euca2ools/commands/euca/createimage.py b/euca2ools/commands/euca/createimage.py
index e39c1c4..944bc9a 100644
--- a/euca2ools/commands/euca/createimage.py
+++ b/euca2ools/commands/euca/createimage.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class CreateImage(EucalyptusRequest):
- Description = 'Create an EBS image from a running or stopped EBS instance'
+ DESCRIPTION = 'Create an EBS image from a running or stopped EBS instance'
ARGS = [Arg('InstanceId', metavar='INSTANCE',
help='instance from which to create the image'),
Arg('-n', '--name', dest='Name', required=True,
diff --git a/euca2ools/commands/euca/createkeypair.py b/euca2ools/commands/euca/createkeypair.py
index 3c43ed2..0812ffb 100644
--- a/euca2ools/commands/euca/createkeypair.py
+++ b/euca2ools/commands/euca/createkeypair.py
@@ -33,7 +33,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class CreateKeyPair(EucalyptusRequest):
- Description = 'Create a new SSH key pair for use with instances'
+ DESCRIPTION = 'Create a new SSH key pair for use with instances'
ARGS = [Arg('KeyName', metavar='KEYPAIR', help='name of the new key pair'),
Arg('-f', '--filename', metavar='FILE', route_to=None,
help='file name to save the private key to')]
diff --git a/euca2ools/commands/euca/createsecuritygroup.py b/euca2ools/commands/euca/createsecuritygroup.py
index 3329ddc..d027ace 100644
--- a/euca2ools/commands/euca/createsecuritygroup.py
+++ b/euca2ools/commands/euca/createsecuritygroup.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class CreateSecurityGroup(EucalyptusRequest):
- Description = 'Create a new security group'
+ DESCRIPTION = 'Create a new security group'
ARGS = [Arg('-d', '--description', dest='GroupDescription', metavar='DESC',
required=True),
Arg('GroupName', metavar='GROUP', help='name of the new group')]
diff --git a/euca2ools/commands/euca/createsnapshot.py b/euca2ools/commands/euca/createsnapshot.py
index eb110ac..5ad3cb5 100644
--- a/euca2ools/commands/euca/createsnapshot.py
+++ b/euca2ools/commands/euca/createsnapshot.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class CreateSnapshot(EucalyptusRequest):
- Description = 'Create a snapshot of a volume'
+ DESCRIPTION = 'Create a snapshot of a volume'
ARGS = [Arg('VolumeId', metavar='VOLUME', help='volume to snapshot'),
Arg('-d', '--description', metavar='DESC', dest='Description',
help='snapshot description')]
diff --git a/euca2ools/commands/euca/createtags.py b/euca2ools/commands/euca/createtags.py
index 9f01aa3..2e04912 100644
--- a/euca2ools/commands/euca/createtags.py
+++ b/euca2ools/commands/euca/createtags.py
@@ -34,7 +34,7 @@ from .argtypes import binary_tag_def
class CreateTags(EucalyptusRequest):
API_VERSION = '2010-08-31'
- Description = 'Add or overwrite tags for one or more resources'
+ DESCRIPTION = 'Add or overwrite tags for one or more resources'
ARGS = [Arg('ResourceId', metavar='RESOURCE', nargs='+',
help='IDs of the resource(s) to tag'),
Arg('--tag', dest='Tag', metavar='KEY[=VALUE]',
diff --git a/euca2ools/commands/euca/createvolume.py b/euca2ools/commands/euca/createvolume.py
index 3969288..49df098 100644
--- a/euca2ools/commands/euca/createvolume.py
+++ b/euca2ools/commands/euca/createvolume.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class CreateVolume(EucalyptusRequest):
- Description = 'Create a new volume'
+ DESCRIPTION = 'Create a new volume'
ARGS = [Arg('-s', '--size', dest='Size', type=int,
help='''size of the new volume in GiB. Required unless
--snapshot is used'''),
diff --git a/euca2ools/commands/euca/deletekeypair.py b/euca2ools/commands/euca/deletekeypair.py
index 434c7bf..168aae9 100644
--- a/euca2ools/commands/euca/deletekeypair.py
+++ b/euca2ools/commands/euca/deletekeypair.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class DeleteKeyPair(EucalyptusRequest):
- Description = 'Delete an existing keypair'
+ DESCRIPTION = 'Delete an existing keypair'
ARGS = [Arg('KeyName', metavar='KEYPAIR',
help='name of the keypair to delete')]
diff --git a/euca2ools/commands/euca/deletesecuritygroup.py b/euca2ools/commands/euca/deletesecuritygroup.py
index 77bb1a9..c2ee5c1 100644
--- a/euca2ools/commands/euca/deletesecuritygroup.py
+++ b/euca2ools/commands/euca/deletesecuritygroup.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class DeleteSecurityGroup(EucalyptusRequest):
- Description = 'Delete a security group'
+ DESCRIPTION = 'Delete a security group'
ARGS = [Arg('GroupName', metavar='GROUP')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/deletesnapshot.py b/euca2ools/commands/euca/deletesnapshot.py
index 923558c..63081bc 100644
--- a/euca2ools/commands/euca/deletesnapshot.py
+++ b/euca2ools/commands/euca/deletesnapshot.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class DeleteSnapshot(EucalyptusRequest):
- Description = 'Delete a snapshot'
+ DESCRIPTION = 'Delete a snapshot'
ARGS = [Arg('SnapshotId', metavar='SNAPSHOT', help='snapshot to delete')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/deletetags.py b/euca2ools/commands/euca/deletetags.py
index 9234180..915c76d 100644
--- a/euca2ools/commands/euca/deletetags.py
+++ b/euca2ools/commands/euca/deletetags.py
@@ -34,7 +34,7 @@ from .argtypes import ternary_tag_def
class DeleteTags(EucalyptusRequest):
API_VERSION = '2010-08-31'
- Description = 'Delete tags from one or more resources'
+ DESCRIPTION = 'Delete tags from one or more resources'
ARGS = [Arg('ResourceId', metavar='RESOURCE', nargs='+',
help='IDs of the resource(s) to un-tag'),
Arg('--tag', dest='Tag', metavar='KEY[=[VALUE]]',
diff --git a/euca2ools/commands/euca/deletevolume.py b/euca2ools/commands/euca/deletevolume.py
index 19d57b3..f9ff72d 100644
--- a/euca2ools/commands/euca/deletevolume.py
+++ b/euca2ools/commands/euca/deletevolume.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class DeleteVolume(EucalyptusRequest):
- Description = 'Delete a volume'
+ DESCRIPTION = 'Delete a volume'
ARGS = [Arg('VolumeId', metavar='VOLUME', help='volume to delete')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/deregisterimage.py b/euca2ools/commands/euca/deregisterimage.py
index 5f6deba..c2dd5f2 100644
--- a/euca2ools/commands/euca/deregisterimage.py
+++ b/euca2ools/commands/euca/deregisterimage.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class DeregisterImage(EucalyptusRequest):
- Description = 'De-register an image'
+ DESCRIPTION = 'De-register an image'
ARGS = [Arg('ImageId', metavar='IMAGE', help='image to de-register')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/describeaddresses.py b/euca2ools/commands/euca/describeaddresses.py
index f39aa78..1ae0ccb 100644
--- a/euca2ools/commands/euca/describeaddresses.py
+++ b/euca2ools/commands/euca/describeaddresses.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DescribeAddresses(EucalyptusRequest):
API_VERSION = '2011-01-01'
- Description = 'Show information about elastic IP addresses'
+ DESCRIPTION = 'Show information about elastic IP addresses'
ARGS = [Arg('address', nargs='*', route_to=None,
help='''limit results to one or more elastic IP addresses or
allocation IDs''')]
diff --git a/euca2ools/commands/euca/describeavailabilityzones.py b/euca2ools/commands/euca/describeavailabilityzones.py
index 213ba9b..c498d73 100644
--- a/euca2ools/commands/euca/describeavailabilityzones.py
+++ b/euca2ools/commands/euca/describeavailabilityzones.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg, Filter
from . import EucalyptusRequest
class DescribeAvailabilityZones(EucalyptusRequest):
- Description = 'Display availability zones within the active region'
+ DESCRIPTION = 'Display availability zones within the active region'
API_VERSION = '2010-08-31'
ARGS = [Arg('ZoneName', metavar='ZONE', nargs='*',
help='limit results to one or more availability zones')]
diff --git a/euca2ools/commands/euca/describebundletasks.py b/euca2ools/commands/euca/describebundletasks.py
index b8026d8..90d48bd 100644
--- a/euca2ools/commands/euca/describebundletasks.py
+++ b/euca2ools/commands/euca/describebundletasks.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg, Filter
from . import EucalyptusRequest
class DescribeBundleTasks(EucalyptusRequest):
- Description = 'Describe current instance-bundling tasks'
+ DESCRIPTION = 'Describe current instance-bundling tasks'
API_VERSION = '2010-08-31'
ARGS = [Arg('BundleId', metavar='BUNDLE', nargs='*',
help='limit results to one or more bundle tasks')]
diff --git a/euca2ools/commands/euca/describeimageattribute.py b/euca2ools/commands/euca/describeimageattribute.py
index 044f40a..4491caf 100644
--- a/euca2ools/commands/euca/describeimageattribute.py
+++ b/euca2ools/commands/euca/describeimageattribute.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg, MutuallyExclusiveArgList
from . import EucalyptusRequest
class DescribeImageAttribute(EucalyptusRequest):
- Description = 'Show information about an attribute of an image'
+ DESCRIPTION = 'Show information about an attribute of an image'
ARGS = [Arg('ImageId', metavar='IMAGE', help='image to describe'),
MutuallyExclusiveArgList(True,
Arg('-l', '--launch-permission', dest='Attribute',
diff --git a/euca2ools/commands/euca/describeimages.py b/euca2ools/commands/euca/describeimages.py
index ca95a89..2e754c2 100644
--- a/euca2ools/commands/euca/describeimages.py
+++ b/euca2ools/commands/euca/describeimages.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg, Filter, GenericTagFilter
from . import EucalyptusRequest
class DescribeImages(EucalyptusRequest):
- Description = '''\
+ DESCRIPTION = '''\
Show information about images
By default, only images the caller owns and images for which the caller
diff --git a/euca2ools/commands/euca/describeinstances.py b/euca2ools/commands/euca/describeinstances.py
index 01e8665..84633ee 100644
--- a/euca2ools/commands/euca/describeinstances.py
+++ b/euca2ools/commands/euca/describeinstances.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DescribeInstances(EucalyptusRequest):
API_VERSION = '2010-08-31'
- Description = 'Show information about instances'
+ DESCRIPTION = 'Show information about instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='*',
help='Limit results to one or more instances')]
FILTERS = [Filter('architecture', help='CPU architecture'),
diff --git a/euca2ools/commands/euca/describekeypairs.py b/euca2ools/commands/euca/describekeypairs.py
index 02d1cd3..fedae71 100644
--- a/euca2ools/commands/euca/describekeypairs.py
+++ b/euca2ools/commands/euca/describekeypairs.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DescribeKeyPairs(EucalyptusRequest):
API_VERSION = '2010-08-31'
- Description = 'Display information about available key pairs'
+ DESCRIPTION = 'Display information about available key pairs'
ARGS = [Arg('KeyName', nargs='*', metavar='KEYPAIR',
help='limit results to specific key pairs')]
FILTERS = [Filter('fingerprint', help='fingerprint of the key pair'),
diff --git a/euca2ools/commands/euca/describeregions.py b/euca2ools/commands/euca/describeregions.py
index c8b628a..13f7b48 100644
--- a/euca2ools/commands/euca/describeregions.py
+++ b/euca2ools/commands/euca/describeregions.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DescribeRegions(EucalyptusRequest):
API_VERSION = '2010-08-31'
- Description = 'Display information about regions'
+ DESCRIPTION = 'Display information about regions'
ARGS = [Arg('RegionName', nargs='*', metavar='REGION',
help='limit results to specific regions')]
FILTERS = [Filter('endpoint'),
diff --git a/euca2ools/commands/euca/describesecuritygroups.py b/euca2ools/commands/euca/describesecuritygroups.py
index fa7a2b6..042a904 100644
--- a/euca2ools/commands/euca/describesecuritygroups.py
+++ b/euca2ools/commands/euca/describesecuritygroups.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg, Filter
from . import EucalyptusRequest
class DescribeSecurityGroups(EucalyptusRequest):
- Description = '''\
+ DESCRIPTION = '''\
Show information about security groups
Note that filters are matched on literal strings only, so
diff --git a/euca2ools/commands/euca/describesnapshots.py b/euca2ools/commands/euca/describesnapshots.py
index 8dd0e7b..3af6bdd 100644
--- a/euca2ools/commands/euca/describesnapshots.py
+++ b/euca2ools/commands/euca/describesnapshots.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class DescribeSnapshots(EucalyptusRequest):
API_VERSION = '2010-08-31'
- Description = '''\
+ DESCRIPTION = '''\
Show information about snapshots
By default, only snapshots explicitly restorable by the caller are
diff --git a/euca2ools/commands/euca/describetags.py b/euca2ools/commands/euca/describetags.py
index b7a6379..d12ccb5 100644
--- a/euca2ools/commands/euca/describetags.py
+++ b/euca2ools/commands/euca/describetags.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest, RESOURCE_TYPE_MAP
class DescribeTags(EucalyptusRequest):
API_VERSION = '2010-08-31'
- Description = 'List tags associated with your account'
+ DESCRIPTION = 'List tags associated with your account'
FILTERS = [Filter('key'),
Filter('resource-id'),
Filter('resource-type',
diff --git a/euca2ools/commands/euca/describevolumes.py b/euca2ools/commands/euca/describevolumes.py
index 9937c5b..e810b68 100644
--- a/euca2ools/commands/euca/describevolumes.py
+++ b/euca2ools/commands/euca/describevolumes.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg, Filter, GenericTagFilter
from . import EucalyptusRequest
class DescribeVolumes(EucalyptusRequest):
- Description = 'Display information about volumes'
+ DESCRIPTION = 'Display information about volumes'
API_VERSION = '2010-08-31'
ARGS = [Arg('VolumeId', metavar='VOLUME', nargs='*',
help='volume(s) to describe (default: all volumes)')]
diff --git a/euca2ools/commands/euca/detachvolume.py b/euca2ools/commands/euca/detachvolume.py
index 52320fb..8931a23 100644
--- a/euca2ools/commands/euca/detachvolume.py
+++ b/euca2ools/commands/euca/detachvolume.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class DetachVolume(EucalyptusRequest):
- Description = 'Detach a volume from an instance'
+ DESCRIPTION = 'Detach a volume from an instance'
ARGS = [Arg('VolumeId', metavar='VOLUME', help='volume to detach'),
Arg('-i', '--instance', dest='InstanceID', metavar='INSTANCE',
help='instance to detach from'),
diff --git a/euca2ools/commands/euca/disassociateaddress.py b/euca2ools/commands/euca/disassociateaddress.py
index f3878c8..8b5a27f 100644
--- a/euca2ools/commands/euca/disassociateaddress.py
+++ b/euca2ools/commands/euca/disassociateaddress.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class DisassociateAddress(EucalyptusRequest):
- Description = 'Disassociate an elastic IP address from an instance'
+ DESCRIPTION = 'Disassociate an elastic IP address from an instance'
ARGS = [Arg('address', route_to=None,
help='elastic IP address or association ID to disassociate')]
diff --git a/euca2ools/commands/euca/getconsoleoutput.py b/euca2ools/commands/euca/getconsoleoutput.py
index 93a07dc..3d4e5db 100644
--- a/euca2ools/commands/euca/getconsoleoutput.py
+++ b/euca2ools/commands/euca/getconsoleoutput.py
@@ -33,7 +33,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class GetConsoleOutput(EucalyptusRequest):
- Description = 'Retrieve console output for the specified instance'
+ DESCRIPTION = 'Retrieve console output for the specified instance'
ARGS = [Arg('InstanceId', metavar='INSTANCE',
help='instance to obtain console output from')]
diff --git a/euca2ools/commands/euca/getpassword.py b/euca2ools/commands/euca/getpassword.py
index a63b1d9..4182916 100644
--- a/euca2ools/commands/euca/getpassword.py
+++ b/euca2ools/commands/euca/getpassword.py
@@ -36,7 +36,7 @@ from .getpassworddata import GetPasswordData
class GetPassword(GetPasswordData):
Action = 'GetPasswordData'
- Description = '''Retrieve the administrator password for an instance
+ DESCRIPTION = '''Retrieve the administrator password for an instance
running Windows'''
ARGS = [Arg('-k', '--priv-launch-key', metavar='PRIVKEY',
type=file_contents, required=True, route_to=None,
diff --git a/euca2ools/commands/euca/getpassworddata.py b/euca2ools/commands/euca/getpassworddata.py
index ffde4fc..cbf2e90 100644
--- a/euca2ools/commands/euca/getpassworddata.py
+++ b/euca2ools/commands/euca/getpassworddata.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class GetPasswordData(EucalyptusRequest):
- Description = '''Retrieve the encrypted administrator password for an
+ DESCRIPTION = '''Retrieve the encrypted administrator password for an
instance running Windows'''
ARGS = [Arg('InstanceId', metavar='INSTANCE',
help='instance to obtain the initial password for')]
diff --git a/euca2ools/commands/euca/importkeypair.py b/euca2ools/commands/euca/importkeypair.py
index 75a3f54..7b38d50 100644
--- a/euca2ools/commands/euca/importkeypair.py
+++ b/euca2ools/commands/euca/importkeypair.py
@@ -35,7 +35,7 @@ from .argtypes import file_contents
class ImportKeyPair(EucalyptusRequest):
API_VERSION = '2010-08-31'
- Description = 'Import a public RSA key'
+ DESCRIPTION = 'Import a public RSA key'
ARGS = [Arg('KeyName', metavar='KEYPAIR',
help='name for the new key pair'),
Arg('-f', '--public-key-file', dest='pubkey', metavar='PUBKEY',
diff --git a/euca2ools/commands/euca/modifyimageattribute.py b/euca2ools/commands/euca/modifyimageattribute.py
index 6ea5d83..9b854d3 100644
--- a/euca2ools/commands/euca/modifyimageattribute.py
+++ b/euca2ools/commands/euca/modifyimageattribute.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg, MutuallyExclusiveArgList
from . import EucalyptusRequest
class ModifyImageAttribute(EucalyptusRequest):
- Description = 'Modify an attribute of an image'
+ DESCRIPTION = 'Modify an attribute of an image'
ARGS = [Arg('ImageId', metavar='IMAGE', help='image to modify'),
MutuallyExclusiveArgList(True,
Arg('--description', dest='Description.Value', metavar='DESC',
diff --git a/euca2ools/commands/euca/monitorinstances.py b/euca2ools/commands/euca/monitorinstances.py
index 80584b7..41b147d 100644
--- a/euca2ools/commands/euca/monitorinstances.py
+++ b/euca2ools/commands/euca/monitorinstances.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class MonitorInstances(EucalyptusRequest):
- Description = 'Enable monitoring for one or more instances'
+ DESCRIPTION = 'Enable monitoring for one or more instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to monitor')]
ListDelims = ['instancesSet']
diff --git a/euca2ools/commands/euca/rebootinstances.py b/euca2ools/commands/euca/rebootinstances.py
index cfc2048..e6b4622 100644
--- a/euca2ools/commands/euca/rebootinstances.py
+++ b/euca2ools/commands/euca/rebootinstances.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class RebootInstances(EucalyptusRequest):
- Description = 'Reboot one or more instances'
+ DESCRIPTION = 'Reboot one or more instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to reboot')]
diff --git a/euca2ools/commands/euca/registerimage.py b/euca2ools/commands/euca/registerimage.py
index 319813a..390aa1a 100644
--- a/euca2ools/commands/euca/registerimage.py
+++ b/euca2ools/commands/euca/registerimage.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
from .argtypes import block_device_mapping
class RegisterImage(EucalyptusRequest):
- Description = 'Register a new image'
+ DESCRIPTION = 'Register a new image'
ARGS = [Arg('ImageLocation', metavar='MANIFEST', nargs='?',
help='''location of the image manifest in S3 storage
(required for instance-store images)'''),
diff --git a/euca2ools/commands/euca/releaseaddress.py b/euca2ools/commands/euca/releaseaddress.py
index ca69e8d..2b33980 100644
--- a/euca2ools/commands/euca/releaseaddress.py
+++ b/euca2ools/commands/euca/releaseaddress.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class ReleaseAddress(EucalyptusRequest):
- Description = 'Release an elastic IP address'
+ DESCRIPTION = 'Release an elastic IP address'
ARGS = [Arg('PublicIp', metavar='IP', help='elastic IP to release')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/resetimageattribute.py b/euca2ools/commands/euca/resetimageattribute.py
index 9686f30..3cacbcb 100644
--- a/euca2ools/commands/euca/resetimageattribute.py
+++ b/euca2ools/commands/euca/resetimageattribute.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class ResetImageAttribute(EucalyptusRequest):
- Description = 'Reset an attribute of an image to its default value'
+ DESCRIPTION = 'Reset an attribute of an image to its default value'
ARGS = [Arg('ImageId', metavar='IMAGE',
help='image whose attribute should be reset'),
Arg('-l', '--launch-permission', dest='Attribute',
diff --git a/euca2ools/commands/euca/runinstances.py b/euca2ools/commands/euca/runinstances.py
index 6ca451a..8ecf0e9 100644
--- a/euca2ools/commands/euca/runinstances.py
+++ b/euca2ools/commands/euca/runinstances.py
@@ -37,7 +37,7 @@ from . import EucalyptusRequest
from .argtypes import b64encoded_file_contents, block_device_mapping
class RunInstances(EucalyptusRequest):
- Description = 'Launch instances of a machine image'
+ DESCRIPTION = 'Launch instances of a machine image'
ARGS = [Arg('ImageId', metavar='IMAGE', help='image to instantiate'),
Arg('-n', '--instance-count', dest='count', metavar='MIN[-MAX]',
default='1', route_to=None,
diff --git a/euca2ools/commands/euca/startinstances.py b/euca2ools/commands/euca/startinstances.py
index bb9ae8d..d7e82a7 100644
--- a/euca2ools/commands/euca/startinstances.py
+++ b/euca2ools/commands/euca/startinstances.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class StartInstances(EucalyptusRequest):
- Description = 'Start one or more stopped instances'
+ DESCRIPTION = 'Start one or more stopped instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to start')]
ListDelims = ['instancesSet']
diff --git a/euca2ools/commands/euca/stopinstances.py b/euca2ools/commands/euca/stopinstances.py
index 2ef18fb..e9dafe4 100644
--- a/euca2ools/commands/euca/stopinstances.py
+++ b/euca2ools/commands/euca/stopinstances.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class StopInstances(EucalyptusRequest):
- Description = 'Stop one or more running instances'
+ DESCRIPTION = 'Stop one or more running instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to stop'),
Arg('-f', '--force', dest='Force', action='store_const',
diff --git a/euca2ools/commands/euca/terminateinstances.py b/euca2ools/commands/euca/terminateinstances.py
index 9ba0dd4..a92509d 100644
--- a/euca2ools/commands/euca/terminateinstances.py
+++ b/euca2ools/commands/euca/terminateinstances.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class TerminateInstances(EucalyptusRequest):
- Description = 'Terminate one or more instances'
+ DESCRIPTION = 'Terminate one or more instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to terminate')]
ListDelims = ['instancesSet']
diff --git a/euca2ools/commands/euca/unmonitorinstances.py b/euca2ools/commands/euca/unmonitorinstances.py
index f895e31..1f26c9b 100644
--- a/euca2ools/commands/euca/unmonitorinstances.py
+++ b/euca2ools/commands/euca/unmonitorinstances.py
@@ -32,7 +32,7 @@ from requestbuilder import Arg
from . import EucalyptusRequest
class UnmonitorInstances(EucalyptusRequest):
- Description = 'Disable monitoring for one or more instances'
+ DESCRIPTION = 'Disable monitoring for one or more instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to un-monitor')]
ListDelims = ['instancesSet']
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list