[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit 854842adea4cd4461a8447d0feced40d7a51e567
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri May 4 22:26:55 2012 -0700

    Clean up generic tag filters

diff --git a/euca2ools/commands/euca/describeinstances.py b/euca2ools/commands/euca/describeinstances.py
index ddb322b..810d896 100644
--- a/euca2ools/commands/euca/describeinstances.py
+++ b/euca2ools/commands/euca/describeinstances.py
@@ -94,7 +94,8 @@ class DescribeInstances(EucalyptusRequest):
                       help='name of any tag assigned to the instance'),
                Filter('tag-value',
                       help='value of any tag assigned to the instance'),
-               Filter('tag:key', help='specific tag/value combination'),
+               GenericTagFilter('tag:KEY',
+                                help='specific tag key/value combination'),
                Filter('virtualization-type', choices=['paravirtual', 'hvm']),
                Filter('vpc-id', help='ID of the VPC the instance is in')]
     ListMarkers = ['reservationSet', 'instancesSet', 'groupSet', 'tagSet',
diff --git a/euca2ools/commands/euca/describesnapshots.py b/euca2ools/commands/euca/describesnapshots.py
index 389885e..b1aec64 100644
--- a/euca2ools/commands/euca/describesnapshots.py
+++ b/euca2ools/commands/euca/describesnapshots.py
@@ -56,7 +56,7 @@ class DescribeSnapshots(EucalyptusRequest):
                Filter('tag-value',
                       help='value of a tag assigned to the snapshot'),
                GenericTagFilter('tag:KEY',
-                                help='specific tag/value combination'),
+                                help='specific tag key/value combination'),
                Filter('volume-id', help='source volume ID'),
                Filter('volume-size', type=int)]
     ListMarkers = ['snapshotSet', 'tagSet']
diff --git a/euca2ools/commands/euca/describevolumes.py b/euca2ools/commands/euca/describevolumes.py
index ae138a7..ea5259d 100644
--- a/euca2ools/commands/euca/describevolumes.py
+++ b/euca2ools/commands/euca/describevolumes.py
@@ -57,7 +57,7 @@ class DescribeVolumes(EucalyptusRequest):
                Filter('tag-value',
                       help='value of a tag assigned to the volume'),
                GenericTagFilter('tag:KEY',
-                                help='specific tag/value combination'),
+                                help='specific tag key/value combination'),
                Filter(name='volume-id')]
     ListMarkers = ['volumeSet', 'attachmentSet', 'tagSet']
     ItemMarkers = ['item']

-- 
managing cloud instances for Eucalyptus