Merge "Update scenario test results file for Colorado release"

diff --git a/etc/yardstick/nodes/fuel_virtual/id_rsa b/etc/yardstick/nodes/fuel_virtual/id_rsa
deleted file mode 100644 (file)
index 35ac1b5..0000000
--- a/etc/yardstick/nodes/fuel_virtual/id_rsa
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA24CCFpmsaPUt9KJsaER/R4IyYvOd0iOXhFuOUCl4nJvBnlXu
-D8Pzombgz6bZcHx96ukgmOKq/Bf0tPA4fN733fw/Jjb4t6O4HFVpcBZykcgdnB56
-pqwN108pQZCq8R3EiKU3BgL2nWi9YP94JxsbD8I6vcQVbG7SMeJ0YpQzNYyJ1ig9
-fjff7ROuOc+XVZhG7UtbCz7adGS2/FfGgXz49mLS98pNLMOAUSUtoBog0CveotXM
-rWT9OOOpTTihWFspVU1cnT1LGJ+MYVRX2uF7sZASsglwA0kzjlf1nzQ8fGXC3o7D
-kFPdM1jtHWf4ah4DSb2e/LnCrwqBgmMyKpV+AQIBIwKCAQEA1TsCB1N0SLOo/EYC
-6PIVPia0mqODXmu3wmeRj7NB9zg4be0TJUICncMGRg/L6Z2Bol7PNW56NrgvizKA
-BEZP3vUKJR91RK2riT0HVvE8GJaDKfG4+a5z2HjI/dz91EjNjA41c43ZoDncihy9
-3NiAsDkF3Opd9E5lyg8vOzDhSfRwCg2u2HMiGy9/yB+V8x8QJ2vjDzXI1Nn40jAa
-azw94wIdkHCrXRbt3z5zNMNRTQtGUD1uUSsTGO2AH4LY/Dtq0kAZw2f4dgfZS8f3
-FGIa2o3wpJfgZWmHS+jWBg1ADZTr45Ur2BpKIo/GcjeTdf8DkNQ2/hy0x3JGBVBE
-e5HvYwKBgQDzb5ApXZu7gOm5XOCWC0cNiqQT7VUHQMdc9i7waV862kH7+Jn1nPBj
-QsJQhGVrB/vP3PhkGbRHp86QBJiwTpY4m9YQFfvFH47a2NWrlafNyvQ5y37OIsD0
-ib8vYRXQrBFnrkBn+wCbDNTy04v3hbPayN5OC7EwT1g7PbexIpYH7wKBgQDm1Lcr
-bvhyQR61FnQjKmX0DOVk6Jve0Pk0PNkzXm7JsnF8U+mJClmgqJOEoaBaj3dGZDTC
-TzGLUcZCkZk+2PEv8BcyAd4GNETZYCHEgxDsnDbotZPvlkFCzQr4+6delSv+8zTM
-kTgyEf8IW8/4Jy7wIH1UkRgyoXFYin6F1BZpDwKBgQDekeLj/dA2ZzwXMFhOqzml
-+xmr0azTbm0hyyOZ+fCq1i2zLG+BeYtTcDyhYxrlg6RmRl9xdpYy4pD4s77NFKaa
-KBQr9tePp9MRO0cDRv/SGKTHIHPvqr8LdqArUXMH7cbFMZn4qvk9TY9+7UzFDIcu
-boIbeGd8oFCrMRz5uTi2ywKBgQCXsFscisCFmIHktvvcmDRejCG3VwdX6Gk/lbNN
-pHSwbfLOC0Gx05n73H4ylhjrDdIJr5Bibo5FnCMzDzjRhz9opRaOk4NF59V452al
-tTcB4v+C+vrQpJFJJ6gf9dRiucx0Vq2rAFgg50ExYOfAVENqmQHnHYTuElHMeESD
-1IPBYQKBgQDUEnv0htzJjJef2080CMN4RG+Sq2PHBkFlwe6fL52+AVv/zyCqKqy5
-TXRV1tHnMTII68+/NobwG+UC8dCBQSFmbLEqHcLF1+PxtOiSkRotU8rBZAafuMCS
-ajH+CdGMwUkMvsPL2PnnX/A6w0PJZM/arpou9qOI1bzxQuL7h43zzw==
------END RSA PRIVATE KEY-----

diff --git a/yardstick/benchmark/scenarios/networking/ping6.py b/yardstick/benchmark/scenarios/networking/ping6.py
index dc896b2..817f3e2 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/ping6.py
+++ b/yardstick/benchmark/scenarios/networking/ping6.py
@@ -86,7 +86,7 @@ class Ping6(base.Scenario):  # pragma: no cover
         options = self.scenario_cfg['options']
         self.ping_options = "-s %s" % \
             options.get("packetsize", '56') + \
-            "-c %s" % \
+            " -c %s" % \
             options.get("ping_count", '5')
         host_str = options.get("host", 'host1')
         self.host_list = host_str.split(',')
@@ -133,7 +133,7 @@ class Ping6(base.Scenario):  # pragma: no cover
             options = self.scenario_cfg['options']
             self.ping_options = "-s %s" % \
                 options.get("packetsize", '56') + \
-                "-c %s" % \
+                " -c %s" % \
                 options.get("ping_count", '5')
             host_str = options.get("host", 'host1')
             self.host_list = host_str.split(',')

diff --git a/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash b/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash
index 9a08b09..bf730eb 100644 (file)
--- a/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash
+++ b/yardstick/benchmark/scenarios/networking/ping6_benchmark.bash
@@ -11,7 +11,7 @@
 
 # Run a single ping6 command towards a ipv6 router
 set -e
-ping6_options=$1
+ping6_options=$*
 source /opt/admin-openrc.sh
 chmod 600 vRouterKey
 # TODO find host

diff --git a/yardstick/benchmark/scenarios/networking/ping6_metadata.txt b/yardstick/benchmark/scenarios/networking/ping6_metadata.txt
index 82accbf..ad97b24 100644 (file)
--- 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 b2f324f..267fb3e 100644 (file)
--- 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