diff --git a/tempest/api/compute/admin/test_security_group_default_rules.py b/tempest/api/compute/admin/test_security_group_default_rules.py index 5ae6553e1..74f3caa2d 100644 --- a/tempest/api/compute/admin/test_security_group_default_rules.py +++ b/tempest/api/compute/admin/test_security_group_default_rules.py @@ -48,7 +48,7 @@ class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest): ip_protocol=ip_protocol, from_port=from_port, to_port=to_port, - cidr=cidr) + cidr=cidr)['security_group_default_rule'] self.assertEqual(ip_protocol, rule['ip_protocol']) self.assertEqual(from_port, rule['from_port']) self.assertEqual(to_port, rule['to_port']) @@ -75,7 +75,7 @@ class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest): rule = self.adm_client.create_security_default_group_rule( ip_protocol=ip_protocol, from_port=from_port, - to_port=to_port) + to_port=to_port)['security_group_default_rule'] self.addCleanup(self.adm_client.delete_security_group_default_rule, rule['id']) self.assertNotEqual(0, rule['id']) @@ -91,7 +91,7 @@ class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest): ip_protocol=ip_protocol, from_port=from_port, to_port=to_port, - cidr=cidr) + cidr=cidr)['security_group_default_rule'] self.addCleanup(self.adm_client.delete_security_group_default_rule, rule['id']) self.assertNotEqual(0, rule['id']) @@ -109,7 +109,8 @@ class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest): cidr) self.addCleanup(self.adm_client.delete_security_group_default_rule, rule['id']) - rules = self.adm_client.list_security_group_default_rules() + rules = (self.adm_client.list_security_group_default_rules() + ['security_group_default_rules']) self.assertNotEqual(0, len(rules)) self.assertIn(rule, rules) @@ -126,5 +127,5 @@ class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest): self.addCleanup(self.adm_client.delete_security_group_default_rule, rule['id']) fetched_rule = self.adm_client.show_security_group_default_rule( - rule['id']) + rule['id'])['security_group_default_rule'] self.assertEqual(rule, fetched_rule) diff --git a/tempest/services/compute/json/security_group_default_rules_client.py b/tempest/services/compute/json/security_group_default_rules_client.py index 658b89aef..6e4d1e442 100644 --- a/tempest/services/compute/json/security_group_default_rules_client.py +++ b/tempest/services/compute/json/security_group_default_rules_client.py @@ -36,8 +36,7 @@ class SecurityGroupDefaultRulesClient(service_client.ServiceClient): body = json.loads(body) self.validate_response(schema.create_get_security_group_default_rule, resp, body) - rule = body['security_group_default_rule'] - return service_client.ResponseBody(resp, rule) + return service_client.ResponseBody(resp, body) def delete_security_group_default_rule(self, security_group_default_rule_id): @@ -54,8 +53,7 @@ class SecurityGroupDefaultRulesClient(service_client.ServiceClient): body = json.loads(body) self.validate_response(schema.list_security_group_default_rules, resp, body) - rules = body['security_group_default_rules'] - return service_client.ResponseBodyList(resp, rules) + return service_client.ResponseBody(resp, body) def show_security_group_default_rule(self, security_group_default_rule_id): """Return the details of provided Security Group default rule.""" @@ -64,5 +62,4 @@ class SecurityGroupDefaultRulesClient(service_client.ServiceClient): body = json.loads(body) self.validate_response(schema.create_get_security_group_default_rule, resp, body) - rule = body['security_group_default_rule'] - return service_client.ResponseBody(resp, rule) + return service_client.ResponseBody(resp, body)