From: Marcin Migdal <marcin.migdal@nokia.com>
Date: Wed, 17 Apr 2019 05:07:01 +0000 (+0200)
Subject: Attempt to check CSIT
X-Git-Tag: 4.0.0-ONAP~42
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=integration%2Fcsit.git;a=commitdiff_plain;h=63104217173f8ed9159c595c67d3ed274c119b7c

Attempt to check CSIT
Invalid VES in DMaaP

Change-Id: Ief0bb5935200939c3d4329836f855a5d5b7cf59a
Issue-ID: INT-989
Signed-off-by: Marcin Migdal <marcin.migdal@nokia.com>
---

diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot
index 5b8098b4..49098214 100644
--- a/tests/dcaegen2/prh-testcases/prh_tests.robot
+++ b/tests/dcaegen2/prh-testcases/prh_tests.robot
@@ -42,11 +42,7 @@ 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
     [Tags]    PRH    Invalid event
     [Template]    Invalid event processing
-    #${EVENT_WITH_MISSING_IPV4_AND_IPV6}
     ${EVENT_WITH_MISSING_SOURCENAME}
-    #${EVENT_WITH_MISSING_SOURCENAME_AND_IPV4}
-    #${EVENT_WITH_MISSING_SOURCENAME_AND_IPV6}
-    #${EVENT_WITH_MISSING_SOURCENAME_IPV4_AND_IPV6}
 
 Get valid event from DMaaP and record in AAI does not exist
     [Documentation]    PRH get valid event from DMaaP with all required fields and in AAI record doesn't exist - PRH does not produce PNF_READY notification
@@ -75,4 +71,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
\ No newline at end of file
+    Ensure Container Is Running  aai_simulator
diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
index 7c486eab..29203ecd 100644
--- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot
+++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
@@ -22,16 +22,6 @@ Reset Simulators
     Reset AAI simulator
     Reset DMaaP simulator
 
-Invalid event processing
-    [Arguments]    ${input_invalid_event_in_dmaap}
-    [Timeout]    30s
-    ${data}=    Get Data From File    ${input_invalid_event_in_dmaap}
-    Set event in DMaaP    ${data}
-    ${invalid_notification}=    Create invalid notification    ${data}
-    ${notification}=    Catenate    SEPARATOR= \\n    |Incorrect json, consumerDmaapModel can not be created:     ${invalid_notification}
-    #TODO to fix after CBS merge
-    #Wait Until Keyword Succeeds    100x    100ms    Check PRH log    ${notification}
-
 Valid event processing
     [Arguments]    ${input_valid__ves_event_in_dmaap}    ${input_aai}
     [Timeout]    150s
@@ -43,9 +33,18 @@ Valid event processing
     Set PNF name in AAI    ${pnf_name}
     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    3000ms    Check PNF_READY notification    ${expected_event_pnf_ready_in_dpaap}
-    #Wait Until Keyword Succeeds    10x    3000ms    Check PRH log    Mandingo
+
+Invalid event processing
+    [Arguments]    ${input_invalid_event_in_dmaap}
+    [Timeout]    150s
+    ${data}=    Get Data From File    ${input_invalid_event_in_dmaap}
+    Set event in DMaaP    ${data}
+    ${invalid_notification}=    Create invalid notification    ${data}
+    ${notification}=    Catenate    SEPARATOR= \\n    |Incorrect json, consumerDmaapModel can not be created:     ${invalid_notification}
+    Wait Until Keyword Succeeds    100x    100ms    Check PRH log    ${notification}
+    #Wait Until Keyword Succeeds    100x    100ms    Check PRH log    ${notification}
+
 
 Check PRH log
     [Arguments]    ${searched_log}