X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tests%2Fdcaegen2%2Fprh-testcases%2Fprh_tests.robot;h=aa6fc052292013adbd36a0f7efab8e0d6a2c2688;hb=932334d9523a23d8c437bef25accb7956451cc2f;hp=701a714d96add13a59e7a121c4e0bd2158d70bd5;hpb=d70b3bd459ddd60d01113ef1504961446f7ac0b2;p=integration%2Fcsit.git

diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot
index 701a714d..aa6fc052 100644
--- a/tests/dcaegen2/prh-testcases/prh_tests.robot
+++ b/tests/dcaegen2/prh-testcases/prh_tests.robot
@@ -11,6 +11,10 @@ Resource          ../../common.robot
 *** Variables ***
 ${DMAAP_SIMULATOR_SETUP_URL}    http://${DMAAP_SIMULATOR_SETUP}
 ${AAI_SIMULATOR_SETUP_URL}    http://${AAI_SIMULATOR_SETUP}
+${CONSUL_SETUP_URL}    http://${CONSUL_SETUP}
+
+${VES_EVENT_PNF_REGISTRATION_SIMPLE}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-simple.json
+${AAI_PNF_REGISTRATION_SIMPLE}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/aai-pnf-registration-simple.json
 ${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_all_fields.json
 ${EVENT_WITH_IPV4}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV4.json
 ${EVENT_WITH_IPV6}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/event_with_IPV6.json
@@ -27,28 +31,18 @@ ${EVENT_WITHOUT_IPV6_FILED}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/
 ${Not_json_format}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/not_json_format.json
 
 *** Test Cases ***
-Valid DMaaP event can be converted to PNF_READY notification
+Process valid simple PNF Registration DMaaP event which can be converted to PNF_READY notification
     [Documentation]    PRH get valid event from DMaaP with required fields - PRH produce PNF_READY notification
     [Tags]    PRH    Valid event
     [Template]    Valid event processing
-    ${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}    ${AAI_PNF_REGISTRATION_SIMPLE}
+    #${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
     [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
@@ -65,7 +59,7 @@ Event in DMaaP is not JSON format
     [Tags]    PRH
     ${data}=    Get Data From File    ${Not_json_format}
     Set event in DMaaP    ${data}
-    #TODO to fix after CBS merge
+    #TODO hangs up build
     #Wait Until Keyword Succeeds    100x    300ms    Check PRH log    |java.lang.IllegalStateException: Not a JSON Array:
 
 Get valid event from DMaaP and AAI is not responding
@@ -75,6 +69,5 @@ Get valid event from DMaaP and AAI is not responding
     ${data}=    Get Data From File    ${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}
     Ensure Container Is Exited   aai_simulator
     Set event in DMaaP    ${data}
-    #TODO fix after CBS merge
-    #Wait Until Keyword Succeeds    100x    300ms    Check PRH log    java.net.UnknownHostException: aai
+    Wait Until Keyword Succeeds    100x    300ms    Check PRH log    java.net.UnknownHostException: aai
     Ensure Container Is Running  aai_simulator