Upgrade to Sodium

Upgrade to Opendaylight Sodium

Issue-ID: OAM-134
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: Id9dd1867d067fd3cac9beb13043a467f066006a9
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>

diff --git a/features/devicemanager/o-ran/ru-fh/feature/pom.xml b/features/devicemanager/o-ran/ru-fh/feature/pom.xml
index 2cefd07..712fd0a 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/feature/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/feature/pom.xml
@@ -27,15 +27,15 @@
     <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-oran-ru-fh-feature</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>o-ran-sc-features :: ${project.artifactId}</name>

diff --git a/features/devicemanager/o-ran/ru-fh/installer/pom.xml b/features/devicemanager/o-ran/ru-fh/installer/pom.xml
index 557f3a9..2a4aea2 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/installer/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/installer/pom.xml
@@ -27,15 +27,15 @@
     <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-oran-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>

diff --git a/features/devicemanager/o-ran/ru-fh/model/pom.xml b/features/devicemanager/o-ran/ru-fh/model/pom.xml
index b8af4b2..cdb2c42 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/model/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/model/pom.xml
@@ -27,15 +27,15 @@
     <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-oran-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>

diff --git a/features/devicemanager/o-ran/ru-fh/pom.xml b/features/devicemanager/o-ran/ru-fh/pom.xml
index 0d7a874..2290d0f 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/pom.xml
@@ -27,15 +27,15 @@
     <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-oran-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>

diff --git a/features/devicemanager/o-ran/ru-fh/provider/pom.xml b/features/devicemanager/o-ran/ru-fh/provider/pom.xml
index 07fc2ae..afa296e 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/pom.xml
+++ b/features/devicemanager/o-ran/ru-fh/provider/pom.xml
@@ -27,15 +27,15 @@
     <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-oran-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>
@@ -71,13 +71,13 @@
         <dependency>
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-devicemanager-model</artifactId>
-            <version>0.7.1</version>
+            <version>${project.version}</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>
+            <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/mock/NetconfConfigChangeMock.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/mock/NetconfConfigChangeMock.java
deleted file mode 100644 (file)
index c1991dc..0000000
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/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.oran.test.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;
-       }
-
-}

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestDeviceManagerORanImpl.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestDeviceManagerORanImpl.java
similarity index 97%
rename from features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestDeviceManagerORanImpl.java
rename to features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestDeviceManagerORanImpl.java
index 4667f88..93459f6 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestDeviceManagerORanImpl.java
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestDeviceManagerORanImpl.java
@@ -1,4 +1,4 @@
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test;
+package org.oransc.oam.features.devicemanager.oran.test;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestHardwareClass.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestHardwareClass.java
similarity index 71%
rename from features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestHardwareClass.java
rename to features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestHardwareClass.java
index caa4e64..67c91ca 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestHardwareClass.java
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestHardwareClass.java
@@ -1,4 +1,4 @@
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test;
+package org.oransc.oam.features.devicemanager.oran.test;
 
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.hardware.rev180313.HardwareClass;
 

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanChangeNotificationListener.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanChangeNotificationListener.java
similarity index 98%
rename from features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanChangeNotificationListener.java
rename to features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanChangeNotificationListener.java
index bdc7566..9bf71bb 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanChangeNotificationListener.java
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanChangeNotificationListener.java
@@ -16,7 +16,7 @@
  * ============LICENSE_END==========================================================================
  */
 
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test;
+package org.oransc.oam.features.devicemanager.oran.test;
 
 import static org.mockito.Mockito.*;
 

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanFaultNotificationListener.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanFaultNotificationListener.java
similarity index 95%
rename from features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanFaultNotificationListener.java
rename to features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanFaultNotificationListener.java
index 12b8801..247982a 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanFaultNotificationListener.java
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanFaultNotificationListener.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test;
+package org.oransc.oam.features.devicemanager.oran.test;
 
 import org.junit.Test;
 import org.oransc.oam.features.devicemanager.oran.impl.ORanFaultNotificationListener;

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanNetworkElement.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElement.java
similarity index 94%
rename from features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanNetworkElement.java
rename to features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElement.java
index 8c13f54..6ae6d75 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanNetworkElement.java
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElement.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test;
+package org.oransc.oam.features.devicemanager.oran.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -30,14 +30,14 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test.mock.TransactionUtilsMock;
 import org.opendaylight.yang.gen.v1.urn.o.ran.hardware._1._0.rev190328.ORANHWCOMPONENT;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.network.topology.simulator.rev191025.SimulatorStatus;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.oransc.oam.features.devicemanager.oran.impl.ORanNetworkElementFactory;
+import org.oransc.oam.features.devicemanager.oran.test.mock.NetconfAccessorMock;
+import org.oransc.oam.features.devicemanager.oran.test.mock.TransactionUtilsMock;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test.mock.NetconfAccessorMock;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.Capabilities;
 
 public class TestORanNetworkElement {

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanNetworkElementFactory.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElementFactory.java
similarity index 96%
rename from features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanNetworkElementFactory.java
rename to features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElementFactory.java
index 6179717..8f32670 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanNetworkElementFactory.java
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanNetworkElementFactory.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test;
+package org.oransc.oam.features.devicemanager.oran.test;
 
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
@@ -26,13 +26,13 @@ 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.oran.test.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.o.ran.hardware._1._0.rev190328.ORANHWCOMPONENT;
 import org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.network.topology.simulator.rev191025.SimulatorStatus;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.oransc.oam.features.devicemanager.oran.impl.ORanNetworkElementFactory;
+import org.oransc.oam.features.devicemanager.oran.test.mock.NetconfAccessorMock;
 
 public class TestORanNetworkElementFactory {
 

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanToInternalDataModel.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanToInternalDataModel.java
similarity index 95%
rename from features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanToInternalDataModel.java
rename to features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanToInternalDataModel.java
index 69368af..07cff9d 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanToInternalDataModel.java
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/TestORanToInternalDataModel.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test;
+package org.oransc.oam.features.devicemanager.oran.test;
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
@@ -37,7 +37,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.oran.impl.ORanToInternalDataModel;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test.TestHardwareClass;
+import org.oransc.oam.features.devicemanager.oran.test.TestHardwareClass;
 
 public class TestORanToInternalDataModel {
 

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/mock/NetconfAccessorMock.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/NetconfAccessorMock.java
similarity index 98%
rename from features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/mock/NetconfAccessorMock.java
rename to features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/NetconfAccessorMock.java
index 108f5ec..84cae04 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/mock/NetconfAccessorMock.java
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/NetconfAccessorMock.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test.mock;
+package org.oransc.oam.features.devicemanager.oran.test.mock;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import org.eclipse.jdt.annotation.NonNull;

diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/mock/TransactionUtilsMock.java b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/TransactionUtilsMock.java
similarity index 96%
rename from features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/mock/TransactionUtilsMock.java
rename to features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/TransactionUtilsMock.java
index 0ae9b4a..cfd01d9 100644 (file)
--- a/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/mock/TransactionUtilsMock.java
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/test/java/org/oransc/oam/features/devicemanager/oran/test/mock/TransactionUtilsMock.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test.mock;
+package org.oransc.oam.features.devicemanager.oran.test.mock;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;