aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--VPP_REPO_URL2
-rw-r--r--bootstrap-vpp-honeycomb.sh2
-rw-r--r--bootstrap-vpp-verify-semiweekly.sh5
-rw-r--r--bootstrap-vpp-verify-weekly.sh5
-rwxr-xr-xbootstrap.sh5
-rw-r--r--resources/libraries/python/SetupFramework.py3
-rw-r--r--resources/libraries/python/TrafficScriptExecutor.py3
-rw-r--r--resources/libraries/python/VppConfigGenerator.py4
-rw-r--r--resources/libraries/robot/qemu.robot5
-rw-r--r--topologies/available/lf_testbed1.yaml6
-rw-r--r--topologies/available/lf_testbed2.yaml6
-rw-r--r--topologies/available/lf_testbed3.yaml6
-rw-r--r--virl_params.sh3
13 files changed, 33 insertions, 22 deletions
diff --git a/VPP_REPO_URL b/VPP_REPO_URL
index b26b592986..56de6b69e9 100644
--- 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 2e89d9d747..70d1e36cf4 100644
--- 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 4f7c67333f..c2ed4ea3e0 100644
--- 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 94688ed66d..206670476d 100644
--- 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 671a9a0873..56cfbe2e15 100755
--- 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 d0059ebed8..5d3d59ab56 100644
--- 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 33b3d6d520..58d48d3ca9 100644
--- 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 d4ef04e65c..099d07636b 100644
--- 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 a9cf0101a5..989b73e531 100644
--- 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 e55df8cc7d..3c3c7dfdc2 100644
--- 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 083737de53..8b7d2da681 100644
--- 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 bae6697717..839e9433a1 100644
--- 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 e36058d06d..8f6669d989 100644
--- 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