[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:00 UTC 2013
The following commit has been merged in the master branch:
commit ce3c5a50339326f1afa1566dd905d73316b67a17
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Sat Jan 26 22:46:38 2013 -0600
Rename ListDelims -> LIST_MARKERS
diff --git a/euca2ools/commands/euare/listusers.py b/euca2ools/commands/euare/listusers.py
index b5bcf6e..b34358d 100644
--- a/euca2ools/commands/euare/listusers.py
+++ b/euca2ools/commands/euare/listusers.py
@@ -37,7 +37,7 @@ class ListUsers(EuareRequest):
help='''limit results to users who begin with a given path
(default: list all users)'''),
DELEGATE]
- ListDelims = ['Users']
+ LIST_MARKERS = ['Users']
def print_result(self, result):
for user in result.get('Users', []):
diff --git a/euca2ools/commands/euca/describeaddresses.py b/euca2ools/commands/euca/describeaddresses.py
index 1ae0ccb..b96cede 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')]
- ListDelims = ['addressesSet']
+ LIST_MARKERS = ['addressesSet']
def main(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 c498d73..03be5ce 100644
--- a/euca2ools/commands/euca/describeavailabilityzones.py
+++ b/euca2ools/commands/euca/describeavailabilityzones.py
@@ -42,7 +42,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')]
- ListDelims = ['availabilityZoneInfo', 'messageSet']
+ LIST_MARKERS = ['availabilityZoneInfo', 'messageSet']
def print_result(self, result):
for zone in result.get('availabilityZoneInfo', []):
diff --git a/euca2ools/commands/euca/describebundletasks.py b/euca2ools/commands/euca/describebundletasks.py
index 90d48bd..3352c29 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')]
- ListDelims = ['bundleInstanceTasksSet']
+ LIST_MARKERS = ['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 4491caf..ae7875f 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"))]
- ListDelims = ['blockDeviceMapping', 'launchPermission', 'productCodes']
+ LIST_MARKERS = ['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 2e754c2..f7fcefc 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")')]
- ListDelims = ['imagesSet', 'blockDeviceMapping', 'tagSet']
+ LIST_MARKERS = ['imagesSet', 'blockDeviceMapping', 'tagSet']
def main(self):
if not any(self.args.get(item) for item in ('all', 'ImageId',
diff --git a/euca2ools/commands/euca/describeinstances.py b/euca2ools/commands/euca/describeinstances.py
index 84633ee..8c230cb 100644
--- a/euca2ools/commands/euca/describeinstances.py
+++ b/euca2ools/commands/euca/describeinstances.py
@@ -98,8 +98,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')]
- ListDelims = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
- 'blockDeviceMapping', 'productCodes']
+ LIST_MARKERS = ['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 fedae71..edf019a 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')]
- ListDelims = ['keySet']
+ LIST_MARKERS = ['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 13f7b48..f48e358 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')]
- ListDelims = ['regionInfo']
+ LIST_MARKERS = ['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 042a904..f38a6e8 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')]
- ListDelims = ['securityGroupInfo', 'ipPermissions', 'ipPermissionsEgress',
- 'groups', 'ipRanges']
+ LIST_MARKERS = ['securityGroupInfo', 'ipPermissions',
+ 'ipPermissionsEgress', 'groups', 'ipRanges']
def main(self):
self.params = {}
diff --git a/euca2ools/commands/euca/describesnapshots.py b/euca2ools/commands/euca/describesnapshots.py
index 3af6bdd..3962116 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)]
- ListDelims = ['snapshotSet', 'tagSet']
+ LIST_MARKERS = ['snapshotSet', 'tagSet']
def main(self):
if not any(self.args.get(item) for item in ('all', 'Owner',
diff --git a/euca2ools/commands/euca/describetags.py b/euca2ools/commands/euca/describetags.py
index d12ccb5..5351727 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')]
- ListDelims = ['tagSet']
+ LIST_MARKERS = ['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 e810b68..8831b42 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')]
- ListDelims = ['volumeSet', 'attachmentSet', 'tagSet']
+ LIST_MARKERS = ['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 41b147d..7d5d208 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')]
- ListDelims = ['instancesSet']
+ LIST_MARKERS = ['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 8ecf0e9..abb340e 100644
--- a/euca2ools/commands/euca/runinstances.py
+++ b/euca2ools/commands/euca/runinstances.py
@@ -86,8 +86,8 @@ class RunInstances(EucalyptusRequest):
help='VPC subnet in which to launch the instance(s)'),
Arg('-z', '--availability-zone', metavar='ZONE',
dest='Placement.AvailabilityZone')]
- ListDelims = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
- 'blockDeviceMapping', 'productCodes']
+ LIST_MARKERS = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
+ 'blockDeviceMapping', 'productCodes']
def main(self):
self.params = {}
diff --git a/euca2ools/commands/euca/startinstances.py b/euca2ools/commands/euca/startinstances.py
index d7e82a7..8471838 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')]
- ListDelims = ['instancesSet']
+ LIST_MARKERS = ['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 e9dafe4..13a96f2 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')]
- ListDelims = ['instancesSet']
+ LIST_MARKERS = ['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 a92509d..50d3038 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')]
- ListDelims = ['instancesSet']
+ LIST_MARKERS = ['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 1f26c9b..a822215 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')]
- ListDelims = ['instancesSet']
+ LIST_MARKERS = ['instancesSet']
def print_result(self, result):
for instance in result.get('instancesSet', []):
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list