[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:24 UTC 2013
The following commit has been merged in the master branch:
commit 7459707035d691d904443f6a2926c0a63398edc3
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Wed Feb 20 15:05:52 2013 -0800
Rename --delegate -> --as-account
diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index 40b7c4c..cfedefa 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -28,11 +28,13 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+import argparse
from euca2ools.exceptions import AWSError
from requestbuilder import Arg, MutuallyExclusiveArgList, SERVICE
import requestbuilder.auth
import requestbuilder.request
import requestbuilder.service
+import sys
from .. import Euca2ools
class Euare(requestbuilder.service.BaseService):
@@ -58,6 +60,15 @@ class EuareRequest(requestbuilder.request.AWSQueryRequest):
SERVICE_CLASS = Euare
METHOD = 'POST'
+ def configure(self):
+ requestbuilder.request.AWSQueryRequest.configure(self)
+ if self.args.get('deprecated_delegate'):
+ # Use it and complain
+ self.args['DelegateAccount'] = self.args['deprecated_delegate']
+ msg = 'argument --delegate is deprecated; use --as-account instead'
+ self.log.warn(msg)
+ print >> sys.stderr, 'warning:', msg
+
def parse_response(self, response):
response_dict = requestbuilder.request.AWSQueryRequest.parse_response(
self, response)
@@ -71,7 +82,9 @@ class EuareRequest(requestbuilder.request.AWSQueryRequest):
else:
return response_dict
-DELEGATE = Arg('--delegate', dest='DelegateAccount', metavar='ACCOUNT',
- help='''[Eucalyptus only] interpret this command as if the
- administrator of a different account had run it (only
- usable by cloud administrators)''')
+AS_ACCOUNT = [Arg('--as-account', dest='DelegateAccount', metavar='ACCOUNT',
+ help='''[Eucalyptus only] run this command as the
+ administrator of another account (only usable by
+ cloud administrators)'''),
+ Arg('--delegate', dest='deprecated_delegate', route_to=None,
+ help=argparse.SUPPRESS)]
diff --git a/euca2ools/commands/euare/addgrouppolicy.py b/euca2ools/commands/euare/addgrouppolicy.py
index 9a3333b..1ac59d7 100644
--- a/euca2ools/commands/euare/addgrouppolicy.py
+++ b/euca2ools/commands/euare/addgrouppolicy.py
@@ -32,7 +32,7 @@ import datetime
import euca2ools.commands.euare.putgrouppolicy
import json
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class AddGroupPolicy(EuareRequest):
@@ -50,7 +50,7 @@ class AddGroupPolicy(EuareRequest):
help='resource the policy should apply to (required)'),
Arg('-o', '--output', action='store_true',
help='display the newly-created policy'),
- DELEGATE]
+ AS_ACCOUNT]
def build_policy(self):
stmt = {'Sid': datetime.datetime.utcnow().strftime('%Y%m%d%H%M%S%f'),
diff --git a/euca2ools/commands/euare/adduserpolicy.py b/euca2ools/commands/euare/adduserpolicy.py
index a7a9a29..f34dfdb 100644
--- a/euca2ools/commands/euare/adduserpolicy.py
+++ b/euca2ools/commands/euare/adduserpolicy.py
@@ -32,7 +32,7 @@ import datetime
import euca2ools.commands.euare.putuserpolicy
import json
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class AddUserPolicy(EuareRequest):
@@ -50,7 +50,7 @@ class AddUserPolicy(EuareRequest):
help='resource the policy should apply to (required)'),
Arg('-o', '--output', action='store_true',
help='display the newly-created policy'),
- DELEGATE]
+ AS_ACCOUNT]
def build_policy(self):
stmt = {'Sid': datetime.datetime.utcnow().strftime('%Y%m%d%H%M%S%f'),
diff --git a/euca2ools/commands/euare/addusertogroup.py b/euca2ools/commands/euare/addusertogroup.py
index f3254e0..c6e5c7f 100644
--- a/euca2ools/commands/euare/addusertogroup.py
+++ b/euca2ools/commands/euare/addusertogroup.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class AddUserToGroup(EuareRequest):
DESCRIPTION = 'Add a user to a group'
@@ -37,4 +37,4 @@ class AddUserToGroup(EuareRequest):
help='group to add the user to'),
Arg('-u', '--user-name', dest='UserName', required=True,
help='user to add'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/createaccesskey.py b/euca2ools/commands/euare/createaccesskey.py
index decc924..5aa44fb 100644
--- a/euca2ools/commands/euare/createaccesskey.py
+++ b/euca2ools/commands/euare/createaccesskey.py
@@ -29,13 +29,13 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class CreateAccessKey(EuareRequest):
DESCRIPTION = 'Create a new access key for a user'
ARGS = [Arg('-u', '--user-name', dest='UserName', help='''user the new key
will belong to (default: calling user)'''),
- DELEGATE]
+ AS_ACCOUNT]
def print_result(self, result):
print result['AccessKey']['AccessKeyId']
diff --git a/euca2ools/commands/euare/createaccountalias.py b/euca2ools/commands/euare/createaccountalias.py
index 994303c..c4b857c 100644
--- a/euca2ools/commands/euare/createaccountalias.py
+++ b/euca2ools/commands/euare/createaccountalias.py
@@ -29,11 +29,11 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class CreateAccountAlias(EuareRequest):
DESCRIPTION = 'Create an alias for an account, a.k.a. an account name'
ARGS = [Arg('-a', '--account-alias', dest='AccountAlias', metavar='ALIAS',
required=True, help='name of the alias to create (required)'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/creategroup.py b/euca2ools/commands/euare/creategroup.py
index 9bb5896..72fef61 100644
--- a/euca2ools/commands/euare/creategroup.py
+++ b/euca2ools/commands/euare/creategroup.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class CreateGroup(EuareRequest):
@@ -40,7 +40,7 @@ class CreateGroup(EuareRequest):
help='path for the new group (default: "/")'),
Arg('-v', '--verbose', action='store_true', route_to=None,
help="print the new group's ARN and GUID"),
- DELEGATE]
+ AS_ACCOUNT]
def print_result(self, result):
if self.args['verbose']:
diff --git a/euca2ools/commands/euare/createloginprofile.py b/euca2ools/commands/euare/createloginprofile.py
index fbc871b..f0f5922 100644
--- a/euca2ools/commands/euare/createloginprofile.py
+++ b/euca2ools/commands/euare/createloginprofile.py
@@ -30,7 +30,7 @@
import getpass
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class CreateLoginProfile(EuareRequest):
@@ -41,7 +41,7 @@ class CreateLoginProfile(EuareRequest):
Arg('-p', '--password', dest='Password',
help='''the new password. If unspecified, the new password
will be read from the console.'''),
- DELEGATE]
+ AS_ACCOUNT]
def configure(self):
EuareRequest.configure(self)
diff --git a/euca2ools/commands/euare/createsigningcertificate.py b/euca2ools/commands/euare/createsigningcertificate.py
index df6e11b..7940a73 100644
--- a/euca2ools/commands/euare/createsigningcertificate.py
+++ b/euca2ools/commands/euare/createsigningcertificate.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class CreateSigningCertificate(EuareRequest):
@@ -41,7 +41,7 @@ class CreateSigningCertificate(EuareRequest):
help='file to write the certificate to (default: stdout)'),
Arg('--keyout', metavar='FILE', route_to=None,
help='file to write the private key to (default: stdout)'),
- DELEGATE]
+ AS_ACCOUNT]
def postprocess(self, result):
if self.args['out']:
diff --git a/euca2ools/commands/euare/createuser.py b/euca2ools/commands/euare/createuser.py
index ad892ec..5fc6b73 100644
--- a/euca2ools/commands/euare/createuser.py
+++ b/euca2ools/commands/euare/createuser.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
from .addusertogroup import AddUserToGroup
from .createaccesskey import CreateAccessKey
@@ -47,7 +47,7 @@ class CreateUser(EuareRequest):
standard out'''),
Arg('-v', '--verbose', action='store_true', route_to=None,
help="print the new user's ARN and GUID"),
- DELEGATE]
+ AS_ACCOUNT]
def postprocess(self, result):
if self.args.get('group_name'):
diff --git a/euca2ools/commands/euare/deactivatemfadevice.py b/euca2ools/commands/euare/deactivatemfadevice.py
index 33b7533..cfe6a78 100644
--- a/euca2ools/commands/euare/deactivatemfadevice.py
+++ b/euca2ools/commands/euare/deactivatemfadevice.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeactivateMFADevice(EuareRequest):
@@ -40,4 +40,4 @@ class DeactivateMFADevice(EuareRequest):
Arg('-s', '--serial-number', dest='SerialNumber', metavar='SERIAL',
required=True, help='''serial number of the MFA device to
deactivate (required)'''),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/deleteaccesskey.py b/euca2ools/commands/euare/deleteaccesskey.py
index e7031a0..fe273a3 100644
--- a/euca2ools/commands/euare/deleteaccesskey.py
+++ b/euca2ools/commands/euare/deleteaccesskey.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeleteAccessKey(EuareRequest):
@@ -39,4 +39,4 @@ class DeleteAccessKey(EuareRequest):
Arg('-k', '--user-key-id', dest='AccessKeyId', metavar='KEY_ID',
required=True,
help='ID of the access key to delete (required)'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/deleteaccountalias.py b/euca2ools/commands/euare/deleteaccountalias.py
index fd62cc7..92c0c7b 100644
--- a/euca2ools/commands/euare/deleteaccountalias.py
+++ b/euca2ools/commands/euare/deleteaccountalias.py
@@ -29,11 +29,11 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeleteAccountAlias(EuareRequest):
DESCRIPTION = "Delete an account's alias, a.k.a. its account name"
ARGS = [Arg('-a', '--account-alias', dest='AccountAlias', metavar='ALIAS',
required=True, help='name of the alias to delete (required)'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/deletegroup.py b/euca2ools/commands/euare/deletegroup.py
index 1ebf80a..5ffbe80 100644
--- a/euca2ools/commands/euare/deletegroup.py
+++ b/euca2ools/commands/euare/deletegroup.py
@@ -34,7 +34,7 @@ from euca2ools.commands.euare.getgroup import GetGroup
from euca2ools.commands.euare.listgrouppolicies import ListGroupPolicies
from euca2ools.commands.euare.removeuserfromgroup import RemoveUserFromGroup
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeleteGroup(EuareRequest):
DESCRIPTION = 'Delete a group'
@@ -49,7 +49,7 @@ class DeleteGroup(EuareRequest):
help='''list the user memberships and policies that would be
deleted instead of actually deleting them. Implies
-r.'''),
- DELEGATE]
+ AS_ACCOUNT]
def main(self):
if self.args['recursive'] or self.args['pretend']:
diff --git a/euca2ools/commands/euare/deletegrouppolicy.py b/euca2ools/commands/euare/deletegrouppolicy.py
index 307abb5..90fd82b 100644
--- a/euca2ools/commands/euare/deletegrouppolicy.py
+++ b/euca2ools/commands/euare/deletegrouppolicy.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeleteGroupPolicy(EuareRequest):
@@ -39,4 +39,4 @@ class DeleteGroupPolicy(EuareRequest):
help='group the policy is attached to (required)'),
Arg('-p', '--policy-name', dest='PolicyName', metavar='POLICY',
required=True, help='name of the policy to delete (required)'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/deleteloginprofile.py b/euca2ools/commands/euare/deleteloginprofile.py
index 75d7b30..2659710 100644
--- a/euca2ools/commands/euare/deleteloginprofile.py
+++ b/euca2ools/commands/euare/deleteloginprofile.py
@@ -32,11 +32,11 @@
# Mitch Garnaat mgarnaat at eucalyptus.com
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeleteLoginProfile(EuareRequest):
DESCRIPTION = "Delete a user's password"
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
required=True, help='''name of the user whose password should
be deleted (required)'''),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/deleteservercertificate.py b/euca2ools/commands/euare/deleteservercertificate.py
index 01fc166..81cf1a2 100644
--- a/euca2ools/commands/euare/deleteservercertificate.py
+++ b/euca2ools/commands/euare/deleteservercertificate.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeleteServerCertificate(EuareRequest):
@@ -37,4 +37,4 @@ class DeleteServerCertificate(EuareRequest):
ARGS = [Arg('-s', '--server-certificate-name', dest='ServerCertificateName',
metavar='CERT', required=True,
help='name of the server certificate to delete (required)'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/deletesigningcertificate.py b/euca2ools/commands/euare/deletesigningcertificate.py
index c6cf650..6948521 100644
--- a/euca2ools/commands/euare/deletesigningcertificate.py
+++ b/euca2ools/commands/euare/deletesigningcertificate.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeleteSigningCertificate(EuareRequest):
@@ -40,4 +40,4 @@ class DeleteSigningCertificate(EuareRequest):
Arg('-c', '--certificate-id', dest='CertificateId', metavar='CERT',
required=True,
help='ID of the signing certificate to delete (required)'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/deleteuser.py b/euca2ools/commands/euare/deleteuser.py
index d234b6a..944fa41 100644
--- a/euca2ools/commands/euare/deleteuser.py
+++ b/euca2ools/commands/euare/deleteuser.py
@@ -42,7 +42,7 @@ from euca2ools.commands.euare.removeuserfromgroup import RemoveUserFromGroup
from euca2ools.exceptions import AWSError
from requestbuilder import Arg
import sys
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeleteUser(EuareRequest):
@@ -56,7 +56,7 @@ class DeleteUser(EuareRequest):
Arg('-p', '--pretend', action='store_true', route_to=None,
help='''list the resources that would be deleted instead of
actually deleting them. Implies -r.'''),
- DELEGATE]
+ AS_ACCOUNT]
def main(self):
if self.args['recursive'] or self.args['pretend']:
diff --git a/euca2ools/commands/euare/deleteuserpolicy.py b/euca2ools/commands/euare/deleteuserpolicy.py
index 9aa37f8..2ffb079 100644
--- a/euca2ools/commands/euare/deleteuserpolicy.py
+++ b/euca2ools/commands/euare/deleteuserpolicy.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class DeleteUserPolicy(EuareRequest):
@@ -39,4 +39,4 @@ class DeleteUserPolicy(EuareRequest):
help='user the policy is attached to (required)'),
Arg('-p', '--policy-name', dest='PolicyName', metavar='POLICY',
required=True, help='name of the policy to delete (required)'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/enablemfadevice.py b/euca2ools/commands/euare/enablemfadevice.py
index 54a7fdb..8f16148 100644
--- a/euca2ools/commands/euare/enablemfadevice.py
+++ b/euca2ools/commands/euare/enablemfadevice.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class EnableMFADevice(EuareRequest):
@@ -46,4 +46,4 @@ class EnableMFADevice(EuareRequest):
Arg('-c2', dest='AuthenticationCode2', metavar='CODE',
required=True, help='''a subsequent authentication code emitted
by the MFA device (required)'''),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/getaccountsummary.py b/euca2ools/commands/euare/getaccountsummary.py
index b3f73a4..3595a7a 100644
--- a/euca2ools/commands/euare/getaccountsummary.py
+++ b/euca2ools/commands/euare/getaccountsummary.py
@@ -29,13 +29,13 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class GetAccountSummary(EuareRequest):
DESCRIPTION = '''Display account-level information about account entity
usage and IAM quotas'''
- PARAMS = [DELEGATE]
+ PARAMS = [AS_ACCOUNT]
LIST_MARKERS = ['SummaryMap']
def print_result(self, result):
diff --git a/euca2ools/commands/euare/getgroup.py b/euca2ools/commands/euare/getgroup.py
index 4840efc..2ebfd56 100644
--- a/euca2ools/commands/euare/getgroup.py
+++ b/euca2ools/commands/euare/getgroup.py
@@ -30,14 +30,14 @@
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class GetGroup(EuareRequest):
DESCRIPTION = 'List all the users in a group'
ARGS = [Arg('-g', '--group-name', dest='GroupName', metavar='GROUP',
required=True, help='name of the group to show info about'),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['Users']
def main(self):
diff --git a/euca2ools/commands/euare/getgrouppolicy.py b/euca2ools/commands/euare/getgrouppolicy.py
index 31e9189..e919f43 100644
--- a/euca2ools/commands/euare/getgrouppolicy.py
+++ b/euca2ools/commands/euare/getgrouppolicy.py
@@ -31,7 +31,7 @@
from requestbuilder import Arg
import json
import urllib
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class GetGroupPolicy(EuareRequest):
@@ -43,7 +43,7 @@ class GetGroupPolicy(EuareRequest):
required=True, help='name of the policy to show (required)'),
Arg('--pretty-print', action='store_true', route_to=None,
help='reformat the policy for easier reading'),
- DELEGATE]
+ AS_ACCOUNT]
def print_result(self, result):
policy_content = urllib.unquote(result['PolicyDocument'])
diff --git a/euca2ools/commands/euare/getloginprofile.py b/euca2ools/commands/euare/getloginprofile.py
index d3288e7..36e0bf2 100644
--- a/euca2ools/commands/euare/getloginprofile.py
+++ b/euca2ools/commands/euare/getloginprofile.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class GetLoginProfile(EuareRequest):
@@ -38,7 +38,7 @@ class GetLoginProfile(EuareRequest):
required=True, help='user whose password to verify (required)'),
Arg('--verbose', action='store_true', route_to=None,
help="print extra info about the user's password"),
- DELEGATE]
+ AS_ACCOUNT]
def print_result(self, result):
# If we've managed to get to this point, we already know the user has
diff --git a/euca2ools/commands/euare/getservercertificate.py b/euca2ools/commands/euare/getservercertificate.py
index 93842b8..a1d2540 100644
--- a/euca2ools/commands/euare/getservercertificate.py
+++ b/euca2ools/commands/euare/getservercertificate.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class GetServerCertificate(EuareRequest):
@@ -37,7 +37,7 @@ class GetServerCertificate(EuareRequest):
ARGS = [Arg('-s', '--server-certificate-name', dest='ServerCertificateName',
metavar='CERT', required=True, help='''name of the server
certificate to retrieve info about (required)'''),
- DELEGATE]
+ AS_ACCOUNT]
def print_result(self, result):
metadata = result.get('ServerCertificate', {}) \
diff --git a/euca2ools/commands/euare/getuser.py b/euca2ools/commands/euare/getuser.py
index e9f3536..a1afd7e 100644
--- a/euca2ools/commands/euare/getuser.py
+++ b/euca2ools/commands/euare/getuser.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class GetUser(EuareRequest):
@@ -39,7 +39,7 @@ class GetUser(EuareRequest):
user)'''),
Arg('--show-extra', dest='ShowExtra', action='store_const',
const='true', help='also display additional user info'),
- DELEGATE]
+ AS_ACCOUNT]
def print_result(self, result):
print result['User']['Arn']
diff --git a/euca2ools/commands/euare/getuserinfo.py b/euca2ools/commands/euare/getuserinfo.py
index 52eb3c9..e1449ca 100644
--- a/euca2ools/commands/euare/getuserinfo.py
+++ b/euca2ools/commands/euare/getuserinfo.py
@@ -30,7 +30,7 @@
from requestbuilder import Arg
from requestbuilder.mixins import TabifyingCommand
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class GetUserInfo(EuareRequest, TabifyingCommand):
@@ -40,7 +40,7 @@ class GetUserInfo(EuareRequest, TabifyingCommand):
user)'''),
Arg('-k', '--info-key', dest='InfoKey',
help='name of the piece of user info to show'),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['Infos']
def print_result(self, result):
diff --git a/euca2ools/commands/euare/getuserpolicy.py b/euca2ools/commands/euare/getuserpolicy.py
index 83c32f6..0f6d400 100644
--- a/euca2ools/commands/euare/getuserpolicy.py
+++ b/euca2ools/commands/euare/getuserpolicy.py
@@ -31,7 +31,7 @@
import json
from requestbuilder import Arg
import urllib
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class GetUserPolicy(EuareRequest):
@@ -43,7 +43,7 @@ class GetUserPolicy(EuareRequest):
required=True, help='name of the policy to show (required)'),
Arg('--pretty-print', action='store_true', route_to=None,
help='reformat the policy for easier reading'),
- DELEGATE]
+ AS_ACCOUNT]
def print_result(self, result):
policy_content = urllib.unquote(result['PolicyDocument'])
diff --git a/euca2ools/commands/euare/listaccesskeys.py b/euca2ools/commands/euare/listaccesskeys.py
index bcc483d..c6fdda6 100644
--- a/euca2ools/commands/euare/listaccesskeys.py
+++ b/euca2ools/commands/euare/listaccesskeys.py
@@ -30,14 +30,14 @@
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListAccessKeys(EuareRequest):
DESCRIPTION = "List a user's access keys"
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
help='user to list keys for (default: current user)'),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['AccessKeyMetadata']
def main(self):
diff --git a/euca2ools/commands/euare/listaccountaliases.py b/euca2ools/commands/euare/listaccountaliases.py
index 7a54525..9988236 100644
--- a/euca2ools/commands/euare/listaccountaliases.py
+++ b/euca2ools/commands/euare/listaccountaliases.py
@@ -29,12 +29,12 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListAccountAliases(EuareRequest):
DESCRIPTION = "List your account's aliases"
- ARGS = [DELEGATE]
+ ARGS = [AS_ACCOUNT]
LIST_MARKERS = ['AccountAliases']
def print_result(self, result):
diff --git a/euca2ools/commands/euare/listgrouppolicies.py b/euca2ools/commands/euare/listgrouppolicies.py
index 37f92bb..4ca67bb 100644
--- a/euca2ools/commands/euare/listgrouppolicies.py
+++ b/euca2ools/commands/euare/listgrouppolicies.py
@@ -31,7 +31,7 @@
import euca2ools.commands.euare.getgrouppolicy
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListGroupPolicies(EuareRequest):
@@ -48,7 +48,7 @@ class ListGroupPolicies(EuareRequest):
Arg('--pretty-print', action='store_true', route_to=None,
help='''when printing the contents of policies, reformat them
for easier reading'''),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['PolicyNames']
def main(self):
diff --git a/euca2ools/commands/euare/listgroups.py b/euca2ools/commands/euare/listgroups.py
index 6ea1c8c..15abcef 100644
--- a/euca2ools/commands/euare/listgroups.py
+++ b/euca2ools/commands/euare/listgroups.py
@@ -30,7 +30,7 @@
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListGroups(EuareRequest):
@@ -38,7 +38,7 @@ class ListGroups(EuareRequest):
ARGS = [Arg('-p', '--path-prefix', dest='PathPrefix', metavar='PATH',
help='''restrict results to groups whose paths begin with a
specific prefix'''),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['Groups']
def main(self):
diff --git a/euca2ools/commands/euare/listgroupsforuser.py b/euca2ools/commands/euare/listgroupsforuser.py
index 9f4e54c..af0976e 100644
--- a/euca2ools/commands/euare/listgroupsforuser.py
+++ b/euca2ools/commands/euare/listgroupsforuser.py
@@ -30,14 +30,14 @@
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListGroupsForUser(EuareRequest):
DESCRIPTION = 'List all groups a user is a member of'
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
required=True, help='user to list membership for (required)'),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['Groups']
def main(self):
diff --git a/euca2ools/commands/euare/listmfadevices.py b/euca2ools/commands/euare/listmfadevices.py
index 64edf85..f93dd11 100644
--- a/euca2ools/commands/euare/listmfadevices.py
+++ b/euca2ools/commands/euare/listmfadevices.py
@@ -30,14 +30,14 @@
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListMFADevices(EuareRequest):
DESCRIPTION = "List a user's MFA devices"
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
help='user to list MFA devices for (default: current user)'),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['MFADevices']
def main(self):
diff --git a/euca2ools/commands/euare/listservercertificates.py b/euca2ools/commands/euare/listservercertificates.py
index 48c2b24..c5d543b 100644
--- a/euca2ools/commands/euare/listservercertificates.py
+++ b/euca2ools/commands/euare/listservercertificates.py
@@ -30,14 +30,14 @@
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListServerCertificates(EuareRequest):
DESCRIPTION = "List your account's server certificates"
ARGS = [Arg('-p', '--path-prefix', dest='PathPrefix', metavar='PREFIX',
help='''limit results to server certificates that begin with a
given path'''),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['ServerCertificateMetadataList']
def main(self):
diff --git a/euca2ools/commands/euare/listsigningcertificates.py b/euca2ools/commands/euare/listsigningcertificates.py
index a30bb59..be1b27a 100644
--- a/euca2ools/commands/euare/listsigningcertificates.py
+++ b/euca2ools/commands/euare/listsigningcertificates.py
@@ -30,7 +30,7 @@
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListSigningCertificates(EuareRequest):
@@ -39,7 +39,7 @@ class ListSigningCertificates(EuareRequest):
help='user to list certificates for (default: current user)'),
Arg('-v', '--verbose', action='store_true', route_to=None,
help="also show certificates' contents"),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['Certificates']
def main(self):
diff --git a/euca2ools/commands/euare/listuserpolicies.py b/euca2ools/commands/euare/listuserpolicies.py
index b110564..34bb0eb 100644
--- a/euca2ools/commands/euare/listuserpolicies.py
+++ b/euca2ools/commands/euare/listuserpolicies.py
@@ -31,7 +31,7 @@
import euca2ools.commands.euare.getuserpolicy
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListUserPolicies(EuareRequest):
@@ -48,7 +48,7 @@ class ListUserPolicies(EuareRequest):
Arg('--pretty-print', action='store_true', route_to=None,
help='''when printing the contents of policies, reformat them
for easier reading'''),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['PolicyNames']
def main(self):
diff --git a/euca2ools/commands/euare/listusers.py b/euca2ools/commands/euare/listusers.py
index f4d5bab..ea8e3f8 100644
--- a/euca2ools/commands/euare/listusers.py
+++ b/euca2ools/commands/euare/listusers.py
@@ -30,13 +30,13 @@
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ListUsers(EuareRequest):
DESCRIPTION = "List your account's users"
ARGS = [Arg('-p', '--path-prefix', dest='PathPrefix', metavar='PREFIX',
help='limit results to users who begin with a given path'),
- DELEGATE]
+ AS_ACCOUNT]
LIST_MARKERS = ['Users']
def main(self):
diff --git a/euca2ools/commands/euare/putgrouppolicy.py b/euca2ools/commands/euare/putgrouppolicy.py
index 22b623a..c637b2c 100644
--- a/euca2ools/commands/euare/putgrouppolicy.py
+++ b/euca2ools/commands/euare/putgrouppolicy.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg, MutuallyExclusiveArgList
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class PutGroupPolicy(EuareRequest):
@@ -44,4 +44,4 @@ class PutGroupPolicy(EuareRequest):
Arg('-f', '--policy-document', dest='PolicyDocument',
metavar='FILE', type=open,
help='file containing the policy to attach')),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/putuserpolicy.py b/euca2ools/commands/euare/putuserpolicy.py
index 17893be..9ea3a58 100644
--- a/euca2ools/commands/euare/putuserpolicy.py
+++ b/euca2ools/commands/euare/putuserpolicy.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg, MutuallyExclusiveArgList
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class PutUserPolicy(EuareRequest):
@@ -44,4 +44,4 @@ class PutUserPolicy(EuareRequest):
Arg('-f', '--policy-document', dest='PolicyDocument',
metavar='FILE', type=open,
help='file containing the policy to attach')),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/removeuserfromgroup.py b/euca2ools/commands/euare/removeuserfromgroup.py
index 4422d79..4f90846 100644
--- a/euca2ools/commands/euare/removeuserfromgroup.py
+++ b/euca2ools/commands/euare/removeuserfromgroup.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class RemoveUserFromGroup(EuareRequest):
@@ -39,7 +39,7 @@ class RemoveUserFromGroup(EuareRequest):
help='user to remove from the group (required)'),
Arg('-g', '--group-name', dest='GroupName', metavar='GROUP',
required=True, help='group to remove the user from (required)'),
- DELEGATE]
+ AS_ACCOUNT]
def main(self):
for user in self.args['user_names']:
diff --git a/euca2ools/commands/euare/resyncmfadevice.py b/euca2ools/commands/euare/resyncmfadevice.py
index 2fb63ae..d80518b 100644
--- a/euca2ools/commands/euare/resyncmfadevice.py
+++ b/euca2ools/commands/euare/resyncmfadevice.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class ResyncMFADevice(EuareRequest):
@@ -46,4 +46,4 @@ class ResyncMFADevice(EuareRequest):
Arg('-c2', dest='AuthenticationCode2', metavar='CODE',
required=True, help='''a subsequent authentication code emitted
by the MFA device (required)'''),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/updateaccesskey.py b/euca2ools/commands/euare/updateaccesskey.py
index 78c6e18..6d9c579 100644
--- a/euca2ools/commands/euare/updateaccesskey.py
+++ b/euca2ools/commands/euare/updateaccesskey.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class UpdateAccessKey(EuareRequest):
@@ -44,4 +44,4 @@ class UpdateAccessKey(EuareRequest):
Arg('-s', '--status', dest='Status', required=True,
choices=('Active', 'Inactive'),
help='status to assign to the access key'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/updategroup.py b/euca2ools/commands/euare/updategroup.py
index 4405b65..2d9a4c7 100644
--- a/euca2ools/commands/euare/updategroup.py
+++ b/euca2ools/commands/euare/updategroup.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class UpdateGroup(EuareRequest):
@@ -40,4 +40,4 @@ class UpdateGroup(EuareRequest):
help='new name for the group'),
Arg('-p', '--new-path', dest='NewPath', metavar='PATH',
help='new path for the group'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/updateloginprofile.py b/euca2ools/commands/euare/updateloginprofile.py
index 4ec6d7b..aae15d4 100644
--- a/euca2ools/commands/euare/updateloginprofile.py
+++ b/euca2ools/commands/euare/updateloginprofile.py
@@ -30,7 +30,7 @@
import getpass
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class UpdateLoginProfile(EuareRequest):
@@ -41,7 +41,7 @@ class UpdateLoginProfile(EuareRequest):
Arg('-p', '--password', dest='Password',
help='''the new password. If unspecified, the new password
will be read from the console.'''),
- DELEGATE]
+ AS_ACCOUNT]
def configure(self):
EuareRequest.configure(self)
diff --git a/euca2ools/commands/euare/updateservercertificate.py b/euca2ools/commands/euare/updateservercertificate.py
index 39ddcf6..a95bef3 100644
--- a/euca2ools/commands/euare/updateservercertificate.py
+++ b/euca2ools/commands/euare/updateservercertificate.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class UpdateServerCertificate(EuareRequest):
@@ -42,4 +42,4 @@ class UpdateServerCertificate(EuareRequest):
help='new name for the server certificate'),
Arg('-p', '--new-path', dest='NewPath', metavar='PATH',
help='new path for the server certificate'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/updatesigningcertificate.py b/euca2ools/commands/euare/updatesigningcertificate.py
index 49a1a32..1a7f0dd 100644
--- a/euca2ools/commands/euare/updatesigningcertificate.py
+++ b/euca2ools/commands/euare/updatesigningcertificate.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class UpdateSigningCertificate(EuareRequest):
@@ -42,4 +42,4 @@ class UpdateSigningCertificate(EuareRequest):
required=True, help='ID of the signing certificate to update'),
Arg('-s', '--status', dest='Status', choices=('Active', 'Inactive'),
required=True, help='status to assign to the certificate'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/updateuser.py b/euca2ools/commands/euare/updateuser.py
index 753c643..5e39273 100644
--- a/euca2ools/commands/euare/updateuser.py
+++ b/euca2ools/commands/euare/updateuser.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class UpdateUser(EuareRequest):
@@ -50,4 +50,4 @@ class UpdateUser(EuareRequest):
Arg('--pwd-expires', dest='PasswordExpiration', metavar='DATETIME',
help='''[Eucalyptus only] New password expiration date, in
ISO8601 format'''),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/updateuserinfo.py b/euca2ools/commands/euare/updateuserinfo.py
index 014fe4d..01d1390 100644
--- a/euca2ools/commands/euare/updateuserinfo.py
+++ b/euca2ools/commands/euare/updateuserinfo.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class UpdateUserInfo(EuareRequest):
@@ -40,4 +40,4 @@ class UpdateUserInfo(EuareRequest):
required=True, help='name of the info field to set (required)'),
Arg('-i', '--info-value', dest='InfoValue', metavar='VALUE',
help='value to set the info field to (omit to delete it)'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/uploadservercertificate.py b/euca2ools/commands/euare/uploadservercertificate.py
index 0c67201..f610804 100644
--- a/euca2ools/commands/euare/uploadservercertificate.py
+++ b/euca2ools/commands/euare/uploadservercertificate.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg, MutuallyExclusiveArgList
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class UploadServerCertificate(EuareRequest):
@@ -60,4 +60,4 @@ class UploadServerCertificate(EuareRequest):
certificates of the chain, concatenated together.''')),
Arg('-p', '--path', dest='Path',
help='path for the new server certificate (default: "/")'),
- DELEGATE]
+ AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/uploadsigningcertificate.py b/euca2ools/commands/euare/uploadsigningcertificate.py
index b92f5a7..a563ab3 100644
--- a/euca2ools/commands/euare/uploadsigningcertificate.py
+++ b/euca2ools/commands/euare/uploadsigningcertificate.py
@@ -29,7 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
from requestbuilder import Arg, MutuallyExclusiveArgList
-from . import EuareRequest, DELEGATE
+from . import EuareRequest, AS_ACCOUNT
class UploadSigningCertificate(EuareRequest):
@@ -43,4 +43,4 @@ class UploadSigningCertificate(EuareRequest):
Arg('-u', '--user-name', dest='UserName', metavar='USER',
help='''user the signing certificate is for (default: current
user)'''),
- DELEGATE]
+ AS_ACCOUNT]
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list