summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-12-14 04:14:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-12-14 04:14:50 +0000
commitaf65e938889ba7d6f68176864fed3f1a41f8f7e8 (patch)
treeba90a5625a9b23fcc80025d5ed72932a42efa17b
parent26938b0cabc4841e7e75847b728bf7cf54db6aad (diff)
parenta98d00fcdaeaf801be08c6f561fe1a0cab955a5a (diff)
Merge "Addition of IPv6 icpm, udp and tcp to Neutron Security Group" into stable/euphrates
-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'}
]
}
}