diff options
Diffstat (limited to 'robot/resources/aai')
| -rw-r--r-- | robot/resources/aai/create_customer.robot | 4 | ||||
| -rw-r--r-- | robot/resources/aai/create_service.robot | 4 | ||||
| -rw-r--r-- | robot/resources/aai/create_tenant.robot | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/robot/resources/aai/create_customer.robot b/robot/resources/aai/create_customer.robot index fec58843..78547758 100644 --- a/robot/resources/aai/create_customer.robot +++ b/robot/resources/aai/create_customer.robot @@ -6,7 +6,6 @@ Documentation Create A&AI Customer API. Resource aai_interface.robot Resource ../json_templater.robot Library Collections -Library OperatingSystem *** Variables *** @@ -19,9 +18,8 @@ ${A&AI ADD CUSTOMER BODY} robot/assets/templates/aai/add_customer.template Create Customer [Documentation] Creates a customer in A&AI [Arguments] ${customer_name} ${customer_id} ${customer_type} ${service_type} ${clouder_owner} ${cloud_region_id} ${tenant_id} - ${data_template}= OperatingSystem.Get File ${A&AI ADD CUSTOMER BODY} ${arguments}= Create Dictionary subscriber_name=${customer_name} global_customer_id=${customer_id} subscriber_type=${customer_type} cloud_owner1=${clouder_owner} cloud_region_id1=${cloud_region_id} tenant_id1=${tenant_id} service1=${service_type} - ${data}= Fill JSON Template ${data_template} ${arguments} + ${data}= Fill JSON Template File ${A&AI ADD CUSTOMER BODY} ${arguments} ${put_resp}= Run A&AI Put Request ${INDEX PATH}${ROOT_CUSTOMER_PATH}${customer_id} ${data} Should Be Equal As Strings ${put_resp.status_code} 201 [Return] ${put_resp.status_code} diff --git a/robot/resources/aai/create_service.robot b/robot/resources/aai/create_service.robot index f4f2b27c..0584a2a1 100644 --- a/robot/resources/aai/create_service.robot +++ b/robot/resources/aai/create_service.robot @@ -5,7 +5,6 @@ Documentation Create A&AI Customer API. Resource ../json_templater.robot Resource aai_interface.robot -Library OperatingSystem Library Collections Library ONAPLibrary.Utilities @@ -30,9 +29,8 @@ Create Service [Documentation] Creates a service in A&AI [Arguments] ${service_type} ${uuid}= Generate UUID4 - ${data_template}= OperatingSystem.Get File ${AAI_ADD_SERVICE_BODY} ${arguments}= Create Dictionary service_type=${service_type} UUID=${uuid} - ${data}= Fill JSON Template ${data_template} ${arguments} + ${data}= Fill JSON Template File ${AAI_ADD_SERVICE_BODY} ${arguments} ${fullpath}= Catenate ${INDEX PATH}${ROOT_SERVICE_PATH}/service/${uuid} ${put_resp}= Run A&AI Put Request ${fullpath} ${data} Should Be Equal As Strings ${put_resp.status_code} 201 diff --git a/robot/resources/aai/create_tenant.robot b/robot/resources/aai/create_tenant.robot index 99d3a08d..24cb4d4d 100644 --- a/robot/resources/aai/create_tenant.robot +++ b/robot/resources/aai/create_tenant.robot @@ -5,7 +5,6 @@ Documentation Create A&AI Customer API. Resource ../json_templater.robot Resource aai_interface.robot -Library OperatingSystem Library Collections @@ -29,9 +28,8 @@ Inventory Tenant [Documentation] Inventorys a Tenant in A&AI [Arguments] ${cloud_owner} ${cloud_region_id} ${cloud_type} ${owner_defined_type} ${cloud_region_version} ${cloud_zone} ${tenant_id} ${tenant_name} ${json_resource_version}= Get Resource Version If Exists ${cloud_owner} ${cloud_region_id} ${cloud_type} ${owner_defined_type} ${cloud_region_version} ${cloud_zone} - ${data_template}= OperatingSystem.Get File ${AAI_ADD_TENANT_BODY} ${arguments}= Create Dictionary cloud_owner=${cloud_owner} cloud_region_id=${cloud_region_id} cloud_type=${cloud_type} owner_defined_type=${owner_defined_type} cloud_region_version=${cloud_region_version} cloud_zone=${cloud_zone} tenant_id=${tenant_id} tenant_name=${tenant_name} resource_version=${json_resource_version} - ${data}= Fill JSON Template ${data_template} ${arguments} + ${data}= Fill JSON Template File ${AAI_ADD_TENANT_BODY} ${arguments} ${put_resp}= Run A&AI Put Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id} ${data} ${status_string}= Convert To String ${put_resp.status_code} Should Match Regexp ${status_string} ^(201|200)$ |