[VOL-5536] fix vgc pipeline issues
Change-Id: I6a50276a598cb5d51d54ef499ada170a9a0fc438
Signed-off-by: Abhay Kumar <abhay.kumar@radisys.com>
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml
index a5fd993..7e99924 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON_VGC.yaml
@@ -27,7 +27,8 @@
# Actual Unused sadis.file but ready to future implementation
sadis.file: ../data/dt-sadis-multiolt-config-vgc.json
-
+oltconfig.file: ../data/oltdeviceconfig.json
+oltconfig1.file: ../data/oltdeviceconfig_1.json
nodes:
-
diff --git a/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml b/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml
index d257a1e7..25e4b53 100644
--- a/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml
+++ b/tests/data/bbsim-kind-dt-fttb-1OLTx1PONx2ONUx2UNI.yaml
@@ -28,6 +28,7 @@
# Actual Unused sadis.file but ready to future implementation
sadis.file: ../data/dt-sadis-config-fttb-vgc.json
+oltconfig.file: ../data/oltdeviceconfig.json
nodes:
-
diff --git a/tests/data/bbsim-kind-dt-vgc.yaml b/tests/data/bbsim-kind-dt-vgc.yaml
index c28e98c..397db20 100755
--- a/tests/data/bbsim-kind-dt-vgc.yaml
+++ b/tests/data/bbsim-kind-dt-vgc.yaml
@@ -27,6 +27,7 @@
# Actual Unused sadis.file but ready to future implementation
sadis.file: ../data/dt-sadis-config.json
+oltconfig.file: ../data/oltdeviceconfig.json
nodes:
diff --git a/tests/data/oltdeviceconfig.json b/tests/data/oltdeviceconfig.json
new file mode 100644
index 0000000..6cfd9b3
--- /dev/null
+++ b/tests/data/oltdeviceconfig.json
@@ -0,0 +1,9 @@
+{
+ "id": "BBSIM_OLT_10",
+ "nasId": "BBSIM_OLT_10",
+ "hardwareIdentifier": "28:b9:d9:e2:93:d6",
+ "uplinkPort": "16777216",
+ "nniDhcpTrapVid": 4,
+ "nniPorts":["16777216","16777217"]
+}
+
diff --git a/tests/data/oltdeviceconfig_1.json b/tests/data/oltdeviceconfig_1.json
new file mode 100755
index 0000000..a46d3da
--- /dev/null
+++ b/tests/data/oltdeviceconfig_1.json
@@ -0,0 +1,9 @@
+{
+ "id": "BBSIM_OLT_11",
+ "nasId": "BBSIM_OLT_11",
+ "hardwareIdentifier": "28:b9:d9:e2:93:d6",
+ "uplinkPort": "16777216",
+ "nniDhcpTrapVid": 4,
+ "nniPorts":["16777216","16777217"]
+}
+
diff --git a/tests/dt-workflow/Voltha_DT_FailureScenarios_VGC.robot b/tests/dt-workflow/Voltha_DT_FailureScenarios_VGC.robot
index f9bf40c..88f9b0a 100644
--- a/tests/dt-workflow/Voltha_DT_FailureScenarios_VGC.robot
+++ b/tests/dt-workflow/Voltha_DT_FailureScenarios_VGC.robot
@@ -284,8 +284,10 @@
... ${dst['dp_iface_name']} ${dst['ip']} ${dst['user']} ${dst['pass']} ${dst['container_type']}
... ${dst['container_name']}
END
- Restart VOLTHA Port Forward voltha-api
- ${port_fwd} Start Process kubectl -n voltha port-forward svc/${kafka} ${KAFKA_PORT}:${KAFKA_PORT} --address 0.0.0.0 & shell=true
+ Restart VOLTHA Port Forward voltha-api 55555:55555\
+ ${cmd} Set Variable ps -ef | grep -E "[k]ubectl.*-n[[:space:]]*voltha.*port-forward.*voltha-voltha-api.*55555:55555" | awk '{print $2}' | xargs -r kill -9
+ ${rc} ${pid} Run And Return Rc And Output ${cmd}
+ ${port_fwd} Start Process kubectl -n voltha port-forward svc/${kafka} ${KAFKA_PORT}:${KAFKA_PORT} & shell=true
Verify OLT Soft Reboot for DT
[Documentation] Test soft reboot of the OLT using voltctl command
@@ -516,7 +518,9 @@
# of now. And there is no other to check if the reconcile has happened for all the OLTs. Due to this limitations a
# sleep of 60s is introduced to give enough time for rw core to reconcile the OLTs."
Sleep 60s
- ${port_fwd} Start Process kubectl -n voltha port-forward svc/${kafka} ${KAFKA_PORT}:${KAFKA_PORT} --address 0.0.0.0 & shell=true
+ ${cmd} Set Variable ps -ef | grep -E "[k]ubectl.*-n[[:space:]]*voltha.*port-forward.*voltha-voltha-api.*55555:55555" | awk '{print $2}' | xargs -r kill -9
+ ${rc} ${pid} Run And Return Rc And Output ${cmd}
+ ${port_fwd} Start Process kubectl -n voltha port-forward svc/${kafka} ${KAFKA_PORT}:${KAFKA_PORT} & shell=true
Verify Control Plane After Pod Restart DT
*** Keywords ***