From 3b22a2d4f52f24e0984bb4d712a4cafd83d06d7b Mon Sep 17 00:00:00 2001 From: jf9860 Date: Wed, 1 Mar 2017 19:43:28 -0500 Subject: Remove fragile process test from vFW validation. Process name is vairable. Process validation is implied by susbequent log validation. Allow for A&AI teardown delete to fail due to lingering references. Change-Id: Iea269d24232d4ff711233f5c666da677354ab694 Signed-off-by: jf9860 --- robot/resources/aai/create_tenant.robot | 67 +++++++++++++++++---------------- 1 file changed, 34 insertions(+), 33 deletions(-) (limited to 'robot/resources/aai/create_tenant.robot') diff --git a/robot/resources/aai/create_tenant.robot b/robot/resources/aai/create_tenant.robot index e5a55966..756882e7 100644 --- a/robot/resources/aai/create_tenant.robot +++ b/robot/resources/aai/create_tenant.robot @@ -11,76 +11,78 @@ Library Collections *** Variables *** -${INDEX PATH} /aai/v8 +${INDEX PATH} /aai/v8 ${ROOT_TENANT_PATH} /cloud-infrastructure/cloud-regions/cloud-region/ ${SYSTEM USER} robot-ete ${AAI_ADD_TENANT_BODY}= robot/assets/templates/aai/add_tenant_body.template -*** Keywords *** +*** Keywords *** Inventory Tenant If Not Exists - [Documentation] Creates a service in A&AI if it doesn't exist + [Documentation] Creates a service in A&AI if it doesn't exist [Arguments] ${cloud_owner} ${cloud_region_id} ${cloud_type} ${owner_defined_type} ${cloud_region_version} ${cloud_zone} ${tenant_id} ${tenant_name} ${dict}= Get Tenants ${cloud_owner} ${cloud_region_id} - ${status} ${value}= Run Keyword And Ignore Error Dictionary Should Contain Key ${dict} ${tenant_id} + ${status} ${value}= Run Keyword And Ignore Error Dictionary Should Contain Key ${dict} ${tenant_id} Run Keyword If '${status}' == 'FAIL' Inventory Tenant ${cloud_owner} ${cloud_region_id} ${cloud_type} ${owner_defined_type} ${cloud_region_version} ${cloud_zone} ${tenant_id} ${tenant_name} - + 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} + [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} + ${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} ${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)$ + Should Match Regexp ${status_string} ^(201|200)$ Get Resource Version If Exists - [Documentation] Creates a service in A&AI if it doesn't exist + [Documentation] Creates a service in A&AI if it doesn't exist [Arguments] ${cloud_owner} ${cloud_region_id} ${cloud_type} ${owner_defined_type} ${cloud_region_version} ${cloud_zone} ${resource_version}= Set Variable ${resp}= Get Cloud Region ${cloud_owner} ${cloud_region_id} Return from Keyword if '${resp.status_code}' != '200' ${resource_version} ${json}= Set Variable ${resp.json()} - ${resource_version}= Catenate ${json['resource-version']} - [Return] "resource-version":"${resource_version}", - + ${resource_version}= Catenate ${json['resource-version']} + [Return] "resource-version":"${resource_version}", + Delete Tenant - [Documentation] Removes both Tenant + [Documentation] Removes both Tenant [Arguments] ${tenant_id} ${cloud_owner} ${cloud_region_id} - ${get_resp}= Run A&AI Get Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id}/tenants/tenant/${tenant_id} + ${get_resp}= Run A&AI Get Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id}/tenants/tenant/${tenant_id} Run Keyword If '${get_resp.status_code}' == '200' Delete Tenant Exists ${tenant_id} ${cloud_owner} ${cloud_region_id} ${get_resp.json()['resource-version']} Delete Tenant Exists [Arguments] ${tenant_id} ${cloud_owner} ${cloud_region_id} ${resource_version} - ${put_resp}= Run A&AI Delete Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id}/tenants/tenant/${tenant_id} ${resource_version} - Should Be Equal As Strings ${put_resp.status_code} 204 - + ${put_resp}= Run A&AI Delete Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id}/tenants/tenant/${tenant_id} ${resource_version} + Should Be Equal As Strings ${put_resp.status_code} 204 + Delete Cloud Region [Documentation] Removes both Tenant and Cloud Region in A&AI [Arguments] ${tenant_id} ${cloud_owner} ${cloud_region_id} - ${get_resp}= Run A&AI Get Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id} + ${get_resp}= Run A&AI Get Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id} Run Keyword If '${get_resp.status_code}' == '200' Delete Cloud Region Exists ${tenant_id} ${cloud_owner} ${cloud_region_id} ${get_resp.json()['resource-version']} - + Delete Cloud Region Exists + [Documentation] Delete may get status 400 (Bad Request) if the region is still referenced [Arguments] ${tenant_id} ${cloud_owner} ${cloud_region_id} ${resource_version} ${put_resp}= Run A&AI Delete Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id} ${resource_version} - Should Be Equal As Strings ${put_resp.status_code} 204 - + ${status_string}= Convert To String ${put_resp.status_code} + Should Match Regexp ${status_string} ^(204|400)$ + Get Tenants - [Documentation] Return list of tenants for this cloud owner/region - [Arguments] ${cloud_owner} ${cloud_region_id} + [Documentation] Return list of tenants for this cloud owner/region + [Arguments] ${cloud_owner} ${cloud_region_id} ${resp}= Run A&AI Get Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id}/tenants - ${dict}= Create Dictionary + ${dict}= Create Dictionary ${status} ${value}= Run Keyword And Ignore Error Should Be Equal As Strings ${resp.status_code} 200 - Run Keyword If '${status}' == 'PASS' Update Tenant Dictionary ${dict} ${resp.json()} + Run Keyword If '${status}' == 'PASS' Update Tenant Dictionary ${dict} ${resp.json()} [Return] ${dict} Get Cloud Region - [Documentation] Returns the Cloud Region if it exists - [Arguments] ${cloud_owner} ${cloud_region_id} + [Documentation] Returns the Cloud Region if it exists + [Arguments] ${cloud_owner} ${cloud_region_id} ${resp}= Run A&AI Get Request ${INDEX PATH}${ROOT_TENANT_PATH}${cloud_owner}/${cloud_region_id} [Return] ${resp} @@ -89,9 +91,8 @@ Update Tenant Dictionary ${list}= Evaluate ${json}['tenant'] :for ${map} in @{list} \ ${status} ${tenant_id}= Run Keyword And Ignore Error Get From Dictionary ${map} tenant-id - \ Run Keyword If '${status}' == 'PASS' Set To Dictionary ${dict} ${tenant_id}=${map} + \ Run Keyword If '${status}' == 'PASS' Set To Dictionary ${dict} ${tenant_id}=${map} Log ${dict} - - - \ No newline at end of file + + -- cgit 1.2.3-korg