Make security_group_default_rules_client use kwargs
As we discussed on
http://lists.openstack.org/pipermail/openstack-dev/2015-July/068864.html
All http POST/PUT methods need to contain **kwargs as their arguments.
This patch makes security_group_default_rules_client use **kwargs.
Partially implements blueprint consistent-service-method-names
Change-Id: I809523507e77b2356fe79757d881b84243ecce1e
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 13d6cc0..5ae6553 100644
--- a/tempest/api/compute/admin/test_security_group_default_rules.py
+++ b/tempest/api/compute/admin/test_security_group_default_rules.py
@@ -45,9 +45,9 @@
cidr='10.10.0.0/24'):
# Create Security Group default rule
rule = self.adm_client.create_security_default_group_rule(
- ip_protocol,
- from_port,
- to_port,
+ ip_protocol=ip_protocol,
+ from_port=from_port,
+ to_port=to_port,
cidr=cidr)
self.assertEqual(ip_protocol, rule['ip_protocol'])
self.assertEqual(from_port, rule['from_port'])
@@ -73,9 +73,9 @@
from_port = 80
to_port = 80
rule = self.adm_client.create_security_default_group_rule(
- ip_protocol,
- from_port,
- to_port)
+ ip_protocol=ip_protocol,
+ from_port=from_port,
+ to_port=to_port)
self.addCleanup(self.adm_client.delete_security_group_default_rule,
rule['id'])
self.assertNotEqual(0, rule['id'])
@@ -88,9 +88,9 @@
to_port = 10
cidr = ''
rule = self.adm_client.create_security_default_group_rule(
- ip_protocol,
- from_port,
- to_port,
+ ip_protocol=ip_protocol,
+ from_port=from_port,
+ to_port=to_port,
cidr=cidr)
self.addCleanup(self.adm_client.delete_security_group_default_rule,
rule['id'])
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 fcc715a..658b89a 100644
--- a/tempest/services/compute/json/security_group_default_rules_client.py
+++ b/tempest/services/compute/json/security_group_default_rules_client.py
@@ -22,8 +22,7 @@
class SecurityGroupDefaultRulesClient(service_client.ServiceClient):
- def create_security_default_group_rule(self, ip_protocol, from_port,
- to_port, **kwargs):
+ def create_security_default_group_rule(self, **kwargs):
"""
Creating security group default rules.
ip_protocol : ip_protocol (icmp, tcp, udp).
@@ -31,13 +30,7 @@
to_port : Port at end of range.
cidr : CIDR for address range.
"""
- post_body = {
- 'ip_protocol': ip_protocol,
- 'from_port': from_port,
- 'to_port': to_port,
- 'cidr': kwargs.get('cidr'),
- }
- post_body = json.dumps({'security_group_default_rule': post_body})
+ post_body = json.dumps({'security_group_default_rule': kwargs})
url = 'os-security-group-default-rules'
resp, body = self.post(url, post_body)
body = json.loads(body)