From f8c267cf722fab31e4d6b5b94f445ae556ce7890 Mon Sep 17 00:00:00 2001 From: krzysztof kuzmicki Date: Wed, 10 Oct 2018 13:04:28 +0200 Subject: E2E sunny scenario for PNF registration Change-Id: Icbe8914f6111f5ca385117d3c7027e53e960281b Issue-ID: INT-685 Signed-off-by: krzysztof kuzmicki --- .../aai/add_pnf_registration_info.template | 12 ++++++++ .../ves/pnf_registration_request.template | 36 ++++++++++++++++++++++ .../aai/add_pnf_registration_info.template | 12 -------- .../pnf_registration_without_SO_template.robot | 12 ++++---- .../ves/pnf_registration_request.template | 36 ---------------------- 5 files changed, 54 insertions(+), 54 deletions(-) create mode 100644 robot/assets/templates/aai/add_pnf_registration_info.template create mode 100644 robot/assets/templates/ves/pnf_registration_request.template delete mode 100644 robot/resources/aai/add_pnf_registration_info.template delete mode 100644 robot/resources/ves/pnf_registration_request.template diff --git a/robot/assets/templates/aai/add_pnf_registration_info.template b/robot/assets/templates/aai/add_pnf_registration_info.template new file mode 100644 index 00000000..2122ef24 --- /dev/null +++ b/robot/assets/templates/aai/add_pnf_registration_info.template @@ -0,0 +1,12 @@ +{ + "pnf-name": "${correlation_id}", + "pnf-name2": "example-pnf-name2-val-78244", + "pnf-name2-source": "example-pnf-name2-source-val-99275", + "pnf-id": "example-pnf-id-val-7989", + "equip-type": "example-equip-type-val-20348", + "equip-vendor": "example-equip-vendor-val-52182", + "equip-model": "example-equip-model-val-8370", + "management-option": "example-management-option-val-72881", + "ipaddress-v4-oam": "", + "ipaddress-v6-oam": "" +} diff --git a/robot/assets/templates/ves/pnf_registration_request.template b/robot/assets/templates/ves/pnf_registration_request.template new file mode 100644 index 00000000..61b46d16 --- /dev/null +++ b/robot/assets/templates/ves/pnf_registration_request.template @@ -0,0 +1,36 @@ +{ + "event": { + "commonEventHeader": { + "startEpochMicrosec": 1538407540940, + "sourceId": "val13", + "eventId": "registration_38407540", + "nfcNamingCode": "oam", + "internalHeaderFields": {}, + "eventType": "pnfRegistration", + "priority": "Normal", + "version": "4.0.1", + "reportingEntityName": "NOK6061ZW3", + "sequence": 0, + "domain": "pnfRegistration", + "lastEpochMicrosec": 1538407540940, + "eventName": "pnfRegistration_Nokia_5gDu", + "vesEventListenerVersion": "7.0.1", + "sourceName": "${correlation_id}", + "nfNamingCode": "gNB" + }, + "pnfRegistrationFields": { + "unitType": "val8", + "serialNumber": "6061ZW3", + "pnfRegistrationFieldsVersion": "2.0", + "manufactureDate": "1538407540942", + "modelNumber": "val6", + "lastServiceDate": "1538407540942", + "unitFamily": "BBU", + "vendorName": "Nokia", + "oamV4IpAddress": "${PNF_IPv4_address}", + "oamV6IpAddress": "${PNF_IPv6_address}", + "softwareVersion": "val7" + } + } +} + diff --git a/robot/resources/aai/add_pnf_registration_info.template b/robot/resources/aai/add_pnf_registration_info.template deleted file mode 100644 index 2122ef24..00000000 --- a/robot/resources/aai/add_pnf_registration_info.template +++ /dev/null @@ -1,12 +0,0 @@ -{ - "pnf-name": "${correlation_id}", - "pnf-name2": "example-pnf-name2-val-78244", - "pnf-name2-source": "example-pnf-name2-source-val-99275", - "pnf-id": "example-pnf-id-val-7989", - "equip-type": "example-equip-type-val-20348", - "equip-vendor": "example-equip-vendor-val-52182", - "equip-model": "example-equip-model-val-8370", - "management-option": "example-management-option-val-72881", - "ipaddress-v4-oam": "", - "ipaddress-v6-oam": "" -} 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 cc18aa18..19eef1cd 100644 --- a/robot/resources/test_templates/pnf_registration_without_SO_template.robot +++ b/robot/resources/test_templates/pnf_registration_without_SO_template.robot @@ -25,8 +25,8 @@ Create A&AI antry without SO and succesfully registrate PNF [Arguments] ${PNF_entry_dict} Create PNF initial entry in A&AI ${PNF_entry_dict} Send VES integration request ${PNF_entry_dict} - Verifi PNF Integration Request in A&AI ${PNF_entry_dict} - Verifi PNF Integration Request in MR ${PNF_entry_dict} + Verify PNF Integration Request in A&AI ${PNF_entry_dict} + Verify PNF Integration Request in MR ${PNF_entry_dict} Create PNF initial entry in A&AI [Documentation] Creates PNF initial entry in A&AI registry. Entry contains only correlation id (pnf-name) @@ -47,14 +47,14 @@ Send VES integration request Should Be Equal As Strings ${post_resp.status_code} 202 Log VES integration request has been send -Verifi PNF integration request in A&AI - [Documentation] Verifi if PNF integration request entries are present in A&AI +Verify PNF integration request in A&AI + [Documentation] Verify if PNF integration request entries are present in A&AI [Arguments] ${PNF_entry_dict} Wait Until Keyword Succeeds 10x 1s Query PNF A&AI updated entry ${PNF_entry_dict} Log PNF integration request in A&AI has been verified and contains all necessary entries -Verifi PNF integration request in MR - [Documentation] Verifi if PNF integration request entries are present in MR unauthenticated.PNF_READY/ topic +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} ${get_resp}= Run MR Get Request ${DMAAP_MESSAGE_ROUTER_UNAUTHENTICATED_PNF_PATH} Should Be Equal As Strings ${get_resp.status_code} 200 diff --git a/robot/resources/ves/pnf_registration_request.template b/robot/resources/ves/pnf_registration_request.template deleted file mode 100644 index 61b46d16..00000000 --- a/robot/resources/ves/pnf_registration_request.template +++ /dev/null @@ -1,36 +0,0 @@ -{ - "event": { - "commonEventHeader": { - "startEpochMicrosec": 1538407540940, - "sourceId": "val13", - "eventId": "registration_38407540", - "nfcNamingCode": "oam", - "internalHeaderFields": {}, - "eventType": "pnfRegistration", - "priority": "Normal", - "version": "4.0.1", - "reportingEntityName": "NOK6061ZW3", - "sequence": 0, - "domain": "pnfRegistration", - "lastEpochMicrosec": 1538407540940, - "eventName": "pnfRegistration_Nokia_5gDu", - "vesEventListenerVersion": "7.0.1", - "sourceName": "${correlation_id}", - "nfNamingCode": "gNB" - }, - "pnfRegistrationFields": { - "unitType": "val8", - "serialNumber": "6061ZW3", - "pnfRegistrationFieldsVersion": "2.0", - "manufactureDate": "1538407540942", - "modelNumber": "val6", - "lastServiceDate": "1538407540942", - "unitFamily": "BBU", - "vendorName": "Nokia", - "oamV4IpAddress": "${PNF_IPv4_address}", - "oamV6IpAddress": "${PNF_IPv6_address}", - "softwareVersion": "val7" - } - } -} - -- cgit 1.2.3-korg