[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:57 UTC 2013
The following commit has been merged in the master branch:
commit b6a94de224f3fcf4eec908333d475487e35eea17
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Sat Jan 26 20:36:26 2013 -0600
Rename Args -> ARGS
diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index 10b7718..541f376 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -40,7 +40,7 @@ class Euare(requestbuilder.service.BaseService):
class EuareRequest(Euca2oolsRequest):
ServiceClass = Euare
- Args = [Arg('-U', '--url', dest='url', metavar='URL', route_to=SERVICE,
+ ARGS = [Arg('-U', '--url', dest='url', metavar='URL', route_to=SERVICE,
help='identity service endpoint URL')] + STD_AUTH_ARGS
def parse_response(self, response):
diff --git a/euca2ools/commands/euare/addusertogroup.py b/euca2ools/commands/euare/addusertogroup.py
index 5e0a933..a050c0e 100644
--- a/euca2ools/commands/euare/addusertogroup.py
+++ b/euca2ools/commands/euare/addusertogroup.py
@@ -33,7 +33,7 @@ from . import EuareRequest, DELEGATE
class AddUserToGroup(EuareRequest):
Description = 'Add a user to a group'
- Args = [Arg('-g', '--group-name', dest='GroupName', required=True,
+ ARGS = [Arg('-g', '--group-name', dest='GroupName', required=True,
help='group to add the user to'),
Arg('-u', '--user-name', dest='UserName', required=True,
help='user to add'),
diff --git a/euca2ools/commands/euare/createaccesskey.py b/euca2ools/commands/euare/createaccesskey.py
index 574dbc0..962d1a2 100644
--- a/euca2ools/commands/euare/createaccesskey.py
+++ b/euca2ools/commands/euare/createaccesskey.py
@@ -33,7 +33,7 @@ from . import EuareRequest, DELEGATE
class CreateAccessKey(EuareRequest):
Description = 'Create a new access key for a user'
- Args = [Arg('-u', '--user-name', dest='UserName', help='''user the new key
+ 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 7120f52..ca5cbb2 100644
--- a/euca2ools/commands/euare/createuser.py
+++ b/euca2ools/commands/euare/createuser.py
@@ -36,7 +36,7 @@ from .createaccesskey import CreateAccessKey
class CreateUser(EuareRequest):
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,
+ ARGS = [Arg('-u', '--user-name', dest='UserName', required=True,
help='name of the new user'),
Arg('-p', '--path', dest='Path',
help='path for the new user (default: "/")'),
diff --git a/euca2ools/commands/euare/deleteloginprofile.py b/euca2ools/commands/euare/deleteloginprofile.py
index 143a524..792328a 100644
--- a/euca2ools/commands/euare/deleteloginprofile.py
+++ b/euca2ools/commands/euare/deleteloginprofile.py
@@ -36,7 +36,7 @@ from . import EuareRequest, DELEGATE
class DeleteLoginProfile(EuareRequest):
Description = "Delete a user's login profile"
- Args = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
+ ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
required=True, help='''name of the user whose login profile
should be deleted (required)'''),
DELEGATE]
diff --git a/euca2ools/commands/euare/listusers.py b/euca2ools/commands/euare/listusers.py
index 7eed565..7e9eb05 100644
--- a/euca2ools/commands/euare/listusers.py
+++ b/euca2ools/commands/euare/listusers.py
@@ -33,7 +33,7 @@ from . import EuareRequest, DELEGATE
class ListUsers(EuareRequest):
Description = 'List users under a specific path prefix'
- Args = [Arg('-p', '--path-prefix', dest='PathPrefix', metavar='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)'''),
DELEGATE]
diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index f099fa9..9f79b3b 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -138,7 +138,7 @@ class EucalyptusRequest(Euca2oolsRequest, TabifyingCommand):
# old -a/--access-key/-s args. As before, if either -a or -s conflicts
# with another arg, both are capitalized. All are deprecated. They are no
# longer documented and using them will result in warnings.
- Args = [Arg('-a', '--access-key', metavar='KEY_ID',
+ ARGS = [Arg('-a', '--access-key', metavar='KEY_ID',
dest='deprecated_key_id', route_to=SERVICE,
help=argparse.SUPPRESS),
Arg('-s', metavar='KEY', dest='deprecated_sec_key',
@@ -156,8 +156,9 @@ class EucalyptusRequest(Euca2oolsRequest, TabifyingCommand):
# If an inheriting class defines '-a' or '-s' args, resolve conflicts
# with this class's old-style auth args by capitalizing this class's
# auth args.
- a_args = _find_args_by_parg(self.Args, '-a')
- s_args = _find_args_by_parg(self.Args, '-s')
+ args = self.aggregate_subclass_fields('ARGS')
+ a_args = _find_args_by_parg(args, '-a')
+ s_args = _find_args_by_parg(args, '-s')
if len(a_args) > 1 or len(s_args) > 1:
for arg in a_args:
if arg.kwargs.get('dest') == 'deprecated_key_id':
diff --git a/euca2ools/commands/euca/associateaddress.py b/euca2ools/commands/euca/associateaddress.py
index f361e34..5b11c38 100644
--- a/euca2ools/commands/euca/associateaddress.py
+++ b/euca2ools/commands/euca/associateaddress.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class AssociateAddress(EucalyptusRequest):
Description = 'Associate an elastic IP address with a running instance'
- Args = [Arg('-i', '--instance', dest='InstanceId', metavar='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 a23ddba..f6925a3 100644
--- a/euca2ools/commands/euca/attachvolume.py
+++ b/euca2ools/commands/euca/attachvolume.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class AttachVolume(EucalyptusRequest):
Description = 'Attach an EBS volume to an instance'
- Args = [Arg('-i', '--instance', dest='InstanceId', metavar='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,
help='device name exposed to the instance'),
diff --git a/euca2ools/commands/euca/bundleinstance.py b/euca2ools/commands/euca/bundleinstance.py
index c0a1613..2fa5a80 100644
--- a/euca2ools/commands/euca/bundleinstance.py
+++ b/euca2ools/commands/euca/bundleinstance.py
@@ -39,7 +39,7 @@ from . import EucalyptusRequest
class BundleInstance(EucalyptusRequest):
Description = 'Bundle an S3-backed Windows instance'
- Args = [Arg('InstanceId', metavar='INSTANCE', help='instance to bundle'),
+ ARGS = [Arg('InstanceId', metavar='INSTANCE', help='instance to bundle'),
Arg('-b', '--bucket', dest='Storage.S3.Bucket', metavar='BUCKET',
required=True,
help='bucket in which to store the new machine image'),
diff --git a/euca2ools/commands/euca/cancelbundletask.py b/euca2ools/commands/euca/cancelbundletask.py
index 7ff2b0a..41bc964 100644
--- a/euca2ools/commands/euca/cancelbundletask.py
+++ b/euca2ools/commands/euca/cancelbundletask.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class CancelBundleTask(EucalyptusRequest):
Description = 'Cancel an instance bundling operation'
- Args = [Arg('BundleId', metavar='TASK-ID',
+ ARGS = [Arg('BundleId', metavar='TASK-ID',
help='ID of the bundle task to cancel')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/confirmproductinstance.py b/euca2ools/commands/euca/confirmproductinstance.py
index e87f567..4b0b0d6 100644
--- a/euca2ools/commands/euca/confirmproductinstance.py
+++ b/euca2ools/commands/euca/confirmproductinstance.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class ConfirmProductInstance(EucalyptusRequest):
Description = 'Verify if a product code is associated with an instance'
- Args = [Arg('ProductCode', metavar='CODE', help='product code to confirm'),
+ 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 01b2276..e39c1c4 100644
--- a/euca2ools/commands/euca/createimage.py
+++ b/euca2ools/commands/euca/createimage.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class CreateImage(EucalyptusRequest):
Description = 'Create an EBS image from a running or stopped EBS instance'
- Args = [Arg('InstanceId', metavar='INSTANCE',
+ ARGS = [Arg('InstanceId', metavar='INSTANCE',
help='instance from which to create the image'),
Arg('-n', '--name', dest='Name', required=True,
help='name for the new image (required)'),
diff --git a/euca2ools/commands/euca/createkeypair.py b/euca2ools/commands/euca/createkeypair.py
index d5e5335..3c43ed2 100644
--- a/euca2ools/commands/euca/createkeypair.py
+++ b/euca2ools/commands/euca/createkeypair.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class CreateKeyPair(EucalyptusRequest):
Description = 'Create a new SSH key pair for use with instances'
- Args = [Arg('KeyName', metavar='KEYPAIR', help='name of the new key pair'),
+ 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 afc8b43..3329ddc 100644
--- a/euca2ools/commands/euca/createsecuritygroup.py
+++ b/euca2ools/commands/euca/createsecuritygroup.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class CreateSecurityGroup(EucalyptusRequest):
Description = 'Create a new security group'
- Args = [Arg('-d', '--description', dest='GroupDescription', metavar='DESC',
+ 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 e975c38..eb110ac 100644
--- a/euca2ools/commands/euca/createsnapshot.py
+++ b/euca2ools/commands/euca/createsnapshot.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class CreateSnapshot(EucalyptusRequest):
Description = 'Create a snapshot of a volume'
- Args = [Arg('VolumeId', metavar='VOLUME', help='volume to snapshot'),
+ 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 a255a27..05445e4 100644
--- a/euca2ools/commands/euca/createtags.py
+++ b/euca2ools/commands/euca/createtags.py
@@ -35,7 +35,7 @@ from .argtypes import binary_tag_def
class CreateTags(EucalyptusRequest):
APIVersion = '2010-08-31'
Description = 'Add or overwrite tags for one or more resources'
- Args = [Arg('ResourceId', metavar='RESOURCE', nargs='+',
+ ARGS = [Arg('ResourceId', metavar='RESOURCE', nargs='+',
help='IDs of the resource(s) to tag'),
Arg('--tag', dest='Tag', metavar='KEY[=VALUE]',
type=binary_tag_def, action='append', required=True,
diff --git a/euca2ools/commands/euca/createvolume.py b/euca2ools/commands/euca/createvolume.py
index 210e169..3969288 100644
--- a/euca2ools/commands/euca/createvolume.py
+++ b/euca2ools/commands/euca/createvolume.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class CreateVolume(EucalyptusRequest):
Description = 'Create a new volume'
- Args = [Arg('-s', '--size', dest='Size', type=int,
+ ARGS = [Arg('-s', '--size', dest='Size', type=int,
help='''size of the new volume in GiB. Required unless
--snapshot is used'''),
Arg('--snapshot', dest='SnapshotId', metavar='SNAPSHOT',
diff --git a/euca2ools/commands/euca/deletekeypair.py b/euca2ools/commands/euca/deletekeypair.py
index 87bf8eb..434c7bf 100644
--- a/euca2ools/commands/euca/deletekeypair.py
+++ b/euca2ools/commands/euca/deletekeypair.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DeleteKeyPair(EucalyptusRequest):
Description = 'Delete an existing keypair'
- Args = [Arg('KeyName', metavar='KEYPAIR',
+ ARGS = [Arg('KeyName', metavar='KEYPAIR',
help='name of the keypair to delete')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/deletesecuritygroup.py b/euca2ools/commands/euca/deletesecuritygroup.py
index 2bcb548..77bb1a9 100644
--- a/euca2ools/commands/euca/deletesecuritygroup.py
+++ b/euca2ools/commands/euca/deletesecuritygroup.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DeleteSecurityGroup(EucalyptusRequest):
Description = 'Delete a security group'
- Args = [Arg('GroupName', metavar='GROUP')]
+ ARGS = [Arg('GroupName', metavar='GROUP')]
def print_result(self, result):
print self.tabify(('RETURN', result.get('return')))
diff --git a/euca2ools/commands/euca/deletesnapshot.py b/euca2ools/commands/euca/deletesnapshot.py
index c82b69d..923558c 100644
--- a/euca2ools/commands/euca/deletesnapshot.py
+++ b/euca2ools/commands/euca/deletesnapshot.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DeleteSnapshot(EucalyptusRequest):
Description = 'Delete a snapshot'
- Args = [Arg('SnapshotId', metavar='SNAPSHOT', help='snapshot to delete')]
+ ARGS = [Arg('SnapshotId', metavar='SNAPSHOT', help='snapshot to delete')]
def print_result(self, result):
print self.tabify(['SNAPSHOT', self.args['SnapshotId']])
diff --git a/euca2ools/commands/euca/deletetags.py b/euca2ools/commands/euca/deletetags.py
index 0f61691..ca55549 100644
--- a/euca2ools/commands/euca/deletetags.py
+++ b/euca2ools/commands/euca/deletetags.py
@@ -35,7 +35,7 @@ from .argtypes import ternary_tag_def
class DeleteTags(EucalyptusRequest):
APIVersion = '2010-08-31'
Description = 'Delete tags from one or more resources'
- Args = [Arg('ResourceId', metavar='RESOURCE', nargs='+',
+ ARGS = [Arg('ResourceId', metavar='RESOURCE', nargs='+',
help='IDs of the resource(s) to un-tag'),
Arg('--tag', dest='Tag', metavar='KEY[=[VALUE]]',
type=ternary_tag_def, action='append', required=True,
diff --git a/euca2ools/commands/euca/deletevolume.py b/euca2ools/commands/euca/deletevolume.py
index e60c32c..19d57b3 100644
--- a/euca2ools/commands/euca/deletevolume.py
+++ b/euca2ools/commands/euca/deletevolume.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DeleteVolume(EucalyptusRequest):
Description = 'Delete a volume'
- Args = [Arg('VolumeId', metavar='VOLUME', help='volume to delete')]
+ ARGS = [Arg('VolumeId', metavar='VOLUME', help='volume to delete')]
def print_result(self, result):
print self.tabify(['VOLUME', self.args['VolumeId']])
diff --git a/euca2ools/commands/euca/deregisterimage.py b/euca2ools/commands/euca/deregisterimage.py
index f602179..5f6deba 100644
--- a/euca2ools/commands/euca/deregisterimage.py
+++ b/euca2ools/commands/euca/deregisterimage.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DeregisterImage(EucalyptusRequest):
Description = 'De-register an image'
- Args = [Arg('ImageId', metavar='IMAGE', help='image to de-register')]
+ ARGS = [Arg('ImageId', metavar='IMAGE', help='image to de-register')]
def print_result(self, result):
print self.tabify(['IMAGE', self.args['ImageId']])
diff --git a/euca2ools/commands/euca/describeaddresses.py b/euca2ools/commands/euca/describeaddresses.py
index dade340..8283508 100644
--- a/euca2ools/commands/euca/describeaddresses.py
+++ b/euca2ools/commands/euca/describeaddresses.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class DescribeAddresses(EucalyptusRequest):
APIVersion = '2011-01-01'
Description = 'Show information about elastic IP addresses'
- Args = [Arg('address', nargs='*', route_to=None,
+ ARGS = [Arg('address', nargs='*', route_to=None,
help='''limit results to one or more elastic IP addresses or
allocation IDs''')]
Filters = [Filter('allocation-id', help='allocation ID (VPC only)'),
diff --git a/euca2ools/commands/euca/describeavailabilityzones.py b/euca2ools/commands/euca/describeavailabilityzones.py
index e211135..8e56d60 100644
--- a/euca2ools/commands/euca/describeavailabilityzones.py
+++ b/euca2ools/commands/euca/describeavailabilityzones.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class DescribeAvailabilityZones(EucalyptusRequest):
Description = 'Display availability zones within the active region'
APIVersion = '2010-08-31'
- Args = [Arg('ZoneName', metavar='ZONE', nargs='*',
+ ARGS = [Arg('ZoneName', metavar='ZONE', nargs='*',
help='limit results to one or more availability zones')]
Filters = [Filter('message', help=('message giving information about the'
'availability zone')),
diff --git a/euca2ools/commands/euca/describebundletasks.py b/euca2ools/commands/euca/describebundletasks.py
index c99a174..799501c 100644
--- a/euca2ools/commands/euca/describebundletasks.py
+++ b/euca2ools/commands/euca/describebundletasks.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class DescribeBundleTasks(EucalyptusRequest):
Description = 'Describe current instance-bundling tasks'
APIVersion = '2010-08-31'
- Args = [Arg('BundleId', metavar='BUNDLE', nargs='*',
+ ARGS = [Arg('BundleId', metavar='BUNDLE', nargs='*',
help='limit results to one or more bundle tasks')]
Filters = [Filter('bundle-id', help='bundle task ID'),
Filter('error-code',
diff --git a/euca2ools/commands/euca/describeimageattribute.py b/euca2ools/commands/euca/describeimageattribute.py
index e37e0b4..044f40a 100644
--- a/euca2ools/commands/euca/describeimageattribute.py
+++ b/euca2ools/commands/euca/describeimageattribute.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DescribeImageAttribute(EucalyptusRequest):
Description = 'Show information about an attribute of an image'
- Args = [Arg('ImageId', metavar='IMAGE', help='image to describe'),
+ ARGS = [Arg('ImageId', metavar='IMAGE', help='image to describe'),
MutuallyExclusiveArgList(True,
Arg('-l', '--launch-permission', dest='Attribute',
action='store_const', const='launchPermission',
diff --git a/euca2ools/commands/euca/describeimages.py b/euca2ools/commands/euca/describeimages.py
index 2d7970c..b87cd42 100644
--- a/euca2ools/commands/euca/describeimages.py
+++ b/euca2ools/commands/euca/describeimages.py
@@ -39,7 +39,7 @@ class DescribeImages(EucalyptusRequest):
has explicit launch permissions are shown.'''
APIVersion = '2010-08-31'
- Args = [Arg('ImageId', metavar='IMAGE', nargs='*',
+ ARGS = [Arg('ImageId', metavar='IMAGE', nargs='*',
help='limit results to one or more images'),
Arg('-a', '--all', action='store_true', route_to=None,
help='describe all images'),
diff --git a/euca2ools/commands/euca/describeinstances.py b/euca2ools/commands/euca/describeinstances.py
index da389de..325a5c8 100644
--- a/euca2ools/commands/euca/describeinstances.py
+++ b/euca2ools/commands/euca/describeinstances.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class DescribeInstances(EucalyptusRequest):
APIVersion = '2010-08-31'
Description = 'Show information about instances'
- Args = [Arg('InstanceId', metavar='INSTANCE', nargs='*',
+ ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='*',
help='Limit results to one or more instances')]
Filters = [Filter('architecture', help='CPU architecture'),
Filter('availability-zone'),
diff --git a/euca2ools/commands/euca/describekeypairs.py b/euca2ools/commands/euca/describekeypairs.py
index 68d6d9a..4f3ae3f 100644
--- a/euca2ools/commands/euca/describekeypairs.py
+++ b/euca2ools/commands/euca/describekeypairs.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class DescribeKeyPairs(EucalyptusRequest):
APIVersion = '2010-08-31'
Description = 'Display information about available key pairs'
- Args = [Arg('KeyName', nargs='*', metavar='KEYPAIR',
+ ARGS = [Arg('KeyName', nargs='*', metavar='KEYPAIR',
help='limit results to specific key pairs')]
Filters = [Filter('fingerprint', help='fingerprint of the key pair'),
Filter('key-name', help='name of the key pair')]
diff --git a/euca2ools/commands/euca/describeregions.py b/euca2ools/commands/euca/describeregions.py
index a2bb026..49d9e70 100644
--- a/euca2ools/commands/euca/describeregions.py
+++ b/euca2ools/commands/euca/describeregions.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class DescribeRegions(EucalyptusRequest):
APIVersion = '2010-08-31'
Description = 'Display information about regions'
- Args = [Arg('RegionName', nargs='*', metavar='REGION',
+ ARGS = [Arg('RegionName', nargs='*', metavar='REGION',
help='limit results to specific regions')]
Filters = [Filter('endpoint'),
Filter('region-name')]
diff --git a/euca2ools/commands/euca/describesecuritygroups.py b/euca2ools/commands/euca/describesecuritygroups.py
index 6263b6f..5e93834 100644
--- a/euca2ools/commands/euca/describesecuritygroups.py
+++ b/euca2ools/commands/euca/describesecuritygroups.py
@@ -40,7 +40,7 @@ class DescribeSecurityGroups(EucalyptusRequest):
port range of 20 to 30.'''
APIVersion = '2011-01-01'
- Args = [Arg('group', metavar='GROUP', nargs='*', route_to=None, default=[],
+ ARGS = [Arg('group', metavar='GROUP', nargs='*', route_to=None, default=[],
help='limit results to one or more security groups')]
Filters = [Filter('description', help='group description'),
Filter('group-id'),
diff --git a/euca2ools/commands/euca/describesnapshots.py b/euca2ools/commands/euca/describesnapshots.py
index ecd5afb..2229dfe 100644
--- a/euca2ools/commands/euca/describesnapshots.py
+++ b/euca2ools/commands/euca/describesnapshots.py
@@ -39,7 +39,7 @@ class DescribeSnapshots(EucalyptusRequest):
By default, only snapshots explicitly restorable by the caller are
shown.'''
- Args = [Arg('SnapshotId', nargs='*', metavar='SNAPSHOT',
+ ARGS = [Arg('SnapshotId', nargs='*', metavar='SNAPSHOT',
help='limit results to specific snapshots'),
Arg('-a', '--all', action='store_true', route_to=None,
help='describe all snapshots'),
diff --git a/euca2ools/commands/euca/describevolumes.py b/euca2ools/commands/euca/describevolumes.py
index 004cab2..83db316 100644
--- a/euca2ools/commands/euca/describevolumes.py
+++ b/euca2ools/commands/euca/describevolumes.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class DescribeVolumes(EucalyptusRequest):
Description = 'Display information about volumes'
APIVersion = '2010-08-31'
- Args = [Arg('VolumeId', metavar='VOLUME', nargs='*',
+ ARGS = [Arg('VolumeId', metavar='VOLUME', nargs='*',
help='volume(s) to describe (default: all volumes)')]
Filters = [Filter('attachment.attach-time', help='attachment start time'),
Filter('attachment.delete-on-termination', help='''whether the
diff --git a/euca2ools/commands/euca/detachvolume.py b/euca2ools/commands/euca/detachvolume.py
index 37b2b08..52320fb 100644
--- a/euca2ools/commands/euca/detachvolume.py
+++ b/euca2ools/commands/euca/detachvolume.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DetachVolume(EucalyptusRequest):
Description = 'Detach a volume from an instance'
- Args = [Arg('VolumeId', metavar='VOLUME', help='volume to detach'),
+ ARGS = [Arg('VolumeId', metavar='VOLUME', help='volume to detach'),
Arg('-i', '--instance', dest='InstanceID', metavar='INSTANCE',
help='instance to detach from'),
Arg('-d', '--device', dest='Device', help='device name'),
diff --git a/euca2ools/commands/euca/disassociateaddress.py b/euca2ools/commands/euca/disassociateaddress.py
index 1969df0..f3878c8 100644
--- a/euca2ools/commands/euca/disassociateaddress.py
+++ b/euca2ools/commands/euca/disassociateaddress.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class DisassociateAddress(EucalyptusRequest):
Description = 'Disassociate an elastic IP address from an instance'
- Args = [Arg('address', route_to=None,
+ ARGS = [Arg('address', route_to=None,
help='elastic IP address or association ID to disassociate')]
def main(self):
diff --git a/euca2ools/commands/euca/getconsoleoutput.py b/euca2ools/commands/euca/getconsoleoutput.py
index 0505188..93a07dc 100644
--- a/euca2ools/commands/euca/getconsoleoutput.py
+++ b/euca2ools/commands/euca/getconsoleoutput.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class GetConsoleOutput(EucalyptusRequest):
Description = 'Retrieve console output for the specified instance'
- Args = [Arg('InstanceId', metavar='INSTANCE',
+ ARGS = [Arg('InstanceId', metavar='INSTANCE',
help='instance to obtain console output from')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/getpassword.py b/euca2ools/commands/euca/getpassword.py
index 960ca89..a63b1d9 100644
--- a/euca2ools/commands/euca/getpassword.py
+++ b/euca2ools/commands/euca/getpassword.py
@@ -38,7 +38,7 @@ class GetPassword(GetPasswordData):
Action = 'GetPasswordData'
Description = '''Retrieve the administrator password for an instance
running Windows'''
- Args = [Arg('-k', '--priv-launch-key', metavar='PRIVKEY',
+ ARGS = [Arg('-k', '--priv-launch-key', metavar='PRIVKEY',
type=file_contents, required=True, route_to=None,
help='''file containing the private key corresponding to the
key pair supplied at instance launch time''')]
diff --git a/euca2ools/commands/euca/getpassworddata.py b/euca2ools/commands/euca/getpassworddata.py
index 03e28ae..ffde4fc 100644
--- a/euca2ools/commands/euca/getpassworddata.py
+++ b/euca2ools/commands/euca/getpassworddata.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest
class GetPasswordData(EucalyptusRequest):
Description = '''Retrieve the encrypted administrator password for an
instance running Windows'''
- Args = [Arg('InstanceId', metavar='INSTANCE',
+ ARGS = [Arg('InstanceId', metavar='INSTANCE',
help='instance to obtain the initial password for')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/importkeypair.py b/euca2ools/commands/euca/importkeypair.py
index d754f32..24558d5 100644
--- a/euca2ools/commands/euca/importkeypair.py
+++ b/euca2ools/commands/euca/importkeypair.py
@@ -36,7 +36,7 @@ from .argtypes import file_contents
class ImportKeyPair(EucalyptusRequest):
APIVersion = '2010-08-31'
Description = 'Import a public RSA key'
- Args = [Arg('KeyName', metavar='KEYPAIR',
+ ARGS = [Arg('KeyName', metavar='KEYPAIR',
help='name for the new key pair'),
Arg('-f', '--public-key-file', dest='pubkey', metavar='PUBKEY',
type=file_contents, required=True, route_to=None,
diff --git a/euca2ools/commands/euca/modgroup.py b/euca2ools/commands/euca/modgroup.py
index 8caa355..66ddbf4 100644
--- a/euca2ools/commands/euca/modgroup.py
+++ b/euca2ools/commands/euca/modgroup.py
@@ -37,7 +37,7 @@ class ModifySecurityGroupRequest(EucalyptusRequest):
The basis for security group-editing commands
'''
- Args = [Arg('GroupName', metavar='GROUP',
+ ARGS = [Arg('GroupName', metavar='GROUP',
help='name of the security group to modify'),
Arg('-P', '--protocol', dest='IpPermissions.1.IpProtocol',
choices=['tcp', 'udp', 'icmp', '6', '17', '1'], default='tcp',
diff --git a/euca2ools/commands/euca/modifyimageattribute.py b/euca2ools/commands/euca/modifyimageattribute.py
index 5272490..6ea5d83 100644
--- a/euca2ools/commands/euca/modifyimageattribute.py
+++ b/euca2ools/commands/euca/modifyimageattribute.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class ModifyImageAttribute(EucalyptusRequest):
Description = 'Modify an attribute of an image'
- Args = [Arg('ImageId', metavar='IMAGE', help='image to modify'),
+ ARGS = [Arg('ImageId', metavar='IMAGE', help='image to modify'),
MutuallyExclusiveArgList(True,
Arg('--description', dest='Description.Value', metavar='DESC',
help="change the image's description"),
diff --git a/euca2ools/commands/euca/monitorinstances.py b/euca2ools/commands/euca/monitorinstances.py
index 4a6d200..80584b7 100644
--- a/euca2ools/commands/euca/monitorinstances.py
+++ b/euca2ools/commands/euca/monitorinstances.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class MonitorInstances(EucalyptusRequest):
Description = 'Enable monitoring for one or more instances'
- Args = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
+ 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 325dd77..cfc2048 100644
--- a/euca2ools/commands/euca/rebootinstances.py
+++ b/euca2ools/commands/euca/rebootinstances.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class RebootInstances(EucalyptusRequest):
Description = 'Reboot one or more instances'
- Args = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
+ ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to reboot')]
def print_result(self, result):
diff --git a/euca2ools/commands/euca/registerimage.py b/euca2ools/commands/euca/registerimage.py
index 7fcab7a..319813a 100644
--- a/euca2ools/commands/euca/registerimage.py
+++ b/euca2ools/commands/euca/registerimage.py
@@ -34,7 +34,7 @@ from .argtypes import block_device_mapping
class RegisterImage(EucalyptusRequest):
Description = 'Register a new image'
- Args = [Arg('ImageLocation', metavar='MANIFEST', nargs='?',
+ ARGS = [Arg('ImageLocation', metavar='MANIFEST', nargs='?',
help='''location of the image manifest in S3 storage
(required for instance-store images)'''),
Arg('-n', '--name', dest='Name', required=True,
diff --git a/euca2ools/commands/euca/releaseaddress.py b/euca2ools/commands/euca/releaseaddress.py
index 331c44c..ca69e8d 100644
--- a/euca2ools/commands/euca/releaseaddress.py
+++ b/euca2ools/commands/euca/releaseaddress.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class ReleaseAddress(EucalyptusRequest):
Description = 'Release an elastic IP address'
- Args = [Arg('PublicIp', metavar='IP', help='elastic IP to release')]
+ ARGS = [Arg('PublicIp', metavar='IP', help='elastic IP to release')]
def print_result(self, result):
print self.tabify(('ADDRESS', self.args.get('PublicIp'),
diff --git a/euca2ools/commands/euca/resetimageattribute.py b/euca2ools/commands/euca/resetimageattribute.py
index 0b0a7f1..9686f30 100644
--- a/euca2ools/commands/euca/resetimageattribute.py
+++ b/euca2ools/commands/euca/resetimageattribute.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class ResetImageAttribute(EucalyptusRequest):
Description = 'Reset an attribute of an image to its default value'
- Args = [Arg('ImageId', metavar='IMAGE',
+ ARGS = [Arg('ImageId', metavar='IMAGE',
help='image whose attribute should be reset'),
Arg('-l', '--launch-permission', dest='Attribute',
action='store_const', const='launchPermission', required=True,
diff --git a/euca2ools/commands/euca/runinstances.py b/euca2ools/commands/euca/runinstances.py
index 5ea535a..6ca451a 100644
--- a/euca2ools/commands/euca/runinstances.py
+++ b/euca2ools/commands/euca/runinstances.py
@@ -38,7 +38,7 @@ from .argtypes import b64encoded_file_contents, block_device_mapping
class RunInstances(EucalyptusRequest):
Description = 'Launch instances of a machine image'
- Args = [Arg('ImageId', metavar='IMAGE', help='image to instantiate'),
+ ARGS = [Arg('ImageId', metavar='IMAGE', help='image to instantiate'),
Arg('-n', '--instance-count', dest='count', metavar='MIN[-MAX]',
default='1', route_to=None,
help='''number of instances to launch. If this number of
diff --git a/euca2ools/commands/euca/startinstances.py b/euca2ools/commands/euca/startinstances.py
index 728d73c..bb9ae8d 100644
--- a/euca2ools/commands/euca/startinstances.py
+++ b/euca2ools/commands/euca/startinstances.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class StartInstances(EucalyptusRequest):
Description = 'Start one or more stopped instances'
- Args = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
+ 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 a6cf32a..2ef18fb 100644
--- a/euca2ools/commands/euca/stopinstances.py
+++ b/euca2ools/commands/euca/stopinstances.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class StopInstances(EucalyptusRequest):
Description = 'Stop one or more running instances'
- Args = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
+ ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to stop'),
Arg('-f', '--force', dest='Force', action='store_const',
const='true',
diff --git a/euca2ools/commands/euca/terminateinstances.py b/euca2ools/commands/euca/terminateinstances.py
index 46d2d76..9ba0dd4 100644
--- a/euca2ools/commands/euca/terminateinstances.py
+++ b/euca2ools/commands/euca/terminateinstances.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class TerminateInstances(EucalyptusRequest):
Description = 'Terminate one or more instances'
- Args = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
+ 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 0c6775e..f895e31 100644
--- a/euca2ools/commands/euca/unmonitorinstances.py
+++ b/euca2ools/commands/euca/unmonitorinstances.py
@@ -33,7 +33,7 @@ from . import EucalyptusRequest
class UnmonitorInstances(EucalyptusRequest):
Description = 'Disable monitoring for one or more instances'
- Args = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
+ 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