diff options
| -rw-r--r-- | robot/resources/sdc_interface.robot | 15 | ||||
| -rw-r--r-- | robot/resources/stack_validation/validate_dns_scaling.robot | 2 | ||||
| -rw-r--r-- | robot/resources/stack_validation/validate_vfw.robot | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/robot/resources/sdc_interface.robot b/robot/resources/sdc_interface.robot index 1f77f9b7..b1dc6e31 100644 --- 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 9082ecab..cf66525b 100644 --- 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 4646720e..3af5164e 100644 --- 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 |