Merge lp:~devcamcar/nova-adminclient/latest_client into lp:nova-adminclient

[Devin Carlen]

Incorporated latest changes from nova's adminclient.

[Devin Carlen (devcamcar)]

approve

review: Approve

=== modified file 'nova_adminclient/client.py'
--- nova_adminclient/client.py	2011-03-16 04:52:32 +0000
+++ nova_adminclient/client.py	2011-03-31 01:42:23 +0000
@@ -15,7 +15,6 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-
 """
 Nova User API client library.
 """
@@ -265,6 +264,20 @@
         else:
             setattr(self, name, str(value))
 
+class StatusResponse(object):
+    def __init__(self, connection=None):
+        self.connection = connection
+        self.status = None
+
+    def __repr__(self):
+        return 'Status:%s' % self.status
+
+    def startElement(self, name, attrs, connection):
+        return None
+
+    def endElement(self, name, value, connection):
+        setattr(self, name, str(value))
+
 
 class NovaAdminClient(object):
 
@@ -326,7 +339,7 @@
     def get_user(self, name):
         """Grab a single user by name."""
         try:
-            return self.apiconn.get_object('DescribeUser',
+            user = self.apiconn.get_object('DescribeUser',
                                            {'Name': name},
                                            UserInfo)
         except boto.exception.BotoServerError, e:
@@ -334,6 +347,9 @@
                 return None
             raise
 
+        if user.username != None:
+            return user
+
     def has_user(self, username):
         """Determine if user exists."""
         return self.get_user(username) != None
@@ -475,3 +491,8 @@
         """Grabs the list of all users."""
         return self.apiconn.get_list('DescribeInstanceTypes', {},
                                      [('item', InstanceType)])
+
+    def disable_project_credentials(self, project):
+        """Revoke project credentials and kill the cloudpipe/vpn instance."""
+        return self.apiconn.get_object('DisableProjectCredentials',
+                                       {'Project': project}, StatusResponse)
 
=== modified file 'setup.py' (properties changed: -x to +x)
--- setup.py	2011-03-30 15:57:16 +0000
+++ setup.py	2011-03-31 01:42:23 +0000
@@ -17,17 +17,16 @@
 #    under the License.
 
 import os
-from setuptools import setup
-
+from setuptools import setup, find_packages
 
 setup(name = "nova-adminclient",
-      version = "0.1.3",
+      version = "0.1.5",
       license = 'Apache License (2.0)',
       description = "client for administering OpenStack Nova",
       author = 'OpenStack',
       author_email = '[e-mail]',
       url='http://www.openstack.org',
-      packages = ['nova_adminclient'],
+      packages = find_packages(),
       install_requires = ['setuptools', 'boto==1.9b'],
       classifiers = [
           'Development Status :: 5 - Production/Stable',