[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 f0975a7a1e9e2008a1d807280bc5b046f29749a7
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Sat Jan 26 21:28:09 2013 -0600
Rename Filters -> FILTERS
diff --git a/euca2ools/commands/euca/describeaddresses.py b/euca2ools/commands/euca/describeaddresses.py
index 8283508..4fa8ad2 100644
--- a/euca2ools/commands/euca/describeaddresses.py
+++ b/euca2ools/commands/euca/describeaddresses.py
@@ -37,7 +37,7 @@ class DescribeAddresses(EucalyptusRequest):
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)'),
+ FILTERS = [Filter('allocation-id', help='allocation ID (VPC only)'),
Filter('association-id', help='association ID (VPC only)'),
Filter('domain', choices=['standard', 'vpc'],
help='whether the address is a standard or VPC address'),
diff --git a/euca2ools/commands/euca/describeavailabilityzones.py b/euca2ools/commands/euca/describeavailabilityzones.py
index 8e56d60..acdbfe2 100644
--- a/euca2ools/commands/euca/describeavailabilityzones.py
+++ b/euca2ools/commands/euca/describeavailabilityzones.py
@@ -36,7 +36,7 @@ class DescribeAvailabilityZones(EucalyptusRequest):
APIVersion = '2010-08-31'
ARGS = [Arg('ZoneName', metavar='ZONE', nargs='*',
help='limit results to one or more availability zones')]
- Filters = [Filter('message', help=('message giving information about the'
+ FILTERS = [Filter('message', help=('message giving information about the'
'availability zone')),
Filter('region-name',
help='region the availability zone is in'),
diff --git a/euca2ools/commands/euca/describebundletasks.py b/euca2ools/commands/euca/describebundletasks.py
index 799501c..bfed0cb 100644
--- a/euca2ools/commands/euca/describebundletasks.py
+++ b/euca2ools/commands/euca/describebundletasks.py
@@ -36,7 +36,7 @@ class DescribeBundleTasks(EucalyptusRequest):
APIVersion = '2010-08-31'
ARGS = [Arg('BundleId', metavar='BUNDLE', nargs='*',
help='limit results to one or more bundle tasks')]
- Filters = [Filter('bundle-id', help='bundle task ID'),
+ FILTERS = [Filter('bundle-id', help='bundle task ID'),
Filter('error-code',
help='if the task failed, the error code returned'),
Filter('error-message',
diff --git a/euca2ools/commands/euca/describeimages.py b/euca2ools/commands/euca/describeimages.py
index b87cd42..89abd36 100644
--- a/euca2ools/commands/euca/describeimages.py
+++ b/euca2ools/commands/euca/describeimages.py
@@ -50,7 +50,7 @@ class DescribeImages(EucalyptusRequest):
metavar='ACCOUNT', action='append',
help='''describe images for which the specified entity has
explicit launch permissions''')]
- Filters = [Filter('architecture', choices=('i386', 'x86_64', 'armhf'),
+ FILTERS = [Filter('architecture', choices=('i386', 'x86_64', 'armhf'),
help='image architecture'),
Filter('block-device-mapping.delete-on-termination',
help='''whether a volume is deleted upon instance
diff --git a/euca2ools/commands/euca/describeinstances.py b/euca2ools/commands/euca/describeinstances.py
index 325a5c8..8baacc4 100644
--- a/euca2ools/commands/euca/describeinstances.py
+++ b/euca2ools/commands/euca/describeinstances.py
@@ -36,7 +36,7 @@ class DescribeInstances(EucalyptusRequest):
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'),
+ FILTERS = [Filter('architecture', help='CPU architecture'),
Filter('availability-zone'),
Filter('block-device-mapping.attach-time',
help='volume attachment time'),
diff --git a/euca2ools/commands/euca/describekeypairs.py b/euca2ools/commands/euca/describekeypairs.py
index 4f3ae3f..fb12582 100644
--- a/euca2ools/commands/euca/describekeypairs.py
+++ b/euca2ools/commands/euca/describekeypairs.py
@@ -36,7 +36,7 @@ class DescribeKeyPairs(EucalyptusRequest):
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'),
+ FILTERS = [Filter('fingerprint', help='fingerprint of the key pair'),
Filter('key-name', help='name of the key pair')]
ListDelims = ['keySet']
diff --git a/euca2ools/commands/euca/describeregions.py b/euca2ools/commands/euca/describeregions.py
index 49d9e70..a988d77 100644
--- a/euca2ools/commands/euca/describeregions.py
+++ b/euca2ools/commands/euca/describeregions.py
@@ -36,7 +36,7 @@ class DescribeRegions(EucalyptusRequest):
Description = 'Display information about regions'
ARGS = [Arg('RegionName', nargs='*', metavar='REGION',
help='limit results to specific regions')]
- Filters = [Filter('endpoint'),
+ FILTERS = [Filter('endpoint'),
Filter('region-name')]
ListDelims = ['regionInfo']
diff --git a/euca2ools/commands/euca/describesecuritygroups.py b/euca2ools/commands/euca/describesecuritygroups.py
index 5e93834..63aa0d5 100644
--- a/euca2ools/commands/euca/describesecuritygroups.py
+++ b/euca2ools/commands/euca/describesecuritygroups.py
@@ -42,7 +42,7 @@ class DescribeSecurityGroups(EucalyptusRequest):
APIVersion = '2011-01-01'
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'),
+ FILTERS = [Filter('description', help='group description'),
Filter('group-id'),
Filter('group-name'),
Filter('ip-permission.cidr',
diff --git a/euca2ools/commands/euca/describesnapshots.py b/euca2ools/commands/euca/describesnapshots.py
index 2229dfe..afd3cdd 100644
--- a/euca2ools/commands/euca/describesnapshots.py
+++ b/euca2ools/commands/euca/describesnapshots.py
@@ -49,7 +49,7 @@ class DescribeSnapshots(EucalyptusRequest):
Arg('-r', '--restorable-by', dest='RestorableBy', action='append',
metavar='ACCOUNT', default=[], help='''limit results to
snapahots restorable by specific accounts''')]
- Filters = [Filter('description', help='snapshot description'),
+ FILTERS = [Filter('description', help='snapshot description'),
Filter('owner-alias', help="snapshot owner's account alias"),
Filter('owner-id', help="snapshot owner's account ID"),
Filter('progress', help='snapshot progress, in percentage'),
diff --git a/euca2ools/commands/euca/describetags.py b/euca2ools/commands/euca/describetags.py
index e6eefd2..df8584d 100644
--- a/euca2ools/commands/euca/describetags.py
+++ b/euca2ools/commands/euca/describetags.py
@@ -34,7 +34,7 @@ from . import EucalyptusRequest, RESOURCE_TYPE_MAP
class DescribeTags(EucalyptusRequest):
APIVersion = '2010-08-31'
Description = 'List tags associated with your account'
- Filters = [Filter('key'),
+ FILTERS = [Filter('key'),
Filter('resource-id'),
Filter('resource-type',
choices=sorted(tuple(RESOURCE_TYPE_MAP))),
diff --git a/euca2ools/commands/euca/describevolumes.py b/euca2ools/commands/euca/describevolumes.py
index 83db316..5dec137 100644
--- a/euca2ools/commands/euca/describevolumes.py
+++ b/euca2ools/commands/euca/describevolumes.py
@@ -36,7 +36,7 @@ class DescribeVolumes(EucalyptusRequest):
APIVersion = '2010-08-31'
ARGS = [Arg('VolumeId', metavar='VOLUME', nargs='*',
help='volume(s) to describe (default: all volumes)')]
- Filters = [Filter('attachment.attach-time', help='attachment start time'),
+ FILTERS = [Filter('attachment.attach-time', help='attachment start time'),
Filter('attachment.delete-on-termination', help='''whether the
volume will be deleted upon instance termination'''),
Filter('attachment.device',
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list