[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:41 UTC 2013
The following commit has been merged in the master branch:
commit 1ea14cb197bcee76e99c4b7ce3a4f5cbc8dd3b77
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date: Sun Mar 17 01:54:44 2013 -0700
Appease the PEP8 gods
diff --git a/bin/euca-check-bucket b/bin/euca-check-bucket
old mode 100644
new mode 100755
diff --git a/euca2ools/commands/__init__.py b/euca2ools/commands/__init__.py
index f829b62..c850650 100644
--- a/euca2ools/commands/__init__.py
+++ b/euca2ools/commands/__init__.py
@@ -28,13 +28,14 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools import __version__
import glob
import os.path
import platform
import requestbuilder
import requests
import sys
-from .. import __version__
+
class Euca2ools(object):
'''
diff --git a/euca2ools/commands/elasticloadbalancing/__init__.py b/euca2ools/commands/elasticloadbalancing/__init__.py
index 4eac030..2e6e85c 100644
--- a/euca2ools/commands/elasticloadbalancing/__init__.py
+++ b/euca2ools/commands/elasticloadbalancing/__init__.py
@@ -28,11 +28,12 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands import Euca2ools
from requestbuilder import Arg, SERVICE
import requestbuilder.auth
import requestbuilder.service
import requestbuilder.request
-from .. import Euca2ools
+
class ELB(requestbuilder.service.BaseService):
NAME = 'elasticloadbalancing'
diff --git a/euca2ools/commands/euare/__init__.py b/euca2ools/commands/euare/__init__.py
index cfedefa..cbcd0cc 100644
--- a/euca2ools/commands/euare/__init__.py
+++ b/euca2ools/commands/euare/__init__.py
@@ -29,13 +29,14 @@
# POSSIBILITY OF SUCH DAMAGE.
import argparse
+from euca2ools.commands import Euca2ools
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):
NAME = 'iam'
diff --git a/euca2ools/commands/euare/addgrouppolicy.py b/euca2ools/commands/euare/addgrouppolicy.py
index 1ac59d7..3c374e8 100644
--- a/euca2ools/commands/euare/addgrouppolicy.py
+++ b/euca2ools/commands/euare/addgrouppolicy.py
@@ -29,10 +29,10 @@
# POSSIBILITY OF SUCH DAMAGE.
import datetime
-import euca2ools.commands.euare.putgrouppolicy
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
+from euca2ools.commands.euare.putgrouppolicy import PutGroupPolicy
import json
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class AddGroupPolicy(EuareRequest):
@@ -59,14 +59,13 @@ class AddGroupPolicy(EuareRequest):
'Resource': self.args['resource']}
return {'Statement': [stmt]}
-
def main(self):
policy_doc = json.dumps(self.build_policy())
- req = euca2ools.commands.euare.putgrouppolicy.PutGroupPolicy(
- service=self.service, GroupName=self.args['group_name'],
- PolicyName=self.args['policy_name'],
- PolicyDocument=policy_doc,
- DelegateAccount=self.args['DelegateAccount'])
+ req = PutGroupPolicy(service=self.service,
+ GroupName=self.args['group_name'],
+ PolicyName=self.args['policy_name'],
+ PolicyDocument=policy_doc,
+ DelegateAccount=self.args['DelegateAccount'])
response = req.main()
response['PolicyDocument'] = policy_doc
return response
diff --git a/euca2ools/commands/euare/adduserpolicy.py b/euca2ools/commands/euare/adduserpolicy.py
index f34dfdb..fe24b04 100644
--- a/euca2ools/commands/euare/adduserpolicy.py
+++ b/euca2ools/commands/euare/adduserpolicy.py
@@ -29,10 +29,10 @@
# POSSIBILITY OF SUCH DAMAGE.
import datetime
-import euca2ools.commands.euare.putuserpolicy
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
+from euca2ools.commands.euare.putuserpolicy import PutUserPolicy
import json
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class AddUserPolicy(EuareRequest):
@@ -59,14 +59,12 @@ class AddUserPolicy(EuareRequest):
'Resource': self.args['resource']}
return {'Statement': [stmt]}
-
def main(self):
policy_doc = json.dumps(self.build_policy())
- req = euca2ools.commands.euare.putuserpolicy.PutUserPolicy(
- service=self.service, UserName=self.args['user_name'],
- PolicyName=self.args['policy_name'],
- PolicyDocument=policy_doc,
- DelegateAccount=self.args['DelegateAccount'])
+ req = PutUserPolicy(service=self.service,
+ UserName=self.args['user_name'],
+ PolicyName=self.args['policy_name'], PolicyDocument=policy_doc,
+ DelegateAccount=self.args['DelegateAccount'])
response = req.main()
response['PolicyDocument'] = policy_doc
return response
diff --git a/euca2ools/commands/euare/addusertogroup.py b/euca2ools/commands/euare/addusertogroup.py
index c6e5c7f..d139c8d 100644
--- a/euca2ools/commands/euare/addusertogroup.py
+++ b/euca2ools/commands/euare/addusertogroup.py
@@ -28,8 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
+
class AddUserToGroup(EuareRequest):
DESCRIPTION = 'Add a user to a group'
diff --git a/euca2ools/commands/euare/createaccesskey.py b/euca2ools/commands/euare/createaccesskey.py
index 5aa44fb..1c1a335 100644
--- a/euca2ools/commands/euare/createaccesskey.py
+++ b/euca2ools/commands/euare/createaccesskey.py
@@ -28,8 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
+
class CreateAccessKey(EuareRequest):
DESCRIPTION = 'Create a new access key for a user'
diff --git a/euca2ools/commands/euare/createaccount.py b/euca2ools/commands/euare/createaccount.py
index fcee92d..955d0e7 100644
--- a/euca2ools/commands/euare/createaccount.py
+++ b/euca2ools/commands/euare/createaccount.py
@@ -28,9 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest
from requestbuilder import Arg
from requestbuilder.mixins import TabifyingCommand
-from . import EuareRequest
class CreateAccount(EuareRequest, TabifyingCommand):
diff --git a/euca2ools/commands/euare/createaccountalias.py b/euca2ools/commands/euare/createaccountalias.py
index c4b857c..6f83d5f 100644
--- a/euca2ools/commands/euare/createaccountalias.py
+++ b/euca2ools/commands/euare/createaccountalias.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class CreateAccountAlias(EuareRequest):
diff --git a/euca2ools/commands/euare/creategroup.py b/euca2ools/commands/euare/creategroup.py
index 72fef61..4de5b07 100644
--- a/euca2ools/commands/euare/creategroup.py
+++ b/euca2ools/commands/euare/creategroup.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class CreateGroup(EuareRequest):
diff --git a/euca2ools/commands/euare/createloginprofile.py b/euca2ools/commands/euare/createloginprofile.py
index f0f5922..36b383a 100644
--- a/euca2ools/commands/euare/createloginprofile.py
+++ b/euca2ools/commands/euare/createloginprofile.py
@@ -28,9 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
import getpass
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class CreateLoginProfile(EuareRequest):
diff --git a/euca2ools/commands/euare/createsigningcertificate.py b/euca2ools/commands/euare/createsigningcertificate.py
index 7940a73..660b642 100644
--- a/euca2ools/commands/euare/createsigningcertificate.py
+++ b/euca2ools/commands/euare/createsigningcertificate.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class CreateSigningCertificate(EuareRequest):
diff --git a/euca2ools/commands/euare/createuser.py b/euca2ools/commands/euare/createuser.py
index 5fc6b73..5c8499e 100644
--- a/euca2ools/commands/euare/createuser.py
+++ b/euca2ools/commands/euare/createuser.py
@@ -28,14 +28,15 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
+from euca2ools.commands.euare.addusertogroup import AddUserToGroup
+from euca2ools.commands.euare.createaccesskey import CreateAccessKey
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
-from .addusertogroup import AddUserToGroup
-from .createaccesskey import CreateAccessKey
+
class CreateUser(EuareRequest):
- DESCRIPTION = '''Create a new user and optionally add the user to a group
- or generate an access key for the user'''
+ DESCRIPTION = ('Create a new user and optionally add the user to a group '
+ 'or generate an access key for the user')
ARGS = [Arg('-u', '--user-name', dest='UserName', required=True,
help='name of the new user'),
Arg('-p', '--path', dest='Path',
@@ -52,14 +53,14 @@ class CreateUser(EuareRequest):
def postprocess(self, result):
if self.args.get('group_name'):
obj = AddUserToGroup(service=self.service,
- UserName=self.args['UserName'],
- GroupName=self.args['group_name'],
- DelegateAccount=self.args['DelegateAccount'])
+ UserName=self.args['UserName'],
+ GroupName=self.args['group_name'],
+ DelegateAccount=self.args['DelegateAccount'])
obj.main()
if self.args.get('create_accesskey'):
obj = CreateAccessKey(service=self.service,
- UserName=self.args['UserName'],
- DelegateAccount=self.args['DelegateAccount'])
+ UserName=self.args['UserName'],
+ DelegateAccount=self.args['DelegateAccount'])
key_result = obj.main()
result.update(key_result)
diff --git a/euca2ools/commands/euare/deactivatemfadevice.py b/euca2ools/commands/euare/deactivatemfadevice.py
index cfe6a78..afbbab5 100644
--- a/euca2ools/commands/euare/deactivatemfadevice.py
+++ b/euca2ools/commands/euare/deactivatemfadevice.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class DeactivateMFADevice(EuareRequest):
diff --git a/euca2ools/commands/euare/deleteaccesskey.py b/euca2ools/commands/euare/deleteaccesskey.py
index fe273a3..fcf82cf 100644
--- a/euca2ools/commands/euare/deleteaccesskey.py
+++ b/euca2ools/commands/euare/deleteaccesskey.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class DeleteAccessKey(EuareRequest):
diff --git a/euca2ools/commands/euare/deleteaccount.py b/euca2ools/commands/euare/deleteaccount.py
index 35fb6ee..35c66d4 100644
--- a/euca2ools/commands/euare/deleteaccount.py
+++ b/euca2ools/commands/euare/deleteaccount.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest
class DeleteAccount(EuareRequest):
diff --git a/euca2ools/commands/euare/deleteaccountalias.py b/euca2ools/commands/euare/deleteaccountalias.py
index 92c0c7b..63761dd 100644
--- a/euca2ools/commands/euare/deleteaccountalias.py
+++ b/euca2ools/commands/euare/deleteaccountalias.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class DeleteAccountAlias(EuareRequest):
diff --git a/euca2ools/commands/euare/deleteaccountpolicy.py b/euca2ools/commands/euare/deleteaccountpolicy.py
index fc38dd1..eb1c093 100644
--- a/euca2ools/commands/euare/deleteaccountpolicy.py
+++ b/euca2ools/commands/euare/deleteaccountpolicy.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest
class DeleteAccountPolicy(EuareRequest):
diff --git a/euca2ools/commands/euare/deletegroup.py b/euca2ools/commands/euare/deletegroup.py
index 5ffbe80..1c9ebb1 100644
--- a/euca2ools/commands/euare/deletegroup.py
+++ b/euca2ools/commands/euare/deletegroup.py
@@ -29,12 +29,13 @@
# POSSIBILITY OF SUCH DAMAGE.
import argparse
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from euca2ools.commands.euare.deletegrouppolicy import DeleteGroupPolicy
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, AS_ACCOUNT
+
class DeleteGroup(EuareRequest):
DESCRIPTION = 'Delete a group'
@@ -47,8 +48,7 @@ class DeleteGroup(EuareRequest):
action='store_const', const='true', help=argparse.SUPPRESS),
Arg('-p', '--pretend', action='store_true', route_to=None,
help='''list the user memberships and policies that would be
- deleted instead of actually deleting them. Implies
- -r.'''),
+ deleted instead of actually deleting them. Implies -r.'''),
AS_ACCOUNT]
def main(self):
diff --git a/euca2ools/commands/euare/deletegrouppolicy.py b/euca2ools/commands/euare/deletegrouppolicy.py
index 90fd82b..fbc560b 100644
--- a/euca2ools/commands/euare/deletegrouppolicy.py
+++ b/euca2ools/commands/euare/deletegrouppolicy.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class DeleteGroupPolicy(EuareRequest):
diff --git a/euca2ools/commands/euare/deleteloginprofile.py b/euca2ools/commands/euare/deleteloginprofile.py
index 2659710..36df725 100644
--- a/euca2ools/commands/euare/deleteloginprofile.py
+++ b/euca2ools/commands/euare/deleteloginprofile.py
@@ -27,12 +27,10 @@
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: Neil Soman neil at eucalyptus.com
-# Mitch Garnaat mgarnaat at eucalyptus.com
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
+
class DeleteLoginProfile(EuareRequest):
DESCRIPTION = "Delete a user's password"
diff --git a/euca2ools/commands/euare/deleteservercertificate.py b/euca2ools/commands/euare/deleteservercertificate.py
index 81cf1a2..bf22909 100644
--- a/euca2ools/commands/euare/deleteservercertificate.py
+++ b/euca2ools/commands/euare/deleteservercertificate.py
@@ -28,13 +28,13 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class DeleteServerCertificate(EuareRequest):
DESCRIPTION = 'Delete a server certificate'
- ARGS = [Arg('-s', '--server-certificate-name', dest='ServerCertificateName',
- metavar='CERT', required=True,
+ ARGS = [Arg('-s', '--server-certificate-name',
+ dest='ServerCertificateName', metavar='CERT', required=True,
help='name of the server certificate to delete (required)'),
AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/deletesigningcertificate.py b/euca2ools/commands/euare/deletesigningcertificate.py
index 6948521..886fca7 100644
--- a/euca2ools/commands/euare/deletesigningcertificate.py
+++ b/euca2ools/commands/euare/deletesigningcertificate.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class DeleteSigningCertificate(EuareRequest):
diff --git a/euca2ools/commands/euare/deleteuser.py b/euca2ools/commands/euare/deleteuser.py
index 944fa41..44884e4 100644
--- a/euca2ools/commands/euare/deleteuser.py
+++ b/euca2ools/commands/euare/deleteuser.py
@@ -29,6 +29,7 @@
# POSSIBILITY OF SUCH DAMAGE.
import argparse
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from euca2ools.commands.euare.deleteaccesskey import DeleteAccessKey
from euca2ools.commands.euare.deleteloginprofile import DeleteLoginProfile
from euca2ools.commands.euare.deletesigningcertificate import DeleteSigningCertificate
@@ -42,7 +43,6 @@ from euca2ools.commands.euare.removeuserfromgroup import RemoveUserFromGroup
from euca2ools.exceptions import AWSError
from requestbuilder import Arg
import sys
-from . import EuareRequest, AS_ACCOUNT
class DeleteUser(EuareRequest):
diff --git a/euca2ools/commands/euare/deleteuserpolicy.py b/euca2ools/commands/euare/deleteuserpolicy.py
index 2ffb079..50da9ee 100644
--- a/euca2ools/commands/euare/deleteuserpolicy.py
+++ b/euca2ools/commands/euare/deleteuserpolicy.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class DeleteUserPolicy(EuareRequest):
diff --git a/euca2ools/commands/euare/enablemfadevice.py b/euca2ools/commands/euare/enablemfadevice.py
index 8f16148..2c1c56a 100644
--- a/euca2ools/commands/euare/enablemfadevice.py
+++ b/euca2ools/commands/euare/enablemfadevice.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class EnableMFADevice(EuareRequest):
diff --git a/euca2ools/commands/euare/getaccountpolicy.py b/euca2ools/commands/euare/getaccountpolicy.py
index 75623c7..1104f70 100644
--- a/euca2ools/commands/euare/getaccountpolicy.py
+++ b/euca2ools/commands/euare/getaccountpolicy.py
@@ -28,10 +28,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
import json
from requestbuilder import Arg
import urllib
-from . import EuareRequest
class GetAccountPolicy(EuareRequest):
diff --git a/euca2ools/commands/euare/getaccountsummary.py b/euca2ools/commands/euare/getaccountsummary.py
index 13b416b..1bbe59c 100644
--- a/euca2ools/commands/euare/getaccountsummary.py
+++ b/euca2ools/commands/euare/getaccountsummary.py
@@ -28,13 +28,13 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class GetAccountSummary(EuareRequest):
- DESCRIPTION = '''Display account-level information about account entity
- usage and IAM quotas'''
+ DESCRIPTION = ('Display account-level information about account entity '
+ 'usage and IAM quotas')
PARAMS = [AS_ACCOUNT]
LIST_TAGS = ['SummaryMap']
diff --git a/euca2ools/commands/euare/getgroup.py b/euca2ools/commands/euare/getgroup.py
index fea6e95..2b64f2e 100644
--- a/euca2ools/commands/euare/getgroup.py
+++ b/euca2ools/commands/euare/getgroup.py
@@ -28,9 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
class GetGroup(EuareRequest):
diff --git a/euca2ools/commands/euare/getgrouppolicy.py b/euca2ools/commands/euare/getgrouppolicy.py
index e919f43..bfa22f3 100644
--- a/euca2ools/commands/euare/getgrouppolicy.py
+++ b/euca2ools/commands/euare/getgrouppolicy.py
@@ -28,10 +28,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
import json
import urllib
-from . import EuareRequest, AS_ACCOUNT
class GetGroupPolicy(EuareRequest):
diff --git a/euca2ools/commands/euare/getldapsyncstatus.py b/euca2ools/commands/euare/getldapsyncstatus.py
index 7f44ed5..66366a5 100644
--- a/euca2ools/commands/euare/getldapsyncstatus.py
+++ b/euca2ools/commands/euare/getldapsyncstatus.py
@@ -28,8 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder.mixins import TabifyingCommand
-from . import EuareRequest
+
class GetLdapSyncStatus(EuareRequest, TabifyingCommand):
DESCRIPTION = ("[Eucalyptus only] Describe the server's current LDAP "
diff --git a/euca2ools/commands/euare/getloginprofile.py b/euca2ools/commands/euare/getloginprofile.py
index 36e0bf2..a860d50 100644
--- a/euca2ools/commands/euare/getloginprofile.py
+++ b/euca2ools/commands/euare/getloginprofile.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class GetLoginProfile(EuareRequest):
diff --git a/euca2ools/commands/euare/getservercertificate.py b/euca2ools/commands/euare/getservercertificate.py
index a1d2540..f4b0749 100644
--- a/euca2ools/commands/euare/getservercertificate.py
+++ b/euca2ools/commands/euare/getservercertificate.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class GetServerCertificate(EuareRequest):
diff --git a/euca2ools/commands/euare/getuser.py b/euca2ools/commands/euare/getuser.py
index a1afd7e..8e4fe39 100644
--- a/euca2ools/commands/euare/getuser.py
+++ b/euca2ools/commands/euare/getuser.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class GetUser(EuareRequest):
diff --git a/euca2ools/commands/euare/getuserinfo.py b/euca2ools/commands/euare/getuserinfo.py
index 8042b33..9e3e752 100644
--- a/euca2ools/commands/euare/getuserinfo.py
+++ b/euca2ools/commands/euare/getuserinfo.py
@@ -28,16 +28,16 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
from requestbuilder.mixins import TabifyingCommand
-from . import EuareRequest, AS_ACCOUNT
class GetUserInfo(EuareRequest, TabifyingCommand):
DESCRIPTION = '[Eucalyptus only] Display information about a user'
ARGS = [Arg('-u', '--user-name', dest='UserName', metavar='USER',
help='''name of the user to display info for (default: current
- user)'''),
+ user)'''),
Arg('-k', '--info-key', dest='InfoKey',
help='name of the piece of user info to show'),
AS_ACCOUNT]
diff --git a/euca2ools/commands/euare/getuserpolicy.py b/euca2ools/commands/euare/getuserpolicy.py
index 0f6d400..961da34 100644
--- a/euca2ools/commands/euare/getuserpolicy.py
+++ b/euca2ools/commands/euare/getuserpolicy.py
@@ -28,10 +28,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
import json
from requestbuilder import Arg
import urllib
-from . import EuareRequest, AS_ACCOUNT
class GetUserPolicy(EuareRequest):
diff --git a/euca2ools/commands/euare/listaccesskeys.py b/euca2ools/commands/euare/listaccesskeys.py
index 2a54bb6..5e1e0dd 100644
--- a/euca2ools/commands/euare/listaccesskeys.py
+++ b/euca2ools/commands/euare/listaccesskeys.py
@@ -28,9 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
class ListAccessKeys(EuareRequest):
diff --git a/euca2ools/commands/euare/listaccountaliases.py b/euca2ools/commands/euare/listaccountaliases.py
index e0c2165..13195e3 100644
--- a/euca2ools/commands/euare/listaccountaliases.py
+++ b/euca2ools/commands/euare/listaccountaliases.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class ListAccountAliases(EuareRequest):
diff --git a/euca2ools/commands/euare/listaccountpolicies.py b/euca2ools/commands/euare/listaccountpolicies.py
index 6bb8edd..0602240 100644
--- a/euca2ools/commands/euare/listaccountpolicies.py
+++ b/euca2ools/commands/euare/listaccountpolicies.py
@@ -28,10 +28,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-import euca2ools.commands.euare.getaccountpolicy
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
+from euca2ools.commands.euare.getaccountpolicy import GetAccountPolicy
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest
class ListAccountPolicies(EuareRequest):
@@ -78,8 +78,8 @@ class ListAccountPolicies(EuareRequest):
self.print_policy(policy_name)
def print_policy(self, policy_name):
- req = euca2ools.commands.euare.getaccountpolicy.GetAccountPolicy(
- service=self.service, AccountName=self.args['AccountName'],
- PolicyName=policy_name, pretty_print=self.args['pretty_print'])
+ req = GetAccountPolicy(service=self.service,
+ AccountName=self.args['AccountName'], PolicyName=policy_name,
+ pretty_print=self.args['pretty_print'])
response = req.main()
req.print_result(response)
diff --git a/euca2ools/commands/euare/listaccounts.py b/euca2ools/commands/euare/listaccounts.py
index 7f9c1aa..3bf468d 100644
--- a/euca2ools/commands/euare/listaccounts.py
+++ b/euca2ools/commands/euare/listaccounts.py
@@ -28,9 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest
from requestbuilder import Arg
from requestbuilder.mixins import TabifyingCommand
-from . import EuareRequest
class ListAccounts(EuareRequest, TabifyingCommand):
diff --git a/euca2ools/commands/euare/listgrouppolicies.py b/euca2ools/commands/euare/listgrouppolicies.py
index a2d1f9a..b2be898 100644
--- a/euca2ools/commands/euare/listgrouppolicies.py
+++ b/euca2ools/commands/euare/listgrouppolicies.py
@@ -28,16 +28,16 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-import euca2ools.commands.euare.getgrouppolicy
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
+from euca2ools.commands.euare.getgrouppolicy import GetGroupPolicy
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
class ListGroupPolicies(EuareRequest):
DESCRIPTION = ('List one specific policy or all policies attached to a '
'group. If no policies are attached to the group, the '
- 'action still succeeds.')
+ 'command still succeeds.')
ARGS = [Arg('-g', '--group-name', dest='GroupName', metavar='GROUP',
required=True, help='group owning the policies to list'),
Arg('-p', '--policy-name', metavar='POLICY', route_to=None,
@@ -79,9 +79,9 @@ class ListGroupPolicies(EuareRequest):
self.print_policy(policy_name)
def print_policy(self, policy_name):
- req = euca2ools.commands.euare.getgrouppolicy.GetGroupPolicy(
- service=self.service, GroupName=self.args['GroupName'],
- PolicyName=policy_name, pretty_print=self.args['pretty_print'],
+ req = GetGroupPolicy(service=self.service,
+ GroupName=self.args['GroupName'], PolicyName=policy_name,
+ pretty_print=self.args['pretty_print'],
DelegateAccount=self.args.get('DelegateAccount'))
response = req.main()
req.print_result(response)
diff --git a/euca2ools/commands/euare/listgroups.py b/euca2ools/commands/euare/listgroups.py
index 67ce8d7..72377c3 100644
--- a/euca2ools/commands/euare/listgroups.py
+++ b/euca2ools/commands/euare/listgroups.py
@@ -28,16 +28,16 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
class ListGroups(EuareRequest):
DESCRIPTION = "List your account's groups"
ARGS = [Arg('-p', '--path-prefix', dest='PathPrefix', metavar='PATH',
help='''restrict results to groups whose paths begin with a
- specific prefix'''),
+ specific prefix'''),
AS_ACCOUNT]
LIST_TAGS = ['Groups']
diff --git a/euca2ools/commands/euare/listgroupsforuser.py b/euca2ools/commands/euare/listgroupsforuser.py
index bead9d1..c266344 100644
--- a/euca2ools/commands/euare/listgroupsforuser.py
+++ b/euca2ools/commands/euare/listgroupsforuser.py
@@ -28,9 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
class ListGroupsForUser(EuareRequest):
diff --git a/euca2ools/commands/euare/listmfadevices.py b/euca2ools/commands/euare/listmfadevices.py
index d3357ca..c10f307 100644
--- a/euca2ools/commands/euare/listmfadevices.py
+++ b/euca2ools/commands/euare/listmfadevices.py
@@ -28,9 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
class ListMFADevices(EuareRequest):
diff --git a/euca2ools/commands/euare/listservercertificates.py b/euca2ools/commands/euare/listservercertificates.py
index 01b5ce1..62c8571 100644
--- a/euca2ools/commands/euare/listservercertificates.py
+++ b/euca2ools/commands/euare/listservercertificates.py
@@ -28,9 +28,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
+
class ListServerCertificates(EuareRequest):
DESCRIPTION = "List your account's server certificates"
diff --git a/euca2ools/commands/euare/listsigningcertificates.py b/euca2ools/commands/euare/listsigningcertificates.py
index e15ddfd..a7a2bb7 100644
--- a/euca2ools/commands/euare/listsigningcertificates.py
+++ b/euca2ools/commands/euare/listsigningcertificates.py
@@ -28,9 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
class ListSigningCertificates(EuareRequest):
diff --git a/euca2ools/commands/euare/listuserpolicies.py b/euca2ools/commands/euare/listuserpolicies.py
index b0ec503..700b3e2 100644
--- a/euca2ools/commands/euare/listuserpolicies.py
+++ b/euca2ools/commands/euare/listuserpolicies.py
@@ -28,10 +28,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-import euca2ools.commands.euare.getuserpolicy
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
+from euca2ools.commands.euare.getuserpolicy import GetUserPolicy
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
class ListUserPolicies(EuareRequest):
@@ -79,9 +79,9 @@ class ListUserPolicies(EuareRequest):
self.print_policy(policy_name)
def print_policy(self, policy_name):
- req = euca2ools.commands.euare.getuserpolicy.GetUserPolicy(
- service=self.service, UserName=self.args['UserName'],
- PolicyName=policy_name, pretty_print=self.args['pretty_print'],
+ req = GetUserPolicy(service=self.service,
+ UserName=self.args['UserName'], PolicyName=policy_name,
+ pretty_print=self.args['pretty_print'],
DelegateAccount=self.args.get('DelegateAccount'))
response = req.main()
req.print_result(response)
diff --git a/euca2ools/commands/euare/listusers.py b/euca2ools/commands/euare/listusers.py
index bde9317..3c3ca02 100644
--- a/euca2ools/commands/euare/listusers.py
+++ b/euca2ools/commands/euare/listusers.py
@@ -28,9 +28,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
from requestbuilder.response import PaginatedResponse
-from . import EuareRequest, AS_ACCOUNT
+
class ListUsers(EuareRequest):
DESCRIPTION = "List your account's users"
diff --git a/euca2ools/commands/euare/putaccountpolicy.py b/euca2ools/commands/euare/putaccountpolicy.py
index 0bc23f7..fb7f0d1 100644
--- a/euca2ools/commands/euare/putaccountpolicy.py
+++ b/euca2ools/commands/euare/putaccountpolicy.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg, MutuallyExclusiveArgList
-from . import EuareRequest
class PutAccountPolicy(EuareRequest):
diff --git a/euca2ools/commands/euare/putgrouppolicy.py b/euca2ools/commands/euare/putgrouppolicy.py
index c637b2c..a0a8de9 100644
--- a/euca2ools/commands/euare/putgrouppolicy.py
+++ b/euca2ools/commands/euare/putgrouppolicy.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg, MutuallyExclusiveArgList
-from . import EuareRequest, AS_ACCOUNT
class PutGroupPolicy(EuareRequest):
diff --git a/euca2ools/commands/euare/putuserpolicy.py b/euca2ools/commands/euare/putuserpolicy.py
index 9ea3a58..f48b305 100644
--- a/euca2ools/commands/euare/putuserpolicy.py
+++ b/euca2ools/commands/euare/putuserpolicy.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg, MutuallyExclusiveArgList
-from . import EuareRequest, AS_ACCOUNT
class PutUserPolicy(EuareRequest):
diff --git a/euca2ools/commands/euare/removeuserfromgroup.py b/euca2ools/commands/euare/removeuserfromgroup.py
index 4f90846..8f9541a 100644
--- a/euca2ools/commands/euare/removeuserfromgroup.py
+++ b/euca2ools/commands/euare/removeuserfromgroup.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class RemoveUserFromGroup(EuareRequest):
diff --git a/euca2ools/commands/euare/resyncmfadevice.py b/euca2ools/commands/euare/resyncmfadevice.py
index d80518b..8a1e402 100644
--- a/euca2ools/commands/euare/resyncmfadevice.py
+++ b/euca2ools/commands/euare/resyncmfadevice.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class ResyncMFADevice(EuareRequest):
diff --git a/euca2ools/commands/euare/updateaccesskey.py b/euca2ools/commands/euare/updateaccesskey.py
index 6d9c579..6f2c0b8 100644
--- a/euca2ools/commands/euare/updateaccesskey.py
+++ b/euca2ools/commands/euare/updateaccesskey.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class UpdateAccessKey(EuareRequest):
diff --git a/euca2ools/commands/euare/updategroup.py b/euca2ools/commands/euare/updategroup.py
index 2d9a4c7..f80f30c 100644
--- a/euca2ools/commands/euare/updategroup.py
+++ b/euca2ools/commands/euare/updategroup.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class UpdateGroup(EuareRequest):
diff --git a/euca2ools/commands/euare/updateloginprofile.py b/euca2ools/commands/euare/updateloginprofile.py
index aae15d4..9538285 100644
--- a/euca2ools/commands/euare/updateloginprofile.py
+++ b/euca2ools/commands/euare/updateloginprofile.py
@@ -28,9 +28,9 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
import getpass
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class UpdateLoginProfile(EuareRequest):
diff --git a/euca2ools/commands/euare/updateservercertificate.py b/euca2ools/commands/euare/updateservercertificate.py
index a95bef3..2480f88 100644
--- a/euca2ools/commands/euare/updateservercertificate.py
+++ b/euca2ools/commands/euare/updateservercertificate.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class UpdateServerCertificate(EuareRequest):
diff --git a/euca2ools/commands/euare/updatesigningcertificate.py b/euca2ools/commands/euare/updatesigningcertificate.py
index 1a7f0dd..a3e3ad8 100644
--- a/euca2ools/commands/euare/updatesigningcertificate.py
+++ b/euca2ools/commands/euare/updatesigningcertificate.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class UpdateSigningCertificate(EuareRequest):
diff --git a/euca2ools/commands/euare/updateuser.py b/euca2ools/commands/euare/updateuser.py
index 5e39273..7c8ed9c 100644
--- a/euca2ools/commands/euare/updateuser.py
+++ b/euca2ools/commands/euare/updateuser.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class UpdateUser(EuareRequest):
diff --git a/euca2ools/commands/euare/updateuserinfo.py b/euca2ools/commands/euare/updateuserinfo.py
index 01d1390..f138f6c 100644
--- a/euca2ools/commands/euare/updateuserinfo.py
+++ b/euca2ools/commands/euare/updateuserinfo.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg
-from . import EuareRequest, AS_ACCOUNT
class UpdateUserInfo(EuareRequest):
diff --git a/euca2ools/commands/euare/uploadservercertificate.py b/euca2ools/commands/euare/uploadservercertificate.py
index f610804..ea15984 100644
--- a/euca2ools/commands/euare/uploadservercertificate.py
+++ b/euca2ools/commands/euare/uploadservercertificate.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg, MutuallyExclusiveArgList
-from . import EuareRequest, AS_ACCOUNT
class UploadServerCertificate(EuareRequest):
diff --git a/euca2ools/commands/euare/uploadsigningcertificate.py b/euca2ools/commands/euare/uploadsigningcertificate.py
index a563ab3..4a39cf8 100644
--- a/euca2ools/commands/euare/uploadsigningcertificate.py
+++ b/euca2ools/commands/euare/uploadsigningcertificate.py
@@ -28,8 +28,8 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.euare import EuareRequest, AS_ACCOUNT
from requestbuilder import Arg, MutuallyExclusiveArgList
-from . import EuareRequest, AS_ACCOUNT
class UploadSigningCertificate(EuareRequest):
diff --git a/euca2ools/commands/monitoring/__init__.py b/euca2ools/commands/monitoring/__init__.py
index 0e5febb..8637a9a 100644
--- a/euca2ools/commands/monitoring/__init__.py
+++ b/euca2ools/commands/monitoring/__init__.py
@@ -28,11 +28,12 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands import Euca2ools
from requestbuilder import Arg, SERVICE
import requestbuilder.auth
import requestbuilder.service
import requestbuilder.request
-from .. import Euca2ools
+
class CloudWatch(requestbuilder.service.BaseService):
NAME = 'monitoring'
diff --git a/euca2ools/commands/walrus/__init__.py b/euca2ools/commands/walrus/__init__.py
index 6e2f1a7..8aef08d 100644
--- a/euca2ools/commands/walrus/__init__.py
+++ b/euca2ools/commands/walrus/__init__.py
@@ -28,6 +28,7 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands import Euca2ools
from euca2ools.exceptions import AWSError
from requestbuilder import Arg, MutuallyExclusiveArgList, SERVICE
import requestbuilder.auth
@@ -36,7 +37,7 @@ import requestbuilder.service
from requestbuilder.xmlparse import parse_aws_xml
import string
import urlparse
-from .. import Euca2ools
+
class Walrus(requestbuilder.service.BaseService):
NAME = 's3'
diff --git a/euca2ools/commands/walrus/checkbucket.py b/euca2ools/commands/walrus/checkbucket.py
index da3f55d..4d82508 100644
--- a/euca2ools/commands/walrus/checkbucket.py
+++ b/euca2ools/commands/walrus/checkbucket.py
@@ -28,16 +28,16 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.walrus import WalrusRequest
+from euca2ools.exceptions import AWSError
from requestbuilder import Arg
from requestbuilder.exceptions import ServerError
-from . import WalrusRequest
-from .listbucket import ListBucket
class CheckBucket(WalrusRequest):
DESCRIPTION = 'Return successfully if a bucket exists'
ARGS = [Arg('bucket', route_to=None, help='name of the bucket to check')]
- def main(self):
- req = ListBucket(paths=[self.args['bucket']], **{'max-keys': 0})
- req.main()
+ def preprocess(self):
+ self.method = 'HEAD'
+ self.path = self.args['bucket']
diff --git a/euca2ools/commands/walrus/createbucket.py b/euca2ools/commands/walrus/createbucket.py
index 73ed96d..85710e1 100644
--- a/euca2ools/commands/walrus/createbucket.py
+++ b/euca2ools/commands/walrus/createbucket.py
@@ -28,9 +28,11 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.walrus import (WalrusRequest,
+ validate_generic_bucket_name)
from requestbuilder import Arg
import xml.etree.ElementTree as ET
-from . import WalrusRequest, validate_generic_bucket_name
+
class CreateBucket(WalrusRequest):
DESCRIPTION = 'Create a new bucket'
@@ -40,7 +42,7 @@ class CreateBucket(WalrusRequest):
WalrusRequest.configure(self)
validate_generic_bucket_name(self.args['bucket'])
- def main(self):
+ def preprocess(self):
self.method = 'PUT'
self.path = self.args['bucket']
cb_config = ET.Element('CreateBucketConfiguration')
@@ -53,4 +55,3 @@ class CreateBucket(WalrusRequest):
cb_xml = ET.tostring(cb_config)
self.log.debug('bucket configuration: %s', cb_xml)
self.body = cb_xml
- self.send()
diff --git a/euca2ools/commands/walrus/deletebucket.py b/euca2ools/commands/walrus/deletebucket.py
index f8ed998..42ef906 100644
--- a/euca2ools/commands/walrus/deletebucket.py
+++ b/euca2ools/commands/walrus/deletebucket.py
@@ -28,8 +28,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.walrus import (WalrusRequest,
+ validate_generic_bucket_name)
from requestbuilder import Arg
-from . import WalrusRequest, validate_generic_bucket_name
+
class DeleteBucket(WalrusRequest):
DESCRIPTION = 'Delete a bucket'
@@ -39,7 +41,6 @@ class DeleteBucket(WalrusRequest):
WalrusRequest.configure(self)
validate_generic_bucket_name(self.args['bucket'])
- def main(self):
+ def preprocess(self):
self.method = 'DELETE'
self.path = self.args['bucket']
- self.send()
diff --git a/euca2ools/commands/walrus/deleteobject.py b/euca2ools/commands/walrus/deleteobject.py
index 13947b9..4cb4f23 100644
--- a/euca2ools/commands/walrus/deleteobject.py
+++ b/euca2ools/commands/walrus/deleteobject.py
@@ -28,8 +28,10 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.walrus import WalrusRequest
from requestbuilder import Arg
-from . import WalrusRequest
+from requestbuilder.exceptions import ArgumentError
+
class DeleteObject(WalrusRequest):
DESCRIPTION = 'Delete objects from the server'
@@ -39,8 +41,7 @@ class DeleteObject(WalrusRequest):
WalrusRequest.configure(self)
for path in self.args['paths']:
if '/' not in path:
- self._cli_parser.error(
- "path '{0}' must include a key name")
+ raise ArgumentError("path '{0}' must include a key name")
def main(self):
self.method = 'DELETE'
diff --git a/euca2ools/commands/walrus/getobject.py b/euca2ools/commands/walrus/getobject.py
index c501f20..7b35bf8 100644
--- a/euca2ools/commands/walrus/getobject.py
+++ b/euca2ools/commands/walrus/getobject.py
@@ -28,27 +28,27 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-from requestbuilder import Arg
+from euca2ools.commands.walrus import WalrusRequest
import os.path
-from . import WalrusRequest
+from requestbuilder import Arg
+
class GetObject(WalrusRequest):
DESCRIPTION = 'Retrieve objects from the server'
ARGS = [Arg('paths', metavar='BUCKET/KEY', nargs='+', route_to=None),
Arg('-o', dest='opath', metavar='PATH', default='.', route_to=None,
help='''where to download to. If this names an existing
- directory or ends in '/' all objects will be downloaded
- separately to files in that directory. Otherwise, all
- downloads will be written to a file with this name.
- Note that outputting multiple objects to a file will
- result in their concatenation. (default: current
- directory)''')]
+ directory or ends in '/' all objects will be downloaded
+ separately to files in that directory. Otherwise, all
+ downloads will be written to a file with this name. Note that
+ outputting multiple objects to a file will result in their
+ concatenation. (default: current directory)''')]
def main(self):
opath = self.args['opath']
if opath.endswith('/') and not os.path.isdir(opath):
# Ends with '/' and does not exist -> create it
- os.makedirs(opath)
+ os.mkdir(opath)
if os.path.isdir(opath):
# Download one per directory
for path in self.args['paths']:
diff --git a/euca2ools/commands/walrus/listallmybuckets.py b/euca2ools/commands/walrus/listallmybuckets.py
index 3a9be76..289abb3 100644
--- a/euca2ools/commands/walrus/listallmybuckets.py
+++ b/euca2ools/commands/walrus/listallmybuckets.py
@@ -28,18 +28,20 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
+from euca2ools.commands.walrus import WalrusRequest
from requestbuilder import Arg
from requestbuilder.mixins import TabifyingCommand
from requestbuilder.xmlparse import parse_listdelimited_aws_xml
-from . import WalrusRequest
+
class ListAllMyBuckets(WalrusRequest, TabifyingCommand):
DESCRIPTION = 'List all buckets owned by your account'
ARGS = [Arg('-l', dest='long_output', action='store_true', route_to=None,
- help='list in long format, with creation dates and owner info'),
- Arg('-n', dest='numeric_output', action='store_true', route_to=None,
- help=('display account IDs numerically in long (-l) output. '
- 'This option turns on the -l option.'))]
+ help='''list in long format, with creation dates and owner
+ info'''),
+ Arg('-n', dest='numeric_output', action='store_true',
+ route_to=None, help='''display account IDs numerically in long
+ (-l) output. This option turns on the -l option.''')]
def configure(self):
WalrusRequest.configure(self)
diff --git a/euca2ools/commands/walrus/listbucket.py b/euca2ools/commands/walrus/listbucket.py
index 4a9180e..a8082f5 100644
--- a/euca2ools/commands/walrus/listbucket.py
+++ b/euca2ools/commands/walrus/listbucket.py
@@ -29,11 +29,14 @@
# POSSIBILITY OF SUCH DAMAGE.
import argparse
+from euca2ools.commands.walrus import (WalrusRequest,
+ validate_generic_bucket_name)
from requestbuilder import Arg
+from requestbuilder.exceptions import ArgumentError
from requestbuilder.mixins import TabifyingCommand
from requestbuilder.response import PaginatedResponse
from requestbuilder.xmlparse import parse_aws_xml
-from . import WalrusRequest, validate_generic_bucket_name
+
class ListBucket(WalrusRequest, TabifyingCommand):
DESCRIPTION = 'List keys in one or more buckets'
@@ -45,14 +48,14 @@ class ListBucket(WalrusRequest, TabifyingCommand):
WalrusRequest.configure(self)
for path in self.args['paths']:
if path.startswith('/'):
- self._cli_parser.error(('argument \'{0}\' must not start with '
- '\'/\'; format is BUCKET[/KEY]').format(path))
+ raise ArgumentError(('argument \'{0}\' must not start with '
+ '"/"; format is BUCKET[/KEY]').format(path))
bucket = path.split('/', 1)[0]
try:
validate_generic_bucket_name(bucket)
except ValueError as err:
- self._cli_parser.error(
- 'bucket \'{0}\': {1}'.format(bucket, err.message))
+ raise ArgumentError(
+ 'bucket "{0}": {1}'.format(bucket, err.message))
def main(self):
self.method = 'GET'
@@ -78,7 +81,7 @@ class ListBucket(WalrusRequest, TabifyingCommand):
def parse_response(self, response):
response_dict = self.log_and_parse_response(response,
- parse_aws_xml, list_item_tags=('Contents', 'CommonPrefixes'))
+ parse_aws_xml, list_item_tags=('Contents', 'CommonPrefixes'))
return response_dict['ListBucketResult']
def print_result(self, result):
--
managing cloud instances for Eucalyptus
More information about the pkg-eucalyptus-commits
mailing list