Merge "Identity v3 proxy methods"

2014-11-13 21:51:30 +00:00
parent 9547cda583 f342bccebd
commit ce81f08706
2 changed files with 283 additions and 18 deletions
--- a/openstack/identity/v3/_proxy.py
+++ b/openstack/identity/v3/_proxy.py
@@ -10,7 +10,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.

+from openstack.identity.v3 import credential
+from openstack.identity.v3 import domain
+from openstack.identity.v3 import endpoint
+from openstack.identity.v3 import group
+from openstack.identity.v3 import policy
 from openstack.identity.v3 import project
+from openstack.identity.v3 import service
+from openstack.identity.v3 import user


 class Proxy(object):
@@ -18,26 +25,146 @@ class Proxy(object):
    def __init__(self, session):
        self.session = session

+    def create_credential(self, **data):
+        return credential.Credential(data).create(self.session)
+
+    def delete_credential(self, **data):
+        credential.Credential(data).delete(self.session)
+
+    def find_credential(self, name_or_id):
+        return credential.Credential.find(self.session, name_or_id)
+
+    def get_credential(self, **data):
+        return credential.Credential(data).get(self.session)
+
+    def list_credential(self):
+        return credential.Credential.list(self.session)
+
+    def update_credential(self, **data):
+        return credential.Credential(data).update(self.session)
+
+    def create_domain(self, **data):
+        return domain.Domain(data).create(self.session)
+
+    def delete_domain(self, **data):
+        domain.Domain(data).delete(self.session)
+
+    def find_domain(self, name_or_id):
+        return domain.Domain.find(self.session, name_or_id)
+
+    def get_domain(self, **data):
+        return domain.Domain(data).get(self.session)
+
+    def list_domain(self):
+        return domain.Domain.list(self.session)
+
+    def update_domain(self, **data):
+        return domain.Domain(data).update(self.session)
+
+    def create_endpoint(self, **data):
+        return endpoint.Endpoint(data).create(self.session)
+
+    def delete_endpoint(self, **data):
+        endpoint.Endpoint(data).delete(self.session)
+
+    def find_endpoint(self, name_or_id):
+        return endpoint.Endpoint.find(self.session, name_or_id)
+
+    def get_endpoint(self, **data):
+        return endpoint.Endpoint(data).get(self.session)
+
+    def list_endpoint(self):
+        return endpoint.Endpoint.list(self.session)
+
+    def update_endpoint(self, **data):
+        return endpoint.Endpoint(data).update(self.session)
+
+    def create_group(self, **data):
+        return group.Group(data).create(self.session)
+
+    def delete_group(self, **data):
+        group.Group(data).delete(self.session)
+
+    def find_group(self, name_or_id):
+        return group.Group.find(self.session, name_or_id)
+
+    def get_group(self, **data):
+        return group.Group(data).get(self.session)
+
+    def list_group(self):
+        return group.Group.list(self.session)
+
+    def update_group(self, **data):
+        return group.Group(data).update(self.session)
+
+    def create_policy(self, **data):
+        return policy.Policy(data).create(self.session)
+
+    def delete_policy(self, **data):
+        policy.Policy(data).delete(self.session)
+
+    def find_policy(self, name_or_id):
+        return policy.Policy.find(self.session, name_or_id)
+
+    def get_policy(self, **data):
+        return policy.Policy(data).get(self.session)
+
+    def list_policy(self):
+        return policy.Policy.list(self.session)
+
+    def update_policy(self, **data):
+        return policy.Policy(data).update(self.session)
+
    def create_project(self, **data):
-        obj = project.Project(**data)
-        obj.create(self.session)
-        return obj
+        return project.Project(data).create(self.session)

-    def get_project(self, r_id):
-        obj = project.Project({'id': r_id})
-        obj.get(self.session)
-        return obj
-
-    def update_project(self, **data):
-        obj = project.Project(**data)
-        obj.update(self.session)
-
-    def delete_project(self, r_id):
-        obj = project.Project({'id': r_id})
-        obj.delete(self.session)
-
-    def list_projects(self, **params):
-        return project.Project.list(self.session, **params)
+    def delete_project(self, **data):
+        project.Project(data).delete(self.session)

    def find_project(self, name_or_id):
        return project.Project.find(self.session, name_or_id)
