Making OVS Switch Prompts configurable.

Change-Id: I4e02b78870f822466d28ced66388889d09fedf0f
Signed-off-by: Kailash Khalasi <kkhalasi@iix.net>
(cherry picked from commit d9f02530840a28883fab792d8ecfd0c82daa4619)

diff --git a/test/csit/libraries/SwitchClasses/BaseSwitch.py b/test/csit/libraries/SwitchClasses/BaseSwitch.py
index b09c91d6ad22fcf1fd163185d2017d1e58fa56ca..82b741bf316c846e9d29f45e14dc2598b4424fdf 100644 (file)
--- a/test/csit/libraries/SwitchClasses/BaseSwitch.py
+++ b/test/csit/libraries/SwitchClasses/BaseSwitch.py
@@ -67,6 +67,9 @@ class BaseSwitch(object):
     def set_mgmt_user(self, user):
         self.mgmt_user = user
 
+    def set_mgmt_prompt(self, prompt):
+        self.mgmt_prompt = prompt
+
     def set_ssh_key(self, key):
         self.ssh_key = key
 

diff --git a/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot b/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
index 7c6e730b40f49fa04cc8acfb9fea3ca64584ff4b..a79ab5d1760e018816408d9aabff8084c2084904 100644 (file)
--- a/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
+++ b/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
@@ -15,6 +15,7 @@ Variables         ../../../variables/Variables.py
 *** Variables ***
 ${SWITCH_CLASS}    Ovs
 ${SWITCH_IP}      ${MININET}
+${SWITCH_PROMPT}    ${LINUX_PROMPT}
 ${CONTROLLER}     null
 ${REST_CONTEXT}    /restconf/operational/opendaylight-inventory:nodes
 
@@ -38,6 +39,7 @@ Switch Qualification Suite Setup
     Set Suite Variable    ${test_switch}
     Call Method    ${test_switch}    set_mgmt_ip    ${SWITCH_IP}
     Call Method    ${test_switch}    set_controller_ip    ${CONTROLLER}
+    Call Method    ${test_switch}    set_mgmt_prompt    ${SWITCH_PROMPT}
     Log    MAKE: ${test_switch.make}\n MODEL: ${test_switch.model}\n IP: ${test_switch.mgmt_ip}\n PROMPT: ${test_switch.mgmt_prompt}\n CONTROLLER_IP: ${test_switch.of_controller_ip}\n MGMT_PROTOCOL: ${test_switch.mgmt_protocol}
     Ping    ${test_switch.mgmt_ip}
     Initialize Switch    ${test_switch}

diff --git a/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot b/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
index 8cdf6f7b8bd88ea33eda99067428ed6169a6dba3..2cf991960ed1f68d7b9b1f91e65cf445079c839d 100644 (file)
--- a/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
+++ b/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
@@ -28,6 +28,7 @@ Library           ../../../libraries/SwitchClasses/${SWITCH_CLASS}.py
 *** Variables ***
 ${SWITCH_CLASS}    Ovs
 ${SWITCH_IP}      ${MININET}
+${SWITCH_PROMPT}    ${LINUX_PROMPT}
 ${CONTROLLER}     null
 ${REST_CON}       /restconf/config/opendaylight-inventory:nodes
 ${ipv4_src}       11.3.0.0/16
@@ -107,6 +108,7 @@ OpenFlow Actions Suite Setup
     Set Suite Variable    ${test_switch}
     Call Method    ${test_switch}    set_mgmt_ip    ${SWITCH_IP}
     Call Method    ${test_switch}    set_controller_ip    ${CONTROLLER}
+    Call Method    ${test_switch}    set_mgmt_prompt    ${SWITCH_PROMPT}
     Run Command On Remote System    ${CONTROLLER}   ps -elf | grep java
     Log    MAKE: ${test_switch.make}\n MODEL: ${test_switch.model}\n IP: ${test_switch.mgmt_ip}\n PROMPT: ${test_switch.mgmt_prompt}\n CONTROLLER_IP: ${test_switch.of_controller_ip}\n MGMT_PROTOCOL: ${test_switch.mgmt_protocol}
     Ping    ${test_switch.mgmt_ip}