openstack
/
magnum-tempest-plugin
Code Issues Proposed changes

Merge "Allow keypair to be added during cluster create"

This commit is contained in:
Jenkins 2016-10-07 23:30:00 +00:00 committed by Gerrit Code Review
parent 53285cfb1a 317e1e69ca
commit 827cba713c
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
magnum/tests/functional/api/v1/test_baymodel.py
View File

@ -185,13 +185,6 @@ class BayModelTest(base.BaseTempestTest):
exceptions.BadRequest,
self.baymodel_client.post_baymodel, gen_model)
@testtools.testcase.attr('negative')
def test_create_baymodel_missing_keypair(self):
gen_model = datagen.baymodel_data_with_missing_keypair()
self.assertRaises(
exceptions.NotFound,
self.baymodel_client.post_baymodel, gen_model)
@testtools.testcase.attr('negative')
def test_update_baymodel_invalid_patch(self):
# get json object

6
magnum/tests/functional/api/v1/test_cluster_template.py
View File

@ -200,13 +200,11 @@ class ClusterTemplateTest(base.BaseTempestTest):
exceptions.BadRequest,
self.cluster_template_client.post_cluster_template, gen_model)
@testtools.testcase.attr('negative')
@testtools.testcase.attr('positive')
def test_create_cluster_template_missing_keypair(self):
gen_model = \
datagen.cluster_template_data_with_missing_keypair()
self.assertRaises(
exceptions.NotFound,
self.cluster_template_client.post_cluster_template, gen_model)
resp, model = self._create_cluster_template(gen_model)
@testtools.testcase.attr('negative')
def test_update_cluster_template_invalid_patch(self):

2
magnum/tests/functional/common/datagen.py
View File

@ -502,7 +502,6 @@ def valid_swarm_cluster_template(is_public=False):
public=is_public,
dns_nameserver=config.Config.dns_nameserver,
master_flavor_id=master_flavor_id,
keypair_id=config.Config.keypair_id,
coe="swarm", docker_volume_size=3,
cluster_distro=None,
external_network_id=config.Config.nic_id,
@ -535,6 +534,7 @@ def cluster_data(name=data_utils.rand_name('cluster'),
data = {
"name": name,
"cluster_template_id": cluster_template_id,
"keypair": config.Config.keypair_id,
"node_count": node_count,
"discovery_url": None,
"create_timeout": create_timeout,