diff options
| -rw-r--r-- | red.xml | 3 | ||||
| -rw-r--r-- | robot/resources/global_properties.robot | 3 | ||||
| -rw-r--r-- | robot/resources/openstack/nova_interface.robot | 9 | ||||
| -rw-r--r-- | robot/resources/policy_interface.robot | 3 | ||||
| -rw-r--r-- | robot/resources/sdnc_interface.robot (renamed from robot/resources/sdngc_interface.robot) | 69 | ||||
| -rw-r--r-- | robot/resources/so/add_service_recipe.robot | 2 | ||||
| -rw-r--r-- | robot/resources/test_templates/model_test_template.robot | 4 | ||||
| -rw-r--r-- | robot/resources/test_templates/pnf_orchestration_test_template.robot | 2 | ||||
| -rw-r--r-- | robot/resources/test_templates/pnf_registration_without_SO_template.robot | 10 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 2 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot | 2 | ||||
| -rw-r--r-- | robot/testsuites/health-check.robot | 4 | ||||
| -rw-r--r-- | robot/testsuites/pnf-registration.robot | 15 |
13 files changed, 41 insertions, 87 deletions
@@ -27,8 +27,7 @@ <path location="robot/library"/> </pythonpath> <classpath/> - <variableFiles path="../oom/resources/config/eteshare/config/integration_robot_properties.py"/> - <variableFiles path="../oom/resources/config/eteshare/config/vm_properties.py"/> + <variableFiles path="../oom/resources/config/eteshare/config/robot_properties.py"/> <excludedForValidation> <excludedPath path="robot/library"/> </excludedForValidation> diff --git a/robot/resources/global_properties.robot b/robot/resources/global_properties.robot index 9b2f130e..ff56b031 100644 --- a/robot/resources/global_properties.robot +++ b/robot/resources/global_properties.robot @@ -47,5 +47,4 @@ ${GLOBAL_SO_VFC_ENDPOINT} ${GLOBAL_SO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_S ${GLOBAL_SO_VNFM_ENDPOINT} ${GLOBAL_SO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_VNFM_IP_ADDR}:${GLOBAL_SO_VNFM_SERVER_PORT} ${GLOBAL_SO_HEALTH_CHECK_PATH} /manage/health ${GLOBAL_SO_CLOUD_CONFIG_PATH} /cloudSite -${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} robot/assets/templates/so/create_cloud_config.jinja -${GLOBAL_SO_CLOUD_CONFIG_PATH} /serviceRecipe
\ No newline at end of file +${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} robot/assets/templates/so/create_cloud_config.jinja
\ No newline at end of file diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot index 6c576d15..55b3467e 100644 --- a/robot/resources/openstack/nova_interface.robot +++ b/robot/resources/openstack/nova_interface.robot @@ -79,15 +79,6 @@ Reboot Server ${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE} ${OPENSTACK_NOVA_SERVERS_PATH} /${server_id}/action ${OPENSTACK_NOVA_SERVERS_REBOOT_BODY} [Return] ${resp} -Add Server - [Documentation] Adds a server for the passed if - [Arguments] ${alias} ${name} ${imageRef} ${flavorRef} - ${dict}= Create Dictionary name=${name} imageRef=${imageRef} flavorRef=${flavorRef} - Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Apply Template openstack ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE} ${dict} - ${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE} ${OPENSTACK_NOVA_SERVERS_PATH} data_path= data=${data} - [Return] ${resp} - Add Server For Image Name [Documentation] Adds a server for the passed if [Arguments] ${alias} ${name} ${imageName} ${flavorName} ${public_net_id} diff --git a/robot/resources/policy_interface.robot b/robot/resources/policy_interface.robot index dba8d3ea..57ac0da2 100644 --- a/robot/resources/policy_interface.robot +++ b/robot/resources/policy_interface.robot @@ -44,9 +44,8 @@ Run Policy Health Check Run Drools Get Request [Documentation] Runs Drools Get Request [Arguments] ${data_path} - ${auth}= Create List ${GLOBAL_DROOLS_USERNAME} ${GLOBAL_DROOLS_PASSWORD} Log Creating session ${DROOLS_ENDPOINT} - ${session}= Create Session policy ${DROOLS_ENDPOINT} auth=${auth} + ${session}= Create Session policy ${DROOLS_ENDPOINT} auth=${GLOBAL_DROOLS_AUTHENTICATION} ${headers}= Create Dictionary Accept=application/json Content-Type=application/json ${resp}= Get Request policy ${data_path} headers=${headers} Log Received response from policy ${resp.text} diff --git a/robot/resources/sdngc_interface.robot b/robot/resources/sdnc_interface.robot index ff85c69d..198e364d 100644 --- a/robot/resources/sdngc_interface.robot +++ b/robot/resources/sdnc_interface.robot @@ -20,19 +20,18 @@ ${PRELOAD_NETWORK_TOPOLOGY_OPERATION_PATH} /operations/VNF-API:preload-network- ${PRELOAD_GR_TOPOLOGY_OPERATION_PATH} /operations/GENERIC-RESOURCE-API:preload-vf-module-topology-operation ${PRELOAD_VNF_CONFIG_PATH} /config/VNF-API:preload-vnfs/vnf-preload-list ${PRELOAD_TOPOLOGY_OPERATION_BODY} sdnc -${SDNGC_INDEX_PATH} /restconf +${SDNC_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 +${SDNC_REST_ENDPOINT} ${GLOBAL_SDNC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SDNC_IP_ADDR}:${GLOBAL_SDNC_REST_PORT} +${SDNC_ADMIN_ENDPOINT} ${GLOBAL_SDNC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SDNC_PORTAL_IP_ADDR}:${GLOBAL_SDNC_ADMIN_PORT} +${SDNC_ADMIN_SIGNUP_URL} ${SDNC_ADMIN_ENDPOINT}/signup +${SDNC_ADMIN_LOGIN_URL} ${SDNC_ADMIN_ENDPOINT}/login +${SDNC_ADMIN_VNF_PROFILE_URL} ${SDNC_ADMIN_ENDPOINT}/mobility/getVnfProfile *** Keywords *** -Run SDNGC Health Check - [Documentation] Runs an SDNGC healthcheck - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - ${resp}= SDNC.Run Post Request ${SDNGC_REST_ENDPOINT} ${SDNGC_INDEX PATH}${SDNCGC_HEALTHCHECK_OPERATION_PATH} data=${None} auth=${auth} +Run SDNC Health Check + [Documentation] Runs an SDNC healthcheck + ${resp}= SDNC.Run Post Request ${SDNC_REST_ENDPOINT} ${SDNC_INDEX PATH}${SDNCGC_HEALTHCHECK_OPERATION_PATH} data=${None} auth=${GLOBAL_SDNC_AUTHENTICATION} Should Be Equal As Strings ${resp.status_code} 200 Should Be Equal As Strings ${resp.json()['output']['response-code']} 200 @@ -51,8 +50,7 @@ Preload Network ${parameters}= Create Dictionary network_role=${network_role} service_type=vCPE network_type=Generic NeutronNet network_name=${network_name} subnet_start_ip=${subnet_start_ip} subnet_gateway=${subnet_gateway} Templating.Create Environment sdnc ${GLOBAL_TEMPLATE_FOLDER} ${data}= Templating.Apply Template sdnc ${PRELOAD_TOPOLOGY_OPERATION_BODY}/template.network.jinja ${parameters} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - ${post_resp}= SDNC.Run Post Request ${SDNGC_REST_ENDPOINT} ${SDNGC_INDEX_PATH}${PRELOAD_NETWORK_TOPOLOGY_OPERATION_PATH} data=${data} auth=${auth} + ${post_resp}= SDNC.Run Post Request ${SDNC_REST_ENDPOINT} ${SDNC_INDEX_PATH}${PRELOAD_NETWORK_TOPOLOGY_OPERATION_PATH} data=${data} auth=${GLOBAL_SDNC_AUTHENTICATION} [Return] ${network_name} ${subnet_name} Preload Vcpe vGW @@ -61,8 +59,7 @@ Preload Vcpe vGW ${parameters}= Create Dictionary pub_key=${GLOBAL_INJECTED_PUBLIC_KEY} brg_mac=${brg_mac} cpe_public_net=${cpe_network_name} cpe_public_subnet=${cpe_subnet_name} mux_gw_net=${mux_gw_net} mux_gw_subnet=${mux_gw_subnet} suffix=${name_suffix} oam_onap_net=oam_network_2No2 oam_onap_subnet=oam_network_2No2 public_net_id=${GLOBAL_INJECTED_PUBLIC_NET_ID} Templating.Create Environment sdnc ${GLOBAL_TEMPLATE_FOLDER} ${data}= Templating.Apply Template sdnc ${PRELOAD_TOPOLOGY_OPERATION_BODY}/template.vcpe_vgw_vfmodule.jinja ${parameters} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - ${post_resp}= SDNC.Run Post Request ${SDNGC_REST_ENDPOINT} ${SDNGC_INDEX_PATH}${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} data=${data} auth=${auth} + ${post_resp}= SDNC.Run Post Request ${SDNC_REST_ENDPOINT} ${SDNC_INDEX_PATH}${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} data=${data} auth=${GLOBAL_SDNC_AUTHENTICATION} Preload Vcpe vGW Gra [Arguments] ${brg_mac} ${cpe_public_network_name} ${cpe_public_subnet_name} ${mux_gw_net} ${mux_gw_subnet} @@ -70,8 +67,7 @@ Preload Vcpe vGW Gra ${parameters}= Create Dictionary pub_key=${GLOBAL_INJECTED_PUBLIC_KEY} brg_mac=${brg_mac} cpe_public_net=${cpe_public_network_name} cpe_public_subnet=${cpe_public_subnet_name} mux_gw_net=${mux_gw_net} mux_gw_subnet=${mux_gw_subnet} suffix=${name_suffix} oam_onap_net=oam_network_2No2 oam_onap_subnet=oam_network_2No2 public_net_id=${GLOBAL_INJECTED_PUBLIC_NET_ID} Templating.Create Environment sdnc ${GLOBAL_TEMPLATE_FOLDER} ${data}= Templating.Apply Template sdnc ${PRELOAD_TOPOLOGY_OPERATION_BODY}/template.vcpe_gwgra_vfmodule.jinja ${parameters} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - ${post_resp}= SDNC.Run Post Request ${SDNGC_REST_ENDPOINT} ${SDNGC_INDEX_PATH}${PRELOAD_GR_TOPOLOGY_OPERATION_PATH} data=${data} auth=${auth} + ${post_resp}= SDNC.Run Post Request ${SDNC_REST_ENDPOINT} ${SDNC_INDEX_PATH}${PRELOAD_GR_TOPOLOGY_OPERATION_PATH} data=${data} auth=${GLOBAL_SDNC_AUTHENTICATION} Preload Generic VfModule [Arguments] ${service_instance_id} ${vnf_model} ${model_customization_name} ${short_model_customization_name} ${cpe_public_network_name}=None ${cpe_public_subnet_name}=None ${cpe_signal_network_name}=None ${cpe_signal_subnet_name}=None @@ -84,7 +80,7 @@ Preload Generic VfModule # vnf_type and generic_vnf_type are identical Set To Dictionary ${parameters} vnf_type=${model_customization_name} generic_vnf_type=${model_customization_name} generic_vnf_name=${model_customization_name} vnf_name=${vfmodule_name} Set To Dictionary ${parameters} service_type=${service_instance_id} sdnc_oam_ip=${GLOBAL_INJECTED_SDNC_IP_ADDR} - ${post_resp}= SDNC.Preload Vfmodule ${SDNGC_REST_ENDPOINT} ${SDNGC_INDEX_PATH}${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} ${GLOBAL_TEMPLATE_FOLDER} ${PRELOAD_TOPOLOGY_OPERATION_BODY}/template.vcpe_infra_vfmodule.jinja ${parameters} + ${post_resp}= SDNC.Preload Vfmodule ${SDNC_REST_ENDPOINT} ${SDNC_INDEX_PATH}${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} ${GLOBAL_TEMPLATE_FOLDER} ${PRELOAD_TOPOLOGY_OPERATION_BODY}/template.vcpe_infra_vfmodule.jinja ${parameters} [Return] ${post_resp} Preload Vnf @@ -144,31 +140,16 @@ Preload One Vnf Topology 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} Templating.Create Environment sdnc ${GLOBAL_TEMPLATE_FOLDER} ${data}= Templating.Apply Template sdnc ${PRELOAD_TOPOLOGY_OPERATION_BODY}/preload.jinja ${parameters} - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - ${post_resp}= SDNC.Run Post Request ${SDNGC_REST_ENDPOINT} ${SDNGC_INDEX_PATH}${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} data=${data} auth=${auth} + ${post_resp}= SDNC.Run Post Request ${SDNC_REST_ENDPOINT} ${SDNC_INDEX_PATH}${PRELOAD_VNF_TOPOLOGY_OPERATION_PATH} data=${data} auth=${GLOBAL_SDNC_AUTHENTICATION} Should Be Equal As Strings ${post_resp.json()['output']['response-code']} 200 - ${auth}= Create List ${GLOBAL_SDNGC_USERNAME} ${GLOBAL_SDNGC_PASSWORD} - ${get_resp}= SDNC.Run Get Request ${SDNGC_REST_ENDPOINT} ${SDNGC_INDEX_PATH}${PRELOAD_VNF_CONFIG_PATH}/${vf_module_name}/${vf_module_type} auth=${auth} + ${get_resp}= SDNC.Run Get Request ${SDNC_REST_ENDPOINT} ${SDNC_INDEX_PATH}${PRELOAD_VNF_CONFIG_PATH}/${vf_module_name}/${vf_module_type} auth=${GLOBAL_SDNC_AUTHENTICATION} Get Template Parameters [Arguments] ${generic_vnf_name} ${template} ${uuid} ${service} - ${uuid}= Catenate ${uuid} ${hostid}= Get Substring ${uuid} -4 ${ecompnet}= Evaluate (${GLOBAL_BUILD_NUMBER}%128)+128 - ${valuemap}= Get Globally Injected Parameters - - # 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} generic_vnf_name=${generic_vnf_name} @@ -206,8 +187,8 @@ Resolve VNF Parameters Into Array Preload Vnf Profile [Arguments] ${vnf_name} - Login To SDNGC Admin GUI - Go To ${SDNGC_ADMIN_VNF_PROFILE_URL} + Login To SDNC Admin GUI + Go To ${SDNC_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 @@ -219,8 +200,8 @@ Preload Vnf Profile Delete Vnf Profile [Arguments] ${vnf_name} - Login To SDNGC Admin GUI - Go To ${SDNGC_ADMIN_VNF_PROFILE_URL} + Login To SDNC Admin GUI + Go To ${SDNC_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} @@ -229,15 +210,15 @@ 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 +Login To SDNC Admin GUI + [Documentation] Login To SDNC Admin GUI ## Setup Browser is now being managed by the test case ## Setup Browser - Go To ${SDNGC_ADMIN_SIGNUP_URL} + Go To ${SDNC_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} + Log Logging in to ${SDNC_ADMIN_LOGIN_URL} Handle Proxy Warning Title Should Be AdminPortal ${uuid}= Generate UUID4 @@ -247,9 +228,9 @@ Login To SDNGC Admin GUI 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} + Go To ${SDNC_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} + Log Logged in to ${SDNC_ADMIN_LOGIN_URL} diff --git a/robot/resources/so/add_service_recipe.robot b/robot/resources/so/add_service_recipe.robot index bd999cbd..6d7fa035 100644 --- a/robot/resources/so/add_service_recipe.robot +++ b/robot/resources/so/add_service_recipe.robot @@ -5,7 +5,7 @@ Library OperatingSystem Library Collections Library ONAPLibrary.SO WITH NAME SO Library ONAPLibrary.Templating WITH NAME Templating - +Resource ../global_properties.robot *** Variables *** ${SERVICE_RECIPE_PATH} /serviceRecipe diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot index 7c40e496..7dc5adbd 100644 --- a/robot/resources/test_templates/model_test_template.robot +++ b/robot/resources/test_templates/model_test_template.robot @@ -66,14 +66,14 @@ TOSCA Based PNF Model Distribution For Directory ${service_name}= Catenate ${service} ${uuid} ${shortened_uuid}= Evaluate str("${service_name}")[:23] ${catalog_service_name}= Set Variable If '${catalog_service_name}' =='' ${shortened_uuid} ${catalog_service_name} - :for ${directory} IN @{directory_list} + :FOR ${directory} IN @{directory_list} \ ${zipname}= Replace String ${directory} / _ \ ${csar}= Catenate ${SDC_CSAR_DIRECTORY}/${zipname}.csar \ ${folder}= Catenate ${SDC_TOSCA_ONBOARDING_PACKAGES_DIRECTORY}/${directory} \ OperatingSystem.Create Directory ${SDC_TOSCA_ONBOARDING_PACKAGES_DIRECTORY}/temp \ Create Zip From Files In Directory ${folder} ${csar} sub_directories=${true} \ Append To List ${csarlist} ${csar} - ${catalog_service_name} ${catalog_resource_name} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Distribute TOSCA Model From SDC ${csarlist} ${catalog_service_name} ${service} + ${catalog_service_name} ${catalog_resource_name} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Distribute Model From SDC ${csarlist} ${catalog_service_name} ${service} resourceType=PNF Download CSAR ${catalog_service_id} [Return] ${catalog_service_name} ${catalog_resource_name} ${catalog_resources} diff --git a/robot/resources/test_templates/pnf_orchestration_test_template.robot b/robot/resources/test_templates/pnf_orchestration_test_template.robot index 0e7d9025..9d252bcf 100644 --- a/robot/resources/test_templates/pnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/pnf_orchestration_test_template.robot @@ -6,6 +6,8 @@ Resource ../vid/vid_interface.robot Resource ../aai/service_instance.robot Resource model_test_template.robot Resource ../openstack/neutron_interface.robot +Resource ../sdc_interface.robot +Resource vnf_orchestration_test_template.robot Library ONAPLibrary.Openstack diff --git a/robot/resources/test_templates/pnf_registration_without_SO_template.robot b/robot/resources/test_templates/pnf_registration_without_SO_template.robot index 6da031f5..34f6b5c6 100644 --- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot +++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot @@ -15,6 +15,7 @@ Library ONAPLibrary.Utilities Library ONAPLibrary.Templating WITH NAME Templating Library ONAPLibrary.AAI WITH NAME AAI Library ONAPLibrary.SDC WITH NAME SDC +Library ONAPLibrary.SO WITH NAME SO *** Variables *** ${aai_so_registration_entry_template}= aai/add_pnf_registration_info.jinja @@ -22,8 +23,6 @@ ${pnf_ves_integration_request}= ves/pnf_registration_request.jinja ${DMAAP_MESSAGE_ROUTER_UNAUTHENTICATED_VES_PNFREG_OUTPUT_PATH} /events/unauthenticated.VES_PNFREG_OUTPUT/2/1 ${VES_ENDPOINT} ${GLOBAL_DCAE_VES_PROTOCOL}://${GLOBAL_INJECTED_DCAE_VES_HOST}:${GLOBAL_DCAE_VES_SERVER_PORT} ${VES_data_path} /eventListener/v7 -${SDC_CATALOG_SERVICES_PATH} /sdc2/rest/v1/catalog/services -${SDC_DESIGNER_USER_ID} cs0008 *** Keywords *** @@ -63,12 +62,6 @@ Verify PNF integration request in A&AI Wait Until Keyword Succeeds 10x 5s Query PNF A&AI updated entry ${PNF_entry_dict} Log PNF integration request in A&AI has been verified and contains all necessary entries -Verify PNF integration request in MR - [Documentation] Verify if PNF integration request entries are present in MR unauthenticated.PNF_READY/ topic - [Arguments] ${PNF_entry_dict} - Wait Until Keyword Succeeds 10x 1s Query PNF MR entry ${PNF_entry_dict} - Log PNF integration request in MR has been verified and contains all necessary entries - Query PNF A&AI updated entry [Documentation] Query PNF A&AI updated entry [Arguments] ${PNF_entry_dict} @@ -83,7 +76,6 @@ Query PNF A&AI updated entry Check VES_PNFREG_OUTPUT topic presence in MR [Documentation] Verify if unauthenticated.VES_PNFREG_OUTPUT topic is present in MR - [Arguments] ${get_resp}= Run MR Get Request ${DMAAP_MESSAGE_ROUTER_UNAUTHENTICATED_VES_PNFREG_OUTPUT_PATH} Should Be Equal As Strings ${get_resp.status_code} 200 Log unauthenticated.VES_PNFREG_OUTPUT topic is present in MR diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 016fed20..ef9593c2 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -6,7 +6,7 @@ Resource ../vid/vid_interface.robot Resource ../aai/service_instance.robot Resource ../vid/create_vid_vnf.robot Resource ../vid/teardown_vid.robot -Resource ../sdngc_interface.robot +Resource ../sdnc_interface.robot Resource model_test_template.robot Resource ../aai/create_zone.robot diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot index 50f1bcfb..b8b753ee 100644 --- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot @@ -6,7 +6,7 @@ Resource ../vid/vid_interface.robot Resource ../aai/service_instance.robot Resource ../vid/create_vid_vnf.robot Resource ../vid/teardown_vid.robot -Resource ../sdngc_interface.robot +Resource ../sdnc_interface.robot Resource model_test_template.robot Resource ../aai/create_zone.robot diff --git a/robot/testsuites/health-check.robot b/robot/testsuites/health-check.robot index b1a48892..59c14dbd 100644 --- a/robot/testsuites/health-check.robot +++ b/robot/testsuites/health-check.robot @@ -4,7 +4,7 @@ Documentation Testing ecomp components are available via calls. ... Testing ecomp components are available via calls. Test Timeout 20 second Resource ../resources/dcae_interface.robot -Resource ../resources/sdngc_interface.robot +Resource ../resources/sdnc_interface.robot Resource ../resources/aai/aai_interface.robot Resource ../resources/vid/vid_interface.robot Resource ../resources/policy_interface.robot @@ -190,7 +190,7 @@ Basic SDC Health Check Basic SDNC Health Check [Tags] health core health-sdnc - Run SDNGC Health Check + Run SDNC Health Check Basic SO Health Check [Tags] health core health-so diff --git a/robot/testsuites/pnf-registration.robot b/robot/testsuites/pnf-registration.robot index 9a22a9e2..384c787b 100644 --- a/robot/testsuites/pnf-registration.robot +++ b/robot/testsuites/pnf-registration.robot @@ -5,7 +5,8 @@ Test Timeout 10m ... Resource ../resources/test_templates/pnf_registration_without_SO_template.robot - +Library String + *** Test Cases *** @@ -36,14 +37,4 @@ Design, create, instantiate PNF/macro service and succesfully registrate PNF [Tags] pnf_registrate ${pnf_correlation_id}= Generate Random String 20 [LETTERS][NUMBERS] ${PNF_entry_dict}= Create Dictionary correlation_id=${pnf_correlation_id} PNF_IPv4_address=13.13.13.13 PNF_IPv6_address=2001:0db8:0:0:0:0:1428:57ab - Design, create, instantiate PNF/macro service and succesfully registrate PNF template Demo_pNF ${PNF_entry_dict} ${pnf_correlation_id} - - - - - - - - - - + Design, create, instantiate PNF/macro service and succesfully registrate PNF template Demo_pNF ${PNF_entry_dict} ${pnf_correlation_id}
\ No newline at end of file |