+
+    def get_project(self, **data):
+        return project.Project(data).get(self.session)
+
+    def list_project(self):
+        return project.Project.list(self.session)
+
+    def update_project(self, **data):
+        return project.Project(data).update(self.session)
+
+    def create_service(self, **data):
+        return service.Service(data).create(self.session)
+
+    def delete_service(self, **data):
+        service.Service(data).delete(self.session)
+
+    def find_service(self, name_or_id):
+        return service.Service.find(self.session, name_or_id)
+
+    def get_service(self, **data):
+        return service.Service(data).get(self.session)
+
+    def list_service(self):
+        return service.Service.list(self.session)
+
+    def update_service(self, **data):
+        return service.Service(data).update(self.session)
+
+    def create_user(self, **data):
+        return user.User(data).create(self.session)
+
+    def delete_user(self, **data):
+        user.User(data).delete(self.session)
+
+    def find_user(self, name_or_id):
+        return user.User.find(self.session, name_or_id)
+
+    def get_user(self, **data):
+        return user.User(data).get(self.session)
+
+    def list_user(self):
+        return user.User.list(self.session)
+
+    def update_user(self, **data):
+        return user.User(data).update(self.session)
--- a/openstack/tests/identity/v3/test_proxy.py
+++ b/openstack/tests/identity/v3/test_proxy.py
@@ -0,0 +1,138 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from openstack.identity.v3 import _proxy
+from openstack.tests import test_proxy_base
+
+
+class TestIdentityProxy(test_proxy_base.TestProxyBase):
+    def setUp(self):
+        super(TestIdentityProxy, self).setUp()
+        self.proxy = _proxy.Proxy(self.session)
+
+    def test_credential(self):
+        self.verify_create(
+            'openstack.identity.v3.credential.Credential.create',
+            self.proxy.create_credential
+        )
+        self.verify_delete(
+            'openstack.identity.v3.credential.Credential.delete',
+            self.proxy.delete_credential
+        )
+        self.verify_find('openstack.identity.v3.credential.Credential.find',
+                         self.proxy.find_credential)
+        self.verify_get('openstack.identity.v3.credential.Credential.get',
+                        self.proxy.get_credential)
+        self.verify_list('openstack.identity.v3.credential.Credential.list',
+                         self.proxy.list_credential)
+        self.verify_update(
+            'openstack.identity.v3.credential.Credential.update',
+            self.proxy.update_credential
+        )
+
+    def test_domain(self):
+        self.verify_create('openstack.identity.v3.domain.Domain.create',
+                           self.proxy.create_domain)
+        self.verify_delete('openstack.identity.v3.domain.Domain.delete',
+                           self.proxy.delete_domain)
+        self.verify_find('openstack.identity.v3.domain.Domain.find',
+                         self.proxy.find_domain)
+        self.verify_get('openstack.identity.v3.domain.Domain.get',
+                        self.proxy.get_domain)
+        self.verify_list('openstack.identity.v3.domain.Domain.list',
+                         self.proxy.list_domain)
+        self.verify_update('openstack.identity.v3.domain.Domain.update',
+                           self.proxy.update_domain)
+
+    def test_endpoint(self):
+        self.verify_create('openstack.identity.v3.endpoint.Endpoint.create',
+                           self.proxy.create_endpoint)
+        self.verify_delete('openstack.identity.v3.endpoint.Endpoint.delete',
+                           self.proxy.delete_endpoint)
+        self.verify_find('openstack.identity.v3.endpoint.Endpoint.find',
+                         self.proxy.find_endpoint)
+        self.verify_get('openstack.identity.v3.endpoint.Endpoint.get',
+                        self.proxy.get_endpoint)
+        self.verify_list('openstack.identity.v3.endpoint.Endpoint.list',
+                         self.proxy.list_endpoint)
+        self.verify_update('openstack.identity.v3.endpoint.Endpoint.update',
+                           self.proxy.update_endpoint)
+
+    def test_group(self):
+        self.verify_create('openstack.identity.v3.group.Group.create',
+                           self.proxy.create_group)
+        self.verify_delete('openstack.identity.v3.group.Group.delete',
+                           self.proxy.delete_group)
+        self.verify_find('openstack.identity.v3.group.Group.find',
+                         self.proxy.find_group)
+        self.verify_get('openstack.identity.v3.group.Group.get',
+                        self.proxy.get_group)
+        self.verify_list('openstack.identity.v3.group.Group.list',
+                         self.proxy.list_group)
+        self.verify_update('openstack.identity.v3.group.Group.update',
+                           self.proxy.update_group)
+
+    def test_policy(self):
+        self.verify_create('openstack.identity.v3.policy.Policy.create',
+                           self.proxy.create_policy)
+        self.verify_delete('openstack.identity.v3.policy.Policy.delete',
+                           self.proxy.delete_policy)
+        self.verify_find('openstack.identity.v3.policy.Policy.find',
+                         self.proxy.find_policy)
+        self.verify_get('openstack.identity.v3.policy.Policy.get',
+                        self.proxy.get_policy)
+        self.verify_list('openstack.identity.v3.policy.Policy.list',
+                         self.proxy.list_policy)
+        self.verify_update('openstack.identity.v3.policy.Policy.update',
+                           self.proxy.update_policy)
+
+    def test_project(self):
+        self.verify_create('openstack.identity.v3.project.Project.create',
+                           self.proxy.create_project)
+        self.verify_delete('openstack.identity.v3.project.Project.delete',
+                           self.proxy.delete_project)
+        self.verify_find('openstack.identity.v3.project.Project.find',
+                         self.proxy.find_project)
+        self.verify_get('openstack.identity.v3.project.Project.get',
+                        self.proxy.get_project)
+        self.verify_list('openstack.identity.v3.project.Project.list',
+                         self.proxy.list_project)
+        self.verify_update('openstack.identity.v3.project.Project.update',
+                           self.proxy.update_project)
+
+    def test_service(self):
+        self.verify_create('openstack.identity.v3.service.Service.create',
+                           self.proxy.create_service)
+        self.verify_delete('openstack.identity.v3.service.Service.delete',
+                           self.proxy.delete_service)
+        self.verify_find('openstack.identity.v3.service.Service.find',
+                         self.proxy.find_service)
+        self.verify_get('openstack.identity.v3.service.Service.get',
+                        self.proxy.get_service)
+        self.verify_list('openstack.identity.v3.service.Service.list',
+                         self.proxy.list_service)
+        self.verify_update('openstack.identity.v3.service.Service.update',
+                           self.proxy.update_service)
+
+    def test_user(self):
+        self.verify_create('openstack.identity.v3.user.User.create',
+                           self.proxy.create_user)
+        self.verify_delete('openstack.identity.v3.user.User.delete',
+                           self.proxy.delete_user)
+        self.verify_find('openstack.identity.v3.user.User.find',
+                         self.proxy.find_user)
+        self.verify_get('openstack.identity.v3.user.User.get',
+                        self.proxy.get_user)
+        self.verify_list('openstack.identity.v3.user.User.list',
+                         self.proxy.list_user)
+        self.verify_update('openstack.identity.v3.user.User.update',
+                           self.proxy.update_user)