From: Ravi Pendurty Date: Wed, 29 Jul 2020 10:42:41 +0000 (+0200) Subject: Upgrade to ODL Sodium X-Git-Tag: 2.2.0~39^2 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a533135eca1e8db564cf96bf5fe8a974a11abf9d;p=oam.git Upgrade to ODL Sodium Upgrade to ODL Sodium Issue-ID: OAM-139 Signed-off-by: Ravi Pendurty Change-Id: I3de1909177a711d3587bf37c11d4ec55f187f85d Signed-off-by: Ravi Pendurty --- diff --git a/features/devicemanager/x-ran/ru-fh/feature/pom.xml b/features/devicemanager/x-ran/ru-fh/feature/pom.xml index 2aa27b6..601012b 100644 --- a/features/devicemanager/x-ran/ru-fh/feature/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/feature/pom.xml @@ -27,18 +27,18 @@ 4.0.0 - org.onap.ccsdk.parent + org.o-ran-sc.oam.features.parent single-feature-parent - 1.5.2 + 2.0.0-SNAPSHOT org.o-ran-sc.oam.features.devicemanager devicemanager-xran-ru-fh-feature - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT feature - x-ran-sc-features :: ${project.artifactId} + o-ran-sc-features :: ${project.artifactId} diff --git a/features/devicemanager/x-ran/ru-fh/installer/pom.xml b/features/devicemanager/x-ran/ru-fh/installer/pom.xml index ac020d8..d91997e 100755 --- a/features/devicemanager/x-ran/ru-fh/installer/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/installer/pom.xml @@ -27,15 +27,15 @@ 4.0.0 - org.onap.ccsdk.parent + org.o-ran-sc.oam.features.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.o-ran-sc.oam.features.devicemanager devicemanager-xran-ru-fh-installer - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom o-ran-sc-features :: ${project.artifactId} diff --git a/features/devicemanager/x-ran/ru-fh/model/pom.xml b/features/devicemanager/x-ran/ru-fh/model/pom.xml index b3dcbee..68bd7df 100644 --- a/features/devicemanager/x-ran/ru-fh/model/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/model/pom.xml @@ -27,15 +27,15 @@ 4.0.0 - org.onap.ccsdk.parent + org.o-ran-sc.oam.features.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.o-ran-sc.oam.features.devicemanager devicemanager-xran-ru-fh-model - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle o-ran-sc-features :: ${project.artifactId} diff --git a/features/devicemanager/x-ran/ru-fh/pom.xml b/features/devicemanager/x-ran/ru-fh/pom.xml index d883c11..8d73ed6 100755 --- a/features/devicemanager/x-ran/ru-fh/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/pom.xml @@ -27,15 +27,15 @@ 4.0.0 - org.onap.ccsdk.parent + org.o-ran-sc.oam.features.parent odlparent-lite - 1.5.2 + 2.0.0-SNAPSHOT org.o-ran-sc.oam.features.devicemanager devicemanager-xran-ru-fh-top - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT pom o-ran-sc-features :: ${project.artifactId} diff --git a/features/devicemanager/x-ran/ru-fh/provider/pom.xml b/features/devicemanager/x-ran/ru-fh/provider/pom.xml index 54210d9..0d0f990 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/pom.xml +++ b/features/devicemanager/x-ran/ru-fh/provider/pom.xml @@ -27,15 +27,15 @@ 4.0.0 - org.onap.ccsdk.parent + org.o-ran-sc.oam.features.parent binding-parent - 1.5.2 + 2.0.0-SNAPSHOT org.o-ran-sc.oam.features.devicemanager devicemanager-xran-ru-fh-provider - 0.7.1-SNAPSHOT + 1.0.0-SNAPSHOT bundle o-ran-sc-features :: ${project.artifactId} @@ -71,13 +71,11 @@ org.onap.ccsdk.features.sdnr.wt sdnr-wt-devicemanager-model - 0.7.1 provided org.onap.ccsdk.features.sdnr.wt sdnr-wt-netconfnode-state-service-model - 0.7.1 provided diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/NetconfConfigChangeMock.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/NetconfConfigChangeMock.java deleted file mode 100644 index 41a6085..0000000 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/NetconfConfigChangeMock.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * ============LICENSE_START======================================================================== - * ONAP : ccsdk feature sdnr wt - * ================================================================================================= - * Copyright (C) 2020 highstreet technologies GmbH 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.ccsdk.features.sdnr.wt.devicemanager.xran.mock; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.changed.by.parms.ChangedBy; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.netconf.config.change.Edit; -import org.opendaylight.yangtools.yang.binding.Augmentation; -import org.opendaylight.yangtools.yang.binding.DataContainer; - -public class NetconfConfigChangeMock implements NetconfConfigChange { - - @Override - public Class getImplementedInterface() { - // TODO Auto-generated method stub - return null; - } - - @Override - public > @Nullable E$$ augmentation(Class augmentationType) { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable ChangedBy getChangedBy() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable Datastore getDatastore() { - // TODO Auto-generated method stub - return null; - } - - @Override - public @Nullable List getEdit() { - List list = new ArrayList(); - return list; - } - -} diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestDeviceManagerXRanImpl.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestDeviceManagerXRanImpl.java similarity index 97% rename from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestDeviceManagerXRanImpl.java rename to features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestDeviceManagerXRanImpl.java index 2b10f22..cba3904 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestDeviceManagerXRanImpl.java +++ b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestDeviceManagerXRanImpl.java @@ -1,4 +1,4 @@ -package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran; +package org.oransc.oam.features.devicemanager.xran.test; import java.io.File; import java.io.FileNotFoundException; diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestHardwareClass.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestHardwareClass.java similarity index 73% rename from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestHardwareClass.java rename to features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestHardwareClass.java index a42f35b..34317f6 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestHardwareClass.java +++ b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestHardwareClass.java @@ -1,4 +1,4 @@ -package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran; +package org.oransc.oam.features.devicemanager.xran.test; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.hardware.rev180313.HardwareClass; diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXORanNetworkElementFactory.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXORanNetworkElementFactory.java similarity index 95% rename from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXORanNetworkElementFactory.java rename to features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXORanNetworkElementFactory.java index 199156e..600dc5f 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXORanNetworkElementFactory.java +++ b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXORanNetworkElementFactory.java @@ -15,7 +15,7 @@ * the License. * ============LICENSE_END========================================================================== */ -package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran; +package org.oransc.oam.features.devicemanager.xran.test; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.mock; @@ -26,12 +26,12 @@ import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider; -import org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.mock.NetconfAccessorMock; import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities; import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor; import org.opendaylight.yang.gen.v1.urn.xran.hardware._1._0.rev180720.XRANRADIO; import org.opendaylight.yangtools.yang.common.QName; import org.oransc.oam.features.devicemanager.xran.impl.XRanNetworkElementFactory; +import org.oransc.oam.features.devicemanager.xran.test.mock.NetconfAccessorMock; public class TestXORanNetworkElementFactory { diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanChangeNotificationListener.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanChangeNotificationListener.java similarity index 98% rename from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanChangeNotificationListener.java rename to features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanChangeNotificationListener.java index 8126a8f..c12ab9d 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanChangeNotificationListener.java +++ b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanChangeNotificationListener.java @@ -16,7 +16,7 @@ * ============LICENSE_END========================================================================== */ -package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran; +package org.oransc.oam.features.devicemanager.xran.test; import static org.mockito.Mockito.*; diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanFaultNotificationListener.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanFaultNotificationListener.java similarity index 95% rename from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanFaultNotificationListener.java rename to features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanFaultNotificationListener.java index 6dcaec1..f246ccf 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanFaultNotificationListener.java +++ b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanFaultNotificationListener.java @@ -15,7 +15,7 @@ * the License. * ============LICENSE_END========================================================================== */ -package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran; +package org.oransc.oam.features.devicemanager.xran.test; import org.junit.Test; import org.oransc.oam.features.devicemanager.xran.impl.XRanFaultNotificationListener; diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanNetworkElement.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanNetworkElement.java similarity index 94% rename from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanNetworkElement.java rename to features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanNetworkElement.java index 2e3af29..91ff30e 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanNetworkElement.java +++ b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanNetworkElement.java @@ -15,7 +15,7 @@ * the License. * ============LICENSE_END========================================================================== */ -package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran; +package org.oransc.oam.features.devicemanager.xran.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -34,9 +34,9 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.xran.hardware._1._0.rev180720.XRANRADIO; import org.opendaylight.yangtools.yang.common.QName; import org.oransc.oam.features.devicemanager.xran.impl.XRanNetworkElementFactory; +import org.oransc.oam.features.devicemanager.xran.test.mock.NetconfAccessorMock; +import org.oransc.oam.features.devicemanager.xran.test.mock.TransactionUtilsMock; import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider; -import org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.mock.NetconfAccessorMock; -import org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.mock.TransactionUtilsMock; import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities; public class TestXRanNetworkElement { diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanToInternalDataModel.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanToInternalDataModel.java similarity index 96% rename from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanToInternalDataModel.java rename to features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanToInternalDataModel.java index a80d68a..153870f 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanToInternalDataModel.java +++ b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanToInternalDataModel.java @@ -15,7 +15,7 @@ * the License. * ============LICENSE_END========================================================================== */ -package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran; +package org.oransc.oam.features.devicemanager.xran.test; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -35,7 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.oransc.oam.features.devicemanager.xran.impl.XRanToInternalDataModel; -import org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.TestHardwareClass; +import org.oransc.oam.features.devicemanager.xran.test.TestHardwareClass; public class TestXRanToInternalDataModel { diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/NetconfAccessorMock.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/NetconfAccessorMock.java similarity index 98% rename from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/NetconfAccessorMock.java rename to features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/NetconfAccessorMock.java index 2b3d079..0c50454 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/NetconfAccessorMock.java +++ b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/NetconfAccessorMock.java @@ -15,7 +15,7 @@ * the License. * ============LICENSE_END========================================================================== */ -package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.mock; +package org.oransc.oam.features.devicemanager.xran.test.mock; import com.google.common.util.concurrent.ListenableFuture; import org.eclipse.jdt.annotation.NonNull; diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/TransactionUtilsMock.java b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/TransactionUtilsMock.java similarity index 97% rename from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/TransactionUtilsMock.java rename to features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/TransactionUtilsMock.java index f8c0944..a8ff855 100644 --- a/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/TransactionUtilsMock.java +++ b/features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/TransactionUtilsMock.java @@ -15,7 +15,7 @@ * the License. * ============LICENSE_END========================================================================== */ -package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.mock; +package org.oransc.oam.features.devicemanager.xran.test.mock; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference;