From de7f319a62a249669d7239ce93149124c0da0570 Mon Sep 17 00:00:00 2001 From: Kailash Khalasi Date: Fri, 12 Jun 2015 16:35:46 +0000 Subject: [PATCH] Making OVS Switch Prompts configurable. Change-Id: I4e02b78870f822466d28ced66388889d09fedf0f Signed-off-by: Kailash Khalasi (cherry picked from commit d9f02530840a28883fab792d8ecfd0c82daa4619) --- test/csit/libraries/SwitchClasses/BaseSwitch.py | 3 +++ .../Switch_Qualification/010_OpenFlow_Connection.robot | 2 ++ .../Switch_Qualification/020_OpenFlow_Actions.robot | 2 ++ 3 files changed, 7 insertions(+) diff --git a/test/csit/libraries/SwitchClasses/BaseSwitch.py b/test/csit/libraries/SwitchClasses/BaseSwitch.py index b09c91d6ad..82b741bf31 100644 --- 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 7c6e730b40..a79ab5d176 100644 --- 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 8cdf6f7b8b..2cf991960e 100644 --- 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} -- 2.36.6