Merge "Test cases for Policy V3 API-New"
diff --git a/tempest/api/identity/admin/v3/test_policies.py b/tempest/api/identity/admin/v3/test_policies.py
new file mode 100644
index 0000000..799b081
--- /dev/null
+++ b/tempest/api/identity/admin/v3/test_policies.py
@@ -0,0 +1,82 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 OpenStack Foundation
+# All Rights Reserved.
+#
+# 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 tempest.api.identity import base
+from tempest.common.utils.data_utils import rand_name
+from tempest.test import attr
+
+
+class PoliciesTestJSON(base.BaseIdentityAdminTest):
+ _interface = 'json'
+
+ def _delete_policy(self, policy_id):
+ resp, _ = self.policy_client.delete_policy(policy_id)
+ self.assertEqual(204, resp.status)
+
+ @attr(type='smoke')
+ def test_list_policies(self):
+ #Test to list policies
+ policy_ids = list()
+ fetched_ids = list()
+ for _ in range(3):
+ blob = rand_name('BlobName-')
+ policy_type = rand_name('PolicyType-')
+ resp, policy = self.policy_client.create_policy(blob,
+ policy_type)
+ # Delete the Policy at the end of this method
+ self.addCleanup(self._delete_policy, policy['id'])
+ policy_ids.append(policy['id'])
+ # List and Verify Policies
+ resp, body = self.policy_client.list_policies()
+ self.assertEqual(resp['status'], '200')
+ for p in body:
+ fetched_ids.append(p['id'])
+ missing_pols = [p for p in policy_ids if p not in fetched_ids]
+ self.assertEqual(0, len(missing_pols))
+
+ @attr(type='smoke')
+ def test_create_update_delete_policy(self):
+ #Test to update policy
+ blob = rand_name('BlobName-')
+ policy_type = rand_name('PolicyType-')
+ resp, policy = self.policy_client.create_policy(blob, policy_type)
+ self.addCleanup(self._delete_policy, policy['id'])
+ self.assertIn('id', policy)
+ self.assertIn('type', policy)
+ self.assertIn('blob', policy)
+ self.assertIsNotNone(policy['id'])
+ self.assertEqual(blob, policy['blob'])
+ self.assertEqual(policy_type, policy['type'])
+ resp, fetched_policy = self.policy_client.get_policy(policy['id'])
+ self.assertEqual(resp['status'], '200')
+ #Update policy
+ update_type = rand_name('UpdatedPolicyType-')
+ resp, data = self.policy_client.update_policy(
+ policy['id'], type=update_type)
+ self.assertTrue('type' in data)
+ #Assertion for updated value with fetched value
+ resp, fetched_policy = self.policy_client.get_policy(policy['id'])
+ self.assertIn('id', fetched_policy)
+ self.assertIn('blob', fetched_policy)
+ self.assertIn('type', fetched_policy)
+ self.assertEqual(fetched_policy['id'], policy['id'])
+ self.assertEqual(fetched_policy['blob'], policy['blob'])
+ self.assertEqual(update_type, fetched_policy['type'])
+
+
+class PoliciesTestXML(PoliciesTestJSON):
+ _interface = 'xml'
diff --git a/tempest/api/identity/base.py b/tempest/api/identity/base.py
index 6980425..db55509 100644
--- a/tempest/api/identity/base.py
+++ b/tempest/api/identity/base.py
@@ -31,6 +31,7 @@
cls.endpoints_client = os.endpoints_client
cls.v3_client = os.identity_v3_client
cls.service_client = os.service_client
+ cls.policy_client = os.policy_client
if not cls.client.has_admin_extensions():
raise cls.skipException("Admin extensions disabled")
diff --git a/tempest/clients.py b/tempest/clients.py
index 91d54eb..d78ce61 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -72,11 +72,13 @@
EndPointClientJSON
from tempest.services.identity.v3.json.identity_client import \
IdentityV3ClientJSON
+from tempest.services.identity.v3.json.policy_client import PolicyClientJSON
from tempest.services.identity.v3.json.service_client import \
ServiceClientJSON
from tempest.services.identity.v3.xml.endpoints_client import EndPointClientXML
from tempest.services.identity.v3.xml.identity_client import \
IdentityV3ClientXML
+from tempest.services.identity.v3.xml.policy_client import PolicyClientXML
from tempest.services.identity.v3.xml.service_client import \
ServiceClientXML
from tempest.services.identity.xml.identity_client import IdentityClientXML
@@ -224,6 +226,11 @@
"xml": TenantUsagesClientXML,
}
+POLICY_CLIENT = {
+ "json": PolicyClientJSON,
+ "xml": PolicyClientXML,
+}
+
class Manager(object):
@@ -297,6 +304,7 @@
self.services_client = SERVICES_CLIENT[interface](*client_args)
self.tenant_usages_client = \
TENANT_USAGES_CLIENT[interface](*client_args)
+ self.policy_client = POLICY_CLIENT[interface](*client_args)
except KeyError:
msg = "Unsupported interface type `%s'" % interface
raise exceptions.InvalidConfiguration(msg)
diff --git a/tempest/services/identity/v3/json/policy_client.py b/tempest/services/identity/v3/json/policy_client.py
new file mode 100644
index 0000000..27404c4
--- /dev/null
+++ b/tempest/services/identity/v3/json/policy_client.py
@@ -0,0 +1,82 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 OpenStack Foundation
+# All Rights Reserved.
+#
+# 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.
+
+import json
+from urlparse import urlparse
+
+from tempest.common.rest_client import RestClient
+
+
+class PolicyClientJSON(RestClient):
+
+ def __init__(self, config, username, password, auth_url, tenant_name=None):
+ super(PolicyClientJSON, self).__init__(config, username, password,
+ auth_url, tenant_name)
+ self.service = self.config.identity.catalog_type
+ self.endpoint_url = 'adminURL'
+
+ def request(self, method, url, headers=None, body=None, wait=None):
+ """Overriding the existing HTTP request in super class rest_client."""
+ self._set_auth()
+ self.base_url = self.base_url.replace(urlparse(self.base_url).path,
+ "/v3")
+ return super(PolicyClientJSON, self).request(method, url,
+ headers=headers,
+ body=body)
+
+ def create_policy(self, blob, type):
+ """Creates a Policy."""
+ post_body = {
+ "blob": blob,
+ "type": type
+ }
+ post_body = json.dumps({'policy': post_body})
+ resp, body = self.post('policies', post_body, self.headers)
+ body = json.loads(body)
+ return resp, body['policy']
+
+ def list_policies(self):
+ """Lists the policies."""
+ resp, body = self.get('policies')
+ body = json.loads(body)
+ return resp, body['policies']
+
+ def get_policy(self, policy_id):
+ """Lists out the given policy."""
+ url = 'policies/%s' % policy_id
+ resp, body = self.get(url)
+ body = json.loads(body)
+ return resp, body['policy']
+
+ def update_policy(self, policy_id, **kwargs):
+ """Updates a policy."""
+ resp, body = self.get_policy(policy_id)
+ type = kwargs.get('type')
+ post_body = {
+ 'type': type
+ }
+ post_body = json.dumps({'policy': post_body})
+ url = 'policies/%s' % policy_id
+ resp, body = self.patch(url, post_body,
+ self.headers)
+ body = json.loads(body)
+ return resp, body['policy']
+
+ def delete_policy(self, policy_id):
+ """Deletes the policy."""
+ url = "policies/%s" % policy_id
+ return self.delete(url)
diff --git a/tempest/services/identity/v3/xml/policy_client.py b/tempest/services/identity/v3/xml/policy_client.py
new file mode 100644
index 0000000..c3f6d99
--- /dev/null
+++ b/tempest/services/identity/v3/xml/policy_client.py
@@ -0,0 +1,97 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 OpenStack Foundation
+# All Rights Reserved.
+#
+# 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 urlparse import urlparse
+
+import httplib2
+from lxml import etree
+
+from tempest.common.rest_client import RestClientXML
+from tempest.services.compute.xml.common import Document
+from tempest.services.compute.xml.common import Element
+from tempest.services.compute.xml.common import xml_to_json
+
+XMLNS = "http://docs.openstack.org/identity/api/v3"
+
+
+class PolicyClientXML(RestClientXML):
+
+ def __init__(self, config, username, password, auth_url, tenant_name=None):
+ super(PolicyClientXML, self).__init__(config, username, password,
+ auth_url, tenant_name)
+ self.service = self.config.identity.catalog_type
+ self.endpoint_url = 'adminURL'
+
+ def _parse_array(self, node):
+ array = []
+ for child in node.getchildren():
+ tag_list = child.tag.split('}', 1)
+ if tag_list[1] == "policy":
+ array.append(xml_to_json(child))
+ return array
+
+ def _parse_body(self, body):
+ json = xml_to_json(body)
+ return json
+
+ def request(self, method, url, headers=None, body=None, wait=None):
+ """Overriding the existing HTTP request in super class RestClient."""
+ dscv = self.config.identity.disable_ssl_certificate_validation
+ self.http_obj = httplib2.Http(disable_ssl_certificate_validation=dscv)
+ self._set_auth()
+ self.base_url = self.base_url.replace(urlparse(self.base_url).path,
+ "/v3")
+ return super(PolicyClientXML, self).request(method, url,
+ headers=headers,
+ body=body)
+
+ def create_policy(self, blob, type):
+ """Creates a Policy."""
+ create_policy = Element("policy", xmlns=XMLNS, blob=blob, type=type)
+ resp, body = self.post('policies', str(Document(create_policy)),
+ self.headers)
+ body = self._parse_body(etree.fromstring(body))
+ return resp, body
+
+ def list_policies(self):
+ """Lists the policies."""
+ resp, body = self.get('policies', self.headers)
+ body = self._parse_array(etree.fromstring(body))
+ return resp, body
+
+ def get_policy(self, policy_id):
+ """Lists out the given policy."""
+ url = 'policies/%s' % policy_id
+ resp, body = self.get(url, self.headers)
+ body = self._parse_body(etree.fromstring(body))
+ return resp, body
+
+ def update_policy(self, policy_id, **kwargs):
+ """Updates a policy."""
+ resp, body = self.get_policy(policy_id)
+ type = kwargs.get('type')
+ update_policy = Element("policy", xmlns=XMLNS, type=type)
+ url = 'policies/%s' % policy_id
+ resp, body = self.patch(url, str(Document(update_policy)),
+ self.headers)
+ body = self._parse_body(etree.fromstring(body))
+ return resp, body
+
+ def delete_policy(self, policy_id):
+ """Deletes the policy."""
+ url = "policies/%s" % policy_id
+ return self.delete(url)