From: herbert <herbert.eiselt@highstreet-technologies.com>
Date: Thu, 12 Mar 2020 13:45:05 +0000 (+0100)
Subject: Update distribution and feature
X-Git-Tag: 2.2.0~65
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=bc81a3024b364b146023b5613bfcb52665a287ae;p=oam.git

Update distribution and feature

update onap frankfurt related parts

Issue-ID: OAM-62
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I14ac84203b8056332e28cb648ec497114064d18e
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
---

diff --git a/distribution/nonrtric-o1-controller-frankfurt/pom.xml b/distribution/nonrtric-o1-controller-frankfurt/pom.xml
index ae18224..cdf07f1 100644
--- a/distribution/nonrtric-o1-controller-frankfurt/pom.xml
+++ b/distribution/nonrtric-o1-controller-frankfurt/pom.xml
@@ -28,8 +28,10 @@
     <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
     <o-ran-sc.project.version>${project.version}</o-ran-sc.project.version>
     <o-ran-sc.features.version>0.7.1-SNAPSHOT</o-ran-sc.features.version>
-    <features.repo>mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-oran-ru-fh-feature/${o-ran-sc.features.version}/xml/features, mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-xran-ru-fh-feature/${o-ran-sc.features.version}/xml/features</features.repo>
-    <features.boot>sdnr-wt-feature-aggregator,devicemanager-oran-ru-fh-feature</features.boot>
+    <repo-oran>mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-oran-ru-fh-feature/${o-ran-sc.features.version}/xml/features</repo-oran>
+    <repo-xran>mvn:org.o-ran-sc.oam.features.devicemanager/devicemanager-xran-ru-fh-feature/${o-ran-sc.features.version}/xml/features</repo-xran>
+    <features.repo>${repo-oran},${repo-xran}</features.repo>
+    <features.boot>sdnr-wt-feature-aggregator,devicemanager-oran-ru-fh-feature,devicemanager-xran-ru-fh-feature</features.boot>
     <platform-logic-installer.version>${project.version}</platform-logic-installer.version>
     <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>
     <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
@@ -47,6 +49,13 @@
       <type>zip</type>
       <classifier>repo</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.o-ran-sc.oam.features.devicemanager</groupId>
+      <artifactId>devicemanager-xran-ru-fh-installer</artifactId>
+      <version>${o-ran-sc.features.version}</version>
+      <type>zip</type>
+      <classifier>repo</classifier>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile b/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
index 9df3280..9482d2f 100644
--- a/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
+++ b/distribution/nonrtric-o1-controller-frankfurt/src/main/docker/Dockerfile
@@ -9,4 +9,6 @@ USER root
 COPY system /tmp/system
 RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system
 RUN chown -R odl:odl $ODL_HOME
+
+# Set user for ODL startup
 USER odl
diff --git a/features/devicemanager/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/features/devicemanager/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 898ecfc..d70f328 100644
--- a/features/devicemanager/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/features/devicemanager/o-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -31,7 +31,7 @@
                interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService"/>
 
     <bean id="provider"
-          class="org.oransc.features.devicemanager.oran.impl.DeviceManagerORanImpl"
+          class="org.oransc.oam.features.devicemanager.oran.impl.DeviceManagerORanImpl"
           init-method="init" destroy-method="close">
         <property name="netconfNetworkElementService" ref="netconfNetworkElementService"/>
     </bean>
diff --git a/features/devicemanager/x-ran/ru-fh/feature/pom.xml b/features/devicemanager/x-ran/ru-fh/feature/pom.xml
index 6e9c1fe..42cd8b6 100644
--- a/features/devicemanager/x-ran/ru-fh/feature/pom.xml
+++ b/features/devicemanager/x-ran/ru-fh/feature/pom.xml
@@ -38,7 +38,7 @@
     <version>0.7.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>o-ran-sc-features :: ${project.artifactId}</name>
+    <name>x-ran-sc-features :: ${project.artifactId}</name>
 
     <dependencies>
         <dependency>
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/DeviceManagerXRanImpl.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/DeviceManagerXRanImpl.java
similarity index 98%
rename from features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/DeviceManagerXRanImpl.java
rename to features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/DeviceManagerXRanImpl.java
index 252dd31..5aa89da 100644
--- a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/DeviceManagerXRanImpl.java
+++ b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/DeviceManagerXRanImpl.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl;
+package org.oransc.oam.features.devicemanager.xran.impl;
 
 import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.factory.FactoryRegistration;
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/NullableHelper.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/NullableHelper.java
similarity index 96%
rename from features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/NullableHelper.java
rename to features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/NullableHelper.java
index 9484024..0764226 100644
--- a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/NullableHelper.java
+++ b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/NullableHelper.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  ******************************************************************************/
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl;
+package org.oransc.oam.features.devicemanager.xran.impl;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanChangeNotificationListener.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanChangeNotificationListener.java
similarity index 98%
rename from features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanChangeNotificationListener.java
rename to features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanChangeNotificationListener.java
index 7aeaaf7..be0822f 100644
--- a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanChangeNotificationListener.java
+++ b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanChangeNotificationListener.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl;
+package org.oransc.oam.features.devicemanager.xran.impl;
 
 import java.util.List;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanFaultNotificationListener.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanFaultNotificationListener.java
