Merge "Fixing CSITs Add simple VES PNF reg event"

3 files changed, 36 insertions, 16 deletions

diff --git a/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-simple.json b/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-simple.json
new file mode 100644
index 00000000..c3089678
--- /dev/null
+++ b/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-pnf-registration-simple.json
@@ -0,0 +1,14 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "sourceName":"NOK6061ZW1",
+      "nfNamingCode": "nfNamingCode"
+    },
+    "pnfRegistrationFields": {
+      "serialNumber":"serialNumber",
+      "vendorName":"vendorName",
+      "modelNumber":"modelNumber",
+      "unitType":"unitType"
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot
index 701a714d..31a7d0d8 100644
--- a/tests/dcaegen2/prh-testcases/prh_tests.robot
+++ b/tests/dcaegen2/prh-testcases/prh_tests.robot
@@ -11,6 +11,8 @@ Resource          ../../common.robot
 *** Variables ***
 ${DMAAP_SIMULATOR_SETUP_URL}    http://${DMAAP_SIMULATOR_SETUP}
 ${AAI_SIMULATOR_SETUP_URL}    http://${AAI_SIMULATOR_SETUP}
+
+${VES_EVENT_PNF_REGISTRATION_SIMPLE}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-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
@@ -31,24 +33,25 @@ Valid DMaaP event 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}
+    #${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}
 
 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_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}
+    #${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
diff --git a/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot b/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot
index 49d2c45a..111a4fbd 100644
--- a/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot
+++ b/tests/dcaegen2/prh-testcases/ssl_prh_tests.robot
@@ -11,6 +11,8 @@ Resource          ../../common.robot
 *** Variables ***
 ${DMAAP_SIMULATOR_SETUP_URL}    http://${DMAAP_SIMULATOR_SETUP}
 ${AAI_SIMULATOR_SETUP_URL}    http://${AAI_SIMULATOR_SETUP}
+
+${VES_EVENT_PNF_REGISTRATION_SIMPLE}    %{WORKSPACE}/tests/dcaegen2/prh-testcases/assets/json_events/ves-event-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
@@ -21,7 +23,8 @@ Valid DMaaP event can be converted to PNF_READY notification with ssl connection
     [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}
+    ${VES_EVENT_PNF_REGISTRATION_SIMPLE}
+    #${EVENT_WITH_ALL_VALID_REQUIRED_FIELDS}
+    #${EVENT_WITH_IPV4}
+    #${EVENT_WITH_IPV6}
+    #${EVENT_WITHOUT_IPV6_FILED}