summaryrefslogtreecommitdiffstats
path: root/prh-app-server/src/main/java
diff options
context:
space:
mode:
authorpwielebs <piotr.wielebski@nokia.com>2019-02-13 16:06:53 +0100
committerpwielebs <piotr.wielebski@nokia.com>2019-02-13 16:06:53 +0100
commitdf2c17cd5619d6ca069f73342a9aaafbdf0bba59 (patch)
tree5e605cb30e53e3489796cf5ab5687f9c15c7f216 /prh-app-server/src/main/java
parent2ce68d3c8423d644056becc8ef1e3bb0df731c42 (diff)
Add additional fields to PRH (2)
* correct name of parameters Change-Id: I591ed6ba66691d3fe637b9d81b0956a635deac1c Issue-ID: DCAEGEN2-1173 Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
Diffstat (limited to 'prh-app-server/src/main/java')
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java3
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/PnfRegistrationFields.java12
2 files changed, 8 insertions, 7 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java
index f47231df..7532c5d8 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/DmaapConsumerJsonParser.java
@@ -119,13 +119,14 @@ public class DmaapConsumerJsonParser {
.getAsJsonObject(PNF_REGISTRATION_FIELDS);
this.pnfSourceName = getValueFromJson(commonEventHeader, SOURCE_NAME);
+ this.pnfNfRoleAdditionalField = getValueFromJson(commonEventHeader, NF_ROLE);
+
this.pnfOamIpv4Address = getValueFromJson(pnfRegistrationFields, OAM_IPV_4_ADDRESS);
this.pnfOamIpv6Address = getValueFromJson(pnfRegistrationFields, OAM_IPV_6_ADDRESS);
this.pnfSerialNumberAdditionalField = getValueFromJson(pnfRegistrationFields, SERIAL_NUMBER);
this.pnfEquipVendorAdditionalField = getValueFromJson(pnfRegistrationFields, EQUIP_VENDOR);
this.pnfEquipModelAdditionalField = getValueFromJson(pnfRegistrationFields, EQUIP_MODEL);
this.pnfEquipTypeAdditionalField = getValueFromJson(pnfRegistrationFields, EQUIP_TYPE);
- this.pnfNfRoleAdditionalField = getValueFromJson(pnfRegistrationFields, NF_ROLE);
this.pnfSwVersionAdditionalField = getValueFromJson(pnfRegistrationFields, SW_VERSION);
return (StringUtils.isEmpty(pnfSourceName) || !ipPropertiesNotEmpty(pnfOamIpv4Address, pnfOamIpv6Address))
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/PnfRegistrationFields.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/PnfRegistrationFields.java
index c2c2b741..a9a28c0c 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/PnfRegistrationFields.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/service/PnfRegistrationFields.java
@@ -33,12 +33,12 @@ class PnfRegistrationFields {
static final String CORRELATION_ID = "correlationId";
// additional fields
- static final String SERIAL_NUMBER = "serial-number";
- static final String EQUIP_VENDOR = "equip-vendor";
- static final String EQUIP_MODEL = "equip-model";
- static final String EQUIP_TYPE = "equip-type";
- static final String NF_ROLE = "nf-role";
- static final String SW_VERSION = "sw-version";
+ static final String SERIAL_NUMBER = "serialNumber";
+ static final String EQUIP_VENDOR = "vendorName";
+ static final String EQUIP_MODEL = "modelNumber";
+ static final String EQUIP_TYPE = "unitType";
+ static final String NF_ROLE = "nfNamingCode";
+ static final String SW_VERSION = "softwareVersion";
private PnfRegistrationFields() {}
}