[VOL-3780] Passing INFRA_NAMESPACE as parameter with consistent name
Change-Id: I617c818ba338b9d9958b9fd190c1f38d1e39a460
diff --git a/tests/functional/Voltha_ONOSHATests.robot b/tests/functional/Voltha_ONOSHATests.robot
index e9ecac8..809a945 100644
--- a/tests/functional/Voltha_ONOSHATests.robot
+++ b/tests/functional/Voltha_ONOSHATests.robot
@@ -41,7 +41,7 @@
${HELM_CHARTS_DIR} ~/helm-charts
${VOLTHA_POD_NUM} 8
${NAMESPACE} default
-${ONOSSPACE} infra
+${INFRA_NAMESPACE} infra
# For below variable value, using deployment name as using grep for
# parsing radius pod name, we can also use full radius pod name
${RESTART_POD_NAME} radius
@@ -66,7 +66,7 @@
[Setup] Start Logging onosMasterRestart
[Teardown] Run Keywords Collect Logs
... AND Stop Logging onosMasterRestart
- ${numOfOnos}= Wait Until Keyword Succeeds 20s 5s Get Number of Running Pods Number By Label ${ONOSSPACE}
+ ${numOfOnos}= Wait Until Keyword Succeeds 20s 5s Get Number of Running Pods Number By Label ${INFRA_NAMESPACE}
... app onos-classic
Should Not Be Equal As Integers ${numOfOnos} 0 Error fetching number of ONOS instances
Pass Execution If ${numOfOnos} == 1 Skipping test: just one instance of ONOS
@@ -85,9 +85,9 @@
${node_id}= Wait Until Keyword Succeeds 20s 5s Get Master Instace in ONOS ${of_id}
@{onos_id}= Split String ${node_id} -
${podName}= Catenate SEPARATOR=- voltha-infra-onos-classic ${onos_id[1]}
- Wait Until Keyword Succeeds ${timeout} 15s Delete K8s Pods By Name ${ONOSSPACE} ${podName}
+ Wait Until Keyword Succeeds ${timeout} 15s Delete K8s Pods By Name ${INFRA_NAMESPACE} ${podName}
Sleep 60s
- Wait Until Keyword Succeeds ${timeout} 2s Validate Pods Status By Name ${ONOSSPACE}
+ Wait Until Keyword Succeeds ${timeout} 2s Validate Pods Status By Name ${INFRA_NAMESPACE}
... ${podName} Running
# Performing Sanity Test to make sure subscribers are all AUTH+DHCP and pingable
Run Keyword If ${has_dataplane} Clean Up Linux