Add additional fields to PRH

* patch version updated

Change-Id: I32f8a0ec090a2559ef3324f937601e71670b30cf
Issue-ID: DCAEGEN2-1173
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>

2 files changed, 57 insertions, 51 deletions

diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java
index 86717d7e..5e259a64 100644
--- a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java
+++ b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/CommonFunctionsTest.java
@@ -28,8 +28,62 @@ class CommonFunctionsTest {
 
     @Test
     void createJsonBody_shouldReturnJsonInString() {
-        String expectedResult = "{\"correlationId\":\"NOKnhfsadhff\",\"ipaddress-v4-oam\":\"256.22.33.155\""
-            + ",\"ipaddress-v6-oam\":\"200J:0db8:85a3:0000:0000:8a2e:0370:7334\"}";
-        assertEquals(expectedResult, new JsonBodyBuilderImpl().createJsonBody(new ConsumerDmaapModelForUnitTest()));
+
+        ConsumerDmaapModel model = ImmutableConsumerDmaapModel.builder()
+                .correlationId("NOKnhfsadhff")
+                .ipv4("256.22.33.155")
+                .ipv6("200J:0db8:85a3:0000:0000:8a2e:0370:7334")
+                .serialNumber("1234")
+                .equipVendor("NOKIA")
+                .equipModel("3310")
+                .equipType("cell")
+                .nfRole("role")
+                .swVersion("1.2.3")
+                .build();
+
+
+        String expectedResult = "{"
+                + "\"correlationId\":\"NOKnhfsadhff\","
+                + "\"ipaddress-v4-oam\":\"256.22.33.155\","
+                + "\"ipaddress-v6-oam\":\"200J:0db8:85a3:0000:0000:8a2e:0370:7334\","
+                + "\"serial-number\":\"1234\","
+                + "\"equip-vendor\":\"NOKIA\","
+                + "\"equip-model\":\"3310\","
+                + "\"equip-type\":\"cell\","
+                + "\"nf-role\":\"role\","
+                + "\"sw-version\":\"1.2.3\""
+                + "}";
+
+        assertEquals(expectedResult, new JsonBodyBuilderImpl().createJsonBody(model));
+    }
+
+    @Test
+    void createJsonBodyWithEmptyAdditionalFields_shouldReturnJsonInString() {
+        ConsumerDmaapModel model = ImmutableConsumerDmaapModel.builder()
+                .correlationId("NOKnhfsadhff")
+                .ipv4("256.22.33.155")
+                .ipv6("200J:0db8:85a3:0000:0000:8a2e:0370:7334")
+                .serialNumber("1234")
+                .equipVendor("NOKIA")
+                .equipModel("3310")
+                .equipType("cell")
+                .nfRole("role")
+                .swVersion("1.2.3")
+                .build();
+
+
+        String expectedResult = "{"
+                + "\"correlationId\":\"NOKnhfsadhff\","
+                + "\"ipaddress-v4-oam\":\"256.22.33.155\","
+                + "\"ipaddress-v6-oam\":\"200J:0db8:85a3:0000:0000:8a2e:0370:7334\","
+                + "\"serial-number\":\"1234\","
+                + "\"equip-vendor\":\"NOKIA\","
+                + "\"equip-model\":\"3310\","
+                + "\"equip-type\":\"cell\","
+                + "\"nf-role\":\"role\","
+                + "\"sw-version\":\"1.2.3\""
+                + "}";
+
+        assertEquals(expectedResult, new JsonBodyBuilderImpl().createJsonBody(model));
     }
 }
diff --git a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelTest.java b/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelTest.java
deleted file mode 100644
index 4c4c345f..00000000
--- a/prh-commons/src/test/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * PNF-REGISTRATION-HANDLER
- * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.dcaegen2.services.prh.model;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-
-class ConsumerDmaapModelTest {
-
-    @Test
-    void consumerDmaapModelBuilder_shouldBuildAnObject() {
-
-        // When
-        // Given
-        String sourceName = "NOKnhfsadhff";
-        String ipv4 = "11.22.33.155";
-        String ipv6 = "2001:0db8:85a3:0000:0000:8a2e:0370:7334";
-        ConsumerDmaapModel consumerDmaapModel = ImmutableConsumerDmaapModel.builder()
-            .correlationId(sourceName)
-            .ipv4(ipv4)
-            .ipv6(ipv6)
-            .build();
-
-        // Then
-        Assertions.assertNotNull(consumerDmaapModel);
-        Assertions.assertEquals(sourceName, consumerDmaapModel.getCorrelationId());
-        Assertions.assertEquals(ipv4, consumerDmaapModel.getIpv4());
-        Assertions.assertEquals(ipv6, consumerDmaapModel.getIpv6());
-    }
-}