[VOL-2536] - Refactor the way we test the etcd cluster size changed.
- Put all test cases together due to the help of keyword `Perform Sanity
Test`
- Remove unnecessary target in Makefile
- This test only works for full mode, should change the default port
number of ONOS
Change-Id: I14064c90cd8fb600ab04238e084448e347283fbc
diff --git a/tests/functional/K8S_SystemTest.robot b/tests/functional/K8S_SystemTest.robot
index ce0de14..7810ef8 100644
--- a/tests/functional/K8S_SystemTest.robot
+++ b/tests/functional/K8S_SystemTest.robot
@@ -14,8 +14,16 @@
*** Settings ***
Documentation Provide the function to perform system related test
-Library OperatingSystem
+Suite Setup Common Test Suite Setup
+Test Setup Setup
+Test Teardown Teardown
+Suite Teardown Teardown Suite
+Resource ../../libraries/onos.robot
+Resource ../../libraries/voltctl.robot
+Resource ../../libraries/voltha.robot
+Resource ../../libraries/utils.robot
Resource ../../libraries/k8s.robot
+Resource ../../variables/variables.robot
*** Variables ***
${timeout} 120s
@@ -31,9 +39,9 @@
${adapter_openolt_pod_label_value} adapter-open-olt
*** Test Cases ***
-Scale Down ETCD Cluster
- [Documentation] Scale Down the ETCD cluster to minimal size, skip test if current cluster size < 3
- [Tags] scaledown ETCDdown
+ECTD Scale Test
+ [Documentation] Perform the sanity test if some ETCD endpoints crash
+ [Tags] functional bbsim
${current_size}= Get ETCD Running Size voltha
Pass Execution If '${current_size}' != '${desired_ETCD_cluster_size}'
... 'Skip the test if the cluster size smaller than minimal size 3'
@@ -45,15 +53,10 @@
Wait Until Keyword Succeeds ${timeout} 2s
... Check Expected Running Pods Number By Label ${namespace}
... ${ETCD_pod_label_key} ${ETCD_name} 2
-
-Scale Up ETCD Cluster
- [Documentation] Recover the ETCD cluster by scaling up its size
- [Tags] scaleup ETCDup
- ${current_size}= Get ETCD Running Size voltha
- Pass Execution If '${current_size}' != '${minimal_ETCD_cluster_size}'
- ... 'Skip the test if the cluster size smaller than minimal size 3'
- Scale ETCD ${namespace} ${desired_ETCD_cluster_size}
+ # Perform the sanity-test
+ Wait Until Keyword Succeeds ${timeout} 2s Perform Sanity Test
# We scale up the size to 3, the recommended size of ETCD cluster.
+ Scale ETCD ${namespace} ${desired_ETCD_cluster_size}
Wait Until Keyword Succeeds ${timeout} 2s
... Validate ETCD Size ${namespace} ${desired_ETCD_cluster_size}