Add additional fields to PRH

* patch version updated

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

3 files changed, 29 insertions, 54 deletions

diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java
index b2bac24c..9abbc3b4 100644
--- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java
+++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModel.java
@@ -42,4 +42,22 @@ public interface ConsumerDmaapModel extends AaiModel, DmaapModel {
 
     @SerializedName(value = "ipaddress-v6-oam", alternate = "ipaddress-v6-oam")
     String getIpv6();
+
+    @SerializedName(value = "serial-number", alternate = "serial-number")
+    String getSerialNumber();
+
+    @SerializedName(value = "equip-vendor", alternate = "equip-vendor")
+    String getEquipVendor();
+
+    @SerializedName(value = "equip-model", alternate = "equip-model")
+    String getEquipModel();
+
+    @SerializedName(value = "equip-type", alternate = "equip-type")
+    String getEquipType();
+
+    @SerializedName(value = "nf-role", alternate = "nf-role")
+    String getNfRole();
+
+    @SerializedName(value = "sw-version", alternate = "sw-version")
+    String getSwVersion();
 }
diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java
deleted file mode 100644
index cbada731..00000000
--- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/ConsumerDmaapModelForUnitTest.java
+++ /dev/null
@@ -1,51 +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;
-
-public class ConsumerDmaapModelForUnitTest implements ConsumerDmaapModel {
-
-    private final String correlationId;
-    private final String ipv4;
-    private final String ipv6;
-
-    /**
-     * Class for testing serialization of ConsumerDmaapModel.
-     */
-    public ConsumerDmaapModelForUnitTest() {
-        this.correlationId = "NOKnhfsadhff";
-        this.ipv4 = "256.22.33.155";
-        this.ipv6 = "200J:0db8:85a3:0000:0000:8a2e:0370:7334";
-
-    }
-
-    public String getCorrelationId() {
-        return correlationId;
-    }
-
-    public String getIpv4() {
-        return ipv4;
-    }
-
-    public String getIpv6() {
-        return ipv6;
-    }
-
-}
diff --git a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java
index b504a4bd..fd628834 100644
--- a/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java
+++ b/prh-commons/src/main/java/org/onap/dcaegen2/services/prh/model/JsonBodyBuilderImpl.java
@@ -29,7 +29,6 @@ import java.util.ServiceLoader;
 
 public class JsonBodyBuilderImpl implements JsonBodyBuilder<ConsumerDmaapModel> {
 
-    public JsonBodyBuilderImpl() {}
 
     /**
      * Method for serialization object by GSON.
@@ -40,7 +39,16 @@ public class JsonBodyBuilderImpl implements JsonBodyBuilder<ConsumerDmaapModel>
     public String createJsonBody(ConsumerDmaapModel consumerDmaapModel) {
         GsonBuilder gsonBuilder = new GsonBuilder();
         ServiceLoader.load(TypeAdapterFactory.class).forEach(gsonBuilder::registerTypeAdapterFactory);
-        return gsonBuilder.create().toJson(ImmutableConsumerDmaapModel.builder().ipv4(consumerDmaapModel.getIpv4())
-            .ipv6(consumerDmaapModel.getIpv6()).correlationId(consumerDmaapModel.getCorrelationId()).build());
+        return gsonBuilder.create().toJson(ImmutableConsumerDmaapModel.builder()
+                .ipv4(consumerDmaapModel.getIpv4())
+                .ipv6(consumerDmaapModel.getIpv6())
+                .correlationId(consumerDmaapModel.getCorrelationId())
+                .serialNumber(consumerDmaapModel.getSerialNumber())
+                .equipVendor(consumerDmaapModel.getEquipVendor())
+                .equipModel(consumerDmaapModel.getEquipModel())
+                .equipType(consumerDmaapModel.getEquipType())
+                .nfRole(consumerDmaapModel.getNfRole())
+                .swVersion(consumerDmaapModel.getSwVersion())
+                .build());
     }
 }
\ No newline at end of file