openstack
/
kuryr-tempest-plugin
Code Issues Proposed changes

Merge "Ensure correct failure message is checked on CRD validation"

This commit is contained in:
Zuul 2019-11-20 09:22:35 +00:00 committed by Gerrit Code Review
parent 2619af8513 feaef8ed86
commit 1a7a438a4d
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kuryr_tempest_plugin/tests/scenario/test_namespace.py
View File

@ -297,7 +297,8 @@ class TestNamespaceScenario(base.BaseKuryrScenarioTest):
kuryrnet = dict(self._get_kuryrnet_obj())
del kuryrnet['spec']['netId']
error_msg = 'spec.netId in body is required'
self._create_kuryr_net_crd_obj(kuryrnet, error_msg)
field = 'spec.netId'
self._create_kuryr_net_crd_obj(kuryrnet, error_msg, field)
@decorators.idempotent_id('94641749-9fdf-4fb2-a46d-064f75eac113')
def test_create_kuryrnet_crd_with_populated_as_string(self):
@ -307,7 +308,8 @@ class TestNamespaceScenario(base.BaseKuryrScenarioTest):
kuryrnet = dict(self._get_kuryrnet_obj())
kuryrnet['spec']['populated'] = 'False'
error_msg = 'spec.populated in body must be of type boolean'
self._create_kuryr_net_crd_obj(kuryrnet, error_msg)
field = 'populated'
self._create_kuryr_net_crd_obj(kuryrnet, error_msg, field)
def _get_kuryrnet_obj(self):
return {
@ -327,7 +329,7 @@ class TestNamespaceScenario(base.BaseKuryrScenarioTest):
}
}
def _create_kuryr_net_crd_obj(self, crd_manifest, error_msg):
def _create_kuryr_net_crd_obj(self, crd_manifest, error_msg, field):
version = 'v1'
group = 'openstack.org'
plural = 'kuryrnets'
@ -340,8 +342,13 @@ class TestNamespaceScenario(base.BaseKuryrScenarioTest):
self.assertEqual(e.status, 422)
error_body = json.loads(e.body)
error_causes = error_body['details']['causes']
self.assertTrue(error_msg in
error_causes[0]['message'])
err_msg_cause = error_causes[0].get('message', "")
err_field_cause = error_causes[0].get('field', "[]")
if err_field_cause != "[]":
self.assertTrue(field in
err_field_cause)
else:
self.assertTrue(error_msg in err_msg_cause)
else:
body = self.k8s_client.V1DeleteOptions()
self.addCleanup(custom_obj_api.delete_cluster_custom_object,

20
kuryr_tempest_plugin/tests/scenario/test_network_policy.py
View File

@ -281,7 +281,8 @@ class TestNetworkPolicyScenario(base.BaseKuryrScenarioTest):
knp_obj = dict(self._get_knp_obj(np_name))
del knp_obj['spec']['ingressSgRules']
error_msg = 'ingressSgRules in body is required'
self._create_kuryr_net_policy_crd_obj(knp_obj, error_msg)
field = 'ingressSgRules'
self._create_kuryr_net_policy_crd_obj(knp_obj, error_msg, field)
@decorators.idempotent_id('f036d26e-f603-4d00-ad92-b409b5a3ee6c')
def test_create_knp_crd_without_sg_rule_id(self):
@ -293,7 +294,8 @@ class TestNetworkPolicyScenario(base.BaseKuryrScenarioTest):
del sg_rule['id']
knp_obj = self._get_knp_obj(np_name, sg_rule)
error_msg = 'security_group_rule.id in body is required'
self._create_kuryr_net_policy_crd_obj(knp_obj, error_msg)
field = 'security_group_rule.id'
self._create_kuryr_net_policy_crd_obj(knp_obj, error_msg, field)
@decorators.idempotent_id('47f0e412-3e13-40b2-93e5-503790df870b')
def test_create_knp_crd_with_networkpolicy_spec_wrong_type(self):
@ -304,7 +306,8 @@ class TestNetworkPolicyScenario(base.BaseKuryrScenarioTest):
knp_obj = dict(self._get_knp_obj(np_name))
knp_obj['spec']['networkpolicy_spec'] = []
error_msg = 'networkpolicy_spec in body must be of type object'
self._create_kuryr_net_policy_crd_obj(knp_obj, error_msg)
field = 'networkpolicy_spec'
self._create_kuryr_net_policy_crd_obj(knp_obj, error_msg, field)
def _get_sg_rule(self):
return {
@ -342,7 +345,7 @@ class TestNetworkPolicyScenario(base.BaseKuryrScenarioTest):
'securityGroupName': "sg-" + name}}
def _create_kuryr_net_policy_crd_obj(self, crd_manifest, error_msg,
namespace='default'):
field, namespace='default'):
version = 'v1'
group = 'openstack.org'
plural = 'kuryrnetpolicies'
@ -355,8 +358,13 @@ class TestNetworkPolicyScenario(base.BaseKuryrScenarioTest):
self.assertEqual(e.status, 422)
error_body = json.loads(e.body)
error_causes = error_body['details']['causes']
self.assertTrue(error_msg in
error_causes[0]['message'])
err_msg_cause = error_causes[0].get('message', "")
err_field_cause = error_causes[0].get('field', "[]")
if err_field_cause != "[]":
self.assertTrue(field in
err_field_cause)
else:
self.assertTrue(error_msg in err_msg_cause)
else:
body = self.k8s_client.V1DeleteOptions()
self.addCleanup(custom_obj_api.delete_namespaced_custom_object,