removing all hardcoded references to the namespace
Change-Id: I9b5ddc065be62b3ad2a5a4757a88001faca61146
diff --git a/tests/functional/Voltha_StartContainerPODTests.robot b/tests/functional/Voltha_StartContainerPODTests.robot
index ce1bef1..3606378 100755
--- a/tests/functional/Voltha_StartContainerPODTests.robot
+++ b/tests/functional/Voltha_StartContainerPODTests.robot
@@ -265,7 +265,7 @@
... --set services.kafka.cluster.service=kafka.default.svc --set services.kafka.cluster.port=9092
... --set services.kafka.adapter.address=kafka.default.svc:9092
... --set services.kafka.cluster.address=kafka.default.svc:9092 --set defaults.log_level=WARN
- ... --namespace voltha sim onf/voltha-adapter-simulated
+ ... --namespace ${NAMESPACE} sim onf/voltha-adapter-simulated
${rc} Run And Return Rc ${cmd}
Should Be Equal as Integers ${rc} 0
@@ -279,7 +279,7 @@
... --set services.kafka.cluster.service=kafka.default.svc --set services.kafka.cluster.port=9092
... --set services.kafka.cluster.address=kafka.default.svc:9092
... --set services.kafka.adapter.address=kafka.default.svc:9092 --set defaults.log_level=WARN
- ... --namespace voltha open-olt onf/voltha-adapter-openolt
+ ... --namespace ${NAMESPACE} open-olt onf/voltha-adapter-openolt
${rc} Run And Return Rc ${cmd}
Should Be Equal as Integers ${rc} 0
@@ -293,7 +293,7 @@
... --set services.kafka.cluster.service=kafka.default.svc --set services.kafka.cluster.port=9092
... --set services.kafka.adapter.address=kafka.default.svc:9092
... --set services.kafka.cluster.address=kafka.default.svc:9092 --set replicas.adapter_open_onu=1
- ... --set defaults.log_level=WARN --namespace voltha open-onu onf/voltha-adapter-openonu
+ ... --set defaults.log_level=WARN --namespace ${NAMESPACE} open-onu onf/voltha-adapter-openonu
${rc} Run And Return Rc ${cmd}
Should Be Equal as Integers ${rc} 0
@@ -310,7 +310,7 @@
... --set 'services.controller[0].service=onos-onos-classic-0.onos-onos-classic-hs.default.svc'
... --set 'services.controller[0].port=6653'
... --set 'services.controller[0].address=onos-onos-classic-0.onos-onos-classic-hs.default.svc:6653'
- ... --set defaults.log_level=WARN --namespace voltha voltha onf/voltha
+ ... --set defaults.log_level=WARN --namespace ${NAMESPACE} voltha onf/voltha
${rc} Run And Return Rc ${cmd}
Should Be Equal as Integers ${rc} 0
diff --git a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
index 5a22947..18c6b88 100755
--- a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
@@ -242,7 +242,7 @@
Run Keyword If ${pausebeforecleanup} Log Teardown will be continued... console=yes
Run Keyword If ${teardown_device} Delete All Devices and Verify
# delete etcd MIB Template Data
- Delete MIB Template Data
+ Delete MIB Template Data ${INFRA_NAMESPACE}
# check etcd data are empty
Run Keyword If ${etcdcheckintestteardown} Wait Until Keyword Succeeds ${timeout} 1s
... Validate Onu Data In Etcd ${INFRA_NAMESPACE} 0 ${kvstoreprefix} without_pm_data=False
diff --git a/tests/pm-data/Voltha_ONUPMTests.robot b/tests/pm-data/Voltha_ONUPMTests.robot
index b3d3151..d69233a 100755
--- a/tests/pm-data/Voltha_ONUPMTests.robot
+++ b/tests/pm-data/Voltha_ONUPMTests.robot
@@ -187,7 +187,7 @@
Run Keyword If "${switch_type}"!="" Set Global Variable ${powerswitch_type} ${switch_type}
# set ${kafka} depending on environment in case of port-forward is needed
${rc} ${kafka}= Run Keyword If ${PORT_FORWARDING} Run and Return Rc and Output
- ... kubectl get svc -n default | grep kafka-0-external | awk '{print $1}'
+ ... kubectl get svc -n ${INFRA_NAMESPACE} | grep kafka-0-external | awk '{print $1}'
Run Keyword If ${PORT_FORWARDING} Should Not Be Empty ${kafka} Service kafka-0-external not found
# start port forwarding if needed (when voltha runs in k8s)
${portFwdHandle} = Run Keyword If ${PORT_FORWARDING} Start Process