diff options
| author |   Dan Timoney <dtimoney@att.com> | 2023-08-10 20:46:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-08-10 20:46:56 +0000 |
| commit | 8f708e94e2798d42f1b107828c910304bc5cac6b (patch) | |
| tree | b82972b8fe8087a0c5e6c6c0b91c84d46e108ed4 /sdnr/wt/devicemanager-onap/openroadm | |
| parent | fad3167f42d585e3144547db4c6dd7d00ea7b18a (diff) | |
| parent | c35ad79f3939eebf531f477d62755221789bca12 (diff) | |
Merge "Update features for Argon release"
Diffstat (limited to 'sdnr/wt/devicemanager-onap/openroadm')
6 files changed, 7 insertions, 6 deletions
diff --git a/sdnr/wt/devicemanager-onap/openroadm/feature/pom.xml b/sdnr/wt/devicemanager-onap/openroadm/feature/pom.xml index d3abbbd0a..734f90495 100644 --- a/sdnr/wt/devicemanager-onap/openroadm/feature/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm/feature/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> <relativePath/> </parent> diff --git a/sdnr/wt/devicemanager-onap/openroadm/installer/pom.xml b/sdnr/wt/devicemanager-onap/openroadm/installer/pom.xml index 4027af556..253c06bfc 100755 --- a/sdnr/wt/devicemanager-onap/openroadm/installer/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm/installer/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> <relativePath/> </parent> diff --git a/sdnr/wt/devicemanager-onap/openroadm/model/pom.xml b/sdnr/wt/devicemanager-onap/openroadm/model/pom.xml index 72af8990c..382fdd828 100644 --- a/sdnr/wt/devicemanager-onap/openroadm/model/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm/model/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> <relativePath/> </parent> diff --git a/sdnr/wt/devicemanager-onap/openroadm/pom.xml b/sdnr/wt/devicemanager-onap/openroadm/pom.xml index 071760ceb..36113c2fb 100755 --- a/sdnr/wt/devicemanager-onap/openroadm/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> <relativePath/> </parent> diff --git a/sdnr/wt/devicemanager-onap/openroadm/provider/pom.xml b/sdnr/wt/devicemanager-onap/openroadm/provider/pom.xml index 75dca90d7..0b1a1ebeb 100644 --- a/sdnr/wt/devicemanager-onap/openroadm/provider/pom.xml +++ b/sdnr/wt/devicemanager-onap/openroadm/provider/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.5.4</version> + <version>2.6.0</version> <relativePath/> </parent> diff --git a/sdnr/wt/devicemanager-onap/openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmInventoryInput.java b/sdnr/wt/devicemanager-onap/openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmInventoryInput.java index 416cf7e6d..113225162 100644 --- a/sdnr/wt/devicemanager-onap/openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmInventoryInput.java +++ b/sdnr/wt/devicemanager-onap/openroadm/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/impl/OpenroadmInventoryInput.java @@ -61,7 +61,8 @@ public class OpenroadmInventoryInput { .setUuid(this.openRoadmDevice.getInfo().getNodeId() == null ? "N/A" : this.openRoadmDevice.getInfo().getNodeId().getValue()) .setDate(this.openRoadmDevice.getInfo().getCurrentDatetime().getValue()) - .setId(this.openRoadmDevice.getInfo().getNodeId().getValue()) + .setId(this.accessor.getNodeId().getValue() + "/" + + this.openRoadmDevice.getInfo().getNodeId().getValue()) .setManufacturerIdentifier(this.openRoadmDevice.getInfo().getVendor()) .setModelIdentifier(this.openRoadmDevice.getInfo().getModel()) .setSerial(this.openRoadmDevice.getInfo().getSerialId()).setTreeLevel(treeLevel) |