openstack
/
magnum
Code Issues Proposed changes

Merge "Add functional test for image/flavor validation"

This commit is contained in:
Jenkins 2016-07-29 20:15:14 +00:00 committed by Gerrit Code Review
parent 8195aea93e 960448c212
commit ccf938cf74
2 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,14 +146,21 @@ class BayModelTest(base.BaseMagnumTest):
@testtools.testcase.attr('negative')
def test_create_baymodel_missing_image(self):
gen_model = datagen.baymodel_data_with_valid_keypair()
gen_model = datagen.baymodel_data_with_missing_image()
self.assertRaises(
exceptions.BadRequest,
self.baymodel_client.post_baymodel, gen_model)
@testtools.testcase.attr('negative')
def test_create_baymodel_missing_flavor(self):
gen_model = datagen.baymodel_data_with_missing_flavor()
self.assertRaises(
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_valid_image_and_flavor()
gen_model = datagen.baymodel_data_with_missing_keypair()
self.assertRaises(
exceptions.NotFound,
self.baymodel_client.post_baymodel, gen_model)

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

@ -163,13 +163,36 @@ def baymodel_data_with_valid_keypair_image_flavor():
master_flavor_id=config.Config.master_flavor_id)
def baymodel_data_with_valid_keypair():
"""Generates random baymodel data with valid keypair
def baymodel_data_with_missing_image():
"""Generates random baymodel data with missing image
:returns: BayModelEntity with generated data
"""
return baymodel_data(keypair_id=config.Config.keypair_id)
return baymodel_data(keypair_id=config.Config.keypair_id,
flavor_id=config.Config.flavor_id,
master_flavor_id=config.Config.master_flavor_id)
def baymodel_data_with_missing_flavor():
"""Generates random baymodel data with missing flavor
:returns: BayModelEntity with generated data
"""
return baymodel_data(keypair_id=config.Config.keypair_id,
image_id=config.Config.image_id)
def baymodel_data_with_missing_keypair():
"""Generates random baymodel data with missing keypair
:returns: BayModelEntity with generated data
"""
return baymodel_data(image_id=config.Config.image_id,
flavor_id=config.Config.flavor_id,
master_flavor_id=config.Config.master_flavor_id)
def baymodel_valid_data_with_specific_coe(coe):
@ -183,17 +206,6 @@ def baymodel_valid_data_with_specific_coe(coe):
image_id=config.Config.image_id, coe=coe)
def baymodel_data_with_valid_image_and_flavor():
"""Generates random baymodel data with valid image
:returns: BayModelEntity with generated data
"""
return baymodel_data(image_id=config.Config.image_id,
flavor_id=config.Config.flavor_id,
master_flavor_id=config.Config.master_flavor_id)
def valid_swarm_baymodel():
"""Generates a valid swarm baymodel with valid data