Added Heat Software Config-Deploy API tests
Added functions to the JSON client to support the new software configuration API. Software configurations and deployments are tiered and dependant on each other so splitting the API calls to smaller tests is impossible. Each test verifies different things, this is how I tried to prevent the tests from being too bloated. Co-Authored-By: Steven Hardy <shardy@redhat.com> Change-Id: Ied896fcaf3cf4a80385b28235eb5f4af9cd182c8
This commit is contained in:
cmyster
parent
2b8655221b
commit
2a63ee0a3a
|
|
@ -0,0 +1,163 @@
|
|||
# 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.orchestration import base
|
||||
from tempest.common.utils import data_utils
|
||||
from tempest import config
|
||||
from tempest import exceptions
|
||||
from tempest.openstack.common import log as logging
|
||||
from tempest import test
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
CONF = config.CONF
|
||||
|
||||
|
||||
class TestSoftwareConfig(base.BaseOrchestrationTest):
|
||||
|
||||
def setUp(self):
|
||||
super(TestSoftwareConfig, self).setUp()
|
||||
self.configs = []
|
||||
# Add 2 sets of software configuration
|
||||
self.configs.append(self._config_create('a'))
|
||||
self.configs.append(self._config_create('b'))
|
||||
# Create a deployment using config a's id
|
||||
self._deployment_create(self.configs[0]['id'])
|
||||
|
||||
def _config_create(self, suffix):
|
||||
configuration = {'group': 'script',
|
||||
'inputs': [],
|
||||
'outputs': [],
|
||||
'options': {}}
|
||||
configuration['name'] = 'heat_soft_config_%s' % suffix
|
||||
configuration['config'] = '#!/bin/bash echo init-%s' % suffix
|
||||
api_config = self.client.create_software_config(**configuration)
|
||||
configuration['id'] = api_config['software_config']['id']
|
||||
self.addCleanup(self._config_delete, configuration['id'])
|
||||
self._validate_config(configuration, api_config)
|
||||
return configuration
|
||||
|
||||
def _validate_config(self, configuration, api_config):
|
||||
# Assert all expected keys are present with matching data
|
||||
for k in configuration.keys():
|
||||
self.assertEqual(configuration[k],
|
||||
api_config['software_config'][k])
|
||||
|
||||
def _deployment_create(self, config_id):
|
||||
self.server_id = data_utils.rand_name('dummy-server')
|
||||
self.action = 'ACTION_0'
|
||||
self.status = 'STATUS_0'
|
||||
self.input_values = {}
|
||||
self.output_values = []
|
||||
self.status_reason = 'REASON_0'
|
||||
self.signal_transport = 'NO_SIGNAL'
|
||||
self.deployment = self.client.create_software_deploy(
|
||||
self.server_id, config_id, self.action, self.status,
|
||||
self.input_values, self.output_values, self.status_reason,
|
||||
self.signal_transport)
|
||||
self.deployment_id = self.deployment['software_deployment']['id']
|
||||
self.addCleanup(self._deployment_delete, self.deployment_id)
|
||||
|
||||
def _deployment_delete(self, deploy_id):
|
||||
self.client.delete_software_deploy(deploy_id)
|
||||
# Testing that it is really gone
|
||||
self.assertRaises(
|
||||
exceptions.NotFound, self.client.get_software_deploy,
|
||||
self.deployment_id)
|
||||
|
||||
def _config_delete(self, config_id):
|
||||
self.client.delete_software_config(config_id)
|
||||
# Testing that it is really gone
|
||||
self.assertRaises(
|
||||
exceptions.NotFound, self.client.get_software_config, config_id)
|
||||
|
||||
@test.attr(type='smoke')
|
||||
def test_get_software_config(self):
|
||||
"""Testing software config get."""
|
||||
for conf in self.configs:
|
||||
api_config = self.client.get_software_config(conf['id'])
|
||||
self._validate_config(conf, api_config)
|
||||
|
||||
@test.attr(type='smoke')
|
||||
def test_get_deployment_list(self):
|
||||
"""Getting a list of all deployments"""
|
||||
deploy_list = self.client.get_software_deploy_list()
|
||||
deploy_ids = [deploy['id'] for deploy in
|
||||
deploy_list['software_deployments']]
|
||||
self.assertIn(self.deployment_id, deploy_ids)
|
||||
|
||||
@test.attr(type='smoke')
|
||||
def test_get_deployment_metadata(self):
|
||||
"""Testing deployment metadata get"""
|
||||
metadata = self.client.get_software_deploy_meta(self.server_id)
|
||||
conf_ids = [conf['id'] for conf in metadata['metadata']]
|
||||
self.assertIn(self.configs[0]['id'], conf_ids)
|
||||
|
||||
def _validate_deployment(self, action, status, reason, config_id):
|
||||
deployment = self.client.get_software_deploy(self.deployment_id)
|
||||
self.assertEqual(action, deployment['software_deployment']['action'])
|
||||
self.assertEqual(status, deployment['software_deployment']['status'])
|
||||
self.assertEqual(reason,
|
||||
deployment['software_deployment']['status_reason'])
|
||||
self.assertEqual(config_id,
|
||||
deployment['software_deployment']['config_id'])
|
||||
|
||||
@test.attr(type='smoke')
|
||||
def test_software_deployment_create_validate(self):
|
||||
"""Testing software deployment was created as expected."""
|
||||
# Asserting that all fields were created
|
||||
self.assert_fields_in_dict(
|
||||
self.deployment['software_deployment'], 'action', 'config_id',
|
||||
'id', 'input_values', 'output_values', 'server_id', 'status',
|
||||
'status_reason')
|
||||
# Testing get for this deployment and verifying parameters
|
||||
self._validate_deployment(self.action, self.status,
|
||||
self.status_reason, self.configs[0]['id'])
|
||||
|
||||
@test.attr(type='smoke')
|
||||
def test_software_deployment_update_no_metadata_change(self):
|
||||
"""Testing software deployment update without metadata change."""
|
||||
metadata = self.client.get_software_deploy_meta(self.server_id)
|
||||
# Updating values without changing the configuration ID
|
||||
new_action = 'ACTION_1'
|
||||
new_status = 'STATUS_1'
|
||||
new_reason = 'REASON_1'
|
||||
self.client.update_software_deploy(
|
||||
self.deployment_id, self.server_id, self.configs[0]['id'],
|
||||
new_action, new_status, self.input_values, self.output_values,
|
||||
new_reason, self.signal_transport)
|
||||
# Verifying get and that the deployment was updated as expected
|
||||
self._validate_deployment(new_action, new_status,
|
||||
new_reason, self.configs[0]['id'])
|
||||
|
||||
# Metadata should not be changed at this point
|
||||
test_metadata = self.client.get_software_deploy_meta(self.server_id)
|
||||
for key in metadata['metadata'][0]:
|
||||
self.assertEqual(
|
||||
metadata['metadata'][0][key],
|
||||
test_metadata['metadata'][0][key])
|
||||
|
||||
@test.attr(type='smoke')
|
||||
def test_software_deployment_update_with_metadata_change(self):
|
||||
"""Testing software deployment update with metadata change."""
|
||||
metadata = self.client.get_software_deploy_meta(self.server_id)
|
||||
self.client.update_software_deploy(
|
||||
self.deployment_id, self.server_id, self.configs[1]['id'],
|
||||
self.action, self.status, self.input_values,
|
||||
self.output_values, self.status_reason, self.signal_transport)
|
||||
self._validate_deployment(self.action, self.status,
|
||||
self.status_reason, self.configs[1]['id'])
|
||||
# Metadata should now be changed
|
||||
new_metadata = self.client.get_software_deploy_meta(self.server_id)
|
||||
# Its enough to test the ID in this case
|
||||
meta_id = metadata['metadata'][0]['id']
|
||||
test_id = new_metadata['metadata'][0]['id']
|
||||
self.assertNotEqual(meta_id, test_id)
|
||||
|
|
@ -259,3 +259,140 @@ class OrchestrationClient(rest_client.RestClient):
|
|||
'parameters': parameters,
|
||||
}
|
||||
return self._validate_template(post_body)
|
||||
|
||||
def create_software_config(self, name=None, config=None, group=None,
|
||||
inputs=None, outputs=None, options=None):
|
||||
headers, body = self._prep_software_config_create(
|
||||
name, config, group, inputs, outputs, options)
|
||||
|
||||
url = 'software_configs'
|
||||
resp, body = self.post(url, headers=headers, body=body)
|
||||
self.expected_success(200, resp)
|
||||
body = json.loads(body)
|
||||
return body
|
||||
|
||||
def get_software_config(self, conf_id):
|
||||
"""Returns a software configuration resource."""
|
||||
url = 'software_configs/%s' % str(conf_id)
|
||||
resp, body = self.get(url)
|
||||
self.expected_success(200, resp)
|
||||
body = json.loads(body)
|
||||
return body
|
||||
|
||||
def delete_software_config(self, conf_id):
|
||||
"""Deletes a specific software configuration."""
|
||||
url = 'software_configs/%s' % str(conf_id)
|
||||
resp, _ = self.delete(url)
|
||||
self.expected_success(204, resp)
|
||||
|
||||
def create_software_deploy(self, server_id=None, config_id=None,
|
||||
action=None, status=None,
|
||||
input_values=None, output_values=None,
|
||||
status_reason=None, signal_transport=None):
|
||||
"""Creates or updates a software deployment."""
|
||||
headers, body = self._prep_software_deploy_update(
|
||||
None, server_id, config_id, action, status, input_values,
|
||||
output_values, status_reason, signal_transport)
|
||||
|
||||
url = 'software_deployments'
|
||||
resp, body = self.post(url, headers=headers, body=body)
|
||||
self.expected_success(200, resp)
|
||||
body = json.loads(body)
|
||||
return body
|
||||
|
||||
def update_software_deploy(self, deploy_id=None, server_id=None,
|
||||
config_id=None, action=None, status=None,
|
||||
input_values=None, output_values=None,
|
||||
status_reason=None, signal_transport=None):
|
||||
"""Creates or updates a software deployment."""
|
||||
headers, body = self._prep_software_deploy_update(
|
||||
deploy_id, server_id, config_id, action, status, input_values,
|
||||
output_values, status_reason, signal_transport)
|
||||
|
||||
url = 'software_deployments/%s' % str(deploy_id)
|
||||
resp, body = self.put(url, headers=headers, body=body)
|
||||
self.expected_success(200, resp)
|
||||
body = json.loads(body)
|
||||
return body
|
||||
|
||||
def get_software_deploy_list(self):
|
||||
"""Returns a list of all deployments."""
|
||||
url = 'software_deployments'
|
||||
resp, body = self.get(url)
|
||||
self.expected_success(200, resp)
|
||||
body = json.loads(body)
|
||||
return body
|
||||
|
||||
def get_software_deploy(self, deploy_id):
|
||||
"""Returns a specific software deployment."""
|
||||
url = 'software_deployments/%s' % str(deploy_id)
|
||||
resp, body = self.get(url)
|
||||
self.expected_success(200, resp)
|
||||
body = json.loads(body)
|
||||
return body
|
||||
|
||||
def get_software_deploy_meta(self, server_id):
|
||||
"""Return a config metadata for a specific server."""
|
||||
url = 'software_deployments/metadata/%s' % server_id
|
||||
resp, body = self.get(url)
|
||||
self.expected_success(200, resp)
|
||||
body = json.loads(body)
|
||||
return body
|
||||
|
||||
def delete_software_deploy(self, deploy_id):
|
||||
"""Deletes a specific software deployment."""
|
||||
url = 'software_deployments/%s' % str(deploy_id)
|
||||
resp, _ = self.delete(url)
|
||||
self.expected_success(204, resp)
|
||||
|
||||
def _prep_software_config_create(self, name=None, conf=None, group=None,
|
||||
inputs=None, outputs=None, options=None):
|
||||
"""Prepares a software configuration body."""
|
||||
post_body = {}
|
||||
if name is not None:
|
||||
post_body["name"] = name
|
||||
if conf is not None:
|
||||
post_body["config"] = conf
|
||||
if group is not None:
|
||||
post_body["group"] = group
|
||||
if inputs is not None:
|
||||
post_body["inputs"] = inputs
|
||||
if outputs is not None:
|
||||
post_body["outputs"] = outputs
|
||||
if options is not None:
|
||||
post_body["options"] = options
|
||||
body = json.dumps(post_body)
|
||||
|
||||
headers = self.get_headers()
|
||||
return headers, body
|
||||
|
||||
def _prep_software_deploy_update(self, deploy_id=None, server_id=None,
|
||||
config_id=None, action=None, status=None,
|
||||
input_values=None, output_values=None,
|
||||
status_reason=None,
|
||||
signal_transport=None):
|
||||
"""Prepares a deployment create or update (if an id was given)."""
|
||||
post_body = {}
|
||||
|
||||
if deploy_id is not None:
|
||||
post_body["id"] = deploy_id
|
||||
if server_id is not None:
|
||||
post_body["server_id"] = server_id
|
||||
if config_id is not None:
|
||||
post_body["config_id"] = config_id
|
||||
if action is not None:
|
||||
post_body["action"] = action
|
||||
if status is not None:
|
||||
post_body["status"] = status
|
||||
if input_values is not None:
|
||||
post_body["input_values"] = input_values
|
||||
if output_values is not None:
|
||||
post_body["output_values"] = output_values
|
||||
if status_reason is not None:
|
||||
post_body["status_reason"] = status_reason
|
||||
if signal_transport is not None:
|
||||
post_body["signal_transport"] = signal_transport
|
||||
body = json.dumps(post_body)
|
||||
|
||||
headers = self.get_headers()
|
||||
return headers, body
|
||||
|
|
|
|||
Loading…
Reference in New Issue