Defaulting the profile to voltha/voltha_voltha, according to default-helm-charts
Change-Id: I9332e99b9b94838a8e3f10314640a40df317a4f9
diff --git a/libraries/onu_utilities.robot b/libraries/onu_utilities.robot
index 7f70b11..6265945 100755
--- a/libraries/onu_utilities.robot
+++ b/libraries/onu_utilities.robot
@@ -416,7 +416,7 @@
Validate Resource Instances Used Gem Ports
[Documentation] This keyword validates resource instances data stored in etcd.
... It checks checks the number of gemport-ids which has matched with used Tech Profile
- [Arguments] ${nbofgemports} ${namespace}=default ${defaultkvstoreprefix}=voltha_voltha
+ [Arguments] ${nbofgemports} ${namespace}=default ${defaultkvstoreprefix}=voltha/voltha_voltha
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
${etcddata}= Get ONU Go Adapter ETCD Data namespace=${namespace} defaultkvstoreprefix=${kvstoreprefix}
#prepare result for json convert
@@ -443,7 +443,7 @@
Get Resource Instances ETCD Data
[Documentation] This keyword delivers Resource Instances Data stored in etcd
- [Arguments] ${tppath} ${namespace}=default ${defaultkvstoreprefix}=voltha_voltha
+ [Arguments] ${tppath} ${namespace}=default ${defaultkvstoreprefix}=voltha/voltha_voltha
${podname}= Set Variable etcd
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
${commandget}= Catenate
@@ -457,7 +457,7 @@
[Documentation] This keyword validates tech profiles and flows data stored in etcd per onu.
... It checks checks presence/absence of tech profiles and flows depending on must_exist.
... The values/content of tech profiles and flows will be not validated!
- [Arguments] ${onu_sn} ${namespace}=default ${defaultkvstoreprefix}=voltha_voltha ${must_exist}=True
+ [Arguments] ${onu_sn} ${namespace}=default ${defaultkvstoreprefix}=voltha/voltha_voltha ${must_exist}=True
... ${check_tcont_map_empty}=False ${check_default_flow_att}=True
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
${etcddata}= Get ONU Go Adapter ETCD Data namespace=${namespace} defaultkvstoreprefix=${kvstoreprefix}
@@ -521,7 +521,7 @@
... It checks unique of serial_number and combination of pon, onu and uni in tp_path.
... Furthermore it evaluates the values of onu_id and uni_id with values read from tp_path.
... Number of etcd entries has to match with the passed number.
- [Arguments] ${namespace}=default ${nbofetcddata}=${num_all_onus} ${defaultkvstoreprefix}=voltha_voltha
+ [Arguments] ${namespace}=default ${nbofetcddata}=${num_all_onus} ${defaultkvstoreprefix}=voltha/voltha_voltha
... ${without_prefix}=True ${without_pm_data}=True
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
${etcddata}= Get ONU Go Adapter ETCD Data ${namespace} ${kvstoreprefix} ${without_prefix} ${without_pm_data}
@@ -557,7 +557,7 @@
Validate Onu Data In Etcd Removed
[Documentation] This keyword validates openonu-go-adapter Data stored in etcd are removed.
... In case of a device is passed, only this will be checked.
- [Arguments] ${namespace}=default ${device_id}=${EMPTY} ${defaultkvstoreprefix}=voltha_voltha
+ [Arguments] ${namespace}=default ${device_id}=${EMPTY} ${defaultkvstoreprefix}=voltha/voltha_voltha
... ${without_pm_data}=True
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
${etcddata}= Get ONU Go Adapter ETCD Data ${namespace} ${kvstoreprefix} False ${without_pm_data}
@@ -572,7 +572,8 @@
... In case of a passed dictionary containing set_vids these will be checked for to
... current set-vid depending on setvidequal (True=equal, False=not equal).
[Arguments] ${namespace}=default ${nbofcookieslice}=1 ${reqmatchvid}=4096 ${prevvlanrules}=${NONE}
- ... ${setvidequal}=False ${defaultkvstoreprefix}=voltha_voltha ${without_prefix}=True ${without_pm_data}=True
+ ... ${setvidequal}=False ${defaultkvstoreprefix}=voltha/voltha_voltha
+ ... ${without_prefix}=True ${without_pm_data}=True
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
${etcddata}= Get ONU Go Adapter ETCD Data ${namespace} ${kvstoreprefix} ${without_prefix} ${without_pm_data}
#prepare result for json convert
@@ -611,7 +612,7 @@
Get ONU Go Adapter ETCD Data
[Documentation] This keyword delivers openonu-go-adapter Data stored in etcd
- [Arguments] ${namespace}=default ${defaultkvstoreprefix}=voltha_voltha ${without_prefix}=True
+ [Arguments] ${namespace}=default ${defaultkvstoreprefix}=voltha/voltha_voltha ${without_prefix}=True
... ${without_pm_data}=True ${device_id}=${Empty} ${keys_only}=False
${podname}= Set Variable etcd
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
@@ -690,7 +691,7 @@
Delete ONU Go Adapter ETCD Data
[Documentation] This keyword deletes openonu-go-adapter Data stored in etcd
- [Arguments] ${namespace}=default ${defaultkvstoreprefix}=voltha_voltha ${validate}=False
+ [Arguments] ${namespace}=default ${defaultkvstoreprefix}=voltha/voltha_voltha ${validate}=False
${podname}= Set Variable etcd
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
${commandget}= Catenate
diff --git a/libraries/utils.robot b/libraries/utils.robot
index cfd4235..f30a5f5 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -1482,7 +1482,7 @@
Validate Cleanup In ETCD
[Documentation] The keyword verifies that device, ports, flows, meters are all cleared in ETCD
- [Arguments] ${namespace}=default ${defaultkvstoreprefix}=voltha_voltha
+ [Arguments] ${namespace}=default ${defaultkvstoreprefix}=voltha/voltha_voltha
${podname}= Set Variable etcd
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
# Log Devices Output and Verify Output Should be Empty
diff --git a/libraries/voltha.robot b/libraries/voltha.robot
index 5328fe4..d29b664 100755
--- a/libraries/voltha.robot
+++ b/libraries/voltha.robot
@@ -60,7 +60,7 @@
Get Kv Store Prefix
[Documentation] This keyword delivers the KV Store Prefix read from environment variable KVSTOREPREFIX if present.
- [Arguments] ${defaultkvstoreprefix}=voltha_voltha
+ [Arguments] ${defaultkvstoreprefix}=voltha/voltha_voltha
${kv_store_prefix}= Get Environment Variable KVSTOREPREFIX default=${defaultkvstoreprefix}
# while Get Environment Variable does not work correctly, a manual correction follows
${kv_store_prefix}= Set Variable If "${kv_store_prefix}"=="${EMPTY}" ${defaultkvstoreprefix} ${kv_store_prefix}
diff --git a/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot b/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot
index 739605f..1947f52 100755
--- a/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot
@@ -47,8 +47,8 @@
# Per-test logging on failure is turned off by default; set this variable to enable
${container_log_dir} ${None}
# KV Store Prefix
-# example: -v kvstoreprefix:voltha_voltha
-${kvstoreprefix} voltha_voltha
+# example: -v kvstoreprefix:voltha/voltha_voltha
+${kvstoreprefix} voltha/voltha_voltha
# determines the environment workflow: DT, TT or ATT (default)
# example: -v workflow:DT
${workflow} ATT
@@ -149,7 +149,7 @@
Validate Etcd Vlan Rules Added Subscriber
[Documentation] This keyword validates Vlan rules of openonu-go-adapter Data stored in etcd.
... It checks the match_vid (=4096) and set_vid when subscriber are added.
- [Arguments] ${onu_tags_dict} ${reqmatchvid}=4096 ${defaultkvstoreprefix}=voltha_voltha
+ [Arguments] ${onu_tags_dict} ${reqmatchvid}=4096 ${defaultkvstoreprefix}=voltha/voltha_voltha
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
${etcddata}= Get ONU Go Adapter ETCD Data ${INFRA_NAMESPACE} ${kvstoreprefix} True True
#prepare result for json convert
@@ -191,7 +191,7 @@
Validate Etcd Vlan Rules Removed Subscriber
[Documentation] This keyword validates Vlan rules of openonu-go-adapter Data stored in etcd.
... It checks the match_vid (=4096) and set_vid when subscriber are removed.
- [Arguments] ${reqmatchvid}=4096 ${defaultkvstoreprefix}=voltha_voltha
+ [Arguments] ${reqmatchvid}=4096 ${defaultkvstoreprefix}=voltha/voltha_voltha
${kvstoreprefix}= Get Kv Store Prefix ${defaultkvstoreprefix}
${etcddata}= Get ONU Go Adapter ETCD Data ${INFRA_NAMESPACE} ${kvstoreprefix} True True
#prepare result for json convert
diff --git a/tests/openonu-go-adapter/Voltha_ONUNegativeStateTests.robot b/tests/openonu-go-adapter/Voltha_ONUNegativeStateTests.robot
index 3e57095..1ffe71e 100755
--- a/tests/openonu-go-adapter/Voltha_ONUNegativeStateTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUNegativeStateTests.robot
@@ -46,8 +46,8 @@
# Per-test logging on failure is turned off by default; set this variable to enable
${container_log_dir} ${None}
# KV Store Prefix
-# example: -v kvstoreprefix:voltha_voltha
-${kvstoreprefix} voltha_voltha
+# example: -v kvstoreprefix:voltha/voltha_voltha
+${kvstoreprefix} voltha/voltha_voltha
# used tech profile, can be passed via the command line too, valid values: default (=1T1GEM), 1T4GEM, 1T8GEM
# example: -v techprofile:1T4GEM
${techprofile} default
diff --git a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
index e414ce3..010d05d 100755
--- a/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUReconcileTests.robot
@@ -53,8 +53,8 @@
# example: -v workflow:DT
${workflow} ATT
# KV Store Prefix
-# example: -v kvstoreprefix:voltha_voltha
-${kvstoreprefix} voltha_voltha
+# example: -v kvstoreprefix:voltha/voltha_voltha
+${kvstoreprefix} voltha/voltha_voltha
# flag debugmode is used, if true timeout calculation various, can be passed via the command line too
# example: -v debugmode:True
${debugmode} False
diff --git a/tests/openonu-go-adapter/Voltha_ONUStateTests.robot b/tests/openonu-go-adapter/Voltha_ONUStateTests.robot
index 67f7b4c..e7b425c 100755
--- a/tests/openonu-go-adapter/Voltha_ONUStateTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUStateTests.robot
@@ -46,8 +46,8 @@
# Per-test logging on failure is turned off by default; set this variable to enable
${container_log_dir} ${None}
# KV Store Prefix
-# example: -v kvstoreprefix:voltha_voltha
-${kvstoreprefix} voltha_voltha
+# example: -v kvstoreprefix:voltha/voltha_voltha
+${kvstoreprefix} voltha/voltha_voltha
# state to test variable, can be passed via the command line too, valid values: 1-6
# 1 -> activating-onu
# 2 -> starting-openomci