diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-07-30 15:27:14 -0700 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-07-30 15:27:14 -0700 |
commit | c3d9a46f357d3b083c99ffeeb23abf6fad8b111a (patch) | |
tree | cae3eedb2f2c479eec3ecf5aa2208830f6161938 | |
parent | aecd888a9cc77bb99d6c93b8ab90838990c38e96 (diff) |
Refactor OOM robot changes into demo/testsuite
Refactor OOM-specific robot overrides to make them
generic to both HEAT and OOM; remove OOM-specific
robot overrides to prevent dual-maintenance between
OOM robot and HEAT robot.
Change-Id: I0030d8978cdbd50a12400aaba2f21778745f0431
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r-- | resources/config/robot/resources/oof_interface.robot | 41 | ||||
-rw-r--r-- | resources/config/robot/resources/policy_interface.robot | 60 | ||||
-rw-r--r-- | resources/config/robot/resources/sdngc_interface.robot | 240 | ||||
-rw-r--r-- | templates/configmap.yaml | 8 | ||||
-rw-r--r-- | templates/deployment.yaml | 12 |
5 files changed, 0 insertions, 361 deletions
diff --git a/resources/config/robot/resources/oof_interface.robot b/resources/config/robot/resources/oof_interface.robot deleted file mode 100644 index 1c3137e..0000000 --- a/resources/config/robot/resources/oof_interface.robot +++ /dev/null @@ -1,41 +0,0 @@ -*** Settings *** -Documentation The main interface for interacting with OOF: SNIRO and Homing Service -Library RequestsLibrary - -Resource global_properties.robot - -*** Variables *** -${OOF_HOMING_HEALTH_CHECK_PATH} /v1/plans/healthcheck -${OOF_SNIRO_HEALTH_CHECK_PATH} /api/oof/v1/healthcheck - -${OOF_HOMING_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT} -${OOF_SNIRO_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT} - -*** Keywords *** -Run OOF-Homing Health Check - [Documentation] Runs OOF-Homing Health check - ${resp}= Run OOF-Homing Get Request ${OOF_HOMING_HEALTH_CHECK_PATH} - Should Be Equal As Integers ${resp.status_code} 200 - -Run OOF-Homing Get Request - [Documentation] Runs OOF-Homing Get request - [Arguments] ${data_path} - ${session}= Create Session session ${OOF_HOMING_ENDPOINT} - ${resp}= Get Request session ${data_path} - Should Be Equal As Integers ${resp.status_code} 200 - Log Received response from OOF-Homing ${resp.text} - [Return] ${resp} - -Run OOF-SNIRO Health Check - [Documentation] Runs OOF-SNIRO Health check - ${resp}= Run OOF-SNIRO Get Request ${OOF_SNIRO_HEALTH_CHECK_PATH} - Should Be Equal As Integers ${resp.status_code} 200 - -Run OOF-SNIRO Get Request - [Documentation] Runs OOF-SNIRO Get request - [Arguments] ${data_path} - ${session}= Create Session session ${OOF_SNIRO_ENDPOINT} - ${resp}= Get Request session ${data_path} - Should Be Equal As Integers ${resp.status_code} 200 - Log Received response from OOF-SNIRO ${resp.text} - [Return] ${resp} diff --git a/resources/config/robot/resources/policy_interface.robot b/resources/config/robot/resources/policy_interface.robot deleted file mode 100644 index 9656b7b..0000000 --- a/resources/config/robot/resources/policy_interface.robot +++ /dev/null @@ -1,60 +0,0 @@ -*** Settings *** -Documentation The main interface for interacting with Policy. It handles low level stuff like managing the http request library and Policy required fields -Library RequestsClientCert -Library RequestsLibrary -Library String -Library JSONUtils -Library Collections -Resource global_properties.robot - -*** Variables *** -${POLICY_HEALTH_CHECK_PATH} /healthcheck -${POLICY_ENDPOINT} ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_IP_ADDR}:${GLOBAL_POLICY_SERVER_PORT} -${POLICY_HEALTHCHECK_ENDPOINT} ${GLOBAL_POLICY_SERVER_PROTOCOL}://${GLOBAL_INJECTED_POLICY_HEALTHCHECK_IP_ADDR}:${GLOBAL_POLICY_HEALTHCHECK_PORT} - -*** Keywords *** - -Run Policy Health Check - [Documentation] Runs Policy Health check - ${auth}= Create List ${GLOBAL_POLICY_USERNAME} ${GLOBAL_POLICY_PASSWORD} - Log Creating session ${POLICY_ENDPOINT} - ${session}= Create Session policy ${POLICY_HEALTHCHECK_ENDPOINT} auth=${auth} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= Get Request policy ${POLICY_HEALTH_CHECK_PATH} headers=${headers} - Log Received response from policy ${resp.text} - Should Be Equal As Strings ${resp.status_code} 200 - Should Be True ${resp.json()['healthy']} - @{ITEMS}= Copy List ${resp.json()['details']} - :FOR ${ELEMENT} IN @{ITEMS} - \ Should Be Equal As Strings ${ELEMENT['code']} 200 - \ Should Be True ${ELEMENT['healthy']} - -Run Policy Put Request - [Documentation] Runs Policy Put request - [Arguments] ${data_path} ${data} - Log Creating session ${POLICY_ENDPOINT} - ${session}= Create Session policy ${POLICY_ENDPOINT} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json Authorization=Basic ${GLOBAL_POLICY_AUTH} ClientAuth=${GLOBAL_POLICY_CLIENTAUTH} Environment=TEST - ${resp}= Put Request policy ${data_path} data=${data} headers=${headers} - Log Received response from policy ${resp.text} - [Return] ${resp} - -Run Policy Delete Request - [Documentation] Runs Policy Delete request - [Arguments] ${data_path} ${data} - Log Creating session ${POLICY_ENDPOINT} - ${session}= Create Session policy ${POLICY_ENDPOINT} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json Authorization=Basic ${GLOBAL_POLICY_AUTH} ClientAuth=${GLOBAL_POLICY_CLIENTAUTH} Environment=TEST - ${resp}= Delete Request policy ${data_path} data=${data} headers=${headers} - Log Received response from policy ${resp.text} - [Return] ${resp} - -Run Policy Get Configs Request - [Documentation] Runs Policy Get Configs request - [Arguments] ${data_path} ${data} - Log Creating session ${POLICY_ENDPOINT} - ${session}= Create Session policy ${POLICY_ENDPOINT} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json Authorization=Basic ${GLOBAL_POLICY_AUTH} ClientAuth=${GLOBAL_POLICY_CLIENTAUTH} - ${resp}= Post Request policy ${data_path} data=${data} headers=${headers} - Log Received response from policy ${resp.text} - [Return] ${resp}
\ No newline at end of file diff --git a/resources/config/robot/resources/sdngc_interface.robot b/resources/config/robot/resources/sdngc_interface.robot deleted file mode 100644 index 57198db..0000000 --- a/resources/config/robot/resources/sdngc_interface.robot +++ /dev/null @@ -1,240 +0,0 @@ -*** Settings *** -Documentation The main interface for interacting with SDN-GC. It handles low level stuff like managing the http request library and SDN-GC required fields -Library RequestsLibrary -Library UUID -Library OperatingSystem -Library ExtendedSelenium2Library -Library Collections -Library String -Library StringTemplater -Resource global_properties.robot -Resource ../resources/json_templater.robot -Resource browser_setup.robot - -Variables ../assets/service_mappings.py - -*** Variables *** -${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} /operations/VNF-API:preload-vnf-topology-operation -${PRELOAD_VNF_CONFIG_PATH} /config/VNF-API:preload-vnfs/vnf-preload-list -${PRELOAD_VNF_TOPOLOGY_OPERATION_BODY} robot/assets/templates/sdnc/ -${SDNGC_INDEX_PATH} /restconf -${SDNCGC_HEALTHCHECK_OPERATION_PATH} /operations/SLI-API:healthcheck -${SDNGC_REST_ENDPOINT} ${GLOBAL_SDNGC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SDNC_IP_ADDR}:${GLOBAL_SDNGC_REST_PORT} -${SDNGC_ADMIN_ENDPOINT} ${GLOBAL_SDNGC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR}:${GLOBAL_SDNGC_ADMIN_PORT} -${SDNGC_ADMIN_SIGNUP_URL} ${SDNGC_ADMIN_ENDPOINT}/signup -${SDNGC_ADMIN_LOGIN_URL} ${SDNGC_ADMIN_ENDPOINT}/login -${SDNGC_ADMIN_VNF_PROFILE_URL} ${SDNGC_ADMIN_ENDPOINT}/mobility/getVnfProfile - -*** Keywords *** -Run SDNGC Health Check - [Documentation] Runs an SDNGC healthcheck - ${resp}= Run SDNGC Post Request ${SDNGC_INDEX PATH}${SDNCGC_HEALTHCHECK_OPERATION_PATH} ${None} - Should Be Equal As Strings ${resp.status_code} 200 - Should Be Equal As Strings ${resp.json()['output']['response-code']} 200 - -Run SDNGC Get Request - [Documentation] Runs an SDNGC get request - [Arguments] ${data_path} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - Log Creating session ${SDNGC_REST_ENDPOINT} - ${session}= Create Session sdngc ${SDNGC_REST_ENDPOINT} auth=${auth} - ${uuid}= Generate UUID - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Get Request sdngc ${data_path} headers=${headers} - Log Received response from sdngc ${resp.text} - [Return] ${resp} - -Run SDNGC Put Request - [Documentation] Runs an SDNGC put request - [Arguments] ${data_path} ${data} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - Log Creating session ${SDNGC_REST_ENDPOINT} - ${session}= Create Session sdngc ${SDNGC_REST_ENDPOINT} auth=${auth} - ${uuid}= Generate UUID - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Put Request sdngc ${data_path} data=${data} headers=${headers} - Log Received response from sdngc ${resp.text} - [Return] ${resp} - -Run SDNGC Post Request - [Documentation] Runs an SDNGC post request - [Arguments] ${data_path} ${data} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - Log Creating session ${SDNGC_REST_ENDPOINT} - ${session}= Create Session sdngc ${SDNGC_REST_ENDPOINT} auth=${auth} - ${uuid}= Generate UUID - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Post Request sdngc ${data_path} data=${data} headers=${headers} - Log Received response from sdngc ${resp.text} - [Return] ${resp} - -Run SDNGC Delete Request - [Documentation] Runs an SDNGC delete request - [Arguments] ${data_path} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - Log Creating session ${SDNGC_REST_ENDPOINT} - ${session}= Create Session sdngc ${SDNGC_REST_ENDPOINT} auth=${auth} - ${uuid}= Generate UUID - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Delete Request sdngc ${data_path} headers=${headers} - Log Received response from sdngc ${resp.text} - [Return] ${resp} - - -Preload Vnf - [Arguments] ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_module_name} ${vf_modules} ${service} ${uuid} - ${base_vf_module_type}= Catenate - ${closedloop_vf_module}= Create Dictionary - ${templates}= Get From Dictionary ${GLOBAL_SERVICE_TEMPLATE_MAPPING} ${service} - :for ${vf_module} in @{vf_modules} - \ ${vf_module_type}= Get From Dictionary ${vf_module} name - \ ${dict} Get From Mapping ${templates} ${vf_module} - \ ${filename}= Get From Dictionary ${dict} template - \ ${base_vf_module_type}= Set Variable If '${dict['isBase']}' == 'true' ${vf_module_type} ${base_vf_module_type} - \ ${closedloop_vf_module}= Set Variable If '${dict['isBase']}' == 'false' ${vf_module} ${closedloop_vf_module} - \ ${vf_name}= Update Module Name ${dict} ${vf_module_name} - \ Preload Vnf Profile ${vf_module_type} - \ Preload One Vnf Topology ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_name} ${vf_module_type} ${service} ${filename} ${uuid} - [Return] ${base_vf_module_type} ${closedloop_vf_module} - - -Update Module Name - [Arguments] ${dict} ${vf_module_name} - Return From Keyword If 'prefix' not in ${dict} ${vf_module_name} - Return From Keyword If '${dict['prefix']}' == '' ${vf_module_name} - ${name}= Replace String ${vf_module_name} Vfmodule_ ${dict['prefix']} - [Return] ${name} - -Get From Mapping - [Documentation] Retrieve the appropriate prelad template entry for the passed vf_module - [Arguments] ${templates} ${vf_module} - ${vf_module_name}= Get From DIctionary ${vf_module} name - :for ${template} in @{templates} - \ Return From Keyword If '${template['name_pattern']}' in '${vf_module_name}' ${template} - [Return] None - -Preload One Vnf Topology - [Arguments] ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_module_name} ${vf_module_type} ${service} ${filename} ${uuid} - Return From Keyword If '${filename}' == '' - ${data_template}= OperatingSystem.Get File ${PRELOAD_VNF_TOPOLOGY_OPERATION_BODY}/preload.template - ${parameters}= Get Template Parameters ${filename} ${uuid} - Set To Dictionary ${parameters} generic_vnf_name=${generic_vnf_name} generic_vnf_type=${generic_vnf_type} service_type=${service_type_uuid} vf_module_name=${vf_module_name} vf_module_type=${vf_module_type} - ${data}= Fill JSON Template ${data_template} ${parameters} - ${put_resp}= Run SDNGC Post Request ${SDNGC_INDEX_PATH}${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} ${data} - Should Be Equal As Strings ${put_resp.json()['output']['response-code']} 200 - ${get_resp}= Run SDNGC Get Request ${SDNGC_INDEX_PATH}${PRELOAD_VNF_CONFIG_PATH}/${vf_module_name}/${vf_module_type} - Should Be Equal As Strings ${get_resp.status_code} 200 - -Get Template Parameters - [Arguments] ${template} ${uuid} - ${rest} ${suite}= Split String From Right ${SUITE NAME} . 1 - ${uuid}= Catenate ${uuid} - ${hostid}= Get Substring ${uuid} -4 - ${ecompnet}= Evaluate (${GLOBAL_BUILD_NUMBER}%128)+128 - - - # Initialize the value map with the properties generated from the Robot VM /opt/config folder - ${valuemap}= Copy Dictionary ${GLOBAL_INJECTED_PROPERTIES} - - # These should be deprecated by the above.... - Set To Dictionary ${valuemap} artifacts_version=${GLOBAL_INJECTED_ARTIFACTS_VERSION} - Set To Dictionary ${valuemap} network=${GLOBAL_INJECTED_NETWORK} - Set To Dictionary ${valuemap} public_net_id=${GLOBAL_INJECTED_PUBLIC_NET_ID} - Set To Dictionary ${valuemap} cloud_env=${GLOBAL_INJECTED_CLOUD_ENV} - Set To Dictionary ${valuemap} install_script_version=${GLOBAL_INJECTED_SCRIPT_VERSION} - Set To Dictionary ${valuemap} vm_image_name=${GLOBAL_INJECTED_VM_IMAGE_NAME} - Set To Dictionary ${valuemap} vm_flavor_name=${GLOBAL_INJECTED_VM_FLAVOR} - - - # update the value map with unique values. - Set To Dictionary ${valuemap} uuid=${uuid} hostid=${hostid} ecompnet=${ecompnet} - - # - # Mash together the defaults dict with the test case dict to create the set of - # preload parameters - # - ${suite_templates}= Get From Dictionary ${GLOBAL_PRELOAD_PARAMETERS} ${suite} - ${template}= Get From Dictionary ${suite_templates} ${template} - ${defaults}= Get From Dictionary ${GLOBAL_PRELOAD_PARAMETERS} defaults - # add all of the defaults to template... - @{keys}= Get Dictionary Keys ${defaults} - :for ${key} in @{keys} - \ ${value}= Get From Dictionary ${defaults} ${key} - \ Set To Dictionary ${template} ${key} ${value} - - # - # Get the vnf_parameters to preload - # - ${vnf_parameters}= Resolve VNF Parameters Into Array ${valuemap} ${template} - ${vnf_parameters_json}= Evaluate json.dumps(${vnf_parameters}) json - ${parameters}= Create Dictionary vnf_parameters=${vnf_parameters_json} - [Return] ${parameters} - -Resolve Values Into Dictionary - [Arguments] ${valuemap} ${from} ${to} - ${keys}= Get Dictionary Keys ${from} - :for ${key} in @{keys} - \ ${value}= Get From Dictionary ${from} ${key} - \ ${value}= Template String ${value} ${valuemap} - \ Set To Dictionary ${to} ${key} ${value} - -Resolve VNF Parameters Into Array - [Arguments] ${valuemap} ${from} - ${vnf_parameters}= Create List - ${keys}= Get Dictionary Keys ${from} - :for ${key} in @{keys} - \ ${value}= Get From Dictionary ${from} ${key} - \ ${value}= Template String ${value} ${valuemap} - \ ${parameter}= Create Dictionary vnf-parameter-name=${key} vnf-parameter-value=${value} - \ Append To List ${vnf_parameters} ${parameter} - [Return] ${vnf_parameters} - -Preload Vnf Profile - [Arguments] ${vnf_name} - Login To SDNGC Admin GUI - Go To ${SDNGC_ADMIN_VNF_PROFILE_URL} - Click Button xpath=//button[@data-target='#add_vnf_profile'] - Input Text xpath=//input[@id='nf_vnf_type'] ${vnf_name} - Input Text xpath=//input[@id='nf_availability_zone_count'] 999 - Input Text xpath=//input[@id='nf_equipment_role'] robot-ete-test - Click Button xpath=//button[contains(.,'Submit')] - Page Should Contain VNF Profile - Input Text xpath=//div[@id='vnf_profile_filter']//input ${vnf_name} - Page Should Contain ${vnf_name} - -Delete Vnf Profile - [Arguments] ${vnf_name} - Login To SDNGC Admin GUI - Go To ${SDNGC_ADMIN_VNF_PROFILE_URL} - Page Should Contain VNF Profile - Input Text xpath=//div[@id='vnf_profile_filter']//input ${vnf_name} - Page Should Contain ${vnf_name} - Click Button xpath=//button[contains(@onclick, '${vnf_name}')] - Page Should Contain Are you sure you want to delete VNF_PROFILE - Click Button xpath=//button[contains(text(), 'Yes')] - Page Should Not Contain ${vnf_name} - -Login To SDNGC Admin GUI - [Documentation] Login To SDNGC Admin GUI - ## Setup Browser is now being managed by the test case - ## Setup Browser - Go To ${SDNGC_ADMIN_SIGNUP_URL} - ##Maximize Browser Window - Set Selenium Speed ${GLOBAL_SELENIUM_DELAY} - Set Browser Implicit Wait ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Log Logging in to ${SDNGC_ADMIN_LOGIN_URL} - Handle Proxy Warning - Title Should Be AdminPortal - ${uuid}= Generate UUID - ${shortened_uuid}= Evaluate str("${uuid}")[:12] - ${email}= Catenate ${shortened_uuid}@robotete.com - Input Text xpath=//input[@id='nf_email'] ${email} - Input Password xpath=//input[@id='nf_password'] ${shortened_uuid} - Click Button xpath=//button[@type='submit'] - Wait Until Page Contains User created 20s - Go To ${SDNGC_ADMIN_LOGIN_URL} - Input Text xpath=//input[@id='email'] ${email} - Input Password xpath=//input[@id='password'] ${shortened_uuid} - Click Button xpath=//button[@type='submit'] - Title Should Be SDN-C AdminPortal - Log Logged in to ${SDNGC_ADMIN_LOGIN_URL}
\ No newline at end of file diff --git a/templates/configmap.yaml b/templates/configmap.yaml index ab4a10b..e4096b0 100644 --- a/templates/configmap.yaml +++ b/templates/configmap.yaml @@ -23,14 +23,6 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "common.fullname" . }}-resources-configmap - namespace: {{ include "common.namespace" . }} -data: -{{ tpl (.Files.Glob "resources/config/robot/resources/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap namespace: {{ include "common.namespace" . }} data: diff --git a/templates/deployment.yaml b/templates/deployment.yaml index e5cc1d3..1297760 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -69,15 +69,6 @@ spec: readOnly: true - name: robot-eteshare mountPath: /share/config - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/policy_interface.robot - subPath: policy_interface.robot - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/sdngc_interface.robot - subPath: sdngc_interface.robot - - name: robot-resources - mountPath: /var/opt/OpenECOMP_ETE/robot/resources/oof_interface.robot - subPath: oof_interface.robot - name: robot-lighttpd-authorization mountPath: /etc/lighttpd/authorization subPath: authorization @@ -110,9 +101,6 @@ spec: configMap: name: {{ include "common.fullname" . }}-eteshare-configmap defaultMode: 0755 - - name: robot-resources - configMap: - name: {{ include "common.fullname" . }}-resources-configmap - name: robot-lighttpd-authorization configMap: name: {{ include "common.fullname" . }}-lighttpd-authorization-configmap |