diff options
author | efiacor <fiachra.corcoran@est.tech> | 2022-12-20 18:58:55 +0000 |
---|---|---|
committer | Andreas Geissler <andreas-geissler@telekom.de> | 2023-01-26 16:14:35 +0000 |
commit | 99507033a51c4dfbabc6372c29f43300947be5d6 (patch) | |
tree | 4185c4e1ddb7353fcf6a6dfc7a8afd2ace1055b4 /robot/resources | |
parent | 8b8a4cff5ca8d1bfec1133d8713bb8931d56e1aa (diff) |
[APPC] Remove APPC junk
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ibe45140261245e80a3a662d64c8a1935acabf5af
Issue-ID: OOM-3069
Diffstat (limited to 'robot/resources')
5 files changed, 0 insertions, 119 deletions
diff --git a/robot/resources/appc_interface.robot b/robot/resources/appc_interface.robot deleted file mode 100644 index b031aab4..00000000 --- a/robot/resources/appc_interface.robot +++ /dev/null @@ -1,99 +0,0 @@ -*** Settings *** -Documentation The main interface for interacting with APP-C. It handles low level stuff like managing the http request library and APP-C required fields -Library RequestsLibrary -Library ONAPLibrary.Utilities -Library ONAPLibrary.Templating WITH NAME Templating -Library SeleniumLibrary -Resource browser_setup.robot - -*** Variables *** -${APPC_INDEX_PATH} /restconf -${APPC_HEALTHCHECK_OPERATION_PATH} /operations/SLI-API:healthcheck -${APPC_CREATE_MOUNTPOINT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/ -${APPC_MOUNT_XML} appc/vnf_mount.jinja -${APPC_ENDPOINT} ${GLOBAL_APPC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_APPC_IP_ADDR}:${GLOBAL_APPC_SERVER_PORT} -${APPC_CDT_Config_Scaleout} ${EXECDIR}/robot/assets/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml -${APPC_CDT_Config_Scaleout_PD} ${EXECDIR}/robot/assets/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml -${APPC_CDT_Config_Scaleout_REF} ${EXECDIR}/robot/assets/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json -${APPC_CDT_Config_Scaleout_REF_name} reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json -${APPC_CDT_ENDPOINT} ${GLOBAL_APPC_CDT_SERVER_PROTOCOL}://${GLOBAL_INJECTED_APPC_CDT_IP_ADDR}:${GLOBAL_APPC_CDT_SERVER_PORT} -${APPC_CDT_LOGIN_URL} ${APPC_CDT_ENDPOINT}/index.html - - -*** Keywords *** -Run APPC Health Check - [Documentation] Runs an APPC healthcheck - ${resp}= Run APPC Post Request ${APPC_INDEX PATH}${APPC_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 APPC Post Request - [Documentation] Runs an APPC post request - [Arguments] ${data_path} ${data} ${content}=json - Log Creating session ${APPC_ENDPOINT} - ${session}= Create Session appc ${APPC_ENDPOINT} auth=${GLOBAL_APPC_AUTHENTICATION} - ${uuid}= Generate UUID4 - ${headers}= Create Dictionary Accept=application/${content} Content-Type=application/${content} X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Post Request appc ${data_path} data=${data} headers=${headers} - Log Received response from appc ${resp.text} - [Return] ${resp} - -Run APPC Put Request - [Documentation] Runs an APPC post request - [Arguments] ${data_path} ${data} ${content}=xml - Log Creating session ${APPC_ENDPOINT} - ${session}= Create Session appc ${APPC_ENDPOINT} auth=${GLOBAL_APPC_AUTHENTICATION} - ${uuid}= Generate UUID4 - ${headers}= Create Dictionary Accept=application/${content} Content-Type=application/${content} X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Put Request appc ${data_path} data=${data} headers=${headers} - Log Received response from appc ${resp.text} - [Return] ${resp} - -Create Mount Point In APPC - [Documentation] Go tell APPC about the PGN we just spun up... - [Arguments] ${nodeid} ${host} ${port}=${GLOBAL_PGN_PORT} ${username}=admin ${password}=admin - ${dict}= Create Dictionary nodeid=${nodeid} host=${host} port=${port} username=${username} password=${password} - Templating.Create Environment appc ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Templating.Apply Template appc ${APPC_MOUNT_XML} ${dict} - ${resp}= Run APPC Put Request ${APPC_INDEX PATH}${APPC_CREATE_MOUNTPOINT_PATH}${nodeid} ${data} - Should Be True 200 <= ${resp.status_code} < 300 - [Return] ${resp} - -Preload APPC CDT GUI - [Documentation] APPC CDT GUI Preload - [Arguments] ${username}=${GLOBAL_APPC_CDT_USERNAME} ${reference_file_name}=${APPC_CDT_Config_Scaleout_REF_name} ${reference_file}=${APPC_CDT_Config_Scaleout_REF} ${template_file}=${APPC_CDT_Config_Scaleout} ${parameterdefinition_file}=${APPC_CDT_Config_Scaleout_PD} - # Setup Browser Now being managed by test case - ##Setup Browser - Go To ${APPC_CDT_LOGIN_URL}#/home - Set Selenium Speed ${GLOBAL_SELENIUM_DELAY} - Set Browser Implicit Wait ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Log Logging in to ${APPC_CDT_ENDPOINT} - Handle Proxy Warning - Wait Until Page Contains WELCOME ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} - Go To ${APPC_CDT_LOGIN_URL}#/vnfs - Wait Until Element Is Visible id=userId ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} - Input Text id=userId ${username} - Click Button Submit - Page Should Contain ${username} - Wait Until Page Contains Element xpath=(//*[@class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary']) ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} - Click Button Create New VNF Type or VNFC Type - Page Should Contain Enter VNF type and VNFC to proceed - Click Button Proceed anyway - Click Button Upload Reference File - Choose File id=inputFile ${reference_file} - Select From List By Value name=templateIdentifier vLB - Sleep ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Click Link Template - Click Button Upload Template File - Choose File id=inputFile ${template_file} - Sleep ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Click Link Parameter Definition - Click Button UPLOAD PD FILE - Choose File id=inputFile1 ${parameterdefinition_file} - Sleep ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT} - Click Link Reference Data - Select From List By Value name=templateIdentifier vLB - Click Button saveToAppc - Go To ${APPC_CDT_LOGIN_URL}#/vnfs - Wait Until Page Contains ${reference_file_name} ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT} - Log Logged in to ${APPC_CDT_ENDPOINT} diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot index 9137ac09..f2bba38b 100644 --- a/robot/resources/demo_preload.robot +++ b/robot/resources/demo_preload.robot @@ -168,18 +168,6 @@ Get Persona Model Id ${persona_model_id}= Get From DIctionary ${resp.json()['service-instance'][0]} model-invariant-id [Return] ${persona_model_id} -APPC Mount Point - [Arguments] ${vf_module_name} - Run Openstack Auth Request auth - ${status} ${stack_info}= Run Keyword and Ignore Error Wait for Stack to Be Deployed auth ${vf_module_name} timeout=120s - Run Keyword if '${status}' == 'FAIL' FAIL ${vf_module_name} Stack is not found - ${stack_id}= Get From Dictionary ${stack_info} id - ${server_list}= Get Openstack Servers auth - ${vpg_name_0}= Get From Dictionary ${stack_info} vpg_name_0 - ${vnf_id}= Get From Dictionary ${stack_info} vnf_id - ${vpg_public_ip}= Get Server Ip ${server_list} ${stack_info} vpg_name_0 network_name=${GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK} - ${appc}= Create Mount Point In APPC ${vnf_id} ${vpg_public_ip} - Instantiate VNF [Arguments] ${service} ${vf_module_label}=NULL ${tenant_id} ${tenant_name}= Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone @@ -197,9 +185,6 @@ Instantiate VNF \ ${model_invariant_id}= Set Variable If '${vf_module_label}' in '${vf_module}' ${generic_vnf['model-invariant-id']} ${model_invariant_id} Log Update old vFWCL Policy for ModelInvariantID=${model_invariant_id} ${status} ${value}= Run Keyword And Ignore Error Update vFWCL Operational and Monitoring Policies ${model_invariant_id} - :FOR ${vf_module_name} IN @{vf_module_name_list} - \ Log APPC Mount Point for VNF Module Name=${vf_module_name} - \ ${status} ${value}= Run Keyword And Ignore Error APPC Mount Point ${vf_module_name} Log Update Tca ControlLoopName Update Tca ControlLoopName ${model_invariant_id} @@ -226,7 +211,6 @@ Instantiate Demo VNF \ ${model_invariant_id}= Set Variable If '${vf_module_label}' in '${vf_module}' ${generic_vnf['model-invariant-id']} ${model_invariant_id} Log ModelInvariantID=${model_invariant_id} ${status} ${value}= Run Keyword And Ignore Error Update vFWCL Operational and Monitoring Policies ${model_invariant_id} - ${status} ${value}= Run Keyword And Ignore Error APPC Mount Point ${vf_module_name} Save For Delete [Documentation] Create a variable file to be loaded for save for delete diff --git a/robot/resources/stack_validation/validate_vfw.robot b/robot/resources/stack_validation/validate_vfw.robot index 3af5164e..5acf82c3 100644 --- a/robot/resources/stack_validation/validate_vfw.robot +++ b/robot/resources/stack_validation/validate_vfw.robot @@ -9,7 +9,6 @@ Resource ../../resources/openstack/nova_interface.robot Resource ../../resources/openstack/heat_interface.robot Resource ../../resources/ssh/files.robot Resource ../../resources/ssh/processes.robot -Resource ../appc_interface.robot Resource packet_generator_interface.robot Resource validate_common.robot @@ -42,7 +41,6 @@ Validate Firewall Stack #Wait For Packet Sink ${vsn_public_ip} #Log All server processes up ${vpg_oam_ip}= Get From Dictionary ${stack_info} vpg_onap_private_ip_0 - ${appc}= Create Mount Point In APPC ${vpg_name_0} ${vpg_oam_ip} #Wait For Packets ${vpg_public_ip} ${vpg_unprotected_ip} ${vsn_protected_ip} ${vsn_public_ip} Wait For Packets diff --git a/robot/resources/test_templates/vnf_instantiation_ovp.robot b/robot/resources/test_templates/vnf_instantiation_ovp.robot index 65ff37c3..71f079b3 100644 --- a/robot/resources/test_templates/vnf_instantiation_ovp.robot +++ b/robot/resources/test_templates/vnf_instantiation_ovp.robot @@ -33,7 +33,6 @@ Instantiate VNF ##### INSTANTIATING VNF IN VID ##### :FOR ${vnf} IN @{vnflist} - # APPC max is 50 characters \ ${vnf_name}= Catenate Ete_${vnf}_${uuid}_${vnf_name_index} \ ${generic_vnf_type}= Set Variable ${service_name}/${vnf_type} ${vnf_name_index} \ ${vnf_name_index}= Evaluate ${vnf_name_index} + 1 diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 9d33f7ab..59eff810 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -60,7 +60,6 @@ Orchestrate VNF ${vf_module_name_list}= Create List ${uuid}= Evaluate str("${uuid}")[:8] :FOR ${vnf} IN @{vnflist} - # APPC max is 50 characters \ ${vnf_name}= Catenate Ete_${vnf}_${uuid}_${vnf_name_index} \ ${vf_module_name}= Catenate Vfmodule_Ete_${vnf}_${uuid}_${vnf_name_index} \ ${vnf_name_index}= Evaluate ${vnf_name_index} + 1 |