[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:30:40 UTC 2013
The following commit has been merged in the master branch:
commit bfa5f789bf5e87b15a2005939eb2a7ad5c508ab5
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Thu Mar 7 21:26:08 2013 -0800
Rename LIST_MARKERS -> LIST_TAGS
diff --git a/euca2ools/commands/autoscaling/describeadjustmenttypes.py b/euca2ools/commands/autoscaling/describeadjustmenttypes.py
index f64cb71..0f9d209 100644
--- a/euca2ools/commands/autoscaling/describeadjustmenttypes.py
+++ b/euca2ools/commands/autoscaling/describeadjustmenttypes.py
@@ -35,7 +35,7 @@ from requestbuilder.mixins import TabifyingCommand
class DescribeAdjustmentTypes(AutoScalingRequest, TabifyingCommand):
DESCRIPTION = ('Describe policy adjustment types usable with scaling '
'policies')
- LIST_MARKERS = ['AdjustmentTypes']
+ LIST_TAGS = ['AdjustmentTypes']
def print_result(self, result):
for adj_type in result.get('AdjustmentTypes', []):
diff --git a/euca2ools/commands/autoscaling/describeautoscalinggroups.py b/euca2ools/commands/autoscaling/describeautoscalinggroups.py
index b903c52..bf3e186 100644
--- a/euca2ools/commands/autoscaling/describeautoscalinggroups.py
+++ b/euca2ools/commands/autoscaling/describeautoscalinggroups.py
@@ -41,9 +41,9 @@ class DescribeAutoScalingGroups(AutoScalingRequest, TabifyingCommand):
help='limit results to specific auto-scaling groups'),
Arg('--show-long', action='store_true', route_to=None,
help="show all of the groups' info")]
- LIST_MARKERS = ['AutoScalingGroups', 'AvailabilityZones',
- 'EnabledMetrics', 'Instances', 'LoadBalancerNames',
- 'SuspendedProcesses', 'Tags', 'TerminationPolicies']
+ LIST_TAGS = ['AutoScalingGroups', 'AvailabilityZones', 'EnabledMetrics',
+ 'Instances', 'LoadBalancerNames', 'SuspendedProcesses',
+ 'Tags', 'TerminationPolicies']
def main(self):
return PaginatedResponse(self, (None,), ('AutoScalingGroups',))
diff --git a/euca2ools/commands/autoscaling/describeautoscalinginstances.py b/euca2ools/commands/autoscaling/describeautoscalinginstances.py
index 9b23a93..2cfff45 100644
--- a/euca2ools/commands/autoscaling/describeautoscalinginstances.py
+++ b/euca2ools/commands/autoscaling/describeautoscalinginstances.py
@@ -42,7 +42,7 @@ class DescribeAutoScalingInstances(AutoScalingRequest, TabifyingCommand):
Arg('--show-long', action='store_true', route_to=None,
help=argparse.SUPPRESS)] # doesn't actually do anything, but
# people will use it out of habit
- LIST_MARKERS = ['AutoScalingInstances']
+ LIST_TAGS = ['AutoScalingInstances']
def main(self):
return PaginatedResponse(self, (None,), ('AutoScalingInstances',))
diff --git a/euca2ools/commands/autoscaling/describeautoscalingnotificationtypes.py b/euca2ools/commands/autoscaling/describeautoscalingnotificationtypes.py
index e2e7818..4f87e64 100644
--- a/euca2ools/commands/autoscaling/describeautoscalingnotificationtypes.py
+++ b/euca2ools/commands/autoscaling/describeautoscalingnotificationtypes.py
@@ -35,7 +35,7 @@ from requestbuilder.mixins import TabifyingCommand
class DescribeAutoScalingNotificationTypes(AutoScalingRequest,
TabifyingCommand):
DESCRIPTION = 'List all notification types supported by the service'
- LIST_MARKERS = ['AutoScalingNotificationTypes']
+ LIST_TAGS = ['AutoScalingNotificationTypes']
def print_result(self, result):
for notif_type in result.get('AutoScalingNotificationTypes', []):
diff --git a/euca2ools/commands/autoscaling/describelaunchconfigurations.py b/euca2ools/commands/autoscaling/describelaunchconfigurations.py
index 61357c5..f5366f2 100644
--- a/euca2ools/commands/autoscaling/describelaunchconfigurations.py
+++ b/euca2ools/commands/autoscaling/describelaunchconfigurations.py
@@ -41,8 +41,8 @@ class DescribeLaunchConfigurations(AutoScalingRequest, TabifyingCommand):
help='limit results to specific launch configurations'),
Arg('--show-long', action='store_true', route_to=None,
help="show all of the launch configurations' info")]
- LIST_MARKERS = ['LaunchConfigurations', 'SecurityGroups',
- 'BlockDeviceMappings']
+ LIST_TAGS = ['LaunchConfigurations', 'SecurityGroups',
+ 'BlockDeviceMappings']
def main(self):
return PaginatedResponse(self, (None,), ('LaunchConfigurations',))
diff --git a/euca2ools/commands/autoscaling/describemetriccollectiontypes.py b/euca2ools/commands/autoscaling/describemetriccollectiontypes.py
index d9c5cac..8b1883d 100644
--- a/euca2ools/commands/autoscaling/describemetriccollectiontypes.py
+++ b/euca2ools/commands/autoscaling/describemetriccollectiontypes.py
@@ -34,7 +34,7 @@ from requestbuilder.mixins import TabifyingCommand
class DescribeMetricCollectionTypes(AutoScalingRequest, TabifyingCommand):
DESCRIPTION = 'Describe auto-scaling metrics and granularities'
- LIST_MARKERS = ['Metrics', 'Granularities']
+ LIST_TAGS = ['Metrics', 'Granularities']
def print_result(self, result):
for metric in result.get('Metrics', []):
diff --git a/euca2ools/commands/autoscaling/describenotificationconfigurations.py b/euca2ools/commands/autoscaling/describenotificationconfigurations.py
index 67346f6..fe79f24 100644
--- a/euca2ools/commands/autoscaling/describenotificationconfigurations.py
+++ b/euca2ools/commands/autoscaling/describenotificationconfigurations.py
@@ -40,7 +40,7 @@ class DescribeNotificationConfigurations(AutoScalingRequest, TabifyingCommand):
ARGS = [Arg('AutoScalingGroupNames.member', metavar='ASGROUP',
nargs='*',
help='limit results to specific auto-scaling groups')]
- LIST_MARKERS = ['NotificationConfigurations']
+ LIST_TAGS = ['NotificationConfigurations']
def main(self):
return PaginatedResponse(self, (None,),
diff --git a/euca2ools/commands/autoscaling/describepolicies.py b/euca2ools/commands/autoscaling/describepolicies.py
index c243ee6..9cff37c 100644
--- a/euca2ools/commands/autoscaling/describepolicies.py
+++ b/euca2ools/commands/autoscaling/describepolicies.py
@@ -42,7 +42,7 @@ class DescribePolicies(AutoScalingRequest, TabifyingCommand):
metavar='ASGROUP'),
Arg('--show-long', action='store_true', route_to=None,
help="show all of the policies' info")]
- LIST_MARKERS = ['ScalingPolicies', 'Alarms']
+ LIST_TAGS = ['ScalingPolicies', 'Alarms']
def main(self):
return PaginatedResponse(self, (None,), ('ScalingPolicies',))
diff --git a/euca2ools/commands/autoscaling/describescalingactivities.py b/euca2ools/commands/autoscaling/describescalingactivities.py
index 4cb5056..94571c1 100644
--- a/euca2ools/commands/autoscaling/describescalingactivities.py
+++ b/euca2ools/commands/autoscaling/describescalingactivities.py
@@ -43,7 +43,7 @@ class DescribeScalingActivities(AutoScalingRequest, TabifyingCommand):
which to filter the request'''),
Arg('--show-long', action='store_true', route_to=None,
help="show all of the groups' info")]
- LIST_MARKERS = ['Activities']
+ LIST_TAGS = ['Activities']
def main(self):
return PaginatedResponse(self, (None,), ('Activities',))
diff --git a/euca2ools/commands/autoscaling/describescalingprocesstypes.py b/euca2ools/commands/autoscaling/describescalingprocesstypes.py
index 15e867c..1fd50de 100644
--- a/euca2ools/commands/autoscaling/describescalingprocesstypes.py
+++ b/euca2ools/commands/autoscaling/describescalingprocesstypes.py
@@ -34,7 +34,7 @@ from requestbuilder.mixins import TabifyingCommand
class DescribeScalingProcessTypes(AutoScalingRequest, TabifyingCommand):
DESCRIPTION = 'List all types of scaling processes'
- LIST_MARKERS = ['Processes']
+ LIST_TAGS = ['Processes']
def print_result(self, result):
for process in result.get('Processes', []):
diff --git a/euca2ools/commands/autoscaling/describescheduledactions.py b/euca2ools/commands/autoscaling/describescheduledactions.py
index a43db25..4ad22d6 100644
--- a/euca2ools/commands/autoscaling/describescheduledactions.py
+++ b/euca2ools/commands/autoscaling/describescheduledactions.py
@@ -50,7 +50,7 @@ class DescribeScheduledActions(AutoScalingRequest, TabifyingCommand):
action names are provided.'''),
Arg('--show-long', action='store_true', route_to=None,
help="show all of the scheduled actions' info")]
- LIST_MARKERS = ['ScheduledUpdateGroupActions']
+ LIST_TAGS = ['ScheduledUpdateGroupActions']
def main(self):
return PaginatedResponse(self, (None,),
diff --git a/euca2ools/commands/autoscaling/describeterminationpolicytypes.py b/euca2ools/commands/autoscaling/describeterminationpolicytypes.py
index a8e2d3d..d0b02ab 100644
--- a/euca2ools/commands/autoscaling/describeterminationpolicytypes.py
+++ b/euca2ools/commands/autoscaling/describeterminationpolicytypes.py
@@ -34,7 +34,7 @@ from requestbuilder.mixins import TabifyingCommand
class DescribeTerminationPolicyTypes(AutoScalingRequest, TabifyingCommand):
DESCRIPTION = 'List all termination policies supported by the service'
- LIST_MARKERS = ['TerminationPolicyTypes']
+ LIST_TAGS = ['TerminationPolicyTypes']
def print_result(self, result):
for tp_type in result.get('TerminationPolicyTypes', []):
diff --git a/euca2ools/commands/euare/getaccountsummary.py b/euca2ools/commands/euare/getaccountsummary.py
index 3595a7a..13b416b 100644
--- a/euca2ools/commands/euare/getaccountsummary.py
+++ b/euca2ools/commands/euare/getaccountsummary.py
@@ -36,7 +36,7 @@ class GetAccountSummary(EuareRequest):
DESCRIPTION = '''Display account-level information about account entity
usage and IAM quotas'''
PARAMS = [AS_ACCOUNT]
- LIST_MARKERS = ['SummaryMap']
+ LIST_TAGS = ['SummaryMap']
def print_result(self, result):
for entry in sorted(result.get('SummaryMap', [])):
diff --git a/euca2ools/commands/euare/getgroup.py b/euca2ools/commands/euare/getgroup.py
index 2ebfd56..fea6e95 100644
--- a/euca2ools/commands/euare/getgroup.py
+++ b/euca2ools/commands/euare/getgroup.py
@@ -38,7 +38,7 @@ class GetGroup(EuareRequest):
ARGS = [Arg('-g', '--group-name', dest='GroupName', metavar='GROUP',
required=True, help='name of the group to show info about'),
AS_ACCOUNT]
- LIST_MARKERS = ['Users']
+ LIST_TAGS = ['Users']
def main(self):
return PaginatedResponse(self, (None,), ('Users',))
diff --git a/euca2ools/commands/euare/getuserinfo.py b/euca2ools/commands/euare/getuserinfo.py
index e1449ca..8042b33 100644
--- a/euca2ools/commands/euare/getuserinfo.py
+++ b/euca2ools/commands/euare/getuserinfo.py
@@ -41,7 +41,7 @@ class GetUserInfo(EuareRequest, TabifyingCommand):
Arg('-k', '--info-key', dest='InfoKey',
help='name of the piece of user info to show'),
AS_ACCOUNT]
- LIST_MARKERS = ['Infos']
+ LIST_TAGS = ['Infos']
def print_result(self, result):
for info in data.get('Infos', []):
diff --git a/euca2ools/commands/euare/listaccesskeys.py b/euca2ools/commands/euare/listaccesskeys.py
index c6fdda6..2a54bb6 100644
--- a/euca2ools/commands/euare/listaccesskeys.py
+++ b/euca2ools/commands/euare/listaccesskeys.py
@@ -38,7 +38,7 @@ class ListAccessKeys(EuareRequest):
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
help='user to list keys for (default: current user)'),
AS_ACCOUNT]
- LIST_MARKERS = ['AccessKeyMetadata']
+ LIST_TAGS = ['AccessKeyMetadata']
def main(self):
return PaginatedResponse(self, (None,), ('AccessKeyMetadata',))
diff --git a/euca2ools/commands/euare/listaccountaliases.py b/euca2ools/commands/euare/listaccountaliases.py
index 9988236..e0c2165 100644
--- a/euca2ools/commands/euare/listaccountaliases.py
+++ b/euca2ools/commands/euare/listaccountaliases.py
@@ -35,7 +35,7 @@ from . import EuareRequest, AS_ACCOUNT
class ListAccountAliases(EuareRequest):
DESCRIPTION = "List your account's aliases"
ARGS = [AS_ACCOUNT]
- LIST_MARKERS = ['AccountAliases']
+ LIST_TAGS = ['AccountAliases']
def print_result(self, result):
# These are technically allowed to paginate, but I haven't seen
diff --git a/euca2ools/commands/euare/listaccountpolicies.py b/euca2ools/commands/euare/listaccountpolicies.py
index 3b50f27..6bb8edd 100644
--- a/euca2ools/commands/euare/listaccountpolicies.py
+++ b/euca2ools/commands/euare/listaccountpolicies.py
@@ -48,7 +48,7 @@ class ListAccountPolicies(EuareRequest):
Arg('--pretty-print', action='store_true', route_to=None,
help='''when printing the contents of policies, reformat them
for easier reading''')]
- LIST_MARKERS = ['PolicyNames']
+ LIST_TAGS = ['PolicyNames']
def main(self):
return PaginatedResponse(self, (None,), ('PolicyNames',))
diff --git a/euca2ools/commands/euare/listaccounts.py b/euca2ools/commands/euare/listaccounts.py
index 69dba24..7f9c1aa 100644
--- a/euca2ools/commands/euare/listaccounts.py
+++ b/euca2ools/commands/euare/listaccounts.py
@@ -36,7 +36,7 @@ from . import EuareRequest
class ListAccounts(EuareRequest, TabifyingCommand):
DESCRIPTION = ("[Eucalyptus only] List all of the cloud's accounts. This "
"command is only usable by cloud administrators.")
- LIST_MARKERS = ['Accounts']
+ LIST_TAGS = ['Accounts']
def print_result(self, result):
for account in result.get('Accounts', []):
diff --git a/euca2ools/commands/euare/listgrouppolicies.py b/euca2ools/commands/euare/listgrouppolicies.py
index 4ca67bb..a2d1f9a 100644
--- a/euca2ools/commands/euare/listgrouppolicies.py
+++ b/euca2ools/commands/euare/listgrouppolicies.py
@@ -49,7 +49,7 @@ class ListGroupPolicies(EuareRequest):
help='''when printing the contents of policies, reformat them
for easier reading'''),
AS_ACCOUNT]
- LIST_MARKERS = ['PolicyNames']
+ LIST_TAGS = ['PolicyNames']
def main(self):
return PaginatedResponse(self, (None,), ('PolicyNames',))
diff --git a/euca2ools/commands/euare/listgroups.py b/euca2ools/commands/euare/listgroups.py
index 15abcef..67ce8d7 100644
--- a/euca2ools/commands/euare/listgroups.py
+++ b/euca2ools/commands/euare/listgroups.py
@@ -39,7 +39,7 @@ class ListGroups(EuareRequest):
help='''restrict results to groups whose paths begin with a
specific prefix'''),
AS_ACCOUNT]
- LIST_MARKERS = ['Groups']
+ LIST_TAGS = ['Groups']
def main(self):
return PaginatedResponse(self, (None,), ('Groups',))
diff --git a/euca2ools/commands/euare/listgroupsforuser.py b/euca2ools/commands/euare/listgroupsforuser.py
index af0976e..bead9d1 100644
--- a/euca2ools/commands/euare/listgroupsforuser.py
+++ b/euca2ools/commands/euare/listgroupsforuser.py
@@ -38,7 +38,7 @@ class ListGroupsForUser(EuareRequest):
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
required=True, help='user to list membership for (required)'),
AS_ACCOUNT]
- LIST_MARKERS = ['Groups']
+ LIST_TAGS = ['Groups']
def main(self):
return PaginatedResponse(self, (None,), ('Groups',))
diff --git a/euca2ools/commands/euare/listmfadevices.py b/euca2ools/commands/euare/listmfadevices.py
index f93dd11..d3357ca 100644
--- a/euca2ools/commands/euare/listmfadevices.py
+++ b/euca2ools/commands/euare/listmfadevices.py
@@ -38,7 +38,7 @@ class ListMFADevices(EuareRequest):
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
help='user to list MFA devices for (default: current user)'),
AS_ACCOUNT]
- LIST_MARKERS = ['MFADevices']
+ LIST_TAGS = ['MFADevices']
def main(self):
return PaginatedResponse(self, (None,), ('MFADevices',))
diff --git a/euca2ools/commands/euare/listservercertificates.py b/euca2ools/commands/euare/listservercertificates.py
index c5d543b..01b5ce1 100644
--- a/euca2ools/commands/euare/listservercertificates.py
+++ b/euca2ools/commands/euare/listservercertificates.py
@@ -38,7 +38,7 @@ class ListServerCertificates(EuareRequest):
help='''limit results to server certificates that begin with a
given path'''),
AS_ACCOUNT]
- LIST_MARKERS = ['ServerCertificateMetadataList']
+ LIST_TAGS = ['ServerCertificateMetadataList']
def main(self):
return PaginatedResponse(self, (None,),
diff --git a/euca2ools/commands/euare/listsigningcertificates.py b/euca2ools/commands/euare/listsigningcertificates.py
index be1b27a..e15ddfd 100644
--- a/euca2ools/commands/euare/listsigningcertificates.py
+++ b/euca2ools/commands/euare/listsigningcertificates.py
@@ -40,7 +40,7 @@ class ListSigningCertificates(EuareRequest):
Arg('-v', '--verbose', action='store_true', route_to=None,
help="also show certificates' contents"),
AS_ACCOUNT]
- LIST_MARKERS = ['Certificates']
+ LIST_TAGS = ['Certificates']
def main(self):
return PaginatedResponse(self, (None,), ('Certificates',))
diff --git a/euca2ools/commands/euare/listuserpolicies.py b/euca2ools/commands/euare/listuserpolicies.py
index 34bb0eb..b0ec503 100644
--- a/euca2ools/commands/euare/listuserpolicies.py
+++ b/euca2ools/commands/euare/listuserpolicies.py
@@ -49,7 +49,7 @@ class ListUserPolicies(EuareRequest):
help='''when printing the contents of policies, reformat them
for easier reading'''),
AS_ACCOUNT]
- LIST_MARKERS = ['PolicyNames']
+ LIST_TAGS = ['PolicyNames']
def main(self):
return PaginatedResponse(self, (None,), ('PolicyNames',))
diff --git a/euca2ools/commands/euare/listusers.py b/euca2ools/commands/euare/listusers.py
index f5e8fac..bde9317 100644
--- a/euca2ools/commands/euare/listusers.py
+++ b/euca2ools/commands/euare/listusers.py
@@ -37,7 +37,7 @@ class ListUsers(EuareRequest):
ARGS = [Arg('-p', '--path-prefix', dest='PathPrefix', metavar='PREFIX',
help='limit results to users who begin with a given path'),
AS_ACCOUNT]
- LIST_MARKERS = ['Users']
+ LIST_TAGS = ['Users']
def main(self):
return PaginatedResponse(self, (None,), ('Users',))
diff --git a/euca2ools/commands/euca/describeaddresses.py b/euca2ools/commands/euca/describeaddresses.py
index 546298a..b556dd9 100644
--- a/euca2ools/commands/euca/describeaddresses.py
+++ b/euca2ools/commands/euca/describeaddresses.py
@@ -44,7 +44,7 @@ class DescribeAddresses(EucalyptusRequest):
Filter('instance-id',
help='instance the address is associated with'),
Filter('public-ip', help='the elastic IP address')]
- LIST_MARKERS = ['addressesSet']
+ LIST_TAGS = ['addressesSet']
def preprocess(self):
alloc_ids = set(addr for addr in self.args.get('address', [])
diff --git a/euca2ools/commands/euca/describeavailabilityzones.py b/euca2ools/commands/euca/describeavailabilityzones.py
index 4b4c098..e699b8c 100644
--- a/euca2ools/commands/euca/describeavailabilityzones.py
+++ b/euca2ools/commands/euca/describeavailabilityzones.py
@@ -43,7 +43,7 @@ class DescribeAvailabilityZones(EucalyptusRequest):
help='region the availability zone is in'),
Filter('state', help='state of the availability zone'),
Filter('zone-name', help='name of the availability zone')]
- LIST_MARKERS = ['availabilityZoneInfo', 'messageSet']
+ LIST_TAGS = ['availabilityZoneInfo', 'messageSet']
def send(self):
try:
diff --git a/euca2ools/commands/euca/describebundletasks.py b/euca2ools/commands/euca/describebundletasks.py
index 1763d8f..e75cee0 100644
--- a/euca2ools/commands/euca/describebundletasks.py
+++ b/euca2ools/commands/euca/describebundletasks.py
@@ -51,7 +51,7 @@ class DescribeBundleTasks(EucalyptusRequest):
choices=('pending', 'waiting-for-shutdown', 'bundling',
'storing', 'cancelling', 'complete', 'failed')),
Filter('update-time', help='most recent task update time')]
- LIST_MARKERS = ['bundleInstanceTasksSet']
+ LIST_TAGS = ['bundleInstanceTasksSet']
def print_result(self, result):
for task in result.get('bundleInstanceTasksSet', []):
diff --git a/euca2ools/commands/euca/describeimageattribute.py b/euca2ools/commands/euca/describeimageattribute.py
index 6449ff7..dae3b68 100644
--- a/euca2ools/commands/euca/describeimageattribute.py
+++ b/euca2ools/commands/euca/describeimageattribute.py
@@ -50,7 +50,7 @@ class DescribeImageAttribute(EucalyptusRequest):
const='ramdisk', help='show associated ramdisk image ID'),
Arg('--description', dest='Attribute', action='store_const',
const='description', help="show the image's description"))]
- LIST_MARKERS = ['blockDeviceMapping', 'launchPermission', 'productCodes']
+ LIST_TAGS = ['blockDeviceMapping', 'launchPermission', 'productCodes']
def print_result(self, result):
image_id = result.get('imageId')
diff --git a/euca2ools/commands/euca/describeimages.py b/euca2ools/commands/euca/describeimages.py
index b0bed63..e0db1be 100644
--- a/euca2ools/commands/euca/describeimages.py
+++ b/euca2ools/commands/euca/describeimages.py
@@ -96,7 +96,7 @@ class DescribeImages(EucalyptusRequest):
help='virtualization type ("paravirtual" or "hvm")'),
Filter('hypervisor', choices=('ovm', 'xen'),
help='image\'s hypervisor type ("ovm" or "xen")')]
- LIST_MARKERS = ['imagesSet', 'blockDeviceMapping', 'tagSet']
+ LIST_TAGS = ['imagesSet', 'blockDeviceMapping', 'tagSet']
def configure(self):
EucalyptusRequest.configure(self)
diff --git a/euca2ools/commands/euca/describeinstances.py b/euca2ools/commands/euca/describeinstances.py
index 6621b4e..52c4a1e 100644
--- a/euca2ools/commands/euca/describeinstances.py
+++ b/euca2ools/commands/euca/describeinstances.py
@@ -99,8 +99,8 @@ class DescribeInstances(EucalyptusRequest):
help='specific tag key/value combination'),
Filter('virtualization-type', choices=['paravirtual', 'hvm']),
Filter('vpc-id', help='ID of the VPC the instance is in')]
- LIST_MARKERS = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
- 'blockDeviceMapping', 'productCodes']
+ LIST_TAGS = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
+ 'blockDeviceMapping', 'productCodes']
def print_result(self, result):
for reservation in result.get('reservationSet'):
diff --git a/euca2ools/commands/euca/describekeypairs.py b/euca2ools/commands/euca/describekeypairs.py
index 7967608..35e93a5 100644
--- a/euca2ools/commands/euca/describekeypairs.py
+++ b/euca2ools/commands/euca/describekeypairs.py
@@ -38,7 +38,7 @@ class DescribeKeyPairs(EucalyptusRequest):
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')]
- LIST_MARKERS = ['keySet']
+ LIST_TAGS = ['keySet']
def print_result(self, result):
for key in result.get('keySet', []):
diff --git a/euca2ools/commands/euca/describeregions.py b/euca2ools/commands/euca/describeregions.py
index 6cb5d94..e5ddaf9 100644
--- a/euca2ools/commands/euca/describeregions.py
+++ b/euca2ools/commands/euca/describeregions.py
@@ -38,7 +38,7 @@ class DescribeRegions(EucalyptusRequest):
help='limit results to specific regions')]
FILTERS = [Filter('endpoint'),
Filter('region-name')]
- LIST_MARKERS = ['regionInfo']
+ LIST_TAGS = ['regionInfo']
def print_result(self, result):
for region in result.get('regionInfo', []):
diff --git a/euca2ools/commands/euca/describesecuritygroups.py b/euca2ools/commands/euca/describesecuritygroups.py
index a6a8978..d2251dc 100644
--- a/euca2ools/commands/euca/describesecuritygroups.py
+++ b/euca2ools/commands/euca/describesecuritygroups.py
@@ -62,8 +62,8 @@ class DescribeSecurityGroups(EucalyptusRequest):
Filter('tag-key', help='key of a tag assigned to the group'),
Filter('tag-value',
help='value of a tag assigned to the group')]
- LIST_MARKERS = ['securityGroupInfo', 'ipPermissions',
- 'ipPermissionsEgress', 'groups', 'ipRanges']
+ LIST_TAGS = ['securityGroupInfo', 'ipPermissions', 'ipPermissionsEgress',
+ 'groups', 'ipRanges']
def preprocess(self):
for group in self.args['group']:
diff --git a/euca2ools/commands/euca/describesnapshots.py b/euca2ools/commands/euca/describesnapshots.py
index 404e80b..b06da4c 100644
--- a/euca2ools/commands/euca/describesnapshots.py
+++ b/euca2ools/commands/euca/describesnapshots.py
@@ -63,7 +63,7 @@ class DescribeSnapshots(EucalyptusRequest):
help='specific tag key/value combination'),
Filter('volume-id', help='source volume ID'),
Filter('volume-size', type=int)]
- LIST_MARKERS = ['snapshotSet', 'tagSet']
+ LIST_TAGS = ['snapshotSet', 'tagSet']
def configure(self):
EucalyptusRequest.configure(self)
diff --git a/euca2ools/commands/euca/describetags.py b/euca2ools/commands/euca/describetags.py
index 786c31f..a104dd9 100644
--- a/euca2ools/commands/euca/describetags.py
+++ b/euca2ools/commands/euca/describetags.py
@@ -39,7 +39,7 @@ class DescribeTags(EucalyptusRequest):
Filter('resource-type',
choices=sorted(tuple(RESOURCE_TYPE_MAP))),
Filter('value')]
- LIST_MARKERS = ['tagSet']
+ LIST_TAGS = ['tagSet']
def print_result(self, result):
for tag in result.get('tagSet', []):
diff --git a/euca2ools/commands/euca/describevolumes.py b/euca2ools/commands/euca/describevolumes.py
index f792b01..52de269 100644
--- a/euca2ools/commands/euca/describevolumes.py
+++ b/euca2ools/commands/euca/describevolumes.py
@@ -59,7 +59,7 @@ class DescribeVolumes(EucalyptusRequest):
GenericTagFilter('tag:KEY',
help='specific tag key/value combination'),
Filter(name='volume-id')]
- LIST_MARKERS = ['volumeSet', 'attachmentSet', 'tagSet']
+ LIST_TAGS = ['volumeSet', 'attachmentSet', 'tagSet']
def print_result(self, result):
for volume in result.get('volumeSet'):
diff --git a/euca2ools/commands/euca/monitorinstances.py b/euca2ools/commands/euca/monitorinstances.py
index b804d43..d459548 100644
--- a/euca2ools/commands/euca/monitorinstances.py
+++ b/euca2ools/commands/euca/monitorinstances.py
@@ -35,7 +35,7 @@ class MonitorInstances(EucalyptusRequest):
DESCRIPTION = 'Enable monitoring for one or more instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to monitor')]
- LIST_MARKERS = ['instancesSet']
+ LIST_TAGS = ['instancesSet']
def print_result(self, result):
for instance in result.get('instancesSet', []):
diff --git a/euca2ools/commands/euca/runinstances.py b/euca2ools/commands/euca/runinstances.py
index a0ef543..b74fdf9 100644
--- a/euca2ools/commands/euca/runinstances.py
+++ b/euca2ools/commands/euca/runinstances.py
@@ -91,8 +91,8 @@ class RunInstances(EucalyptusRequest):
choices=('stop', 'terminate'),
help=('whether to "stop" (default) or terminate EBS instances '
'when they shut down'))]
- LIST_MARKERS = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
- 'blockDeviceMapping', 'productCodes']
+ LIST_TAGS = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
+ 'blockDeviceMapping', 'productCodes']
def preprocess(self):
counts = self.args['count'].split('-')
diff --git a/euca2ools/commands/euca/startinstances.py b/euca2ools/commands/euca/startinstances.py
index 3ee91e0..f4d0f1d 100644
--- a/euca2ools/commands/euca/startinstances.py
+++ b/euca2ools/commands/euca/startinstances.py
@@ -35,7 +35,7 @@ class StartInstances(EucalyptusRequest):
DESCRIPTION = 'Start one or more stopped instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to start')]
- LIST_MARKERS = ['instancesSet']
+ LIST_TAGS = ['instancesSet']
def print_result(self, result):
for instance in result.get('instancesSet', []):
diff --git a/euca2ools/commands/euca/stopinstances.py b/euca2ools/commands/euca/stopinstances.py
index 301642f..32426d9 100644
--- a/euca2ools/commands/euca/stopinstances.py
+++ b/euca2ools/commands/euca/stopinstances.py
@@ -38,7 +38,7 @@ class StopInstances(EucalyptusRequest):
Arg('-f', '--force', dest='Force', action='store_const',
const='true',
help='immediately stop the instance. Data may be lost')]
- LIST_MARKERS = ['instancesSet']
+ LIST_TAGS = ['instancesSet']
def print_result(self, result):
for instance in result.get('instancesSet', []):
diff --git a/euca2ools/commands/euca/terminateinstances.py b/euca2ools/commands/euca/terminateinstances.py
index 3a2401e..9021aa1 100644
--- a/euca2ools/commands/euca/terminateinstances.py
+++ b/euca2ools/commands/euca/terminateinstances.py
@@ -35,7 +35,7 @@ class TerminateInstances(EucalyptusRequest):
DESCRIPTION = 'Terminate one or more instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to terminate')]
- LIST_MARKERS = ['instancesSet']
+ LIST_TAGS = ['instancesSet']
def print_result(self, result):
for instance in result.get('instancesSet', []):
diff --git a/euca2ools/commands/euca/unmonitorinstances.py b/euca2ools/commands/euca/unmonitorinstances.py
index dee2e56..bcb3ce0 100644
--- a/euca2ools/commands/euca/unmonitorinstances.py
+++ b/euca2ools/commands/euca/unmonitorinstances.py
@@ -35,7 +35,7 @@ class UnmonitorInstances(EucalyptusRequest):
DESCRIPTION = 'Disable monitoring for one or more instances'
ARGS = [Arg('InstanceId', metavar='INSTANCE', nargs='+',
help='instance(s) to un-monitor')]
- LIST_MARKERS = ['instancesSet']
+ LIST_TAGS = ['instancesSet']
def print_result(self, result):
for instance in result.get('instancesSet', []):
diff --git a/euca2ools/commands/walrus/listallmybuckets.py b/euca2ools/commands/walrus/listallmybuckets.py
index 08e00d6..3a9be76 100644
--- a/euca2ools/commands/walrus/listallmybuckets.py
+++ b/euca2ools/commands/walrus/listallmybuckets.py
@@ -52,7 +52,7 @@ class ListAllMyBuckets(WalrusRequest, TabifyingCommand):
def parse_response(self, response):
response_dict = self.log_and_parse_response(response,
- parse_listdelimited_aws_xml, list_markers=('Buckets',))
+ parse_listdelimited_aws_xml, list_tags=('Buckets',))
return response_dict['ListAllMyBucketsResult']
def print_result(self, result):
diff --git a/euca2ools/commands/walrus/listbucket.py b/euca2ools/commands/walrus/listbucket.py
index d12a620..4a9180e 100644
--- a/euca2ools/commands/walrus/listbucket.py
+++ b/euca2ools/commands/walrus/listbucket.py
@@ -78,7 +78,7 @@ class ListBucket(WalrusRequest, TabifyingCommand):
def parse_response(self, response):
response_dict = self.log_and_parse_response(response,
- parse_aws_xml, list_item_markers=('Contents', 'CommonPrefixes'))
+ parse_aws_xml, list_item_tags=('Contents', 'CommonPrefixes'))
return response_dict['ListBucketResult']
def print_result(self, result):
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list