commit 0ca56d1bc3ff43e8aca4c330283a01c6a422405a
author DR695H <dr695h@att.com> Tue May 14 11:48:20 2019 -0400
committer DR695H <dr695h@att.com> Tue May 14 11:51:57 2019 -0400
tree df3c495769b59e93588557e2bb4e0746d3df3715
parent a9107a734e443c257a114812fb830a3628808efb

remove unneeded libraries

httplibrary is replicated with requests so replacing the few places that
use it with the requests. also removing kafkalibrary since it isnt used
and we dont want to use it since its not python 3 compatible.

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

robot/resources/asdc_interface.robot

diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 6ffc17e..35eab12 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -6,7 +6,6 @@
 Library           OperatingSystem
 Library           Collections
 Library           SeleniumLibrary
-Library           HttpLibrary.HTTP
 Library           String
 Library           StringTemplater
 Library           ArchiveLibrary
@@ -84,7 +83,6 @@
     #   Save the resource_id in a dictionary keyed byt the resource NAme in the zipfile name (vFWDT_vFWSNK.zip or vFWDT_vPKG.zip)
     #   Create the resources but dont immediately add resource
     #   Add Resource to Service in a separate FOR loop
-    #  TODO: CHECK vCPE models to make sure they aren't broken with the split
     ${resource_types}=   Create Dictionary
 
     :FOR    ${zip}     IN     @{model_zip_path}
@@ -178,12 +176,12 @@
     # 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}    Get Json Value    ${vcpe_ar_data_file}    /tunnelxconn/invariantUUID
-    ${tunnelxconn_uuid}    Get Json Value    ${vcpe_ar_data_file}    /tunnelxconn/UUID
-    ${tunnelxconn_node_type}    Get Json Value    ${vcpe_ar_data_file}    /tunnelxconn/node_type
-    ${brg_invariant_uuid}    Get Json Value    ${vcpe_ar_data_file}    /brg/invariantUUID
-    ${brg_uuid}    Get Json Value    ${vcpe_ar_data_file}    /brg/UUID
-    ${brg_node_type}    Get Json Value    ${vcpe_ar_data_file}    /brg/node_type
+    ${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']}
     ${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}