From 329316b4ccbd3ed1de6511bb7137d37e873ebd8b Mon Sep 17 00:00:00 2001
From: rexlee8776 <limingjiang@huawei.com>
Date: Wed, 21 Sep 2016 00:08:22 +0000
Subject: bugfix: ipv6 in mitaka ping6 fail in compass

JIRA: YARDSTICK-317

Change-Id: I2ef9b7647f02a8dc96906c960c01797f426b575b
Signed-off-by: rexlee8776 <limingjiang@huawei.com>
---
 yardstick/benchmark/scenarios/networking/ping6_metadata.txt | 9 ---------
 yardstick/benchmark/scenarios/networking/ping6_setup.bash   | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'yardstick/benchmark/scenarios/networking')

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
-- 
cgit 1.2.3-korg