summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanielMartinBuckley <daniel.m.buckley@intel.com>2017-11-03 11:28:23 +0000
committerRoss Brattain <ross.b.brattain@intel.com>2017-12-14 03:45:55 +0000
commita98d00fcdaeaf801be08c6f561fe1a0cab955a5a (patch)
treecfb69bde921a5a30501902ae3e179ab4b6990a09
parent4f0b2293ce25d8311d352bc4f10708d6a1e00c79 (diff)
Addition of IPv6 icpm, udp and tcp to Neutron Security Group
When creating a Neutron security group for a heat template. Add IPv6 security group rules to access the resouces. Change-Id: I0b541dfe400121e35908a70778665ee1576f0622 Signed-off-by: Daniel Martin Buckley <daniel.m.buckley@intel.com> (cherry picked from commit 3cfdda00a291cf911e2948da774929ad23a60452)
-rw-r--r--yardstick/orchestrator/heat.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py
index 455ddc34e..57847bfa9 100644
--- a/yardstick/orchestrator/heat.py
+++ b/yardstick/orchestrator/heat.py
@@ -497,7 +497,7 @@ name (i.e. %s).\
'type': 'OS::Neutron::SecurityGroup',
'properties': {
'name': name,
- 'description': "Group allowing icmp and upd/tcp on all ports",
+ 'description': "Group allowing IPv4 and IPv6 for icmp and upd/tcp on all ports",
'rules': [
{'remote_ip_prefix': '0.0.0.0/0',
'protocol': 'tcp',
@@ -508,7 +508,20 @@ name (i.e. %s).\
'port_range_min': '1',
'port_range_max': '65535'},
{'remote_ip_prefix': '0.0.0.0/0',
- 'protocol': 'icmp'}
+ 'protocol': 'icmp'},
+ {'remote_ip_prefix': '::/0',
+ 'ethertype': 'IPv6',
+ 'protocol': 'tcp',
+ 'port_range_min': '1',
+ 'port_range_max': '65535'},
+ {'remote_ip_prefix': '::/0',
+ 'ethertype': 'IPv6',
+ 'protocol': 'udp',
+ 'port_range_min': '1',
+ 'port_range_max': '65535'},
+ {'remote_ip_prefix': '::/0',
+ 'ethertype': 'IPv6',
+ 'protocol': 'ipv6-icmp'}
]
}
}