summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-09-21 02:37:47 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-21 02:37:47 +0000
commit337919dc676621208026f2b275f01d795b1db894 (patch)
tree25d274fdd257f0f13d167c5bb41e7cc97324f111
parentb3a4107744b2d059663f4d333e4e5d73fc9d8443 (diff)
parent329316b4ccbd3ed1de6511bb7137d37e873ebd8b (diff)
Merge "bugfix: ipv6 in mitaka ping6 fail in compass"
-rw-r--r--yardstick/benchmark/scenarios/networking/ping6_metadata.txt9
-rw-r--r--yardstick/benchmark/scenarios/networking/ping6_setup.bash9
2 files changed, 9 insertions, 9 deletions
diff --git a/yardstick/benchmark/scenarios/networking/ping6_metadata.txt b/yardstick/benchmark/scenarios/networking/ping6_metadata.txt
index 82accbff5..ad97b24c1 100644
--- a/yardstick/benchmark/scenarios/networking/ping6_metadata.txt
+++ b/yardstick/benchmark/scenarios/networking/ping6_metadata.txt
@@ -60,15 +60,6 @@ write_files:
permissions: '0755'
owner: root:root
- content: |
- interface eth0
- {
- AdvSendAdvert on;
- MinRtrAdvInterval 3;
- MaxRtrAdvInterval 10;
- AdvDefaultLifetime 0;
- route 2001:db8:0:2::/64 {
- };
- };
interface eth1
{
AdvSendAdvert on;
diff --git a/yardstick/benchmark/scenarios/networking/ping6_setup.bash b/yardstick/benchmark/scenarios/networking/ping6_setup.bash
index b2f324f76..267fb3ee9 100644
--- a/yardstick/benchmark/scenarios/networking/ping6_setup.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_setup.bash
@@ -78,4 +78,13 @@ nova boot --image Fedora22 --flavor m1.small \
--nic port-id=$(neutron port-list | grep -w eth0-VM2 | awk '{print $2}') \
--key-name vRouterKey VM2
+sleep 60
+
nova list
+# disable eth0-VM1, eth0-VM2 port-security
+for port in eth0-VM1 eth0-VM2
+do
+ neutron port-update --no-security-groups $port
+ neutron port-update $port --port-security-enabled=False
+ neutron port-show $port | grep port_security_enabled
+done