From: benzelleroehr Date: Tue, 25 Mar 2025 07:27:15 +0000 (+0100) Subject: Fix: pnf-registrate test X-Git-Tag: 1.14.1~2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F140568%2F1;p=testsuite.git Fix: pnf-registrate test Issue-ID: INT-2307 Change-Id: Ib399e30695ddb8a53ecaca298926e3834fa5d417 Signed-off-by: benzelleroehr --- diff --git a/robot/resources/sdc_interface.robot b/robot/resources/sdc_interface.robot index 421fa354..95ee5e10 100644 --- a/robot/resources/sdc_interface.robot +++ b/robot/resources/sdc_interface.robot @@ -898,7 +898,6 @@ Check Catalog Service Distributed Should Be Equal As Strings ${dist_resp['distributionStatusOfServiceList'][0]['deployementStatus']} Distributed ${det_resp}= Get Catalog Service Distribution Details ${dist_resp['distributionStatusOfServiceList'][0]['distributionID']} @{ITEMS}= Copy List ${det_resp['distributionStatusList']} - Should Not Be Empty ${ITEMS} ${SO_COMPLETE} Set Variable FALSE ${dist_status} Set Variable CONTINUE Should Not Be Empty ${ITEMS} 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 844718e9..e3ecaaa4 100644 --- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot +++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot @@ -3,10 +3,9 @@ Documentation PNF Registration Handler (PRH) test cases Resource ../aai/aai_interface.robot Resource ../aai/create_customer.robot Resource ../sdc_interface.robot -Resource ../dmaap/mr_interface.robot Resource ../so/add_service_recipe.robot Resource ../test_templates/pnf_orchestration_test_template.robot -Resource ../demo_preload.robot +Resource ../strimzi_kafka.robot Library ONAPLibrary.Openstack Library OperatingSystem Library RequestsLibrary @@ -21,7 +20,7 @@ Library ONAPLibrary.SO WITH NAME SO *** Variables *** ${aai_so_registration_entry_template}= aai/add_pnf_registration_info.jinja ${pnf_ves_integration_request}= ves/pnf_registration_request.jinja -${DMAAP_MESSAGE_ROUTER_UNAUTHENTICATED_VES_PNFREG_OUTPUT_PATH} /events/unauthenticated.VES_PNFREG_OUTPUT/2/1 +${KAFKA_UNAUTHENTICATED_VES_PNFREG_OUTPUT_TOPIC} unauthenticated.VES_PNFREG_OUTPUT ${VES_ENDPOINT} ${GLOBAL_DCAE_VES_HTTPS_PROTOCOL}://${GLOBAL_INJECTED_DCAE_VES_HOST}:${GLOBAL_DCAE_VES_HTTPS_SERVER_PORT} ${VES_data_path} /eventListener/v7 ${tenant_name} dummy_tenant_for_pnf @@ -30,11 +29,11 @@ ${region} RegionForPNF *** Keywords *** -Create A&AI antry without SO and succesfully registrate PNF +Create A&AI entry without SO and succesfully registrate PNF [Documentation] Test case template for create A&AI antry without SO and succesfully registrate PNF [Arguments] ${PNF_entry_dict} Send VES integration request ${PNF_entry_dict} - Wait Until Keyword Succeeds 10x 5s Check VES_PNFREG_OUTPUT topic presence in MR + Wait Until Keyword Succeeds 10x 5s Check VES_PNFREG_OUTPUT topic presence in Kafka Create PNF initial entry in A&AI ${PNF_entry_dict} Send VES integration request ${PNF_entry_dict} Verify PNF Integration Request in A&AI ${PNF_entry_dict} @@ -86,11 +85,11 @@ Check PNF orchestration status in A&AI ${json_resp}= Set Variable ${get_resp.json()} Should Be Equal As Strings ${status} ${json_resp['orchestration-status']} -Check VES_PNFREG_OUTPUT topic presence in MR - [Documentation] Verify if unauthenticated.VES_PNFREG_OUTPUT topic is present in MR - ${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 +Check VES_PNFREG_OUTPUT topic presence in Kafka + [Documentation] Verify if unauthenticated.VES_PNFREG_OUTPUT topic is present in Kafka + ${get_resp}= Get Last Message From Topic ${KAFKA_UNAUTHENTICATED_VES_PNFREG_OUTPUT_TOPIC} + Should Not Be Empty ${get_resp} + Log unauthenticated.VES_PNFREG_OUTPUT topic is present in Kafka Run VES HTTP Post Request [Documentation] Runs a VES Post request diff --git a/robot/testsuites/pnf-registration.robot b/robot/testsuites/pnf-registration.robot index c1e3ddfe..5f618af4 100644 --- a/robot/testsuites/pnf-registration.robot +++ b/robot/testsuites/pnf-registration.robot @@ -9,16 +9,16 @@ Library String *** Test Cases *** -PNF Registration only DCAE part: AAI, VES, PRH, DMaaP +PNF Registration only DCAE part: AAI, VES, PRH, Kafka [Documentation] ... This test case creates A&AI entry for PNF without SDC model distribution and service instantiation in SO. - ... Test case verify PNF Registration only in DCAE part: AAI, VES, PRH, DMaaP. + ... Test case verify PNF Registration only in DCAE part: AAI, VES, PRH, Kafka. ... During test case Robot adds PNF entry to A&AI that contains: correlation ID, PNF_IPv4_address and PNF_IPv6_address [Tags] pnf_registrate ete ${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 Log Initial PNF entry ${PNF_entry_dict} - Create A&AI antry without SO and succesfully registrate PNF ${PNF_entry_dict} + Create A&AI entry without SO and succesfully registrate PNF ${PNF_entry_dict} [Teardown] Cleanup PNF entry in A&AI ${PNF_entry_dict} @@ -52,4 +52,4 @@ Instantiate PNF service (using building blocks) and succesfully registrate PNF ${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 ${PNF_service_model}= Set Variable Demo_pNF_${pnf_correlation_id} - Instantiate PNF_macro service and succesfully registrate PNF template ${PNF_service_model} ${PNF_entry_dict} ${pnf_correlation_id} building_block_flow=true \ No newline at end of file + Instantiate PNF_macro service and succesfully registrate PNF template ${PNF_service_model} ${PNF_entry_dict} ${pnf_correlation_id} building_block_flow=true