similarity index 96%
rename from features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanFaultNotificationListener.java
rename to features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanFaultNotificationListener.java
index 4ba7605..5fdb078 100644
--- a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanFaultNotificationListener.java
+++ b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanFaultNotificationListener.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl;
+package org.oransc.oam.features.devicemanager.xran.impl;
 
 import org.opendaylight.yang.gen.v1.urn.xran.fm._1._0.rev180720.AlarmNotif;
 import org.opendaylight.yang.gen.v1.urn.xran.fm._1._0.rev180720.XranFmListener;
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanNetworkElement.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElement.java
similarity index 98%
rename from features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanNetworkElement.java
rename to features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElement.java
index 13574d2..a956c44 100644
--- a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanNetworkElement.java
+++ b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElement.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl;
+package org.oransc.oam.features.devicemanager.xran.impl;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanNetworkElementFactory.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElementFactory.java
similarity index 97%
rename from features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanNetworkElementFactory.java
rename to features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElementFactory.java
index 034e393..139fc16 100644
--- a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanNetworkElementFactory.java
+++ b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanNetworkElementFactory.java
@@ -16,7 +16,7 @@
  * ============LICENSE_END==========================================================================
  */
 
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl;
+package org.oransc.oam.features.devicemanager.xran.impl;
 
 import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanToInternalDataModel.java b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanToInternalDataModel.java
similarity index 98%
rename from features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanToInternalDataModel.java
rename to features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanToInternalDataModel.java
index 35ea42c..ed8ffb3 100644
--- a/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/xran/impl/XRanToInternalDataModel.java
+++ b/features/devicemanager/x-ran/ru-fh/provider/src/main/java/org/oransc/oam/features/devicemanager/xran/impl/XRanToInternalDataModel.java
@@ -15,7 +15,7 @@
  * the License.
  * ============LICENSE_END==========================================================================
  */
-package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl;
+package org.oransc.oam.features.devicemanager.xran.impl;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/features/devicemanager/x-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/features/devicemanager/x-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 21b761c..14d3142 100644
--- a/features/devicemanager/x-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/features/devicemanager/x-ran/ru-fh/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -31,7 +31,7 @@
                interface="org.onap.ccsdk.features.sdnr.wt.devicemanager.service.NetconfNetworkElementService"/>
 
     <bean id="provider"
-          class="org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.impl.DeviceManagerORanImpl"
+          class="org.oransc.oam.features.devicemanager.xran.impl.DeviceManagerXRanImpl"
           init-method="init" destroy-method="close">
         <property name="netconfNetworkElementService" ref="netconfNetworkElementService"/>
     </bean>
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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestDeviceManagerXRanImpl.java
index a45a5ea..2b10f22 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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestDeviceManagerXRanImpl.java
@@ -9,7 +9,7 @@ import java.nio.file.Paths;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl.DeviceManagerXRanImpl;
+import org.oransc.oam.features.devicemanager.xran.impl.DeviceManagerXRanImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXORanNetworkElementFactory.java
index 6ffdab7..199156e 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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXORanNetworkElementFactory.java
@@ -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.impl.XRanNetworkElementFactory;
 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;
 
 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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanChangeNotificationListener.java
index ddb60b5..8126a8f 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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanChangeNotificationListener.java
@@ -26,7 +26,6 @@ import java.util.List;
 import org.eclipse.jdt.annotation.NonNull;
 import org.junit.Test;
 import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.DataProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl.XRanChangeNotificationListener;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.NetconfAccessor;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.EditOperationType;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.NetconfConfigChange;
@@ -38,6 +37,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
+import org.oransc.oam.features.devicemanager.xran.impl.XRanChangeNotificationListener;
 
 public class TestXRanChangeNotificationListener {
 
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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanFaultNotificationListener.java
index eea02bb..6dcaec1 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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanFaultNotificationListener.java
@@ -18,7 +18,7 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.xran;
 
 import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl.XRanFaultNotificationListener;
+import org.oransc.oam.features.devicemanager.xran.impl.XRanFaultNotificationListener;
 
 public class TestXRanFaultNotificationListener {
 
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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanNetworkElement.java
index f87ea28..2e3af29 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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanNetworkElement.java
@@ -33,8 +33,8 @@ import org.onap.ccsdk.features.sdnr.wt.devicemanager.ne.service.NetworkElement;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 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.onap.ccsdk.features.sdnr.wt.devicemanager.service.DeviceManagerServiceProvider;
-import org.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl.XRanNetworkElementFactory;
 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;
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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanToInternalDataModel.java
index f2413b9..a80d68a 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/onap/ccsdk/features/sdnr/wt/devicemanager/xran/TestXRanToInternalDataModel.java
@@ -34,8 +34,8 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.hardware.re
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 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.onap.ccsdk.features.sdnr.wt.devicemanager.xran.impl.XRanToInternalDataModel;
 
 public class TestXRanToInternalDataModel {