diff options
| author |   Dan Timoney <dtimoney@att.com> | 2023-06-28 11:38:33 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2023-08-10 14:50:16 -0400 |
| commit | c35ad79f3939eebf531f477d62755221789bca12 (patch) | |
| tree | 557bc55ff8fee542cb98501e0a8612170a971aa0 /sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main | |
| parent | 258ca721d952cffc919ad2265e97d73357abeeae (diff) | |
Update features for Argon release
Update ccsdk/features for use with OpenDaylight Argon release
Issue-ID: CCSDK-3916
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ie28aa66f6c3a9c0c6002e05d8f714613dbe460cf
Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main')
2 files changed, 9 insertions, 4 deletions
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java index 88a470f3f..5e25ce8b1 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDOMNetworkElement.java @@ -204,8 +204,9 @@ public class ORanDOMNetworkElement implements NetworkElement { InstanceIdentifierBuilder ietfSystemIID = YangInstanceIdentifier.builder().node(ORanDeviceManagerQNames.IETF_SYSTEM_CONTAINER); @NonNull - AugmentationIdentifier onapSystemIID = YangInstanceIdentifier.AugmentationIdentifier.create( - Sets.newHashSet(ORanDeviceManagerQNames.ONAP_SYSTEM_NAME, ORanDeviceManagerQNames.ONAP_SYSTEM_WEB_UI)); + AugmentationIdentifier onapSystemIID = YangInstanceIdentifier.AugmentationIdentifier + .create(Sets.newHashSet(ORanDeviceManagerQNames.ONAP_SYSTEM_NAME, + ORanDeviceManagerQNames.ONAP_SYSTEM_WEB_UI, ORanDeviceManagerQNames.ONAP_SYSTEM_GEOLOCATION)); InstanceIdentifierBuilder augmentedOnapSystem = YangInstanceIdentifier.builder(ietfSystemIID.build()).node(onapSystemIID); Capabilities x = netconfDomAccessor.getCapabilites(); diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDeviceManagerQNames.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDeviceManagerQNames.java index e86168abd..9949a6ffc 100644 --- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDeviceManagerQNames.java +++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/impl/dom/ORanDeviceManagerQNames.java @@ -35,11 +35,14 @@ public class ORanDeviceManagerQNames { // onap-system.yang public static final String ONAP_SYSTEM_NS = "urn:onap:system"; - public static final String ONAP_SYSTEM_REVISION = "2020-10-26"; + public static final String ONAP_SYSTEM_REVISION = "2022-11-04"; public static final @NonNull QName ONAP_SYSTEM_QNAME = QName.create(ONAP_SYSTEM_NS, ONAP_SYSTEM_REVISION, "onap-system"); +// public static final @NonNull QName ONAP_SYSTEM_QNAME = +// QName.create(ONAP_SYSTEM_NS, "onap-system"); public static final @NonNull QName ONAP_SYSTEM_NAME = QName.create(ONAP_SYSTEM_QNAME, "name"); public static final @NonNull QName ONAP_SYSTEM_WEB_UI = QName.create(ONAP_SYSTEM_QNAME, "web-ui"); + public static final @NonNull QName ONAP_SYSTEM_GEOLOCATION = QName.create(ONAP_SYSTEM_QNAME, "geographical-location"); //ietf-hardware.yang public static final String IETF_HW_NS = "urn:ietf:params:xml:ns:yang:ietf-hardware"; @@ -84,7 +87,8 @@ public class ORanDeviceManagerQNames { //o-ran-fm.yang public static final String ORAN_FM_NS = "urn:o-ran:fm:1.0"; - public static final String ORAN_FM_REVISION = "2019-02-04"; + //public static final String ORAN_FM_REVISION = "2019-02-04"; + public static final String ORAN_FM_REVISION = "2022-08-15"; public static final @NonNull QName ORAN_FM_MODULE = QName.create(ORAN_FM_NS, ORAN_FM_REVISION, "o-ran-fm"); public static final @NonNull QName ORAN_FM_ALARM_NOTIF = QName.create(ORAN_FM_MODULE, "alarm-notif"); public static final @NonNull QName ORAN_FM_FAULT_ID = QName.create(ORAN_FM_MODULE, "fault-id"); |