x/vmtp
Code Issues Proposed changes

[IPv6] Minor bug fixes to support IPv6

Browse Source 
Change-Id: I6548e44897a04f92b9008e56ed828bdb0d74f502
This commit is contained in:
Sharmin Choksey 2018-04-02 21:42:52 -07:00
parent 5c2a5187c2
commit 3eccdf2433
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmtp/cfg.default.yaml
View File

@ -117,7 +117,7 @@ internal_network_name: ['pns-internal-net', 'pns-internal-net2']
internal_subnet_name: ['pns-internal-subnet', 'pns-internal-subnet2'] internal_subnet_name: ['pns-internal-subnet', 'pns-internal-subnet2']
# Name of the subnets for ipv6 # Name of the subnets for ipv6
internal_subnet_name_ipv6: ['pns-internal-v6-subnet','pns-internal-v6-subnet2'] internal_subnet_name_v6: ['pns-internal-v6-subnet','pns-internal-v6-subnet2']
# Default CIDRs to use for the internal mgmt subnet # Default CIDRs to use for the internal mgmt subnet
internal_cidr: ['192.168.1.0/24' , '192.168.2.0/24'] internal_cidr: ['192.168.1.0/24' , '192.168.2.0/24']

25
vmtp/compute.py
View File

@ -436,7 +436,7 @@ class Compute(object):
self.neutron.create_security_group_rule( self.neutron.create_security_group_rule(
self.generate_security_group_rule_dict(group_id=group["id"], self.generate_security_group_rule_dict(group_id=group["id"],
protocol="icmp", protocol="icmp",
ether_type="IPv6")) ethertype="IPv6"))
# Allow SSH traffic # Allow SSH traffic
self.neutron.create_security_group_rule( self.neutron.create_security_group_rule(
@ -480,13 +480,18 @@ class Compute(object):
def generate_security_group_rule_dict(self, group_id, protocol, ethertype='IPv4', def generate_security_group_rule_dict(self, group_id, protocol, ethertype='IPv4',
port_range_min=None, port_range_min=None,
port_range_max=None): port_range_max=None):
remote_ip_prefix = '0.0.0.0/0'
security_group_rule = {
'direction': 'ingress',
'security_group_id': group_id,
'ethertype': ethertype,
'port_range_min': port_range_min,
'port_range_max': port_range_max,
'protocol': protocol,
'remote_group_id': None}
if ethertype == 'IPv6':
remote_ip_prefix = '::/0'
security_group_rule.update({'remote_ip_prefix': remote_ip_prefix})
return { return {
'security_group_rule': { 'security_group_rule': security_group_rule}
'direction': 'ingress',
'security_group_id': group_id,
'ethertype': ethertype,
'port_range_min': port_range_min,
'port_range_max': port_range_max,
'protocol': protocol,
'remote_group_id': None,
'remote_ip_prefix': '0.0.0.0/0'}}