SEBA-686 Enable multiple Ponsim OLTs
Change-Id: I0128903474f31b6e00d0fc1eed5cfad604d87475
diff --git a/src/test/cord-api/Tests/WorkflowValidations/SIAB.robot b/src/test/cord-api/Tests/WorkflowValidations/SIAB.robot
index 8d72f1f..d14bdf2 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/SIAB.robot
+++ b/src/test/cord-api/Tests/WorkflowValidations/SIAB.robot
@@ -319,7 +319,7 @@
Set Suite Variable ${whitelist_id}
${att_si_id}= Retrieve ATT Service Instance ID ${onu_device}
Set Suite Variable ${att_si_id}
- ${RG_CONTAINER}= Run kubectl -n voltha get pod|grep "^rg-"|cut -d' ' -f1
+ ${RG_CONTAINER}= Run kubectl -n voltha get pod|grep "^rg[0-]"|cut -d' ' -f1
Set Suite Variable ${RG_CONTAINER}
## Validate ATT Workflow SI
Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI ENABLED AWAITING ${onu_device}
@@ -366,7 +366,7 @@
Simple Setup
${datetime}= Run date +"%Y-%m-%dT%H:%M:%S.%NZ"
Set Suite Variable ${datetime}
- ${RG_CONTAINER}= Run kubectl -n voltha get pod|grep "^rg-"|cut -d' ' -f1
+ ${RG_CONTAINER}= Run kubectl -n voltha get pod|grep "^rg[0-]"|cut -d' ' -f1
Set Suite Variable ${RG_CONTAINER}
Test Cleanup
@@ -384,7 +384,7 @@
Restart RG Pod
Run kubectl -n voltha delete pod ${RG_CONTAINER}
- ${RG_CONTAINER}= Wait Until Keyword Succeeds 60s 1s Run kubectl -n voltha get pod|grep "^rg-"|cut -d' ' -f1
+ ${RG_CONTAINER}= Wait Until Keyword Succeeds 60s 1s Run kubectl -n voltha get pod|grep "^rg[0-]"|cut -d' ' -f1
Set Suite Variable ${RG_CONTAINER}
Run kubectl wait -n voltha pod/${RG_CONTAINER} --for condition=Ready --timeout=180s
@@ -426,7 +426,7 @@
Wait Until Keyword Succeeds 60s 2s Create Subscriber
Wait Until Keyword Succeeds 60s 2s Create Whitelist
Subscriber Ready to Authenticate
- ${RG_CONTAINER}= Run kubectl -n voltha get pod|grep "^rg-"|cut -d' ' -f1
+ ${RG_CONTAINER}= Run kubectl -n voltha get pod|grep "^rg[0-]"|cut -d' ' -f1
Set Suite Variable ${RG_CONTAINER}
Validate XConnect in ONOS
diff --git a/src/test/cord-api/Tests/WorkflowValidations/data/SIABOLT0Device.json b/src/test/cord-api/Tests/WorkflowValidations/data/SIABOLT0Device.json
new file mode 100644
index 0000000..75021c7
--- /dev/null
+++ b/src/test/cord-api/Tests/WorkflowValidations/data/SIABOLT0Device.json
@@ -0,0 +1,15 @@
+{
+ "VOLTDeviceInfo" : [
+ {
+ "device_type": "ponsim_olt",
+ "host": "olt0.voltha.svc",
+ "port": 50060,
+ "switch_datapath_id": "of:0000000000000001",
+ "switch_port": "2",
+ "outer_tpid": "0x8100",
+ "name": "PONSIM OLT",
+ "uplink": "2",
+ "volt_service_id": 2
+ }
+ ]
+}
diff --git a/src/test/cord-api/Tests/WorkflowValidations/data/SIABSubscriberLatest.json b/src/test/cord-api/Tests/WorkflowValidations/data/SIABSubscriberLatest.json
index 8458513..c483383 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/data/SIABSubscriberLatest.json
+++ b/src/test/cord-api/Tests/WorkflowValidations/data/SIABSubscriberLatest.json
@@ -1,10 +1,10 @@
{
"SubscriberInfo" : [
{
- "name": "QQClient",
+ "name": "QQClient0",
"s_tag": 222,
"c_tag": 111,
- "onu_device": "PSMO12345678",
+ "onu_device": "PSMO00000000",
"status": "pre-provisioned",
"upstream_bps_id": 2,
"downstream_bps_id": 2
diff --git a/src/test/cord-api/Tests/WorkflowValidations/data/SIABWhitelistLatest.json b/src/test/cord-api/Tests/WorkflowValidations/data/SIABWhitelistLatest.json
new file mode 100644
index 0000000..67da827
--- /dev/null
+++ b/src/test/cord-api/Tests/WorkflowValidations/data/SIABWhitelistLatest.json
@@ -0,0 +1,10 @@
+{
+ "AttWhiteListInfo" : [
+ {
+ "serial_number": "PSMO00000000",
+ "device_id" : "of:0000d0d3e158fede",
+ "pon_port_id" : 1,
+ "owner_id" : "1"
+ }
+ ]
+}