openstack/deb-senlin
Code Issues Proposed changes

Reorg cluster_polcy related tempest API test

Browse Source 
This patch splits cluster_policy related tempest API
tests from cluster tempest API tests since cluster_policy
is actually an individual API interface of Senlin.

Change-Id: I18343d902a47110b5282079bd7d3abafc627d5f7
This commit is contained in:
yanyanhu 2016-06-07 23:14:26 -04:00
parent bcba9a673c
commit b7febc617d
3 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
senlin/tests/tempest/api/cluster_policies/__init__.py Normal file
View File

18
senlin/tests/tempest/api/clusters/test_cluster_policy.py → senlin/tests/tempest/api/cluster_policies/test_cluster_policy_list.py
View File

@ -16,10 +16,10 @@ from senlin.tests.tempest.api import base
from senlin.tests.tempest.api import utils
class TestClusterPolicy(base.BaseSenlinTest):
class TestClusterPolicyList(base.BaseSenlinTest):
def setUp(self):
super(TestClusterPolicy, self).setUp()
super(TestClusterPolicyList, self).setUp()
profile_id = utils.create_a_profile(self)
self.addCleanup(utils.delete_a_profile, self, profile_id)
@ -47,17 +47,3 @@ class TestClusterPolicy(base.BaseSenlinTest):
'policy_id', 'policy_name', 'policy_type']:
self.assertIn(key, policies[0])
self.assertEqual(self.policy_id, policies[0]['policy_id'])
@decorators.idempotent_id('fdf4dbf9-fcc6-4eb0-96c1-d8e8caa90f6d')
def test_cluster_policy_show(self):
res = self.client.get_cluster_policy(self.cluster_id, self.policy_id)
# Verify resp of cluster policy show API
self.assertEqual(200, res['status'])
self.assertIsNone(res['location'])
self.assertIsNotNone(res['body'])
policy = res['body']
for key in ['cluster_id', 'cluster_name', 'id', 'policy_id',
'policy_name', 'policy_type', 'enabled']:
self.assertIn(key, policy)
self.assertEqual(self.policy_id, policy['policy_id'])

48
senlin/tests/tempest/api/cluster_policies/test_cluster_policy_show.py Normal file
View File

@ -0,0 +1,48 @@
# 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.lib import decorators
from senlin.tests.tempest.api import base
from senlin.tests.tempest.api import utils
class TestClusterPolicyShow(base.BaseSenlinTest):
def setUp(self):
super(TestClusterPolicyShow, self).setUp()
profile_id = utils.create_a_profile(self)
self.addCleanup(utils.delete_a_profile, self, profile_id)
self.cluster_id = utils.create_a_cluster(self, profile_id)
self.addCleanup(utils.delete_a_cluster, self, self.cluster_id)
self.policy_id = utils.create_a_policy(self)
self.addCleanup(utils.delete_a_policy, self, self.policy_id)
utils.attach_policy(self, self.cluster_id, self.policy_id)
self.addCleanup(utils.detach_policy, self, self.cluster_id,
self.policy_id)
@decorators.idempotent_id('fdf4dbf9-fcc6-4eb0-96c1-d8e8caa90f6d')
def test_cluster_policy_show(self):
res = self.client.get_cluster_policy(self.cluster_id, self.policy_id)
# Verify resp of cluster policy show API
self.assertEqual(200, res['status'])
self.assertIsNone(res['location'])
self.assertIsNotNone(res['body'])
policy = res['body']
for key in ['cluster_id', 'cluster_name', 'id', 'policy_id',
'policy_name', 'policy_type', 'enabled']:
self.assertIn(key, policy)
self.assertEqual(self.policy_id, policy['policy_id'])