From 70c4e539b0b472b845ebea54e81497c5f8341843 Mon Sep 17 00:00:00 2001 From: Marcin Migdal Date: Tue, 16 Apr 2019 14:35:58 +0200 Subject: Attempt to check CSIT Fix positive cases - they work all now Change-Id: I451f79e3a6cfd1aba9b373e7138c0e8cd3efb88c Issue-ID: INT-989 Signed-off-by: Marcin Migdal --- .../assets/json_events/aai-pnf-registration-simple.json | 4 ++-- tests/dcaegen2/prh-testcases/prh_tests.robot | 11 ++--------- tests/dcaegen2/prh-testcases/resources/docker-compose.yml | 8 ++++---- tests/dcaegen2/prh-testcases/resources/prh_library.robot | 13 ++++++------- tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py | 2 +- tests/dcaegen2/prh-testcases/ssl_prh_tests.robot | 4 ---- 6 files changed, 15 insertions(+), 27 deletions(-) diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/aai-pnf-registration-simple.json b/tests/dcaegen2/prh-testcases/assets/json_events/aai-pnf-registration-simple.json index 18f43456..27738f43 100644 --- a/tests/dcaegen2/prh-testcases/assets/json_events/aai-pnf-registration-simple.json +++ b/tests/dcaegen2/prh-testcases/assets/json_events/aai-pnf-registration-simple.json @@ -1,6 +1,6 @@ -{"pnf-name":"Nokia123", +{"pnf-name":"NOK6061ZW1", "pnf-name2-source":"", - "pnf-id":"Nokia123", + "pnf-id":"NOK6061ZW1", "serial-number":"", "equip-type":"FSM-4", "equip-vendor":"", diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot index 3de7e91a..5b8098b4 100644 --- a/tests/dcaegen2/prh-testcases/prh_tests.robot +++ b/tests/dcaegen2/prh-testcases/prh_tests.robot @@ -36,14 +36,7 @@ Process valid simple PNF Registration DMaaP event which can be converted to PNF_ [Tags] PRH Valid event [Template] Valid event processing ${VES_EVENT_PNF_REGISTRATION_SIMPLE} ${AAI_PNF_REGISTRATION_SIMPLE} - #${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS} - #${EVENT_WITH_IPV4} - #${EVENT_WITH_IPV6} - #${EVENT_WITHOUT_IPV6_FILED} - #${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_ALL_FILLED} - #${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_EMPTY} - #${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_MISSING_ALL} - #${EVENT_WITH_OPTIONAL_REGISTRATION_FIELDS_MISSING_PARTIAL} + #${VES_EVENT_PNF_REGISTRATION_SIMPLE_AND_ATTACHMENT_POINT} Invalid DMaaP event cannot be converted to PNF_READY notification [Documentation] PRH get invalid event from DMaaP with missing required fields - PRH does not produce PNF_READY notification @@ -82,4 +75,4 @@ Get valid event from DMaaP and AAI is not responding Set event in DMaaP ${data} #TODO fix after CBS merge #Wait Until Keyword Succeeds 100x 300ms Check PRH log java.net.UnknownHostException: aai - Ensure Container Is Running aai_simulator + Ensure Container Is Running aai_simulator \ No newline at end of file diff --git a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml index 1b0c4702..fdb1c50e 100644 --- a/tests/dcaegen2/prh-testcases/resources/docker-compose.yml +++ b/tests/dcaegen2/prh-testcases/resources/docker-compose.yml @@ -68,7 +68,7 @@ services: command: ["kv", "put", "-http-addr=http://consul:8500", "dcae-prh", '{ "dmaap.dmaapConsumerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.VES_PNFREG_OUTPUT", "dmaap.dmaapConsumerConfiguration.dmaapHostName":"dmaap-mr", - "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2223, + "dmaap.dmaapConsumerConfiguration.dmaapPortNumber":2222, "dmaap.dmaapConsumerConfiguration.dmaapTopicName": "events/unauthenticated.VES_PNFREG_OUTPUT", "dmaap.dmaapConsumerConfiguration.dmaapProtocol":"http", "dmaap.dmaapConsumerConfiguration.dmaapUserName":"admin", @@ -81,7 +81,7 @@ services: "dmaap.dmaapProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_READY", "dmaap.dmaapProducerConfiguration.dmaapHostName":"dmaap-mr", - "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2223, + "dmaap.dmaapProducerConfiguration.dmaapPortNumber":2222, "dmaap.dmaapProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_READY", "dmaap.dmaapProducerConfiguration.dmaapProtocol":"http", "dmaap.dmaapProducerConfiguration.dmaapUserName":"admin", @@ -90,14 +90,14 @@ services: "dmaap.dmaapUpdateProducerConfiguration.dmaapUrl":"http://dmaap-mr:2222/events/unauthenticated.PNF_UPDATE", "dmaap.dmaapUpdateProducerConfiguration.dmaapHostName": "dmaap-mr", - "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2223, + "dmaap.dmaapUpdateProducerConfiguration.dmaapPortNumber": 2222, "dmaap.dmaapUpdateProducerConfiguration.dmaapTopicName": "events/unauthenticated.PNF_UPDATE", "dmaap.dmaapUpdateProducerConfiguration.dmaapProtocol": "http", "dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin", "dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin", "dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json", - "aai.aaiClientConfiguration.pnfUrl":"https://aai:3333/aai/v12/network/pnfs/pnf", + "aai.aaiClientConfiguration.pnfUrl":"https://aai:3334/aai/v12/network/pnfs/pnf", "aai.aaiClientConfiguration.aaiHost":"aai", "aai.aaiClientConfiguration.aaiHostPortNumber":3334, "aai.aaiClientConfiguration.aaiProtocol":"https", diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot index 88d4b501..7c486eab 100644 --- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot +++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot @@ -16,6 +16,7 @@ Create sessions Set Suite Variable ${aai_setup_session} aai_setup_session Create Session consul_setup_session ${CONSUL_SETUP_URL} Set Suite Variable ${consul_setup_session} consul_setup_session + Sleep 60s Reset Simulators Reset AAI simulator @@ -33,8 +34,7 @@ Invalid event processing Valid event processing [Arguments] ${input_valid__ves_event_in_dmaap} ${input_aai} - [Timeout] 100s - Sleep 50s + [Timeout] 150s Wait Until Keyword Succeeds 10x 3000ms Check CBS ready ${data}= Get Data From File ${input_valid__ves_event_in_dmaap} ${aai_entry_to_be_set}= Get Data From File ${input_aai} @@ -44,15 +44,15 @@ Valid event processing Set PNF content in AAI ${aai_entry_to_be_set} ${expected_event_pnf_ready_in_dpaap}= create pnf ready_notification as pnf ready ${data} #TODO to fix after CBS merge - #Wait Until Keyword Succeeds 10x 300ms Check PNF_READY notification ${expected_event_pnf_ready_in_dpaap} - #Wait Until Keyword Succeeds 10x 5000ms Check PRH log Mandingo + Wait Until Keyword Succeeds 10x 3000ms Check PNF_READY notification ${expected_event_pnf_ready_in_dpaap} + #Wait Until Keyword Succeeds 10x 3000ms Check PRH log Mandingo Check PRH log [Arguments] ${searched_log} ${status}= Check for log ${searched_log} Should Be Equal As Strings ${status} True -Check PNF_READY nojson_objectification +Check PNF_READY notification [Arguments] ${expected_event_pnf_ready_in_dpaap} ${resp}= Get Request ${dmaap_setup_session} /events/pnfReady headers=${suite_headers} Should Be Equal ${resp.text} ${expected_event_pnf_ready_in_dpaap} @@ -92,5 +92,4 @@ Reset DMaaP simulator Check CBS ready ${resp}= Get Request ${consul_setup_session} /v1/catalog/service/cbs Should Be Equal As Strings ${resp.status_code} 200 - #${json_as_str} Convert JSON To String ${resp.content} - #Log CBS ${json_as_str} \ No newline at end of file + Log CBS ${resp.content} \ No newline at end of file diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py index 7f590a5b..2d4fbd65 100644 --- a/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py +++ b/tests/dcaegen2/prh-testcases/resources/simulator/DMaaP.py @@ -83,7 +83,7 @@ class DMaaPHandler(BaseHTTPRequestHandler): def do_GET(self): try: - if re.search('/events/unauthenticated.VES_PNFREG_OUTPUT/OpenDcae-c12/c12', self.path): + if re.search('/events/unauthenticated.VES_PNFREG_OUTPUT/OpenDCAE-c12/c12', self.path): global ves_event httpServerLib.set_response_200_ok(self, payload = ves_event) ves_event = DMAAP_EMPTY diff --git a/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot b/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot index dd193318..3e227e7c 100644 --- a/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot +++ b/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot @@ -26,7 +26,3 @@ Valid DMaaP event can be converted to PNF_READY notification with ssl connection [Tags] PRH Valid event [Template] Valid event processing ${VES_EVENT_PNF_REGISTRATION_SIMPLE} ${AAI_PNF_REGISTRATION_SIMPLE} - #${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS} - #${EVENT_WITH_IPV4} - #${EVENT_WITH_IPV6} - #${EVENT_WITHOUT_IPV6_FILED} -- cgit 1.2.3-korg