openstack/deb-heat
Code Issues Proposed changes

Merge "Add integration tests for admin actions"

Browse Source
This commit is contained in:
Jenkins 2016-06-16 04:23:11 +00:00 committed by Gerrit Code Review
commit 2b0ae3c079
7 changed files with 131 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heat_integrationtests/common/config.py
View File

@ -35,6 +35,9 @@ IntegrationTestGroup = [
default=(os.environ.get('OS_PROJECT_NAME') or
os.environ.get('OS_TENANT_NAME')),
help="Tenant name to use for API requests."),
cfg.StrOpt('admin_tenant_name',
default='admin',
help="Admin tenant name to use for admin API requests."),
cfg.StrOpt('auth_url',
default=os.environ.get('OS_AUTH_URL'),
help="Full URI of the OpenStack Identity API (Keystone)"),

29
heat_integrationtests/common/test.py
View File

@ -81,8 +81,16 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
'No username configured')
self.assertIsNotNone(self.conf.password,
'No password configured')
self.setup_clients(self.conf)
self.useFixture(fixtures.FakeLogger(format=_LOG_FORMAT))
self.updated_time = {}
if self.conf.disable_ssl_certificate_validation:
self.verify_cert = False
else:
self.verify_cert = self.conf.ca_file or True
self.manager = clients.ClientManager(self.conf)
def setup_clients(self, conf):
self.manager = clients.ClientManager(conf)
self.identity_client = self.manager.identity_client
self.orchestration_client = self.manager.orchestration_client
self.compute_client = self.manager.compute_client
@ -90,12 +98,19 @@ class HeatIntegrationTest(testscenarios.WithScenarios,
self.volume_client = self.manager.volume_client
self.object_client = self.manager.object_client
self.metering_client = self.manager.metering_client
self.useFixture(fixtures.FakeLogger(format=_LOG_FORMAT))
self.updated_time = {}
if self.conf.disable_ssl_certificate_validation:
self.verify_cert = False
else:
self.verify_cert = self.conf.ca_file or True
self.client = self.orchestration_client
def setup_clients_for_admin(self):
self.assertIsNotNone(self.conf.admin_username,
'No admin username configured')
self.assertIsNotNone(self.conf.admin_password,
'No admin password configured')
conf = config.init_conf()
conf.username = self.conf.admin_username
conf.password = self.conf.admin_password
conf.tenant_name = self.conf.admin_tenant_name
self.setup_clients(conf)
def get_remote_client(self, server_or_ip, username, private_key=None):
if isinstance(server_or_ip, six.string_types):

1
heat_integrationtests/functional/functional_base.py
View File

@ -20,7 +20,6 @@ class FunctionalTestsBase(test.HeatIntegrationTest):
def setUp(self):
super(FunctionalTestsBase, self).setUp()
self.check_skip()
self.client = self.orchestration_client
def check_skip(self):
test_cls_name = reflection.get_class_name(self, fully_qualified=False)

101
heat_integrationtests/functional/test_admin_actions.py Normal file
View File

@ -0,0 +1,101 @@
# 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 heat_integrationtests.functional import functional_base
# Simple stack
test_template = {
'heat_template_version': '2013-05-23',
'resources': {
'test1': {
'type': 'OS::Heat::TestResource',
'properties': {
'value': 'Test1'
}
}
}
}
# Nested stack
rsg_template = {
'heat_template_version': '2013-05-23',
'resources': {
'random_group': {
'type': 'OS::Heat::ResourceGroup',
'properties': {
'count': 2,
'resource_def': {
'type': 'OS::Heat::RandomString',
'properties': {
'length': 30,
'salt': 'initial'
}
}
}
}
}
}
class AdminActionsTest(functional_base.FunctionalTestsBase):
def setUp(self):
super(AdminActionsTest, self).setUp()
if not self.conf.admin_username or not self.conf.admin_password:
self.skipTest('No admin creds found, skipping')
def create_stack_setup_admin_client(self, template=test_template):
# Create the stack with the default user
self.stack_identifier = self.stack_create(template=template)
# Setup admin clients
self.setup_clients_for_admin()
def test_admin_simple_stack_actions(self):
self.create_stack_setup_admin_client()
updated_template = test_template.copy()
props = updated_template['resources']['test1']['properties']
props['value'] = 'new_value'
# Update, suspend and resume stack
self.update_stack(self.stack_identifier,
template=updated_template)
self.stack_suspend(self.stack_identifier)
self.stack_resume(self.stack_identifier)
# List stack resources
initial_resources = {'test1': 'OS::Heat::TestResource'}
self.assertEqual(initial_resources,
self.list_resources(self.stack_identifier))
# Delete stack
self._stack_delete(self.stack_identifier)
def test_admin_complex_stack_actions(self):
self.create_stack_setup_admin_client(template=rsg_template)
updated_template = rsg_template.copy()
props = updated_template['resources']['random_group']['properties']
props['count'] = 3
# Update, suspend and resume stack
self.update_stack(self.stack_identifier,
template=updated_template)
self.stack_suspend(self.stack_identifier)
self.stack_resume(self.stack_identifier)
# List stack resources
resources = {'random_group': 'OS::Heat::ResourceGroup'}
self.assertEqual(resources,
self.list_resources(self.stack_identifier))
# Delete stack
self._stack_delete(self.stack_identifier)

12
heat_integrationtests/functional/test_encryption_vol_type.py
View File

@ -11,8 +11,6 @@
# under the License.
from heat_integrationtests.common import clients
from heat_integrationtests.common import config
from heat_integrationtests.functional import functional_base
test_encryption_vol_type = {
@ -44,16 +42,10 @@ class EncryptionVolTypeTest(functional_base.FunctionalTestsBase):
super(EncryptionVolTypeTest, self).setUp()
if not self.conf.admin_username or not self.conf.admin_password:
self.skipTest('No admin creds found, skipping')
self.conf = config.init_conf()
# cinder security policy usage of volume type is limited
# to being used by administrators only.
# Temporarily switch to admin
self.conf.username = self.conf.admin_username
self.conf.password = self.conf.admin_password
self.conf.tenant_name = 'admin'
self.manager = clients.ClientManager(self.conf)
self.client = self.manager.orchestration_client
self.volume_client = self.manager.volume_client
# Switch to admin
self.setup_clients_for_admin()
def check_stack(self, sid):
vt = 'my_volume_type'

3
heat_integrationtests/heat_integrationtests.conf.sample
View File

@ -19,6 +19,9 @@
# Tenant name to use for API requests. (string value)
#tenant_name = <None>
# Admin tenant name to use for admin API requests. (string value)
#admin_tenant_name = admin
# Full URI of the OpenStack Identity API (Keystone) (string value)
#auth_url = <None>

2
heat_integrationtests/scenario/scenario_base.py
View File

@ -21,8 +21,6 @@ class ScenarioTestsBase(test.HeatIntegrationTest):
def setUp(self):
super(ScenarioTestsBase, self).setUp()
self.check_skip()
self.client = self.orchestration_client
self.sub_dir = 'templates'
self.assign_keypair()