VOL-2642 Use cord-tester library
Change-Id: If2cbf2987eb8ff152e5aabdc179ba98d8fc37398
diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index c2ec132..bde8265 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -18,7 +18,6 @@
# Change default values in tests
has_dataplane: false
-external_libs: false
teardown_device: true
ONOS_REST_PORT: 8181
ONOS_SSH_PORT: 8101
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index 2ab5b8c..e3b294f 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -18,7 +18,6 @@
# Change default values in tests
has_dataplane: false
-external_libs: false
teardown_device: true
ONOS_REST_PORT: 8181
ONOS_SSH_PORT: 8101
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index a4ce0ef..500f95d 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -18,7 +18,6 @@
# Change default values in tests
has_dataplane: false
-external_libs: false
teardown_device: true
ONOS_REST_PORT: 8181
ONOS_SSH_PORT: 8101
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index a5abc4d..71affaf 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -18,7 +18,6 @@
# Change default values in tests
has_dataplane: false
-external_libs: false
teardown_device: true
ONOS_REST_PORT: 8181
ONOS_SSH_PORT: 8101
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index 021f313..d0060a9 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -18,7 +18,6 @@
# Change default values in tests
has_dataplane: false
-external_libs: false
teardown_device: true
ONOS_REST_PORT: 8181
ONOS_SSH_PORT: 8101
diff --git a/tests/dt-workflow/Voltha_DT_PODTests.robot b/tests/dt-workflow/Voltha_DT_PODTests.robot
index 9210034..9a2eb78 100644
--- a/tests/dt-workflow/Voltha_DT_PODTests.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests.robot
@@ -48,7 +48,6 @@
${of_id} 0
${logical_id} 0
${has_dataplane} True
-${external_libs} True
${teardown_device} False
${scripts} ../../scripts
diff --git a/tests/functional/Voltha_AlarmTests.robot b/tests/functional/Voltha_AlarmTests.robot
index 5a6cc94..0528329 100755
--- a/tests/functional/Voltha_AlarmTests.robot
+++ b/tests/functional/Voltha_AlarmTests.robot
@@ -34,7 +34,6 @@
${of_id} 0
${logical_id} 0
${has_dataplane} True
-${external_libs} True
${setup_device} True
${teardown_device} True
${VOLTCTL_NAMESPACE} default
@@ -385,10 +384,8 @@
Teardown Suite
[Documentation] Clean up devices if desired
... kills processes and cleans up interfaces on src+dst servers
- Run Keyword If ${external_libs} Get ONOS Status ${k8s_node_ip}
+ Get ONOS Status ${k8s_node_ip} ${ONOS_SSH_PORT}
Run Keyword If ${has_dataplane} Clean Up Linux
- Run Keyword If ${external_libs}
- ... Log Kubernetes Containers Logs Since Time ${datetime} ${container_list}
Run Keyword If ${teardown_device} Delete Device and Verify
Run Keyword If ${teardown_device} Test Empty Device List
Run Keyword If ${teardown_device} Execute ONOS CLI Command ${k8s_node_ip} ${ONOS_SSH_PORT}
diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index 4802144..ab53a7b 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -48,7 +48,6 @@
${of_id} 0
${logical_id} 0
${has_dataplane} True
-${external_libs} True
${teardown_device} False
${scripts} ../../scripts
diff --git a/tests/functional/Voltha_FailureScenarios.robot b/tests/functional/Voltha_FailureScenarios.robot
index 50d294d..7ebe566 100644
--- a/tests/functional/Voltha_FailureScenarios.robot
+++ b/tests/functional/Voltha_FailureScenarios.robot
@@ -48,7 +48,6 @@
${of_id} 0
${logical_id} 0
${has_dataplane} True
-${external_libs} True
${teardown_device} False
${scripts} ../../scripts
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 35d5910..631d275 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -48,7 +48,6 @@
${of_id} 0
${logical_id} 0
${has_dataplane} True
-${external_libs} True
${teardown_device} False
${scripts} ../../scripts
diff --git a/tests/functional/Voltha_ScaleFunctionalTests.robot b/tests/functional/Voltha_ScaleFunctionalTests.robot
index e428cb7..3ab37eb 100644
--- a/tests/functional/Voltha_ScaleFunctionalTests.robot
+++ b/tests/functional/Voltha_ScaleFunctionalTests.robot
@@ -35,7 +35,6 @@
${of_id} 0
${logical_id} 0
${has_dataplane} True
-${external_libs} True
${teardown_device} False
*** Test Cases ***
@@ -163,9 +162,8 @@
Teardown Suite
[Documentation] Clean up devices if desired
... kills processes and cleans up interfaces on src+dst servers
- Run Keyword If ${external_libs} Get ONOS Status ${k8s_node_ip}
+ Get ONOS Status ${k8s_node_ip} ${ONOS_SSH_PORT}
Run Keyword If ${has_dataplane} Clean Up Linux
- Run Keyword If ${external_libs} Log Kubernetes Containers Logs Since Time ${datetime} ${container_list}
Run Keyword If ${teardown_device} Delete Device and Verify
Run Keyword If ${teardown_device} Test Empty Device List
Run Keyword If ${teardown_device} Execute ONOS CLI Command ${k8s_node_ip} ${ONOS_SSH_PORT}