diff options
| author |   DR695H <dr695h@att.com> | 2019-07-26 15:50:23 -0400 |
|---|---|---|
| committer | DR695H <dr695h@att.com> | 2019-07-26 15:50:23 -0400 |
| commit | c61842700ce4426111091d7c6187cf8dc85c97b7 (patch) | |
| tree | b731a930d56c7a06acc4f41c4ef2c31349f5bd10 /robot/resources/aai/create_zone.robot | |
| parent | 50e6c29ed3c378451db1a5571676481bb56cebbb (diff) | |
change properties to match what is in the new oom repo
this needs to go in after
https://gerrit.onap.org/r/#/c/testsuite/oom/+/92138/
https://gerrit.onap.org/r/#/c/oom/+/92137/
Issue-ID: TEST-165
Change-Id: I643482f4ec9fa26c7704795bbb33f86f47ad0407
Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/aai/create_zone.robot')
| -rw-r--r-- | robot/resources/aai/create_zone.robot | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/robot/resources/aai/create_zone.robot b/robot/resources/aai/create_zone.robot index bb6577d1..f9cb6972 100644 --- a/robot/resources/aai/create_zone.robot +++ b/robot/resources/aai/create_zone.robot @@ -18,8 +18,7 @@ ${AAI_ADD_ZONE_BODY}= aai/add_zone_body.jinja Inventory Zone If Not Exists [Documentation] Creates a service in A&AI if it doesn't exist [Arguments] ${zone_id}=${GLOBAL_AAI_ZONE_ID} ${zone_name}=${GLOBAL_AAI_ZONE_NAME} ${design_type}=${GLOBAL_AAI_DESIGN_TYPE} ${zone_context}=${GLOBAL_AAI_ZONE_CONTEXT} - ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${get_resp}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} auth=${auth} + ${get_resp}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} auth=${GLOBAL_AAI_AUTHENTICATION} Return From Keyword If '${get_resp.status_code}' == '200' Inventory Zone ${zone_id} ${zone_name} ${design_type} ${zone_context} @@ -29,29 +28,25 @@ Inventory Zone ${arguments}= Create Dictionary zone_id=${zone_id} zone_name=${zone_name} design_type=${design_type} zone_context=${zone_context} Templating.Create Environment aai ${GLOBAL_TEMPLATE_FOLDER} ${data}= Templating.Apply Template aai ${AAI_ADD_ZONE_BODY} ${arguments} - ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${put_resp}= AAI.Run Put Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} ${data} auth=${auth} + ${put_resp}= AAI.Run Put Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} ${data} auth=${GLOBAL_AAI_AUTHENTICATION} ${status_string}= Convert To String ${put_resp.status_code} Should Match Regexp ${status_string} ^(201|200)$ Delete Zone [Documentation] Removes both Tenant [Arguments] ${zone_id}=${GLOBAL_AAI_ZONE_ID} - ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${get_resp}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} auth=${auth} + ${get_resp}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} auth=${GLOBAL_AAI_AUTHENTICATION} Run Keyword If '${get_resp.status_code}' == '200' Delete Zone Exists ${zone_id} ${get_resp.json()} Delete Zone Exists [Arguments] ${zone_id} ${json} ${resource_version}= Catenate ${json['resource-version']} - ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${put_resp}= AAI.Run Delete Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} ${resource_version} auth=${auth} + ${put_resp}= AAI.Run Delete Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} ${resource_version} auth=${GLOBAL_AAI_AUTHENTICATION} Should Be Equal As Strings ${put_resp.status_code} 204 Get Zone [Documentation] Return zone [Arguments] ${zone_id} - ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${resp}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} auth=${auth} + ${resp}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${ZONE_INDEX_PATH}${ROOT_ZONE_PATH}/${zone_id} auth=${GLOBAL_AAI_AUTHENTICATION} Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp.json()} |