Fixes and enhancements to ATT workflow test

Change-Id: I11d08b4ec26336419ce966016cbeefc59a680226
diff --git a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.txt b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.txt
index 28bcb92..154b03c 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.txt
+++ b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.txt
@@ -65,9 +65,9 @@
     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}
     Start DHCP Server on Remote Host    ${dst_ip}    ${dst_user}    ${dst_pass}    ${dst_dp_iface}.${stag}.${ctag}
     Send Dhclient Request    ${src_ip}    ${src_user}    ${src_pass}    ${src_iface}
+    Wait Until Keyword Succeeds    60s    5s    IPv4 Address Assigned to DHCP Client    ${src_ip}    ${src_user}    ${src_pass}    ${src_iface}
     Wait Until Keyword Succeeds    60s    5s    Test Ping    PASS    ${src_ip}    ${src_user}    ${src_pass}    ${dst_dp_ip}    ${src_iface}
 
 *** Keywords ***
diff --git a/src/test/cord-api/Tests/WorkflowValidations/data/ATTSubscriber.json b/src/test/cord-api/Tests/WorkflowValidations/data/ATTSubscriber.json
index a27e9bc..dcfd3a5 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/data/ATTSubscriber.json
+++ b/src/test/cord-api/Tests/WorkflowValidations/data/ATTSubscriber.json
@@ -6,8 +6,9 @@
             "c_tag": 999,
             "onu_device": "ALPHe3d1cfa7",
             "nas_port_id": "PON 1/1/03/1:1.1.1",
-            "circuit_id": "foo",
-            "status": "pre-provisioned"
+            "circuit_id": "foo1",
+            "status": "pre-provisioned",
+            "remote_id": "bar1"
      }
   ]
 }
diff --git a/src/test/cord-api/Tests/data/RealOLTDevice.json b/src/test/cord-api/Tests/data/RealOLTDevice.json
index 0ac640d..1b93373 100644
--- a/src/test/cord-api/Tests/data/RealOLTDevice.json
+++ b/src/test/cord-api/Tests/data/RealOLTDevice.json
@@ -8,8 +8,9 @@
             "switch_port": "7",
             "outer_tpid": "0x8100",
             "name": "olt-1",
-            "uplink": "128",
-            "volt_service_id": 2
+            "uplink": "65536",
+            "volt_service_id": 2,
+            "nas_id": "NAS_ID"
     }
   ]
 }