summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNavya <navyax.bathula@intel.com>2017-12-06 11:41:17 +0530
committerNavya Bathula <navyax.bathula@intel.com>2017-12-12 12:02:02 +0000
commit5f28ffec33fb4b548353854abf51ff75b9814c35 (patch)
treeeeb7f14eba44277f3e5d0e713a35007b6daf042f
parent7ea7eea6dab8c1b40c2626eead4ced80e77f87b9 (diff)
To modify Ixia port numbers and IP in pod.yamlHEADopnfv-5.2.0-SR1opnfv-5.1.0-SR1master
This patch is used to change the IP in pod.yaml for livemigration and modify the port numbers related to Ixia in vsperf.conf and vsperf.conf.sriov as now assigned to different ports. Change-Id: I329bf0672b83e09b2101a62f874ffb3c70da1dbb Signed-off-by: Navya <navyax.bathula@intel.com>
-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