1c64e5c1f7
Fixed most of the errors reported back from hacking 0.9.2. Specifically: - E128 continuation line under-indented for visual indent - E251 unexpected spaces around keyword / parameter equals - E265 block comment should start with '# ' - H305 imports not grouped correctly - H307 like imports should be grouped together - H402 one line docstring needs punctuation - H904 Wrap long lines in parentheses instead of a backslash But opted to ignore the following for now: - E122: continuation line missing indentation or outdented - H405: multi line docstring summary not separated with an empty line Change-Id: Ib8e698d85fd598fa91435538657361a1f695ce89
299 lines
11 KiB
Python
299 lines
11 KiB
Python
# 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 uuid
|
|
|
|
import httpretty
|
|
|
|
from keystoneclient import exceptions
|
|
from keystoneclient.tests.v2_0 import utils
|
|
from keystoneclient.v2_0 import tenants
|
|
|
|
|
|
class TenantTests(utils.TestCase):
|
|
def setUp(self):
|
|
super(TenantTests, self).setUp()
|
|
|
|
self.INVIS_ID = uuid.uuid4().hex
|
|
self.DEMO_ID = uuid.uuid4().hex
|
|
self.ADMIN_ID = uuid.uuid4().hex
|
|
self.EXTRAS_ID = uuid.uuid4().hex
|
|
|
|
self.TEST_TENANTS = {
|
|
"tenants": {
|
|
"values": [
|
|
{
|
|
"enabled": True,
|
|
"description": "A description change!",
|
|
"name": "invisible_to_admin",
|
|
"id": self.INVIS_ID,
|
|
},
|
|
{
|
|
"enabled": True,
|
|
"description": "None",
|
|
"name": "demo",
|
|
"id": self.DEMO_ID,
|
|
},
|
|
{
|
|
"enabled": True,
|
|
"description": "None",
|
|
"name": "admin",
|
|
"id": self.ADMIN_ID,
|
|
},
|
|
{
|
|
"extravalue01": "metadata01",
|
|
"enabled": True,
|
|
"description": "For testing extras",
|
|
"name": "test_extras",
|
|
"id": self.EXTRAS_ID,
|
|
}
|
|
],
|
|
"links": [],
|
|
},
|
|
}
|
|
|
|
@httpretty.activate
|
|
def test_create(self):
|
|
req_body = {
|
|
"tenant": {
|
|
"name": "tenantX",
|
|
"description": "Like tenant 9, but better.",
|
|
"enabled": True,
|
|
"extravalue01": "metadata01",
|
|
},
|
|
}
|
|
id_ = uuid.uuid4().hex
|
|
resp_body = {
|
|
"tenant": {
|
|
"name": "tenantX",
|
|
"enabled": True,
|
|
"id": id_,
|
|
"description": "Like tenant 9, but better.",
|
|
"extravalue01": "metadata01",
|
|
}
|
|
}
|
|
self.stub_url(httpretty.POST, ['tenants'], json=resp_body)
|
|
|
|
tenant = self.client.tenants.create(
|
|
req_body['tenant']['name'],
|
|
req_body['tenant']['description'],
|
|
req_body['tenant']['enabled'],
|
|
extravalue01=req_body['tenant']['extravalue01'],
|
|
name="don't overwrite priors")
|
|
self.assertIsInstance(tenant, tenants.Tenant)
|
|
self.assertEqual(tenant.id, id_)
|
|
self.assertEqual(tenant.name, "tenantX")
|
|
self.assertEqual(tenant.description, "Like tenant 9, but better.")
|
|
self.assertEqual(tenant.extravalue01, "metadata01")
|
|
self.assertRequestBodyIs(json=req_body)
|
|
|
|
@httpretty.activate
|
|
def test_duplicate_create(self):
|
|
req_body = {
|
|
"tenant": {
|
|
"name": "tenantX",
|
|
"description": "The duplicate tenant.",
|
|
"enabled": True
|
|
},
|
|
}
|
|
resp_body = {
|
|
"error": {
|
|
"message": "Conflict occurred attempting to store project.",
|
|
"code": 409,
|
|
"title": "Conflict",
|
|
}
|
|
}
|
|
self.stub_url(httpretty.POST, ['tenants'], status=409, json=resp_body)
|
|
|
|
def create_duplicate_tenant():
|
|
self.client.tenants.create(req_body['tenant']['name'],
|
|
req_body['tenant']['description'],
|
|
req_body['tenant']['enabled'])
|
|
|
|
self.assertRaises(exceptions.Conflict, create_duplicate_tenant)
|
|
|
|
@httpretty.activate
|
|
def test_delete(self):
|
|
self.stub_url(httpretty.DELETE, ['tenants', self.ADMIN_ID], status=204)
|
|
self.client.tenants.delete(self.ADMIN_ID)
|
|
|
|
@httpretty.activate
|
|
def test_get(self):
|
|
resp = {'tenant': self.TEST_TENANTS['tenants']['values'][2]}
|
|
self.stub_url(httpretty.GET, ['tenants', self.ADMIN_ID], json=resp)
|
|
|
|
t = self.client.tenants.get(self.ADMIN_ID)
|
|
self.assertIsInstance(t, tenants.Tenant)
|
|
self.assertEqual(t.id, self.ADMIN_ID)
|
|
self.assertEqual(t.name, 'admin')
|
|
|
|
@httpretty.activate
|
|
def test_list(self):
|
|
self.stub_url(httpretty.GET, ['tenants'], json=self.TEST_TENANTS)
|
|
|
|
tenant_list = self.client.tenants.list()
|
|
[self.assertIsInstance(t, tenants.Tenant) for t in tenant_list]
|
|
|
|
@httpretty.activate
|
|
def test_list_limit(self):
|
|
self.stub_url(httpretty.GET, ['tenants'], json=self.TEST_TENANTS)
|
|
|
|
tenant_list = self.client.tenants.list(limit=1)
|
|
self.assertQueryStringIs('limit=1')
|
|
[self.assertIsInstance(t, tenants.Tenant) for t in tenant_list]
|
|
|
|
@httpretty.activate
|
|
def test_list_marker(self):
|
|
self.stub_url(httpretty.GET, ['tenants'], json=self.TEST_TENANTS)
|
|
|
|
tenant_list = self.client.tenants.list(marker=1)
|
|
self.assertQueryStringIs('marker=1')
|
|
[self.assertIsInstance(t, tenants.Tenant) for t in tenant_list]
|
|
|
|
@httpretty.activate
|
|
def test_list_limit_marker(self):
|
|
self.stub_url(httpretty.GET, ['tenants'], json=self.TEST_TENANTS)
|
|
|
|
tenant_list = self.client.tenants.list(limit=1, marker=1)
|
|
self.assertQueryStringIs('marker=1&limit=1')
|
|
[self.assertIsInstance(t, tenants.Tenant) for t in tenant_list]
|
|
|
|
@httpretty.activate
|
|
def test_update(self):
|
|
req_body = {
|
|
"tenant": {
|
|
"id": self.EXTRAS_ID,
|
|
"name": "tenantX",
|
|
"description": "I changed you!",
|
|
"enabled": False,
|
|
"extravalue01": "metadataChanged",
|
|
# "extraname": "dontoverwrite!",
|
|
},
|
|
}
|
|
resp_body = {
|
|
"tenant": {
|
|
"name": "tenantX",
|
|
"enabled": False,
|
|
"id": self.EXTRAS_ID,
|
|
"description": "I changed you!",
|
|
"extravalue01": "metadataChanged",
|
|
},
|
|
}
|
|
|
|
self.stub_url(httpretty.POST, ['tenants', self.EXTRAS_ID],
|
|
json=resp_body)
|
|
|
|
tenant = self.client.tenants.update(
|
|
req_body['tenant']['id'],
|
|
req_body['tenant']['name'],
|
|
req_body['tenant']['description'],
|
|
req_body['tenant']['enabled'],
|
|
extravalue01=req_body['tenant']['extravalue01'],
|
|
name="don't overwrite priors")
|
|
self.assertIsInstance(tenant, tenants.Tenant)
|
|
self.assertRequestBodyIs(json=req_body)
|
|
self.assertEqual(tenant.id, self.EXTRAS_ID)
|
|
self.assertEqual(tenant.name, "tenantX")
|
|
self.assertEqual(tenant.description, "I changed you!")
|
|
self.assertFalse(tenant.enabled)
|
|
self.assertEqual(tenant.extravalue01, "metadataChanged")
|
|
|
|
@httpretty.activate
|
|
def test_update_empty_description(self):
|
|
req_body = {
|
|
"tenant": {
|
|
"id": self.EXTRAS_ID,
|
|
"name": "tenantX",
|
|
"description": "",
|
|
"enabled": False,
|
|
},
|
|
}
|
|
resp_body = {
|
|
"tenant": {
|
|
"name": "tenantX",
|
|
"enabled": False,
|
|
"id": self.EXTRAS_ID,
|
|
"description": "",
|
|
},
|
|
}
|
|
self.stub_url(httpretty.POST, ['tenants', self.EXTRAS_ID],
|
|
json=resp_body)
|
|
|
|
tenant = self.client.tenants.update(req_body['tenant']['id'],
|
|
req_body['tenant']['name'],
|
|
req_body['tenant']['description'],
|
|
req_body['tenant']['enabled'])
|
|
self.assertIsInstance(tenant, tenants.Tenant)
|
|
self.assertRequestBodyIs(json=req_body)
|
|
self.assertEqual(tenant.id, self.EXTRAS_ID)
|
|
self.assertEqual(tenant.name, "tenantX")
|
|
self.assertEqual(tenant.description, "")
|
|
self.assertFalse(tenant.enabled)
|
|
|
|
@httpretty.activate
|
|
def test_add_user(self):
|
|
self.stub_url(httpretty.PUT,
|
|
['tenants', self.EXTRAS_ID, 'users', 'foo', 'roles',
|
|
'OS-KSADM', 'barrr'],
|
|
status=204)
|
|
|
|
self.client.tenants.add_user(self.EXTRAS_ID, 'foo', 'barrr')
|
|
|
|
@httpretty.activate
|
|
def test_remove_user(self):
|
|
self.stub_url(httpretty.DELETE, ['tenants', self.EXTRAS_ID, 'users',
|
|
'foo', 'roles', 'OS-KSADM', 'barrr'],
|
|
status=204)
|
|
|
|
self.client.tenants.remove_user(self.EXTRAS_ID, 'foo', 'barrr')
|
|
|
|
@httpretty.activate
|
|
def test_tenant_add_user(self):
|
|
self.stub_url(httpretty.PUT, ['tenants', self.EXTRAS_ID, 'users',
|
|
'foo', 'roles', 'OS-KSADM', 'barrr'],
|
|
status=204)
|
|
|
|
req_body = {
|
|
"tenant": {
|
|
"id": self.EXTRAS_ID,
|
|
"name": "tenantX",
|
|
"description": "I changed you!",
|
|
"enabled": False,
|
|
},
|
|
}
|
|
# make tenant object with manager
|
|
tenant = self.client.tenants.resource_class(self.client.tenants,
|
|
req_body['tenant'])
|
|
tenant.add_user('foo', 'barrr')
|
|
self.assertIsInstance(tenant, tenants.Tenant)
|
|
|
|
@httpretty.activate
|
|
def test_tenant_remove_user(self):
|
|
self.stub_url(httpretty.DELETE, ['tenants', self.EXTRAS_ID, 'users',
|
|
'foo', 'roles', 'OS-KSADM', 'barrr'],
|
|
status=204)
|
|
|
|
req_body = {
|
|
"tenant": {
|
|
"id": self.EXTRAS_ID,
|
|
"name": "tenantX",
|
|
"description": "I changed you!",
|
|
"enabled": False,
|
|
},
|
|
}
|
|
|
|
# make tenant object with manager
|
|
tenant = self.client.tenants.resource_class(self.client.tenants,
|
|
req_body['tenant'])
|
|
tenant.remove_user('foo', 'barrr')
|
|
self.assertIsInstance(tenant, tenants.Tenant)
|