openstack/tempest
Code Issues Proposed changes

Merge "Return complete resp from sec grp default rule client"

Browse Source
This commit is contained in:
Jenkins
2015-08-25 19:14:58 +00:00
committed by Gerrit Code Review
parent 00eb71fe86 b3dcdfdf1d
commit f39d9c9aba
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tempest/api/compute/admin/test_security_group_default_rules.py
View File

@@ -48,7 +48,7 @@ class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest):
ip_protocol=ip_protocol, ip_protocol=ip_protocol,
from_port=from_port, from_port=from_port,
to_port=to_port, to_port=to_port,
cidr=cidr) cidr=cidr)['security_group_default_rule']
self.assertEqual(ip_protocol, rule['ip_protocol']) self.assertEqual(ip_protocol, rule['ip_protocol'])
self.assertEqual(from_port, rule['from_port']) self.assertEqual(from_port, rule['from_port'])
self.assertEqual(to_port, rule['to_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( rule = self.adm_client.create_security_default_group_rule(
ip_protocol=ip_protocol, ip_protocol=ip_protocol,
from_port=from_port, 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, self.addCleanup(self.adm_client.delete_security_group_default_rule,
rule['id']) rule['id'])
self.assertNotEqual(0, rule['id']) self.assertNotEqual(0, rule['id'])
@@ -91,7 +91,7 @@ class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest):
ip_protocol=ip_protocol, ip_protocol=ip_protocol,
from_port=from_port, from_port=from_port,
to_port=to_port, to_port=to_port,
cidr=cidr) cidr=cidr)['security_group_default_rule']
self.addCleanup(self.adm_client.delete_security_group_default_rule, self.addCleanup(self.adm_client.delete_security_group_default_rule,
rule['id']) rule['id'])
self.assertNotEqual(0, rule['id']) self.assertNotEqual(0, rule['id'])
@@ -109,7 +109,8 @@ class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest):
cidr) cidr)
self.addCleanup(self.adm_client.delete_security_group_default_rule, self.addCleanup(self.adm_client.delete_security_group_default_rule,
rule['id']) 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.assertNotEqual(0, len(rules))
self.assertIn(rule, rules) self.assertIn(rule, rules)
@@ -126,5 +127,5 @@ class SecurityGroupDefaultRulesTest(base.BaseV2ComputeAdminTest):
self.addCleanup(self.adm_client.delete_security_group_default_rule, self.addCleanup(self.adm_client.delete_security_group_default_rule,
rule['id']) rule['id'])
fetched_rule = self.adm_client.show_security_group_default_rule( fetched_rule = self.adm_client.show_security_group_default_rule(
rule['id']) rule['id'])['security_group_default_rule']
self.assertEqual(rule, fetched_rule) self.assertEqual(rule, fetched_rule)

9
tempest/services/compute/json/security_group_default_rules_client.py
View File

@@ -36,8 +36,7 @@ class SecurityGroupDefaultRulesClient(service_client.ServiceClient):
body = json.loads(body) body = json.loads(body)
self.validate_response(schema.create_get_security_group_default_rule, self.validate_response(schema.create_get_security_group_default_rule,
resp, body) resp, body)
rule = body['security_group_default_rule'] return service_client.ResponseBody(resp, body)
return service_client.ResponseBody(resp, rule)
def delete_security_group_default_rule(self, def delete_security_group_default_rule(self,
security_group_default_rule_id): security_group_default_rule_id):
@@ -54,8 +53,7 @@ class SecurityGroupDefaultRulesClient(service_client.ServiceClient):
body = json.loads(body) body = json.loads(body)
self.validate_response(schema.list_security_group_default_rules, self.validate_response(schema.list_security_group_default_rules,
resp, body) resp, body)
rules = body['security_group_default_rules'] return service_client.ResponseBody(resp, body)
return service_client.ResponseBodyList(resp, rules)
def show_security_group_default_rule(self, security_group_default_rule_id): def show_security_group_default_rule(self, security_group_default_rule_id):
"""Return the details of provided Security Group default rule.""" """Return the details of provided Security Group default rule."""
@@ -64,5 +62,4 @@ class SecurityGroupDefaultRulesClient(service_client.ServiceClient):
body = json.loads(body) body = json.loads(body)
self.validate_response(schema.create_get_security_group_default_rule, self.validate_response(schema.create_get_security_group_default_rule,
resp, body) resp, body)
rule = body['security_group_default_rule'] return service_client.ResponseBody(resp, body)
return service_client.ResponseBody(resp, rule)