Use full path to push custom mininet topo to VM

Change-Id: I7cd3dd46c688dbf717d60092a9c11c72453f7c5f
Signed-off-by: Jamo Luhrsen <james.luhrsen@hp.com>
(cherry picked from commit f7b1f3a989ecbc23b4856a555444acfba218064e)

diff --git a/test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot b/test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
index 4e905ca569826a8b89f03ee5ee0a3fd5aef901d7..7ebedd132294f12f0ce20636daa7236547810050 100644 (file)
--- a/test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
+++ b/test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
@@ -30,5 +30,5 @@ Link Scale Suite Setup
     ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
     Log     Copying ${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH} file to Mininet VM
     ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=${linux_prompt}
     Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/id_rsa    any
     Log     Copying ${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH} file to Mininet VM

-    Put File  ${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH}
+    Put File  ${CURDIR}/../../../${CREATE_FULLYMESH_TOPOLOGY_FILE_PATH}

     Close Connection
\ No newline at end of file
     Close Connection
\ No newline at end of file

diff --git a/test/csit/variables/Variables.py b/test/csit/variables/Variables.py
index 5328ed88d0c5e41822227000281bba8e04c26415..d7f4861c3603c13bad5841c930cad19cc62e67f5 100644 (file)
--- a/test/csit/variables/Variables.py
+++ b/test/csit/variables/Variables.py
@@ -89,6 +89,5 @@ BASE_IP_1 = '75.75.0.0'
 
 # Mininet Custom Topology Path and File
 CREATE_FULLYMESH_TOPOLOGY_FILE = "create_fullymesh.py"
 
 # Mininet Custom Topology Path and File
 CREATE_FULLYMESH_TOPOLOGY_FILE = "create_fullymesh.py"

-CREATE_FULLYMESH_TOPOLOGY_FILE_PATH = "integration/test/csit/" +\
-                                      "libraries/MininetTopo/" +\
+CREATE_FULLYMESH_TOPOLOGY_FILE_PATH = "libraries/MininetTopo/" +\

                                       CREATE_FULLYMESH_TOPOLOGY_FILE
                                       CREATE_FULLYMESH_TOPOLOGY_FILE