VOL-2642 Use cord-tester library
Change-Id: If2cbf2987eb8ff152e5aabdc179ba98d8fc37398
diff --git a/libraries/onos.robot b/libraries/onos.robot
index f3f5e9f..4fe9c57 100644
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -24,20 +24,6 @@
Library OperatingSystem
*** Keywords ***
-Execute ONOS CLI Command
- [Arguments] ${host} ${port} ${cmd}
- [Documentation] Establishes an ssh connection to the onos contoller and executes a command
- ${conn_id}= SSHLibrary.Open Connection ${host} port=${port} timeout=300s
- SSHLibrary.Login karaf karaf
- @{result_values} SSHLibrary.Execute Command ${cmd} return_rc=True
- ... return_stderr=True return_stdout=True
- ${output} Set Variable @{result_values}[0]
- Log ${output}
- Should Be Empty @{result_values}[1]
- Should Be Equal As Integers @{result_values}[2] 0
- SSHLibrary.Close Connection
- [Return] ${output}
-
Validate OLT Device in ONOS
# FIXME use volt-olts to check that the OLT is ONOS
[Arguments] ${serial_number}
diff --git a/libraries/utils.robot b/libraries/utils.robot
index 9ef022e..cd27aa4 100644
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -22,6 +22,8 @@
Library Collections
Library RequestsLibrary
Library OperatingSystem
+Library CORDRobot
+Library ImportResource resources=CORDRobot
*** Keywords ***
Check CLI Tools Configured
@@ -46,15 +48,6 @@
Common Test Suite Setup
[Documentation] Setup the test suite
- # BBSim sanity test doesn't need these imports from other repositories
- Run Keyword If ${external_libs} Import Resource
- ... ${CURDIR}/../../cord-tester/src/test/cord-api/Framework/Subscriber.robot
- Run Keyword If ${external_libs} Import Resource
- ... ${CURDIR}/../../cord-tester/src/test/cord-api/Framework/OLT.robot
- Run Keyword If ${external_libs} Import Resource
- ... ${CURDIR}/../../cord-tester/src/test/cord-api/Framework/DHCP.robot
- Run Keyword If ${external_libs} Import Resource
- ... ${CURDIR}/../../cord-tester/src/test/cord-api/Framework/Kubernetes.robot
Set Global Variable ${KUBECTL_CONFIG} export KUBECONFIG=%{KUBECONFIG}
Set Global Variable ${VOLTCTL_CONFIG} export VOLTCONFIG=%{VOLTCONFIG}
${k8s_node_ip}= Evaluate ${nodes}[0].get("ip")
@@ -266,9 +259,6 @@
Teardown
[Documentation] kills processes and cleans up interfaces on src+dst servers
Run Keyword If ${has_dataplane} Clean Up Linux
- Run Keyword If ${external_libs} Run Keyword and Ignore Error
- ... Log Kubernetes Containers Logs Since Time
- ... ${datetime} ${container_list}
Teardown Suite
[Documentation] Clean up device if desired
@@ -339,7 +329,7 @@
Run Keyword and Ignore Error Get Device List from Voltha
Run Keyword and Ignore Error Get Device Output from Voltha ${olt_device_id}
Run Keyword and Ignore Error Get Logical Device Output from Voltha ${logical_id}
- Run Keyword If ${external_libs} Get ONOS Status ${k8s_node_ip}
+ Get ONOS Status ${k8s_node_ip} ${ONOS_SSH_PORT}
Verify ping is succesful except for given device
[Arguments] ${num_onus} ${exceptional_onu_id}