Code Review / csit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (from parent 1: 909f203)
CSIT-351: Testing Ubuntu 16.04.1 changes 90/3290/17
authorpmikus <pmikus@cisco.com>
Thu, 6 Oct 2016 09:44:15 +0000 (10:44 +0100)
committerDave Wallace <dwallacelf@gmail.com>
Fri, 14 Oct 2016 18:08:02 +0000 (18:08 +0000)
- Update the repository to get xenial packages
- Update phy topology files with new pass
- Update bootstrap to use new VIRL image
- Update framework to reflect 16.04 dependencies
- CSIT-116: Modify VIRL username/password

Change-Id: I4de44755170fd0481acef34c7c2d9c299bc300da
Signed-off-by: pmikus <pmikus@cisco.com>
13 files changed:
VPP_REPO_URL patch | blob | history
bootstrap-vpp-honeycomb.sh patch | blob | history
bootstrap-vpp-verify-semiweekly.sh patch | blob | history
bootstrap-vpp-verify-weekly.sh patch | blob | history
bootstrap.sh patch | blob | history
resources/libraries/python/SetupFramework.py patch | blob | history
resources/libraries/python/TrafficScriptExecutor.py patch | blob | history
resources/libraries/python/VppConfigGenerator.py patch | blob | history
resources/libraries/robot/qemu.robot patch | blob | history
topologies/available/lf_testbed1.yaml patch | blob | history
topologies/available/lf_testbed2.yaml patch | blob | history
topologies/available/lf_testbed3.yaml patch | blob | history
virl_params.sh patch | blob | history

diff --git a/VPP_REPO_URL b/VPP_REPO_URL
index b26b592..56de6b6 100644 (file)
--- a/VPP_REPO_URL
+++ b/VPP_REPO_URL
@@ -1 +1 @@
-https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.trusty.main/io/fd/vpp/
+https://nexus.fd.io/content/repositories/fd.io.master.ubuntu.xenial.main/io/fd/vpp/
diff --git a/bootstrap-vpp-honeycomb.sh b/bootstrap-vpp-honeycomb.sh
index 2e89d9d..70d1e36 100644 (file)
--- a/bootstrap-vpp-honeycomb.sh
+++ b/bootstrap-vpp-honeycomb.sh
@@ -120,7 +120,7 @@ function stop_virl_simulation {
 
 VIRL_SID=$(ssh ${SSH_OPTIONS} \
     ${VIRL_USERNAME}@${VIRL_SERVER} \
-    "start-honeycomb-testcase double-ring-nested")
+    "start-honeycomb-testcase ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE}")
 retval=$?
 if [ "$?" -ne "0" ]; then
     echo "VIRL simulation start failed"
diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh
index 4f7c673..c2ed4ea 100644 (file)
--- a/bootstrap-vpp-verify-semiweekly.sh
+++ b/bootstrap-vpp-verify-semiweekly.sh
@@ -87,6 +87,9 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
+VIRL_TOPOLOGY=double-ring-nested.xenial
+VIRL_RELEASE=csit-ubuntu-16.04.1_2016-10-10_1.4
+
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
 
 function ssh_do() {
@@ -194,7 +197,7 @@ function stop_virl_simulation {
 
 VIRL_SID=$(ssh ${SSH_OPTIONS} \
     ${VIRL_USERNAME}@${VIRL_SERVER} \
-    "start-testcase -c double-ring-nested ${VPP_DEBS_VIRL[@]}")
+    "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_DEBS_VIRL[@]}")
 retval=$?
 if [ "$?" -ne "0" ]; then
     echo "VIRL simulation start failed"
diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh
index 94688ed..2066704 100644 (file)
--- a/bootstrap-vpp-verify-weekly.sh
+++ b/bootstrap-vpp-verify-weekly.sh
@@ -29,6 +29,9 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
+VIRL_TOPOLOGY=double-ring-nested.xenial
+VIRL_RELEASE=csit-ubuntu-16.04.1_2016-10-10_1.4
+
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
 
 function ssh_do() {
@@ -156,7 +159,7 @@ function stop_virl_simulation {
 
 VIRL_SID=$(ssh ${SSH_OPTIONS} \
     ${VIRL_USERNAME}@${VIRL_SERVER} \
-    "start-testcase -c double-ring-nested ${VPP_DEBS_FULL[@]}")
+    "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_DEBS_FULL[@]}")
 retval=$?
 if [ "$?" -ne "0" ]; then
     echo "VIRL simulation start failed"
diff --git a/bootstrap.sh b/bootstrap.sh
index 671a9a0..56cfbe2 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -28,6 +28,9 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
+VIRL_TOPOLOGY=double-ring-nested.xenial
+VIRL_RELEASE=csit-ubuntu-16.04.1_2016-10-10_1.4
+
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
 
 TEST_GROUPS=("bridge_domain,dhcp,gre,honeycomb,l2_xconnect,lisp,softwire" "cop,telemetry,ipsec,ipv6,rpf,tap,vrf" "fds,iacl,ipv4,policer,vlan,vxlan")
@@ -194,7 +197,7 @@ for index in "${!VIRL_SERVER[@]}"; do
     echo "Starting simulation nr. ${index} on VIRL server ${VIRL_SERVER[${index}]}"
     VIRL_SID[${index}]=$(ssh ${SSH_OPTIONS} \
         ${VIRL_USERNAME}@${VIRL_SERVER[${index}]} \
-        "start-testcase -c double-ring-nested -r csit-ubuntu-14.04.4_2016-10-07_1.3 ${VPP_DEBS_FULL[@]}")
+        "start-testcase -c ${VIRL_TOPOLOGY} -r ${VIRL_RELEASE} ${VPP_DEBS_FULL[@]}")
     retval=$?
     if [ "$?" -ne "0" ]; then
         echo "VIRL simulation start failed on ${VIRL_SERVER[${index}]}"
diff --git a/resources/libraries/python/SetupFramework.py b/resources/libraries/python/SetupFramework.py
index d0059eb..5d3d59a 100644 (file)
--- a/resources/libraries/python/SetupFramework.py
+++ b/resources/libraries/python/SetupFramework.py
@@ -112,7 +112,8 @@ def create_env_directory_at_node(node):
     ssh = SSH()
     ssh.connect(node)
     (ret_code, stdout, stderr) = ssh.exec_command(
-        'cd {0} && rm -rf env && virtualenv --system-site-packages env && '
+        'cd {0} && rm -rf env && '
+        'virtualenv --system-site-packages --never-download env && '
         '. env/bin/activate && '
         'pip install -r requirements.txt'
         .format(con.REMOTE_FW_DIR), timeout=100)
diff --git a/resources/libraries/python/TrafficScriptExecutor.py b/resources/libraries/python/TrafficScriptExecutor.py
index 33b3d6d..58d48d3 100644 (file)
--- a/resources/libraries/python/TrafficScriptExecutor.py
+++ b/resources/libraries/python/TrafficScriptExecutor.py
@@ -58,7 +58,8 @@ class TrafficScriptExecutor(object):
         logger.trace("{}".format(timeout))
         ssh = SSH()
         ssh.connect(node)
-        cmd = ("cd {}; virtualenv --system-site-packages env && " +
+        cmd = ("cd {}; " +
+               "virtualenv --system-site-packages --never-download env && " +
                "export PYTHONPATH=${{PWD}}; " +
                ". ${{PWD}}/env/bin/activate; " +
                "resources/traffic_scripts/{} {}") \
diff --git a/resources/libraries/python/VppConfigGenerator.py b/resources/libraries/python/VppConfigGenerator.py
index d4ef04e..099d076 100644 (file)
--- a/resources/libraries/python/VppConfigGenerator.py
+++ b/resources/libraries/python/VppConfigGenerator.py
@@ -424,9 +424,9 @@ class VppConfigGenerator(object):
         # Instead of restarting, we'll do separate start and stop
         # actions. This way we don't care whether VPP was running
         # to begin with.
-        ssh.exec_command('sudo initctl stop {}'.format(VPP_SERVICE_NAME))
+        ssh.exec_command('sudo service {} stop'.format(VPP_SERVICE_NAME))
         (ret, stdout, stderr) = \
-            ssh.exec_command('sudo initctl start {}'.format(VPP_SERVICE_NAME))
+            ssh.exec_command('sudo service {} start'.format(VPP_SERVICE_NAME))
         if ret != 0:
             logger.debug('Restarting VPP failed on node {}'.
                          format(hostname))
diff --git a/resources/libraries/robot/qemu.robot b/resources/libraries/robot/qemu.robot
index a9cf010..989b73e 100644 (file)
--- a/resources/libraries/robot/qemu.robot
+++ b/resources/libraries/robot/qemu.robot
@@ -64,10 +64,7 @@
 | | ...             | returned by qemu_start or None.
 | | [Arguments] | ${dut} | ${vm}
 | | Qemu Set Node | ${dut}
-| | ${status} | ${value}= | Run Keyword And Ignore Error | Qemu System Status
-| | Run Keyword If | "${status}" == "FAIL" | Qemu Kill
-| | ... | ELSE IF | "${value}" == "running" | Qemu System Powerdown
-| | ... | ELSE | Qemu Quit
+| | Qemu Kill
 | | Qemu Clear Socks
 | | Run Keyword If | ${vm} is not None | Disconnect | ${vm}
 
diff --git a/topologies/available/lf_testbed1.yaml b/topologies/available/lf_testbed1.yaml
index e55df8c..3c3c7df 100644 (file)
--- a/topologies/available/lf_testbed1.yaml
+++ b/topologies/available/lf_testbed1.yaml
@@ -13,7 +13,7 @@ nodes:
     host: "10.30.51.16"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
     interfaces:
       port1:
         # t1-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
@@ -104,7 +104,7 @@ nodes:
     host: "10.30.51.17"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
     interfaces:
       port1:
         # t1-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
@@ -173,7 +173,7 @@ nodes:
     host: "10.30.51.18"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
     interfaces:
       port1:
         # t1-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
diff --git a/topologies/available/lf_testbed2.yaml b/topologies/available/lf_testbed2.yaml
index 083737d..8b7d2da 100644 (file)
--- a/topologies/available/lf_testbed2.yaml
+++ b/topologies/available/lf_testbed2.yaml
@@ -13,7 +13,7 @@ nodes:
     host: "10.30.51.20"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
     interfaces:
       port1:
         # t2-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
@@ -104,7 +104,7 @@ nodes:
     host: "10.30.51.21"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: CSIT1234
     interfaces:
       port1:
         # t2-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
@@ -173,7 +173,7 @@ nodes:
     host: "10.30.51.22"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
     interfaces:
       port1:
         # t2-sut2-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
diff --git a/topologies/available/lf_testbed3.yaml b/topologies/available/lf_testbed3.yaml
index bae6697..839e943 100644 (file)
--- a/topologies/available/lf_testbed3.yaml
+++ b/topologies/available/lf_testbed3.yaml
@@ -13,7 +13,7 @@ nodes:
     host: "10.30.51.24"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
     interfaces:
       port1:
         # t3-tg1-c1/p1 - 40GE port1 on Intel NIC xl710 2p40GE.
@@ -104,7 +104,7 @@ nodes:
     host: "10.30.51.25"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
     interfaces:
       port1:
         # t3-sut1-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
@@ -173,7 +173,7 @@ nodes:
     host: "10.30.51.26"
     port: 22
     username: testuser
-    password: Cisco1234
+    password: Csit1234
     interfaces:
       port1:
         # t3-sut3-c1/p1 - 10GE port1 on Intel NIC x520 2p10GE.
diff --git a/virl_params.sh b/virl_params.sh
index e36058d..8f6669d 100644 (file)
--- a/virl_params.sh
+++ b/virl_params.sh
@@ -20,3 +20,6 @@ VIRL_USERNAME=jenkins-in
 VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
+
+VIRL_TOPOLOGY=double-ring-nested.xenial
+VIRL_RELEASE=csit-ubuntu-16.04.1_2016-10-10_1.4
Integration tests