sdc needs to do a json data loads

Issue-ID: TEST-184
Change-Id: I10eadc66fa97d57b6985ce5b5dc5838d7a7ccd00
Signed-off-by: DR695H <dr695h@att.com>

diff --git a/robot/resources/sdc_interface.robot b/robot/resources/sdc_interface.robot
index 1f77f9b..b1dc6e3 100644 (file)
--- a/robot/resources/sdc_interface.robot
+++ b/robot/resources/sdc_interface.robot
@@ -181,13 +181,14 @@ Distribute vCPEResCust Model From SDC
     #${brg_dict}=   Create Dictionary      invariantUUID=ff0337b9-dbe2-4d88-bb74-18bf027ae586   UUID=1b6974f1-4aed-47f4-b962-816aa1261927    node_type=org.openecomp.service.Demovcpevbrgemu
     # Create /tmp/vcpe_allotted_resource_data.json with demo vgmux and brgemu CSARs
     Create Allotted Resource Data File
-    ${vcpe_ar_data_file}    OperatingSystem.Get File    /tmp/vcpe_allotted_resource_data.json
-    ${tunnelxconn_invariant_uuid}=    Catenate    ${vcpe_ar_data_file.json()['tunnelxconn']['invariantUUID']}
-    ${tunnelxconn_uuid}=    Catenate    ${vcpe_ar_data_file.json()['tunnelxconn']['UUID']}
-    ${tunnelxconn_node_type}=    Catenate    ${vcpe_ar_data_file.json()['tunnelxconn']['node_type']}
-    ${brg_invariant_uuid}=    Catenate    ${vcpe_ar_data_file.json()['brg']['invariantUUID']}
-    ${brg_uuid}=    Catenate    ${vcpe_ar_data_file.json()['brg']['UUID']}
-    ${brg_node_type}=    Catenate    ${vcpe_ar_data_file.json()['brg']['node_type']}
+    ${vcpe_ar_data_string}    OperatingSystem.Get File    /tmp/vcpe_allotted_resource_data.json
+    ${vcpe_ar_data_file}=   Evaluate    json.loads('''${vcpe_ar_data_string}''')    json
+    ${tunnelxconn_invariant_uuid}=    Catenate    ${vcpe_ar_data_file['tunnelxconn']['invariantUUID']}
+    ${tunnelxconn_uuid}=    Catenate    ${vcpe_ar_data_file['tunnelxconn']['UUID']}
+    ${tunnelxconn_node_type}=    Catenate    ${vcpe_ar_data_file['tunnelxconn']['node_type']}
+    ${brg_invariant_uuid}=    Catenate    ${vcpe_ar_data_file['brg']['invariantUUID']}
+    ${brg_uuid}=    Catenate    ${vcpe_ar_data_file['brg']['UUID']}
+    ${brg_node_type}=    Catenate    ${vcpe_ar_data_file['brg']['node_type']}
     ${tunnelxconn_dict}=   Create Dictionary      invariantUUID=${tunnelxconn_invariant_uuid}  UUID=${tunnelxconn_uuid}  node_type=${tunnelxconn_node_type}
     ${brg_dict}=   Create Dictionary      invariantUUID=${brg_invariant_uuid}   UUID=${brg_uuid}  node_type=${brg_node_type}
     ${xoffset}=    Set Variable    ${100}

diff --git a/robot/resources/stack_validation/validate_dns_scaling.robot b/robot/resources/stack_validation/validate_dns_scaling.robot
index 9082eca..cf66525 100644 (file)
--- a/robot/resources/stack_validation/validate_dns_scaling.robot
+++ b/robot/resources/stack_validation/validate_dns_scaling.robot
@@ -3,8 +3,6 @@ Documentation     Testing openstack.
 Library    OperatingSystem
 Library    SSHLibrary
 Library    RequestsLibrary
-Library    ONAPLibrary.JSON
-Library    ONAPLibrary.Openstack
 Library    Collections
 Resource          ../../resources/openstack/keystone_interface.robot
 Resource          ../../resources/openstack/nova_interface.robot

diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot
index 4646720..3af5164 100644 (file)
--- a/robot/resources/stack_validation/validate_vfw.robot
+++ b/robot/resources/stack_validation/validate_vfw.robot
@@ -3,8 +3,6 @@ Documentation     Testing openstack.
 Library    OperatingSystem
 Library    SSHLibrary
 Library    RequestsLibrary
-Library    ONAPLibrary.JSON
-Library    ONAPLibrary.Openstack
 Library    Collections
 Resource          ../../resources/openstack/keystone_interface.robot
 Resource          ../../resources/openstack/nova_interface.robot