[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 bf356db73535b81e68b1aea310672e0dd0aba65a
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sun Apr 14 01:51:32 2013 -0700

    Use new service and auth default route providers

diff --git a/euca2ools/commands/autoscaling/__init__.py b/euca2ools/commands/autoscaling/__init__.py
index a683254..e04b994 100644
--- a/euca2ools/commands/autoscaling/__init__.py
+++ b/euca2ools/commands/autoscaling/__init__.py
@@ -46,9 +46,9 @@ class AutoScaling(requestbuilder.service.BaseService):
 
     ARGS = [MutuallyExclusiveArgList(
                 Arg('--region', dest='userregion', metavar='USER at REGION',
-                    route_to=SERVICE, help='''name of the region and/or user
-                    in config files to use to connect to the service'''),
-                Arg('-U', '--url', metavar='URL', route_to=SERVICE,
+                    help='''name of the region and/or user in config files to
+                    use to connect to the service'''),
+                Arg('-U', '--url', metavar='URL',
                     help='auto-scaling service endpoint URL'))]
 
     def handle_http_error(self, response):
diff --git a/euca2ools/commands/elasticloadbalancing/__init__.py b/euca2ools/commands/elasticloadbalancing/__init__.py
index 62107e1..a088ab9 100644
--- a/euca2ools/commands/elasticloadbalancing/__init__.py
+++ b/euca2ools/commands/elasticloadbalancing/__init__.py
@@ -46,9 +46,9 @@ class ELB(requestbuilder.service.BaseService):
 
     ARGS = [MutuallyExclusiveArgList(
                 Arg('--region', dest='userregion', metavar='USER at REGION',
-                    route_to=SERVICE, help='''name of the region and/or user
-                    in config files to use to connect to the service'''),
-                Arg('-U', '--url', metavar='URL', route_to=SERVICE,
+                    help='''name of the region and/or user in config files to
+                    use to connect to the service'''),
+                Arg('-U', '--url', metavar='URL',
                     help='load balancing service endpoint URL'))]
 
     def handle_http_error(self, response):
diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index 76cd953..b46086a 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -48,9 +48,9 @@ class Euare(requestbuilder.service.BaseService):
 
     ARGS = [MutuallyExclusiveArgList(
                 Arg('--region', dest='userregion', metavar='USER at REGION',
-                    route_to=SERVICE, help='''name of the region and/or user
-                    in config files to use to connect to the service'''),
-                Arg('-U', '--url', metavar='URL', route_to=SERVICE,
+                    help='''name of the region and/or user in config files to
+                    use to connect to the service'''),
+                Arg('-U', '--url', metavar='URL',
                     help='identity service endpoint URL'))]
 
     def handle_http_error(self, response):
diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index da87ea9..f088a08 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -48,9 +48,8 @@ import sys
 class EC2CompatibleQuerySigV2Auth(QuerySigV2Auth):
     # -a and -s are deprecated; remove them in 3.2
     ARGS = [Arg('-a', '--access-key', metavar='KEY_ID',
-                dest='deprecated_key_id', route_to=AUTH,
-                help=argparse.SUPPRESS),
-            Arg('-s', metavar='KEY', dest='deprecated_sec_key', route_to=AUTH,
+                dest='deprecated_key_id', help=argparse.SUPPRESS),
+            Arg('-s', metavar='KEY', dest='deprecated_sec_key',
                 help=argparse.SUPPRESS)]
 
     def preprocess_arg_objs(self, arg_objs):
@@ -145,9 +144,9 @@ class Eucalyptus(requestbuilder.service.BaseService):
                  default='', route_to=(SERVICE, AUTH), help=argparse.SUPPRESS),
             MutuallyExclusiveArgList(
                 Arg('--region', dest='userregion', metavar='USER at REGION',
-                    route_to=SERVICE, help='''name of the region and/or user
-                    in config files to use to connect to the service'''),
-                Arg('-U', '--url', metavar='URL', route_to=SERVICE,
+                    help='''name of the region and/or user in config files to
+                    use to connect to the service'''),
+                Arg('-U', '--url', metavar='URL',
                     help='compute service endpoint URL'))]
 
     def configure(self):
diff --git a/euca2ools/commands/monitoring/__init__.py b/euca2ools/commands/monitoring/__init__.py
index 2c5aa7b..05a25d7 100644
--- a/euca2ools/commands/monitoring/__init__.py
+++ b/euca2ools/commands/monitoring/__init__.py
@@ -46,9 +46,9 @@ class CloudWatch(requestbuilder.service.BaseService):
 
     ARGS = [MutuallyExclusiveArgList(
                 Arg('--region', dest='userregion', metavar='USER at REGION',
-                    route_to=SERVICE, help='''name of the region and/or user
-                    in config files to use to connect to the service'''),
-                Arg('-U', '--url', metavar='URL', route_to=SERVICE,
+                    help='''name of the region and/or user in config files to
+                    use to connect to the service'''),
+                Arg('-U', '--url', metavar='URL',
                     help='instance monitoring service endpoint URL'))]
 
     def handle_http_error(self, response):
diff --git a/euca2ools/commands/walrus/__init__.py b/euca2ools/commands/walrus/__init__.py
index adceaa0..bad127b 100644
--- a/euca2ools/commands/walrus/__init__.py
+++ b/euca2ools/commands/walrus/__init__.py
@@ -48,9 +48,9 @@ class Walrus(requestbuilder.service.BaseService):
 
     ARGS = [MutuallyExclusiveArgList(
                 Arg('--region', dest='userregion', metavar='USER at REGION',
-                    route_to=SERVICE, help='''name of the region and/or user
-                    in config files to use to connect to the service'''),
-                Arg('-U', '--url', metavar='URL', route_to=SERVICE,
+                    help='''name of the region and/or user in config files to
+                    use to connect to the service'''),
+                Arg('-U', '--url', metavar='URL',
                     help='storage service endpoint URL'))]
 
     def handle_http_error(self, response):

-- 
managing cloud instances for Eucalyptus