[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:43 UTC 2013
The following commit has been merged in the master branch:
commit 89fff0a9137a4e2278c6822ae79595400e7083ab
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Tue Mar 19 17:16:37 2013 -0700
Update region/url options
diff --git a/euca2ools/commands/autoscaling/__init__.py b/euca2ools/commands/autoscaling/__init__.py
index dfabe91..9d789a2 100644
--- a/euca2ools/commands/autoscaling/__init__.py
+++ b/euca2ools/commands/autoscaling/__init__.py
@@ -30,7 +30,7 @@
from euca2ools.commands import Euca2ools
from euca2ools.exceptions import AWSError
-from requestbuilder import Arg, SERVICE
+from requestbuilder import Arg, MutuallyExclusiveArgList, SERVICE
import requestbuilder.auth
import requestbuilder.service
import requestbuilder.request
@@ -43,6 +43,13 @@ class AutoScaling(requestbuilder.service.BaseService):
AUTH_CLASS = requestbuilder.auth.QuerySigV2Auth
URL_ENVVAR = 'AWS_AUTO_SCALING_URL'
+ 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='auto-scaling service endpoint URL'))]
+
def handle_http_error(self, response):
raise AWSError(response)
@@ -50,8 +57,6 @@ class AutoScaling(requestbuilder.service.BaseService):
class AutoScalingRequest(requestbuilder.request.AWSQueryRequest):
SUITE = Euca2ools
SERVICE_CLASS = AutoScaling
- ARGS = [Arg('-U', '--url', dest='url', metavar='URL', route_to=SERVICE,
- help='auto-scaling service endpoint URL')]
def parse_response(self, response):
response_dict = requestbuilder.request.AWSQueryRequest.parse_response(
diff --git a/euca2ools/commands/elasticloadbalancing/__init__.py b/euca2ools/commands/elasticloadbalancing/__init__.py
index cbae101..16f76b1 100644
--- a/euca2ools/commands/elasticloadbalancing/__init__.py
+++ b/euca2ools/commands/elasticloadbalancing/__init__.py
@@ -30,7 +30,7 @@
from euca2ools.commands import Euca2ools
from euca2ools.exceptions import AWSError
-from requestbuilder import Arg, SERVICE
+from requestbuilder import Arg, MutuallyExclusiveArgList, SERVICE
import requestbuilder.auth
import requestbuilder.service
import requestbuilder.request
@@ -43,6 +43,13 @@ class ELB(requestbuilder.service.BaseService):
AUTH_CLASS = requestbuilder.auth.QuerySigV2Auth
URL_ENVVAR = 'AWS_ELB_URL'
+ 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='load balancing service endpoint URL'))]
+
def handle_http_error(self, response):
raise AWSError(response)
@@ -50,8 +57,6 @@ class ELB(requestbuilder.service.BaseService):
class ELBRequest(requestbuilder.request.AWSQueryRequest):
SUITE = Euca2ools
SERVICE_CLASS = ELB
- ARGS = [Arg('-U', '--url', dest='url', metavar='URL', route_to=SERVICE,
- help='load balancing service endpoint URL')]
def parse_response(self, response):
response_dict = requestbuilder.request.AWSQueryRequest.parse_response(
diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index cbcd0cc..d9fd98f 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -46,11 +46,11 @@ class Euare(requestbuilder.service.BaseService):
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('--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='storage service endpoint URL'))]
+ help='identity service endpoint URL'))]
def handle_http_error(self, response):
raise AWSError(response)
diff --git a/euca2ools/commands/euca/__init__.py b/euca2ools/commands/euca/__init__.py
index 562d839..8f2e069 100644
--- a/euca2ools/commands/euca/__init__.py
+++ b/euca2ools/commands/euca/__init__.py
@@ -141,9 +141,9 @@ class Eucalyptus(requestbuilder.service.BaseService):
ARGS = [Arg('--config', dest='shell_configfile', metavar='CFGFILE',
default='', route_to=SERVICE, help=argparse.SUPPRESS),
MutuallyExclusiveArgList(
- Arg('--region', dest='userregion', metavar='REGION',
- route_to=SERVICE,
- help='region name to connect to, with optional identity'),
+ 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='compute service endpoint URL'))]
diff --git a/euca2ools/commands/monitoring/__init__.py b/euca2ools/commands/monitoring/__init__.py
index c6f5d25..7acaeb5 100644
--- a/euca2ools/commands/monitoring/__init__.py
+++ b/euca2ools/commands/monitoring/__init__.py
@@ -30,7 +30,7 @@
from euca2ools.commands import Euca2ools
from euca2ools.exceptions import AWSError
-from requestbuilder import Arg, SERVICE
+from requestbuilder import Arg, MutuallyExclusiveArgList, SERVICE
import requestbuilder.auth
import requestbuilder.service
import requestbuilder.request
@@ -43,6 +43,13 @@ class CloudWatch(requestbuilder.service.BaseService):
AUTH_CLASS = requestbuilder.auth.QuerySigV2Auth
URL_ENVVAR = 'AWS_CLOUDWATCH_URL'
+ 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='instance monitoring service endpoint URL'))]
+
def handle_http_error(self, response):
raise AWSError(response)
@@ -50,8 +57,6 @@ class CloudWatch(requestbuilder.service.BaseService):
class CloudWatchRequest(requestbuilder.request.AWSQueryRequest):
SUITE = Euca2ools
SERVICE_CLASS = CloudWatch
- ARGS = [Arg('-U', '--url', dest='url', metavar='URL', route_to=SERVICE,
- help='instance monitoring service endpoint URL')]
def parse_response(self, response):
response_dict = requestbuilder.request.AWSQueryRequest.parse_response(
diff --git a/euca2ools/commands/walrus/__init__.py b/euca2ools/commands/walrus/__init__.py
index 8aef08d..1a3d037 100644
--- a/euca2ools/commands/walrus/__init__.py
+++ b/euca2ools/commands/walrus/__init__.py
@@ -46,9 +46,9 @@ class Walrus(requestbuilder.service.BaseService):
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('--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='storage service endpoint URL'))]
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list