In addition to addressing the suggested changes, Added cat bond line to check if...

Change-Id: If7e2960d57a9a2b8d4681858b5e005744ba3dd53
Signed-off-by: mahesh.manivasagam <mahesh_manivasagam@dell.com>

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot b/test/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot
index 8a5df39d2beace78eadfd7cbcef7510c3181a45c..37ad4569ea48e3bb6ebf063df07b6dddcc338904 100644 (file)
--- a/test/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot
+++ b/test/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot
@@ -4,7 +4,7 @@ Suite Setup       LACP Inventory Suite Setup
 Suite Teardown    Delete All Sessions\r
 Library           SSHLibrary\r
 Library           Collections\r
-Library           ../../../libraries/RequestsLibrary.py\r
+Library           RequestsLibrary\r
 Library           ../../../libraries/Common.py\r
 Variables         ../../../variables/Variables.py\r
 \r

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot b/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
index 98a7f7ed44793aacc9bf6ace464ba6761c17028d..9e3716f5ca7e9d16a5e9f123b7014bd904ffd47e 100644 (file)
--- a/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
+++ b/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
@@ -3,6 +3,7 @@ Documentation     Test suite for MD-SAL LACP  mininet OF13
 Suite Setup       Start Suite
 Suite Teardown    Stop Suite
 Library           SSHLibrary
+Resource          ../../../libraries/Utils.txt
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
@@ -12,28 +13,28 @@ ${bond}=     "/etc/modprobe.d/bonding.conf"
 *** Keywords ***
 Start Suite
     Log    Start mininet
-    Open Connection   ${MININET}     prompt=${PROMPT}
+    ${mininet_session_id}=     Open Connection   ${MININET}     prompt=${LINUX_PROMPT}     timeout=30s
+    Set Suite Variable     ${mininet_session_id}
     Login With Public Key    ${MININET_USER}   ${USER_HOME}/.ssh/id_rsa   any
-    Write    sudo ovs-vsctl set-manager ptcp:6633
-    Write    sudo mn -c
-    Read Until    ${PROMPT}
-    Write    sudo rm -rf ${bond}
+    Execute Command    sudo ovs-vsctl set-manager ptcp:6633
+    Execute Command    sudo rm -rf ${bond}
     Put File    ${CURDIR}/LACP_custom1.py
     Put File    ${CURDIR}/h1-bond0.sh
     Put File    ${CURDIR}/h2-bond0.sh
     Put File    ${CURDIR}/m
     Put File    ${CURDIR}/bonding.conf
-    Write    sudo cp bonding.conf ${bond}
-    Write    sed -i -- 's/CONTROLLER/${CONTROLLER}/g' LACP_custom1.py
+    Execute Command        sudo cp bonding.conf ${bond}
+    Execute Command        cat ${bond}
+    Execute Command        sed -i -- 's/CONTROLLER/${CONTROLLER}/g' LACP_custom1.py
     Write    ${start}
-    Read Until     mininet>
+    Read Until       mininet>
 
 Stop Suite
     Log    Stop mininet
+    Switch Connection      ${mininet_session_id}
     Read
     Write    exit
-    Read Until    ${PROMPT}
-    Write    sed -i -- 's/${CONTROLLER}/CONTROLLER/g' LACP_custom1.py
-    Write    sudo rm -rf ${bond}
-    Read Until    ${PROMPT}
+    Clean Mininet System
+    Execute Command      sed -i -- 's/${CONTROLLER}/CONTROLLER/g' LACP_custom1.py
+    Execute Command      sudo rm -rf ${bond}
     Close Connection