summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/envs/lmtest.sh3
-rwxr-xr-xci/test_kvmfornfv.sh6
-rwxr-xr-xtests/vsperf.conf4
-rwxr-xr-xtests/vsperf.conf.sriov4
4 files changed, 9 insertions, 8 deletions
diff --git a/ci/envs/lmtest.sh b/ci/envs/lmtest.sh
index 9136fb6..54c3fb4 100755
--- a/ci/envs/lmtest.sh
+++ b/ci/envs/lmtest.sh
@@ -57,9 +57,6 @@ EOF
# updateConfDaily
#fi
-echo "changing the qemu-migrate.py"
-sed -i "s/\/root\/workspace/\/root\/workspace\//g" ${yardstick_prefix}/qemu_migrate.py
-sed -i "s/host.put_file/host._put_file_shell/g" ${yardstick_prefix}/qemu_migrate.py
#Running livemigration through yardstick
echo "Executing livemigration through yardstick"
diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index 09bba81..6f6d18e 100755
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -65,8 +65,12 @@ function liveMigration {
elif [ ${test_env} == "local" ];then
source $WORKSPACE/ci/cyclicTestTrigger.sh $HOST_IP
connect_host
+ #Update pod.yaml with IP
+ cd $WORKSPACE/tests/
+ sed -ri "s/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/${HOST_IP}/" pod.yaml
+ #Cleaning the environment before running Livemigration through yardstick
env_clean
- #Waiting for ssh to be available for the host machine.
+ #Waiting for ssh to be available for the host machine
sleep 20
if runLiveMigration ${test_env} ${test_name};then
livemigration_result=`expr ${livemigration_result} + 0`
diff --git a/tests/vsperf.conf b/tests/vsperf.conf
index ac55052..aba1eae 100755
--- a/tests/vsperf.conf
+++ b/tests/vsperf.conf
@@ -9,8 +9,8 @@ TRAFFICGEN = 'IxNet'
RTE_TARGET = 'x86_64-native-linuxapp-gcc'
# Ixia/IxNet configuration
TRAFFICGEN_IXIA_CARD = '1'
-TRAFFICGEN_IXIA_PORT1 = '3'
-TRAFFICGEN_IXIA_PORT2 = '4'
+TRAFFICGEN_IXIA_PORT1 = '9'
+TRAFFICGEN_IXIA_PORT2 = '10'
#TRAFFICGEN_IXNET_LIB_PATH = '/opt/ixnet/ixnetwork/8.01.1029.6/lib/IxTclNetwork'
TRAFFICGEN_IXNET_LIB_PATH = '/opt/ixia/ixnetwork/8.01.1029.6/lib/IxTclNetwork'
# Ixia traffic generator
diff --git a/tests/vsperf.conf.sriov b/tests/vsperf.conf.sriov
index f476848..4104746 100755
--- a/tests/vsperf.conf.sriov
+++ b/tests/vsperf.conf.sriov
@@ -9,8 +9,8 @@ TRAFFICGEN = 'IxNet'
RTE_TARGET = 'x86_64-native-linuxapp-gcc'
# Ixia/IxNet configuration
TRAFFICGEN_IXIA_CARD = '1'
-TRAFFICGEN_IXIA_PORT1 = '3'
-TRAFFICGEN_IXIA_PORT2 = '4'
+TRAFFICGEN_IXIA_PORT1 = '9'
+TRAFFICGEN_IXIA_PORT2 = '10'
#TRAFFICGEN_IXNET_LIB_PATH = '/opt/ixnet/ixnetwork/8.01.1029.6/lib/IxTclNetwork'
TRAFFICGEN_IXNET_LIB_PATH = '/opt/ixia/ixnetwork/8.01.1029.6/lib/IxTclNetwork'
# Ixia traffic generator