Merge "Add functional test for public baymodel"

This commit is contained in:
Jenkins 2016-08-02 02:40:03 +00:00 committed by Gerrit Code Review
commit 153120e438
2 changed files with 11 additions and 2 deletions

View File

@ -72,6 +72,15 @@ class BayModelTest(base.BaseMagnumTest):
gen_model = datagen.baymodel_data_with_valid_keypair_image_flavor()
resp, model = self._create_baymodel(gen_model)
@testtools.testcase.attr('positive')
def test_create_get_public_baymodel(self):
gen_model = datagen.valid_swarm_baymodel(is_public=True)
resp, model = self._create_baymodel(gen_model)
resp, model = self.baymodel_client.get_baymodel(model.uuid)
self.assertEqual(200, resp.status)
self.assertTrue(model.public)
@testtools.testcase.attr('positive')
def test_update_baymodel_by_uuid(self):
gen_model = datagen.baymodel_data_with_valid_keypair_image_flavor()

View File

@ -206,7 +206,7 @@ def baymodel_valid_data_with_specific_coe(coe):
image_id=config.Config.image_id, coe=coe)
def valid_swarm_baymodel():
def valid_swarm_baymodel(is_public=False):
"""Generates a valid swarm baymodel with valid data
:returns: BayModelEntity with generated data
@ -214,7 +214,7 @@ def valid_swarm_baymodel():
return baymodel_data(image_id=config.Config.image_id,
fixed_network="192.168.0.0/24",
flavor_id=config.Config.flavor_id, public=False,
flavor_id=config.Config.flavor_id, public=is_public,
dns_nameserver=config.Config.dns_nameserver,
master_flavor_id=config.Config.master_flavor_id,
keypair_id=config.Config.keypair_id, coe="swarm",