[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 cec017810fa614f3b2b8ca657a29c3a3fefeced4
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Feb 16 19:37:08 2013 -0800

    Clean up region/url options

diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index f601ed7..5224231 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -29,7 +29,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 from euca2ools.exceptions import AWSError
-from requestbuilder import Arg, SERVICE
+from requestbuilder import Arg, MutuallyExclusiveArgList, SERVICE
 import requestbuilder.auth
 import requestbuilder.service
 from .. import Euca2oolsQueryRequest
@@ -41,15 +41,19 @@ class Euare(requestbuilder.service.BaseService):
     AUTH_CLASS = requestbuilder.auth.QuerySigV2Auth
     URL_ENVVAR = 'EUARE_URL'
 
+    ARGS = [MutuallyExclusiveArgList(
+                Arg('--region', dest='userregion', metavar='REGION',
+                    route_to=SERVICE,
+                    help='region name to connect to, with optional identity'),
+                Arg('-U', '--url', metavar='URL', route_to=SERVICE,
+                    help='storage service endpoint URL'))]
+
     def handle_http_error(self, response):
         raise AWSError(response)
 
 
 class EuareRequest(Euca2oolsQueryRequest):
     SERVICE_CLASS = Euare
-    ARGS = [Arg('-U', '--url', dest='url', metavar='URL', route_to=SERVICE,
-                help='identity service endpoint URL')]
-
     def parse_response(self, response):
         response_dict = Euca2oolsQueryRequest.parse_response(self, response)
         # EUARE responses enclose their useful data inside FooResponse
diff --git a/euca2ools/commands/walrus/__init__.py b/euca2ools/commands/walrus/__init__.py
index 6b16d1b..c16aa4b 100644
--- a/euca2ools/commands/walrus/__init__.py
+++ b/euca2ools/commands/walrus/__init__.py
@@ -29,7 +29,7 @@
 # POSSIBILITY OF SUCH DAMAGE.
 
 from euca2ools.exceptions import AWSError
-from requestbuilder import Arg, SERVICE
+from requestbuilder import Arg, MutuallyExclusiveArgList, SERVICE
 import requestbuilder.auth
 import requestbuilder.request
 import requestbuilder.service
@@ -44,14 +44,19 @@ class Walrus(requestbuilder.service.BaseService):
     AUTH_CLASS = requestbuilder.auth.S3RestAuth
     URL_ENVVAR = 'S3_URL'
 
+    ARGS = [MutuallyExclusiveArgList(
+                Arg('--region', dest='userregion', metavar='REGION',
+                    route_to=SERVICE,
+                    help='region name to connect to, with optional identity'),
+                Arg('-U', '--url', metavar='URL', route_to=SERVICE,
+                    help='storage service endpoint URL'))]
+
     def handle_http_error(self, response):
         raise AWSError(response)
 
 
 class WalrusRequest(Euca2oolsRequest):
     SERVICE_CLASS = Walrus
-    ARGS = [Arg('-U', '--url', dest='url', metavar='URL', route_to=SERVICE,
-                help='storage service endpoint URL')]
 
     def __init__(self, **kwargs):
         Euca2oolsRequest.__init__(self, **kwargs)

-- 
managing cloud instances for Eucalyptus