Upgrade to ODL Sodium 75/4475/3
authorRavi Pendurty <ravi.pendurty@highstreet-technologies.com>
Wed, 29 Jul 2020 10:42:41 +0000 (12:42 +0200)
committerRavi Pendurty <ravi.pendurty@highstreet-technologies.com>
Mon, 10 Aug 2020 10:23:28 +0000 (12:23 +0200)
Upgrade to ODL Sodium

Issue-ID: OAM-139
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: I3de1909177a711d3587bf37c11d4ec55f187f85d
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
15 files changed:
features/devicemanager/x-ran/ru-fh/feature/pom.xml
features/devicemanager/x-ran/ru-fh/installer/pom.xml
features/devicemanager/x-ran/ru-fh/model/pom.xml
features/devicemanager/x-ran/ru-fh/pom.xml
features/devicemanager/x-ran/ru-fh/provider/pom.xml
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/NetconfConfigChangeMock.java [deleted file]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestDeviceManagerXRanImpl.java [moved from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestDeviceManagerXRanImpl.java with 97% similarity]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestHardwareClass.java [moved from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestHardwareClass.java with 73% similarity]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXORanNetworkElementFactory.java [moved from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXORanNetworkElementFactory.java with 95% similarity]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanChangeNotificationListener.java [moved from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanChangeNotificationListener.java with 98% similarity]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanFaultNotificationListener.java [moved from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanFaultNotificationListener.java with 95% similarity]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanNetworkElement.java [moved from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanNetworkElement.java with 94% similarity]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/TestXRanToInternalDataModel.java [moved from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanToInternalDataModel.java with 96% similarity]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/NetconfAccessorMock.java [moved from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/NetconfAccessorMock.java with 98% similarity]
features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/xran/test/mock/TransactionUtilsMock.java [moved from features/devicemanager/x-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/mock/TransactionUtilsMock.java with 97% similarity]

index 2aa27b6..601012b 100644 (file)
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-feature</artifactId>
-        <version>0.7.1-SNAPSHOT</version>
+        <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>x-ran-sc-features :: ${project.artifactId}</name>
+    <name>o-ran-sc-features :: ${project.artifactId}</name>
 
     <dependencies>
         <dependency>
index ac020d8..d91997e 100755 (executable)
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-       <groupId>org.onap.ccsdk.parent</groupId>
+       <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-installer</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
index b3dcbee..68bd7df 100644 (file)
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-model</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
index d883c11..8d73ed6 100755 (executable)
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-top</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
index 54210d9..0d0f990 100644 (file)
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
+        <groupId>org.o-ran-sc.oam.features.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.5.2</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
     <artifactId>devicemanager-xran-ru-fh-provider</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-devicemanager-model</artifactId>
-            <version>0.7.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-netconfnode-state-service-model</artifactId>
-            <version>0.7.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
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 (file)
index 41a6085..0000000
+++ /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<? extends DataContainer> getImplementedInterface() {
-               // TODO Auto-generated method stub
-               return null;
-       }
-
-       @Override
-       public <E$$ extends Augmentation<NetconfConfigChange>> @Nullable E$$ augmentation(Class<E$$> 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<Edit> getEdit() {
-               List<Edit> list = new ArrayList<Edit>();
-               return list;
-       }
-
-}
@@ -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 {
 
@@ -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 {
@@ -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 {