[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit e260bb95b0faced619a73d91df2d98ccf319c779
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Sat Feb 16 21:01:16 2013 -0800

    Reimplement check-bucket

diff --git a/bin/euca-check-bucket b/bin/euca-check-bucket
deleted file mode 100755
index 40063d7..0000000
--- a/bin/euca-check-bucket
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
-# All rights reserved.
-#
-# Redistribution and use of this software in source and binary forms, with or
-# without modification, are permitted provided that the following conditions
-# are met:
-#
-#   Redistributions of source code must retain the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer.
-#
-#   Redistributions in binary form must reproduce the above
-#   copyright notice, this list of conditions and the
-#   following disclaimer in the documentation and/or other
-#   materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# 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
-
-import euca2ools.commands.walrus.checkbucket
-
-if __name__ == '__main__':
-    cmd = euca2ools.commands.walrus.checkbucket.CheckBucket()
-    cmd.main_cli()
-
diff --git a/euca2ools/commands/walrus/checkbucket.py b/euca2ools/commands/walrus/checkbucket.py
index 933ac50..da3f55d 100644
--- a/euca2ools/commands/walrus/checkbucket.py
+++ b/euca2ools/commands/walrus/checkbucket.py
@@ -1,6 +1,6 @@
 # Software License Agreement (BSD License)
 #
-# Copyright (c) 2009-2011, Eucalyptus Systems, Inc.
+# Copyright (c) 2013, Eucalyptus Systems, Inc.
 # All rights reserved.
 #
 # Redistribution and use of this software in source and binary forms, with or
@@ -27,31 +27,17 @@
 # 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
 
-import sys
-import euca2ools.commands.eucacommand
-from boto.roboto.param import Param
-from boto.exception import S3ResponseError
+from requestbuilder import Arg
+from requestbuilder.exceptions import ServerError
+from . import WalrusRequest
+from .listbucket import ListBucket
 
-class CheckBucket(euca2ools.commands.eucacommand.EucaCommand):
 
-    Description = 'Checks to see if a bucket exists'
-    Options = [Param(name='bucket', short_name='b', long_name='bucket',
-                     optional=False, ptype='string',
-                     doc='The name of the bucket to check')]
+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):
-        conn = self.make_connection_cli(conn_type='s3')
-        print 'Checking bucket: %s' % self.bucket
-        try:
-            return conn.get_bucket(self.bucket)
-        except S3ResponseError:
-            sys.exit(1)
-
-    def main_cli(self):
-        self.main()
-
-
+        req = ListBucket(paths=[self.args['bucket']], **{'max-keys': 0})
+        req.main()
diff --git a/euca2ools/commands/walrus/listbucket.py b/euca2ools/commands/walrus/listbucket.py
index 4a5b498..d12a620 100644
--- a/euca2ools/commands/walrus/listbucket.py
+++ b/euca2ools/commands/walrus/listbucket.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.
 
+import argparse
 from requestbuilder import Arg
 from requestbuilder.mixins import TabifyingCommand
 from requestbuilder.response import PaginatedResponse
@@ -36,7 +37,9 @@ from . import WalrusRequest, validate_generic_bucket_name
 
 class ListBucket(WalrusRequest, TabifyingCommand):
     DESCRIPTION = 'List keys in one or more buckets'
-    ARGS = [Arg('paths', metavar='BUCKET[/KEY]', nargs='+', route_to=None)]
+    ARGS = [Arg('paths', metavar='BUCKET[/KEY]', nargs='+', route_to=None),
+            Arg('--max-keys-per-request', dest='max-keys', type=int,
+                help=argparse.SUPPRESS)]
 
     def configure(self):
         WalrusRequest.configure(self)

-- 
managing cloud instances for Eucalyptus