Fix UTs due to change in Heat stack create

Adapting UTs per changes in Heat commits:
a5297fec8a470d2aef8e41c1c4bee16f986aff74
ed52c86549e65544ca9813d0da135b29d31a4460
10a00d3ee4735bd88c6afbefc1b4a7b63104b060

Change-Id: If983dd6dc49d3fa72e2504e225411a1d13230145
Closes-bug: 1476074
This commit is contained in:
Sumit Naiksatam 2015-07-19 20:42:13 -07:00
parent f807d5b72b
commit 61a2c9cfb0
2 changed files with 175 additions and 140 deletions

View File

@ -319,10 +319,10 @@ class PolicyTargetTest(HeatTestCase):
}).AndReturn({'policy_target': {'id': '5678'}})
snippet = template_format.parse(policy_target_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.PolicyTarget(
'policy_target', resource_defns['policy_target'], stack)
'policy_target', resource_defns['policy_target'], self.stack)
def test_create(self):
rsrc = self.create_policy_target()
@ -342,16 +342,17 @@ class PolicyTargetTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(policy_target_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.PolicyTarget(
'policy_target', resource_defns['policy_target'], stack)
'policy_target', resource_defns['policy_target'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_target: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -388,7 +389,8 @@ class PolicyTargetTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
'NeutronClientException: resources.policy_target: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -411,7 +413,7 @@ class PolicyTargetTest(HeatTestCase):
rsrc.FnGetAtt, 'l2_policy_id')
self.assertEqual(
'The Referenced Attribute (policy_target l2_policy_id) is '
'incorrect.', str(error))
'incorrect.', six.text_type(error))
self.m.VerifyAll()
def test_update(self):
@ -459,11 +461,11 @@ class PolicyTargetGroupTest(HeatTestCase):
}).AndReturn({'policy_target_group': {'id': '5678'}})
snippet = template_format.parse(policy_target_group_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.PolicyTargetGroup(
'policy_target_group', resource_defns['policy_target_group'],
stack)
self.stack)
def test_create(self):
rsrc = self.create_policy_target_group()
@ -492,17 +494,18 @@ class PolicyTargetGroupTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(policy_target_group_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.PolicyTargetGroup(
'policy_target_group', resource_defns['policy_target_group'],
stack)
self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_target_group: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -539,8 +542,9 @@ class PolicyTargetGroupTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_target_group: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -607,10 +611,10 @@ class L2PolicyTest(HeatTestCase):
}).AndReturn({'l2_policy': {'id': '5678'}})
snippet = template_format.parse(l2_policy_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.L2Policy(
'l2_policy', resource_defns['l2_policy'], stack)
'l2_policy', resource_defns['l2_policy'], self.stack)
def test_create(self):
rsrc = self.create_l2_policy()
@ -631,16 +635,17 @@ class L2PolicyTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(l2_policy_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.L2Policy(
'l2_policy', resource_defns['l2_policy'], stack)
'l2_policy', resource_defns['l2_policy'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.l2_policy: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -677,8 +682,9 @@ class L2PolicyTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.l2_policy: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -719,10 +725,10 @@ class L3PolicyTest(HeatTestCase):
}).AndReturn({'l3_policy': {'id': '5678'}})
snippet = template_format.parse(l3_policy_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.L3Policy(
'l3_policy', resource_defns['l3_policy'], stack)
'l3_policy', resource_defns['l3_policy'], self.stack)
def test_create(self):
rsrc = self.create_l3_policy()
@ -745,16 +751,17 @@ class L3PolicyTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(l3_policy_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.L3Policy(
'l3_policy', resource_defns['l3_policy'], stack)
'l3_policy', resource_defns['l3_policy'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.l3_policy: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -791,8 +798,9 @@ class L3PolicyTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.l3_policy: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -837,10 +845,11 @@ class PolicyClassifierTest(HeatTestCase):
}).AndReturn({'policy_classifier': {'id': '5678'}})
snippet = template_format.parse(policy_classifier_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.PolicyClassifier(
'policy_classifier', resource_defns['policy_classifier'], stack)
'policy_classifier', resource_defns['policy_classifier'],
self.stack)
def test_create(self):
rsrc = self.create_policy_classifier()
@ -863,16 +872,18 @@ class PolicyClassifierTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(policy_classifier_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.PolicyClassifier(
'policy_classifier', resource_defns['policy_classifier'], stack)
'policy_classifier', resource_defns['policy_classifier'],
self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_classifier: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -909,8 +920,9 @@ class PolicyClassifierTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_classifier: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -950,10 +962,10 @@ class PolicyActionTest(HeatTestCase):
}).AndReturn({'policy_action': {'id': '5678'}})
snippet = template_format.parse(policy_action_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.PolicyAction(
'policy_action', resource_defns['policy_action'], stack)
'policy_action', resource_defns['policy_action'], self.stack)
def test_create(self):
rsrc = self.create_policy_action()
@ -975,16 +987,17 @@ class PolicyActionTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(policy_action_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.PolicyAction(
'policy_action', resource_defns['policy_action'], stack)
'policy_action', resource_defns['policy_action'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_action: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1021,8 +1034,9 @@ class PolicyActionTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_action: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1063,10 +1077,10 @@ class PolicyRuleTest(HeatTestCase):
}).AndReturn({'policy_rule': {'id': '5678'}})
snippet = template_format.parse(policy_rule_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.PolicyRule(
'policy_rule', resource_defns['policy_rule'], stack)
'policy_rule', resource_defns['policy_rule'], self.stack)
def test_create(self):
rsrc = self.create_policy_rule()
@ -1089,16 +1103,17 @@ class PolicyRuleTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(policy_rule_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.PolicyRule(
'policy_rule', resource_defns['policy_rule'], stack)
'policy_rule', resource_defns['policy_rule'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_rule: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1135,8 +1150,9 @@ class PolicyRuleTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_rule: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1177,10 +1193,10 @@ class PolicyRuleSetTest(HeatTestCase):
}).AndReturn({'policy_rule_set': {'id': '5678'}})
snippet = template_format.parse(policy_rule_set_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.PolicyRuleSet(
'policy_rule_set', resource_defns['policy_rule_set'], stack)
'policy_rule_set', resource_defns['policy_rule_set'], self.stack)
def test_create(self):
rsrc = self.create_policy_rule_set()
@ -1203,16 +1219,17 @@ class PolicyRuleSetTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(policy_rule_set_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.PolicyRuleSet(
'policy_rule_set', resource_defns['policy_rule_set'], stack)
'policy_rule_set', resource_defns['policy_rule_set'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_rule_set: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1249,8 +1266,9 @@ class PolicyRuleSetTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.policy_rule_set: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1295,11 +1313,11 @@ class NetworkServicePolicyTest(HeatTestCase):
}).AndReturn({'network_service_policy': {'id': '5678'}})
snippet = template_format.parse(network_service_policy_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.NetworkServicePolicy(
'network_service_policy',
resource_defns['network_service_policy'], stack)
resource_defns['network_service_policy'], self.stack)
def test_create(self):
rsrc = self.create_network_service_policy()
@ -1322,17 +1340,18 @@ class NetworkServicePolicyTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(network_service_policy_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.NetworkServicePolicy(
'network_service_policy',
resource_defns['network_service_policy'], stack)
resource_defns['network_service_policy'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.network_service_policy: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1369,8 +1388,9 @@ class NetworkServicePolicyTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.network_service_policy: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1423,11 +1443,11 @@ class ExternalPolicyTest(HeatTestCase):
}).AndReturn({'external_policy': {'id': '5678'}})
snippet = template_format.parse(external_policy_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.ExternalPolicy(
'external_policy',
resource_defns['external_policy'], stack)
resource_defns['external_policy'], self.stack)
def test_create(self):
rsrc = self.create_external_policy()
@ -1456,17 +1476,18 @@ class ExternalPolicyTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(external_policy_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.ExternalPolicy(
'external_policy',
resource_defns['external_policy'], stack)
resource_defns['external_policy'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.external_policy: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1503,8 +1524,9 @@ class ExternalPolicyTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.external_policy: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1582,11 +1604,11 @@ class ExternalSegmentTest(HeatTestCase):
}).AndReturn({'external_segment': {'id': '5678'}})
snippet = template_format.parse(external_segment_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.ExternalSegment(
'external_segment',
resource_defns['external_segment'], stack)
resource_defns['external_segment'], self.stack)
def test_create(self):
rsrc = self.create_external_segment()
@ -1614,17 +1636,18 @@ class ExternalSegmentTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(external_segment_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.ExternalSegment(
'external_segment',
resource_defns['external_segment'], stack)
resource_defns['external_segment'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.external_segment: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1661,8 +1684,9 @@ class ExternalSegmentTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.external_segment: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1708,11 +1732,11 @@ class NATPoolTest(HeatTestCase):
}).AndReturn({'nat_pool': {'id': '5678'}})
snippet = template_format.parse(nat_pool_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return grouppolicy.NATPool(
'nat_pool',
resource_defns['nat_pool'], stack)
resource_defns['nat_pool'], self.stack)
def test_create(self):
rsrc = self.create_nat_pool()
@ -1735,17 +1759,18 @@ class NATPoolTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(nat_pool_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = grouppolicy.NATPool(
'nat_pool',
resource_defns['nat_pool'], stack)
resource_defns['nat_pool'], self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.nat_pool: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -1782,8 +1807,9 @@ class NATPoolTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.nat_pool: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()

View File

@ -11,6 +11,7 @@
# under the License.
import copy
import six
from gbpautomation.heat.engine.resources import servicechain
from gbpclient.v2_0 import client as gbpclient
@ -81,10 +82,11 @@ class ServiceChainNodeTest(HeatTestCase):
}).AndReturn({'servicechain_node': {'id': '5678'}})
snippet = template_format.parse(servicechain_node_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return servicechain.ServiceChainNode(
'servicechain_node', resource_defns['servicechain_node'], stack)
'servicechain_node', resource_defns['servicechain_node'],
self.stack)
def test_create(self):
rsrc = self.create_servicechain_node()
@ -105,16 +107,18 @@ class ServiceChainNodeTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(servicechain_node_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = servicechain.ServiceChainNode(
'servicechain_node', resource_defns['servicechain_node'], stack)
'servicechain_node', resource_defns['servicechain_node'],
self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.servicechain_node: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -151,8 +155,9 @@ class ServiceChainNodeTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.servicechain_node: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -190,10 +195,11 @@ class ServiceChainSpecTest(HeatTestCase):
}).AndReturn({'servicechain_spec': {'id': '5678'}})
snippet = template_format.parse(servicechain_spec_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
return servicechain.ServiceChainSpec(
'servicechain_spec', resource_defns['servicechain_spec'], stack)
'servicechain_spec', resource_defns['servicechain_spec'],
self.stack)
def test_create(self):
rsrc = self.create_servicechain_spec()
@ -213,16 +219,18 @@ class ServiceChainSpecTest(HeatTestCase):
self.m.ReplayAll()
snippet = template_format.parse(servicechain_spec_template)
stack = utils.parse_stack(snippet)
resource_defns = stack.t.resource_definitions(stack)
self.stack = utils.parse_stack(snippet)
resource_defns = self.stack.t.resource_definitions(self.stack)
rsrc = servicechain.ServiceChainSpec(
'servicechain_spec', resource_defns['servicechain_spec'], stack)
'servicechain_spec', resource_defns['servicechain_spec'],
self.stack)
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.create))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.servicechain_spec: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.CREATE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()
@ -259,8 +267,9 @@ class ServiceChainSpecTest(HeatTestCase):
error = self.assertRaises(exception.ResourceFailure,
scheduler.TaskRunner(rsrc.delete))
self.assertEqual(
'NeutronClientException: An unknown exception occurred.',
str(error))
'NeutronClientException: resources.servicechain_spec: '
'An unknown exception occurred.',
six.text_type(error))
self.assertEqual((rsrc.DELETE, rsrc.FAILED), rsrc.state)
self.m.VerifyAll()