From c35ad79f3939eebf531f477d62755221789bca12 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 28 Jun 2023 11:38:33 -0400 Subject: Update features for Argon release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update ccsdk/features for use with OpenDaylight Argon release Issue-ID: CCSDK-3916 Signed-off-by: Dan Timoney Change-Id: Ie28aa66f6c3a9c0c6002e05d8f714613dbe460cf Signed-off-by: Michael Dürre --- .../devicemanager-onap/openroadm71/feature/pom.xml | 2 +- .../openroadm71/installer/pom.xml | 2 +- .../devicemanager-onap/openroadm71/model/pom.xml | 2 +- sdnr/wt/devicemanager-onap/openroadm71/pom.xml | 2 +- .../openroadm71/provider/pom.xml | 9 ++++++++- .../openroadm71/impl/OpenroadmInventoryInput.java | 5 +++-- .../pm/types/rev200327/PmDataTypeBuilder.java | 23 ++++++++++++++++++++++ 7 files changed, 38 insertions(+), 7 deletions(-) create mode 100644 sdnr/wt/devicemanager-onap/openroadm71/provider/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev200327/PmDataTypeBuilder.java (limited to 'sdnr/wt/devicemanager-onap/openroadm71') diff --git a/sdnr/wt/devicemanager-onap/openroadm71/feature/pom.xml b/sdnr/wt/devicemanager-onap/openroadm71/feature/pom.xml index 628891e78..b8073d39b 100644 --- a/sdnr/wt/devicemanager-onap/openroadm71/feature/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm71/feature/pom.xml @@ -26,7 +26,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.5.4 + 2.6.0 diff --git a/sdnr/wt/devicemanager-onap/openroadm71/installer/pom.xml b/sdnr/wt/devicemanager-onap/openroadm71/installer/pom.xml index f0b797cc4..48fdad6cd 100755 --- a/sdnr/wt/devicemanager-onap/openroadm71/installer/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm71/installer/pom.xml @@ -26,7 +26,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/sdnr/wt/devicemanager-onap/openroadm71/model/pom.xml b/sdnr/wt/devicemanager-onap/openroadm71/model/pom.xml index c1da892ab..913651a88 100644 --- a/sdnr/wt/devicemanager-onap/openroadm71/model/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm71/model/pom.xml @@ -26,7 +26,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 diff --git a/sdnr/wt/devicemanager-onap/openroadm71/pom.xml b/sdnr/wt/devicemanager-onap/openroadm71/pom.xml index d528a3441..fef7df241 100755 --- a/sdnr/wt/devicemanager-onap/openroadm71/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm71/pom.xml @@ -26,7 +26,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.4 + 2.6.0 diff --git a/sdnr/wt/devicemanager-onap/openroadm71/provider/pom.xml b/sdnr/wt/devicemanager-onap/openroadm71/provider/pom.xml index 9accc7387..1c653c3b9 100644 --- a/sdnr/wt/devicemanager-onap/openroadm71/provider/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm71/provider/pom.xml @@ -26,7 +26,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.4 + 2.6.0 @@ -50,6 +50,13 @@ + + + ${project.groupId} + ietf-alarms + ${project.version} + provided + ${project.groupId} sdnr-wt-devicemanager-onap-openroadm71-model diff --git a/sdnr/wt/devicemanager-onap/openroadm71/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/impl/OpenroadmInventoryInput.java b/sdnr/wt/devicemanager-onap/openroadm71/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/impl/OpenroadmInventoryInput.java index b383c9d70..5b5d43bf4 100644 --- a/sdnr/wt/devicemanager-onap/openroadm71/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/impl/OpenroadmInventoryInput.java +++ b/sdnr/wt/devicemanager-onap/openroadm71/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm71/impl/OpenroadmInventoryInput.java @@ -63,8 +63,9 @@ public class OpenroadmInventoryInput { inventoryBuilder.setNodeId(this.accessor.getNodeId().getValue()) .setUuid(info.getNodeId() == null ? NOT_AVAILABLE : info.getNodeId().getValue()) .setDate(info.getCurrentDatetime() != null ? info.getCurrentDatetime().getValue() : null) - .setId(info.getNodeId().getValue()).setManufacturerIdentifier(info.getVendor()) - .setModelIdentifier(info.getModel()).setSerial(info.getSerialId()).setTreeLevel(treeLevel) + .setId(this.accessor.getNodeId().getValue() + "/" + info.getNodeId().getValue()) + .setManufacturerIdentifier(info.getVendor()).setModelIdentifier(info.getModel()) + .setSerial(info.getSerialId()).setTreeLevel(treeLevel) .setVersion(info.getOpenroadmVersion() != null ? info.getOpenroadmVersion().getName() : null) .setDescription("org-openroadm-device").setParentUuid("None").setTypeName(info.getNodeType().getName()) .setPartTypeId("device"); diff --git a/sdnr/wt/devicemanager-onap/openroadm71/provider/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev200327/PmDataTypeBuilder.java b/sdnr/wt/devicemanager-onap/openroadm71/provider/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev200327/PmDataTypeBuilder.java new file mode 100644 index 000000000..f470fb6ba --- /dev/null +++ b/sdnr/wt/devicemanager-onap/openroadm71/provider/src/main/java/org/opendaylight/yang/gen/v1/http/org/openroadm/pm/types/rev200327/PmDataTypeBuilder.java @@ -0,0 +1,23 @@ +package org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev200327; +import java.lang.String; +import java.lang.UnsupportedOperationException; + +/** + * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation. + * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32). + * + * The reason behind putting it under src/main/java is: + * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent + * loss of user code. + * + */ +public class PmDataTypeBuilder { + private PmDataTypeBuilder() { + //Exists only to defeat instantiation. + } + + public static PmDataType getDefaultInstance(String defaultValue) { + throw new UnsupportedOperationException("Not yet implemented"); + } + +} -- cgit 1.2.3-korg