update subscriber attribute references
Change-Id: Ib60f9c2e219cbec76ab890c00b7816988bb8fdcb
diff --git a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test002.robot b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test002.robot
index 57eea4c..5bda1e2 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test002.robot
+++ b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test002.robot
@@ -67,17 +67,17 @@
Validate Authentication True ${src0['dp_iface_name']} wpa_supplicant.conf ${src0['ip']} ${src0['user']} ${src0['pass']} ${src0['container_type']} ${src0['container_name']}
Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI ENABLED APPROVED ${src0['onu']}
Wait Until Keyword Succeeds 60s 2s Validate Subscriber Status enabled ${src0['onu']}
- Validate DHCP and Ping True True ${src0['dp_iface_name']} ${s_tag} ${c_tag} ${dst0['dp_iface_ip_qinq']} ${src0['ip']} ${src0['user']} ${src0['pass']} ${src0['container_type']} ${src0['container_name']} ${dst0['dp_iface_name']} ${dst0['ip']} ${dst0['user']} ${dst0['pass']} ${dst0['container_type']} ${dst0['container_name']}
+ Validate DHCP and Ping True True ${src0['dp_iface_name']} ${src0['s_tag]} ${src0['c_tag']} ${dst0['dp_iface_ip_qinq']} ${src0['ip']} ${src0['user']} ${src0['pass']} ${src0['container_type']} ${src0['container_name']} ${dst0['dp_iface_name']} ${dst0['ip']} ${dst0['user']} ${dst0['pass']} ${dst0['container_type']} ${dst0['container_name']}
#Second ONU
Wait Until Keyword Succeeds 300s 15s Validate ONU States ACTIVE ENABLED ${src1['onu']}
- Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI ENABLED AWAITING ${src0['onu']}
- Wait Until Keyword Succeeds 60s 2s Validate Subscriber Status awaiting-auth ${src0['onu']}
- Validate Authentication True ${src0['dp_iface_name']} wpa_supplicant.conf ${src0['ip']} ${src0['user']} ${src0['pass']} ${src0['container_type']} ${src0['container_name']}
- Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI ENABLED APPROVED ${src0['onu']}
- Wait Until Keyword Succeeds 60s 2s Validate Subscriber Status enabled ${src0['onu']}
- Validate DHCP and Ping True True ${src0['dp_iface_name']} ${s_tag} ${c_tag} ${dst0['dp_iface_ip_qinq']} ${src0['ip']} ${src0['user']} ${src0['pass']} ${src0['container_type']} ${src0['container_name']} ${dst0['dp_iface_name']} ${dst0['ip']} ${dst0['user']} ${dst0['pass']} ${dst0['container_type']} ${dst0['container_name']}
+ Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI ENABLED AWAITING ${src1['onu']}
+ Wait Until Keyword Succeeds 60s 2s Validate Subscriber Status awaiting-auth ${src1['onu']}
+ Validate Authentication True ${src1['dp_iface_name']} wpa_supplicant.conf ${src1['ip']} ${src1['user']} ${src1['pass']} ${src1['container_type']} ${src1['container_name']}
+ Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI ENABLED APPROVED ${src1['onu']}
+ Wait Until Keyword Succeeds 60s 2s Validate Subscriber Status enabled ${src1['onu']}
+ Validate DHCP and Ping True True ${src1['dp_iface_name']} ${src1['s_tag']} ${src1['c_tag']} ${dst1['dp_iface_ip_qinq']} ${src1['ip']} ${src1['user']} ${src1['pass']} ${src1['container_type']} ${src1['container_name']} ${dst1['dp_iface_name']} ${dst1['ip']} ${dst1['user']} ${dst1['pass']} ${dst1['container_type']} ${dst1['container_name']}
# Validate that the first ONU can still ping
- Validate DHCP and Ping True True ${src0['dp_iface_name']} ${s_tag} ${c_tag} ${dst0['dp_iface_ip_qinq']} ${src0['ip']} ${src0['user']} ${src0['pass']} ${src0['container_type']} ${src0['container_name']} ${dst0['dp_iface_name']} ${dst0['ip']} ${dst0['user']} ${dst0['pass']} ${dst0['container_type']} ${dst0['container_name']}
+ Validate DHCP and Ping True True ${src0['dp_iface_name']} ${src0['s_tag]} ${src0['c_tag']} ${dst0['dp_iface_ip_qinq']} ${src0['ip']} ${src0['user']} ${src0['pass']} ${src0['container_type']} ${src0['container_name']} ${dst0['dp_iface_name']} ${dst0['ip']} ${dst0['user']} ${dst0['pass']} ${dst0['container_type']} ${dst0['container_name']}
*** Keywords ***
Setup Suite
diff --git a/src/test/cord-api/Tests/WorkflowValidations/data/onlab-pod1-qa/ATTSubscriber.json b/src/test/cord-api/Tests/WorkflowValidations/data/onlab-pod1-qa/ATTSubscriber.json
index 3977769..c483a91 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/data/onlab-pod1-qa/ATTSubscriber.json
+++ b/src/test/cord-api/Tests/WorkflowValidations/data/onlab-pod1-qa/ATTSubscriber.json
@@ -11,6 +11,18 @@
"remote_id": "bar2",
"upstream_bps_id": 1,
"downstream_bps_id": 1
+ },
+ {
+ "name": "Sub_ISKra",
+ "s_tag": 111,
+ "c_tag": 113,
+ "onu_device": "ISKT71e80080",
+ "nas_port_id": "PON 1/1/04/1:1.1.1",
+ "circuit_id": "foo3",
+ "status": "pre-provisioned",
+ "remote_id": "bar3",
+ "upstream_bps_id": 2,
+ "downstream_bps_id": 2
}
]
}
diff --git a/src/test/cord-api/Tests/WorkflowValidations/data/onlab-pod1-qa/ATTWhiteList.json b/src/test/cord-api/Tests/WorkflowValidations/data/onlab-pod1-qa/ATTWhiteList.json
index 207c1b5..37d92a3 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/data/onlab-pod1-qa/ATTWhiteList.json
+++ b/src/test/cord-api/Tests/WorkflowValidations/data/onlab-pod1-qa/ATTWhiteList.json
@@ -5,6 +5,12 @@
"device_id" : "of:000000000a5a0072",
"pon_port_id" : 536870912,
"owner_id" : "1"
+ },
+ {
+ "serial_number": "ISKT71e80080",
+ "device_id" : "of:000000000a5a0072",
+ "pon_port_id" : 536870912,
+ "owner_id" : "1"
}
]
}