openstack/manila
Code Issues Proposed changes

Fixed creation neutron api mapping for security groups

Browse Source 
Fixed creation of security group and security group rule via
neutronclient api mapping.
There was a switch from novaclient to neutronclient
for creating a security groups and rules in change
5d5666b10e57a94bcde06c8a296002175d935c7b but
the argument mapping for this function has not been changed.

Change-Id: I1774b73c61adb3b44a61f3f56f99e85f278deb83
Closes-Bug: 1716922
(cherry picked from commit c93f5833e4100d2325994b1bdf8f0d12b70d00c7)
This commit is contained in:
Jan Vondra 2017-09-13 17:58:37 +02:00 committed by Thomas Bechtold
parent 7bcd528e71
commit 7d7022f743
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manila/network/neutron/api.py
View File

@ -382,23 +382,25 @@ class API(object):
def security_group_create(self, name, description=""):
try:
return self.client.create_security_group(
{"name": name, "description": description})
{'security_group': {"name": name, "description": description}})
except neutron_client_exc.NeutronClientException as e:
raise exception.NetworkException(
code=e.status_code, message=e.message)
def security_group_rule_create(self, parent_group_id,
ip_protocol=None, from_port=None,
to_port=None, cidr=None, group_id=None):
to_port=None, cidr=None, group_id=None,
direction="ingress"):
request = {"security_group_id": parent_group_id,
"protocol": ip_protocol, "remote_ip_prefix": cidr,
"remote_group_id": group_id, "direction": direction}
if ip_protocol != "icmp":
request["port_range_min"] = from_port
request["port_range_max"] = to_port
try:
return self.client.create_security_group_rule({
"parent_group_id": parent_group_id,
"ip_protocol": ip_protocol,
"from_port": from_port,
"to_port": to_port,
"cidr": cidr,
"group_id": group_id,
})
return self.client.create_security_group_rule(
{"security_group_rule": request})
except neutron_client_exc.NeutronClientException as e:
raise exception.NetworkException(
code=e.status_code, message=e.message)

1
manila/share/drivers/service_instance.py
View File

@ -336,7 +336,6 @@ class ServiceInstanceManager(object):
name, description)['security_group']
for protocol, ports in const.SERVICE_INSTANCE_SECGROUP_DATA:
self.network_helper.neutron_api.security_group_rule_create(
context,
parent_group_id=sg['id'],
ip_protocol=protocol,
from_port=ports[0],

4
releasenotes/notes/bug-1716922-security-group-creation-failed-d46085d11370d918.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- Fixed creation of security group and security group rule - neutronclient
mapping