Bug 4486 - CSIT test wont copy config file to node

Changed Variable to ODL_SYSTEM_IP

Change-Id: I6080decca4cbe2fd614a1f43ac98cbdf46a7fb2a
Signed-off-by: Martin Mihálek <mamihale@cisco.com>

diff --git a/csit/suites/sxp/scripts/basic_node_setup.sh b/csit/suites/sxp/scripts/basic_node_setup.sh
index 5a0b65952144fb130bbaafd1b2b70c8d6d5b5b36..6ec909a5995146f79fe89874a28664f5a87a3905 100644 (file)
--- a/csit/suites/sxp/scripts/basic_node_setup.sh
+++ b/csit/suites/sxp/scripts/basic_node_setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 #!/bin/bash
 

-echo "Setup config to ${CONTROLLER0}"
-ssh ${CONTROLLER0} "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/"
+echo "Setup config to ${ODL_SYSTEM_IP}"
+ssh ${ODL_SYSTEM_IP} "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/"

 
 

-scp ${WORKSPACE}/test/csit/suites/sxp/basic/22-sxp-controller-one-node.xml ${CONTROLLER0}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/
+scp ${WORKSPACE}/test/csit/suites/sxp/basic/22-sxp-controller-one-node.xml ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/

diff --git a/csit/suites/sxp/scripts/topology_node_setup.sh b/csit/suites/sxp/scripts/topology_node_setup.sh
index 0cb412066eb8050c068bb4e1a39eb000fdd92cf7..93519dc229025bf2b789c18055ab727ae608baa3 100644 (file)
--- a/csit/suites/sxp/scripts/topology_node_setup.sh
+++ b/csit/suites/sxp/scripts/topology_node_setup.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 #!/bin/bash
 

-echo "Setup config to ${CONTROLLER0}"
-ssh ${CONTROLLER0} "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/"
+echo "Setup config to ${ODL_SYSTEM_IP}"
+ssh ${ODL_SYSTEM_IP} "mkdir -p /tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/"

 
 

-scp ${WORKSPACE}/test/csit/suites/sxp/topology/22-sxp-controller-one-node.xml ${CONTROLLER0}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/
+scp ${WORKSPACE}/test/csit/suites/sxp/topology/22-sxp-controller-one-node.xml ${ODL_SYSTEM_IP}:/tmp/${BUNDLEFOLDER}/etc/opendaylight/karaf/