Fixes for ATT Workflow Driver SI and Subscriber checks
Change-Id: I1366d8fd6ce4ef986aaffd4ef02c14313f524a1c
diff --git a/src/test/cord-api/Framework/ATTWorkFlowDriver.robot b/src/test/cord-api/Framework/ATTWorkFlowDriver.robot
index 785e53b..3d63dde 100644
--- a/src/test/cord-api/Framework/ATTWorkFlowDriver.robot
+++ b/src/test/cord-api/Framework/ATTWorkFlowDriver.robot
@@ -30,9 +30,9 @@
Log ${json_result}
${json_result_list}= Get From dictionary ${json_result} items
${getJsonDict}= utils.getDictFromListOfDict ${json_result_list} serial_number ${onu_device}
- ${status}= Get From Dictionary ${getJsonDict} status
- ${authentication_status}= Get From Dictionary ${getJsonDict} authentication_state
- [Return] ${status} ${authentication_status}
+ ${onu_state}= Get From Dictionary ${getJsonDict} onu_state
+ ${authentication_state}= Get From Dictionary ${getJsonDict} authentication_state
+ [Return] ${onu_state} ${authentication_state}
Create Whitelist Entry
[Arguments] ${entry_list} ${list_index}
@@ -49,4 +49,4 @@
[Arguments] ${id}
[Documentation] Sends a DELETE to delete an att whitelist in XOS
${api_result}= restApi.ApiChameleonDelete ATT_WHITELIST ${id}
- Should Be True ${api_result}
\ No newline at end of file
+ Should Be True ${api_result}
diff --git a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.txt b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.txt
index d3c5896..b27f334 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.txt
+++ b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.txt
@@ -58,11 +58,11 @@
... Validate successful pings from src to dst
[Setup] None
Wait Until Keyword Succeeds 60s 2s Validate ONU States ACTIVE ENABLED
- Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI valid AWAITING
- Wait Until Keyword Succeeds 60s 2s Validate Subscriber Status AWAITING-AUTH
+ Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI ENABLED AWAITING
+ Wait Until Keyword Succeeds 60s 2s Validate Subscriber Status awaiting-auth
Send EAPOL Message ${src_ip} ${src_user} ${src_pass} ${src_iface} wpa_supplicant.conf
- Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI valid APPROVED
- Wait Until Keyword Succeeds 60s 2s Validate Subscriber Status ENABLED
+ Wait Until Keyword Succeeds 60s 2s Validate ATT Workflow Driver SI ENABLED APPROVED
+ Wait Until Keyword Succeeds 60s 2s Validate Subscriber Status enabled
Add Double Vlan Interface on Host ${dst_ip} ${dst_user} ${dst_pass} ${dst_dp_iface} ${s_tag} ${c_tag}
Add IP Address on Interface on Host ${dst_ip} ${dst_user} ${dst_pass} ${dst_dp_ip}/24 ${dst_dp_iface}.${stag}.${c_tag}
Add Route to Remote Host ${dst_ip} ${dst_user} ${dst_pass} ${dst_dp_ip} ${src_gateway} ${dst_dp_iface}.${stag}.${c_tag}
@@ -136,11 +136,11 @@
Validate ATT Workflow Driver SI
[Arguments] ${expected_status} ${expected_auth_status}
- ${status} ${authentication_status} Service Instance Status Check ${onu_device}
- Should Be Equal ${status} ${expected_status}
+ ${onu_state} ${authentication_status} Service Instance Status Check ${onu_device}
+ Should Be Equal ${onu_state} ${expected_status}
Should Be Equal ${authentication_status} ${expected_auth_status}
Validate Subscriber Status
[Arguments] ${exepected_status}
${status} Subscriber Status Check ${onu_device}
- Should Be Equal ${status} ${exepected_status}
\ No newline at end of file
+ Should Be Equal ${status} ${exepected_status}