migrate features to silicon

migrate features to silicon

Issue-ID: CCSDK-3278
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: Icabe6bd5b760438eedd8c6b78a70197c287c5199
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>

19 files changed, 71 insertions, 389 deletions

diff --git a/.gitignore b/.gitignore
index acc84eaea..9df93c02a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 # Logs dir in all projects
 **/logs/*
 **/debug-logs/*
+sdnr/northbound/ranSlice/provider/derby.log
 
 # Added for Intellij IDEA IDE
 **/.idea/*
diff --git a/sdnr/wt/devicemanager-core/provider/pom.xml b/sdnr/wt/devicemanager-core/provider/pom.xml
index de6616fa2..575987d41 100644
--- a/sdnr/wt/devicemanager-core/provider/pom.xml
+++ b/sdnr/wt/devicemanager-core/provider/pom.xml
@@ -118,13 +118,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_2.13</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-cluster_2.13</artifactId>
+            <groupId>com.typesafe</groupId>
+            <artifactId>config</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -158,11 +153,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>activation</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
             <scope>provided</scope>
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/ORanNetworkElement.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/ORanNetworkElement.java
index 7c69f832b..0bb7f872b 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/ORanNetworkElement.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/ORanNetworkElement.java
@@ -40,9 +40,9 @@ import org.opendaylight.yang.gen.v1.urn.onap.system.rev201026.System1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Guicutthrough;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Inventory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.NetworkElementDeviceType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev161109.NetconfCallhomeServer;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev161109.netconf.callhome.server.AllowedDevices;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev161109.netconf.callhome.server.allowed.devices.Device;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev201015.NetconfCallhomeServer;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev201015.netconf.callhome.server.AllowedDevices;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.callhome.server.rev201015.netconf.callhome.server.allowed.devices.Device;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestAlarmNotif.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestAlarmNotif.java
index 365b3a226..76487fa17 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestAlarmNotif.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestAlarmNotif.java
@@ -22,6 +22,7 @@
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test;
 
 import java.util.Map;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
 import org.opendaylight.yang.gen.v1.urn.o.ran.fm._1._0.rev190204.AlarmNotif;
@@ -74,4 +75,14 @@ public class TestAlarmNotif implements AlarmNotif {
         return new DateAndTime("2021-03-23T18:19:42.326144Z");
     }
 
+    @Override
+    public @NonNull Map<Class<? extends Augmentation<AlarmNotif>>, Augmentation<AlarmNotif>> augmentations() {
+        return null;
+    }
+
+    @Override
+    public Boolean getIsCleared() {
+        return null;
+    }
+
 }
diff --git a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanRegistrationToVESpnfRegistration.java b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanRegistrationToVESpnfRegistration.java
index 781d333fe..d2cf94807 100644
--- a/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanRegistrationToVESpnfRegistration.java
+++ b/sdnr/wt/devicemanager-o-ran-sc/o-ran/ru-fh/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/oran/test/TestORanRegistrationToVESpnfRegistration.java
@@ -21,6 +21,7 @@
  */
 package org.onap.ccsdk.features.sdnr.wt.devicemanager.oran.test;
 
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import java.math.BigDecimal;
 import org.eclipse.jdt.annotation.Nullable;
@@ -70,8 +71,11 @@ public class TestORanRegistrationToVESpnfRegistration {
         String dateTimeString = "2020-02-05T12:30:45.283Z";
         String name = "Slot-0";
 
+        NetconfNode testNetconfNode = mock(NetconfNode.class);
+        when(testNetconfNode.getHost()).thenReturn(new Host(new IpAddress(new Ipv4Address("10.10.10.10"))));
+        
         when(netconfAccessor.getNodeId()).thenReturn(new NodeId("nSky"));
-        when(netconfAccessor.getNetconfNode()).thenReturn(new TestNetconfNode());
+        when(netconfAccessor.getNetconfNode()).thenReturn(testNetconfNode);
         when(vesCollectorService.getConfig()).thenReturn(vesCfgService);
         when(vesCfgService.getReportingEntityName()).thenReturn("SDN-R");
         Component testComponent = ComponentHelper.get(name, dateTimeString);
@@ -81,168 +85,4 @@ public class TestORanRegistrationToVESpnfRegistration {
         mapper.mapPNFRegistrationFields();
     }
 
-    public class TestNetconfNode implements NetconfNode {
-
-        @Override
-        public @Nullable Credentials getCredentials() {
-            return null;
-        }
-
-        @Override
-        public @Nullable Host getHost() {
-            return new Host(new IpAddress(new Ipv4Address("10.10.10.10")));
-        }
-
-        @Override
-        public @Nullable PortNumber getPort() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Boolean isTcpOnly() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Protocol getProtocol() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Boolean isSchemaless() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable YangModuleCapabilities getYangModuleCapabilities() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable NonModuleCapabilities getNonModuleCapabilities() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Boolean isReconnectOnChangedSchema() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Uint32 getConnectionTimeoutMillis() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Uint32 getDefaultRequestTimeoutMillis() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Uint32 getMaxConnectionAttempts() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Uint16 getBetweenAttemptsTimeoutMillis() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable BigDecimal getSleepFactor() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Uint32 getKeepaliveDelay() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Uint16 getConcurrentRpcLimit() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable Uint16 getActorResponseWaitTime() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable OdlHelloMessageCapabilities getOdlHelloMessageCapabilities() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable ConnectionStatus getConnectionStatus() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable ClusteredConnectionStatus getClusteredConnectionStatus() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable String getConnectedMessage() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable AvailableCapabilities getAvailableCapabilities() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable UnavailableCapabilities getUnavailableCapabilities() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable PassThrough getPassThrough() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable String getSchemaCacheDirectory() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable YangLibrary getYangLibrary() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-        @Override
-        public @Nullable IgnoreMissingSchemaSources getIgnoreMissingSchemaSources() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
-    }
-
 }
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev170324.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev170324.java
index bee34b5b5..f3fd577bf 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev170324.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev170324.java
@@ -308,6 +308,7 @@ public class TestWrapperMicrowaveModelRev170324 {
         List<org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.air._interface.historical.performances.g.HistoricalPerformanceDataList> airHistPMList =
                 Arrays.asList(
                         new org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.air._interface.historical.performances.g.HistoricalPerformanceDataListBuilder()
+                                .setHistoryDataId("123")
                                 .setGranularityPeriod(GranularityPeriodType.Period15Min)
                                 .setPerformanceData(performanceData).build());
         AirInterfaceHistoricalPerformances airHistoricalPerformanceData =
@@ -325,6 +326,7 @@ public class TestWrapperMicrowaveModelRev170324 {
         List<org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.ethernet.container.historical.performances.g.HistoricalPerformanceDataList> ethHistPMList =
                 Arrays.asList(
                         new org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev170324.ethernet.container.historical.performances.g.HistoricalPerformanceDataListBuilder()
+                                .setHistoryDataId("123")
                                 .setGranularityPeriod(GranularityPeriodType.Period24Hours)
                                 .setPerformanceData(ethPerformanceData).build());
         EthernetContainerHistoricalPerformances ethContainerHistoricalPerformanceData =
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev180907.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev180907.java
index 4c4c9734a..ec24b3787 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev180907.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev180907.java
@@ -305,6 +305,7 @@ public class TestWrapperMicrowaveModelRev180907 {
         List<org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.air._interface.historical.performances.g.HistoricalPerformanceDataList> airHistPMList =
                 Arrays.asList(
                         new org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.air._interface.historical.performances.g.HistoricalPerformanceDataListBuilder()
+                                .setHistoryDataId("123")
                                 .setGranularityPeriod(GranularityPeriodType.Period15Min)
                                 .setPerformanceData(performanceData).build());
         AirInterfaceHistoricalPerformances airHistoricalPerformanceData =
@@ -322,6 +323,7 @@ public class TestWrapperMicrowaveModelRev180907 {
         List<org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ethernet.container.historical.performances.g.HistoricalPerformanceDataList> ethHistPMList =
                 Arrays.asList(
                         new org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev180907.ethernet.container.historical.performances.g.HistoricalPerformanceDataListBuilder()
+                                .setHistoryDataId("123")
                                 .setGranularityPeriod(GranularityPeriodType.Period24Hours)
                                 .setPerformanceData(ethPerformanceData).build());
         EthernetContainerHistoricalPerformances ethContainerHistoricalPerformanceData =
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev181010.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev181010.java
index 0259fea5e..c2094cd9b 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev181010.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/microwave/test/TestWrapperMicrowaveModelRev181010.java
@@ -309,6 +309,7 @@ public class TestWrapperMicrowaveModelRev181010 {
         List<org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.air._interface.historical.performances.g.HistoricalPerformanceDataList> airHistPMList =
                 Arrays.asList(
                         new org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.air._interface.historical.performances.g.HistoricalPerformanceDataListBuilder()
+                                .setHistoryDataId("123")
                                 .setGranularityPeriod(GranularityPeriodType.Period15Min)
                                 .setPerformanceData(performanceData).build());
         AirInterfaceHistoricalPerformances airHistoricalPerformanceData =
@@ -326,6 +327,7 @@ public class TestWrapperMicrowaveModelRev181010 {
         List<org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ethernet.container.historical.performances.g.HistoricalPerformanceDataList> ethHistPMList =
                 Arrays.asList(
                         new org.opendaylight.yang.gen.v1.urn.onf.params.xml.ns.yang.microwave.model.rev181010.ethernet.container.historical.performances.g.HistoricalPerformanceDataListBuilder()
+                                .setHistoryDataId("123")
                                 .setGranularityPeriod(GranularityPeriodType.Period24Hours)
                                 .setPerformanceData(ethPerformanceData).build());
         EthernetContainerHistoricalPerformances ethContainerHistoricalPerformanceData =
diff --git a/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/test/TestWrapperPTPModelRev170208.java b/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/test/TestWrapperPTPModelRev170208.java
index 0694bcecc..a890b63d4 100644
--- a/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/test/TestWrapperPTPModelRev170208.java
+++ b/sdnr/wt/devicemanager-onap/onf12/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/onf/ifpac/test/TestWrapperPTPModelRev170208.java
@@ -36,7 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ptp.dataset.rev170208.port.ds.entry.PortIdentityBuilder;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
+import org.opendaylight.yangtools.yang.common.Uint16;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -66,8 +66,10 @@ public class TestWrapperPTPModelRev170208 {
         when(netconfAccessor.getDataBroker()).thenReturn(dataBroker);
 
         PortIdentity portIdentity = new PortIdentityBuilder().setPortNumber(10).build();
-        List<PortDsList> portDsList = Arrays.asList(new PortDsListBuilder().setPortIdentity(portIdentity).build());
-        InstanceList instanceList = new InstanceListBuilder().setPortDsList(portDsList).build();
+        List<PortDsList> portDsList = 
+                Arrays.asList(new PortDsListBuilder().setPortNumber(10).setPortIdentity(portIdentity).build());
+        InstanceList instanceList = 
+                new InstanceListBuilder().setInstanceNumber(Uint16.valueOf(1)).setPortDsList(portDsList).build();
         InstanceIdentifier<InstanceList> PTPINSTANCES_IID =
                 InstanceIdentifier.builder(InstanceList.class, new InstanceListKey(1)).build();
         when(netconfAccessor.getTransactionUtils().readData(netconfAccessor.getDataBroker(),
diff --git a/sdnr/wt/devicemanager-onap/openroadm/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/test/TestOpenRoadmPMDataBuilder.java b/sdnr/wt/devicemanager-onap/openroadm/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/test/TestOpenRoadmPMDataBuilder.java
index 5069acec9..9d80e8f75 100644
--- a/sdnr/wt/devicemanager-onap/openroadm/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/test/TestOpenRoadmPMDataBuilder.java
+++ b/sdnr/wt/devicemanager-onap/openroadm/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/devicemanager/openroadm/test/TestOpenRoadmPMDataBuilder.java
@@ -26,9 +26,11 @@ import static org.junit.Assert.assertNotNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.eclipse.jdt.annotation.NonNull;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.ccsdk.features.sdnr.wt.devicemanager.openroadm.impl.PmDataBuilderOpenRoadm;
@@ -54,10 +56,13 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev191129.PmName
 import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev191129.Validity;
 import org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev191129.ResourceTypeEnum;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Pmdata15mEntity;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.units.rev200413.Celsius;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.units.rev200413.PerformanceMeasurementUnitId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint64;
 
@@ -82,8 +87,16 @@ public class TestOpenRoadmPMDataBuilder {
     private Map<HistoricalPmKey, HistoricalPm> historicalPMCollection = new HashMap<HistoricalPmKey, HistoricalPm>();
     private Map<HistoricalPmEntryKey, HistoricalPmEntry> historicalPmEntryCollection =
             new HashMap<HistoricalPmEntryKey, HistoricalPmEntry>();
-
-
+    private PathArgument pa =new PathArgument() {
+        @Override
+        public int compareTo(PathArgument o) {
+            return 0;
+        }
+        @Override
+        public @NonNull Class<? extends DataObject> getType() {
+            return Pmdata15mEntity.class;
+        }
+    };
 
     // public methods
     @Before
@@ -125,7 +138,8 @@ public class TestOpenRoadmPMDataBuilder {
         when(historicalPm.getMeasurement()).thenReturn(measurementData);
 
         historicalPMCollection.put(historicalPmBuilder.key(), historicalPmBuilder.build());
-        historicalPmEntryBuiler.setPmResourceTypeExtension("dshjdekjdewkk")
+        historicalPmEntryBuiler.setPmResourceInstance(InstanceIdentifier.create(Arrays.asList(pa)))
+                .setPmResourceTypeExtension("dshjdekjdewkk")
                 .setPmResourceType(ResourceTypeEnum.CircuitPack).setHistoricalPm(historicalPMCollection);
 
         historicalPmEntryCollection.put(historicalPmEntryBuiler.key(), historicalPmEntryBuiler.build());
@@ -149,7 +163,8 @@ public class TestOpenRoadmPMDataBuilder {
         when(historicalPm.getMeasurement()).thenReturn(measurementData);
 
         historicalPMCollection.put(historicalPmBuilder.key(), historicalPmBuilder.build());
-        historicalPmEntryBuiler.setPmResourceTypeExtension("dshjdekjdewkk")
+        historicalPmEntryBuiler.setPmResourceInstance(InstanceIdentifier.create(Arrays.asList(pa)))
+                .setPmResourceTypeExtension("dshjdekjdewkk")
                 .setPmResourceType(ResourceTypeEnum.Device).setHistoricalPm(historicalPMCollection);
 
         historicalPmEntryCollection.put(historicalPmEntryBuiler.key(), historicalPmEntryBuiler.build());
diff --git a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfDomAccessor.java b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfDomAccessor.java
index 01d6659a5..aac6813f7 100644
--- a/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfDomAccessor.java
+++ b/sdnr/wt/netconfnode-state-service/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/NetconfDomAccessor.java
@@ -38,7 +38,7 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 
 /**
  * Interface handling netconf connection.
@@ -80,11 +80,11 @@ public interface NetconfDomAccessor extends NetconfAccessor {
      *
      * @param <T> specific child class of DOMNotificationListener
      * @param listener listener to be called
-     * @param types as list of SchemaPath
+     * @param types as list of Absolute
      * @return handler to manager registration
      */
     <T extends DOMNotificationListener> @NonNull ListenerRegistration<DOMNotificationListener> doRegisterNotificationListener(
-            @NonNull T listener, Collection<SchemaPath> types);
+            @NonNull T listener, Collection<Absolute> types);
 
     /**
      * Register netconf notification listener for related mountpoint
@@ -92,11 +92,11 @@ public interface NetconfDomAccessor extends NetconfAccessor {
      * @See <a href="https://tools.ietf.org/html/rfc5277">https://tools.ietf.org/html/rfc5277</a>
      * @param <T>
      * @param listener to be registers
-     * @param types as array of SchemaPath
+     * @param types as array of Absolute
      * @return Object to close and access
      */
     <T extends DOMNotificationListener> @NonNull ListenerRegistration<DOMNotificationListener> doRegisterNotificationListener(
-            @NonNull T listener, SchemaPath[] types);
+            @NonNull T listener, Absolute[] types);
 
     /**
      * Register netconf notification listener for related mountpoint
diff --git a/sdnr/wt/netconfnode-state-service/provider/pom.xml b/sdnr/wt/netconfnode-state-service/provider/pom.xml
index 7cfa08b91..292f3a00b 100644
--- a/sdnr/wt/netconfnode-state-service/provider/pom.xml
+++ b/sdnr/wt/netconfnode-state-service/provider/pom.xml
@@ -102,13 +102,8 @@
         </dependency>
         <!-- akka -->
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_2.13</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-cluster_2.13</artifactId>
+            <groupId>com.typesafe</groupId>
+            <artifactId>config</artifactId>
             <scope>provided</scope>
         </dependency>
         <!-- wt -->
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java
index caf3da1a7..3212eac82 100644
--- a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/access/dom/NetconfDomAccessorImpl.java
@@ -68,7 +68,7 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,8 +77,6 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco
     private static final Logger LOG = LoggerFactory.getLogger(NetconfDomAccessorImpl.class);
 
     private static final QName CREATE_SUBSCRIPTION = QName.create(CreateSubscriptionInput.QNAME, "create-subscription");
-    private static final SchemaPath RPC_PATH_CREATE_SUBSCRIPTION =
-            NetconfMessageTransformUtil.toPath(CREATE_SUBSCRIPTION);
     private static final YangInstanceIdentifier STREAMS_PATH =
             YangInstanceIdentifier.builder().node(Netconf.QNAME).node(Streams.QNAME).build();
 
@@ -174,7 +172,7 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco
 
     @Override
     public @NonNull <T extends DOMNotificationListener> ListenerRegistration<DOMNotificationListener> doRegisterNotificationListener(
-            @NonNull T listener, Collection<SchemaPath> types) {
+            @NonNull T listener, Collection<Absolute> types) {
         LOG.info("Begin register listener for Mountpoint {}", mountpoint.getIdentifier().toString());
 
         final ListenerRegistration<DOMNotificationListener> ranListenerRegistration =
@@ -188,14 +186,14 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco
 
     @Override
     public @NonNull <T extends DOMNotificationListener> ListenerRegistration<DOMNotificationListener> doRegisterNotificationListener(
-            @NonNull T listener, SchemaPath[] types) {
+            @NonNull T listener, Absolute[] types) {
         return doRegisterNotificationListener(listener, Arrays.asList(types));
     }
 
     @Override
     public @NonNull <T extends DOMNotificationListener> ListenerRegistration<DOMNotificationListener> doRegisterNotificationListener(
             @NonNull T listener, QName[] types) {
-        List<SchemaPath> schemaPathList = Arrays.stream(types).map(qname -> NetconfMessageTransformUtil.toPath(qname)).collect(toList());
+        List<Absolute> schemaPathList = Arrays.stream(types).map(qname -> Absolute.of(qname)).collect(toList());
         return doRegisterNotificationListener(listener, schemaPathList);
     }
 
@@ -203,7 +201,7 @@ public class NetconfDomAccessorImpl extends NetconfAccessorImpl implements Netco
     @Override
     public ListenableFuture<? extends DOMRpcResult> invokeCreateSubscription(CreateSubscriptionInput input) {
         final ContainerNode nnInput = serializer.toNormalizedNodeRpcData(input);
-        return rpcService.invokeRpc(RPC_PATH_CREATE_SUBSCRIPTION, nnInput);
+        return rpcService.invokeRpc(CREATE_SUBSCRIPTION, nnInput);
     }
 
     @Override
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfAccessorImpl.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfAccessorImpl.java
index 10c3b2697..9e666431d 100644
--- a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfAccessorImpl.java
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfAccessorImpl.java
@@ -57,7 +57,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.SchemaPath;
+import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute;
 
 public class TestNetconfAccessorImpl extends Mockito {
 
@@ -154,7 +154,7 @@ public class TestNetconfAccessorImpl extends Mockito {
         DOMMountPoint domMountPoint = mock(DOMMountPoint.class);
 
         when(domNotificationService.registerNotificationListener(any(DOMNotificationListener.class),
-                ArgumentMatchers.<Collection<SchemaPath>>any()))
+                ArgumentMatchers.<Collection<Absolute>>any()))
                         .thenReturn(new ListenerRegistration<DOMNotificationListener>() {
                             @Override
                             public @NonNull DOMNotificationListener getInstance() {
@@ -178,7 +178,7 @@ public class TestNetconfAccessorImpl extends Mockito {
         NetconfDomAccessorImpl netconfDomAccessor =
                 new NetconfDomAccessorImpl(netconfAccessor, domDataBroker, domMountPoint, domContext);
 
-        Collection<SchemaPath> types = Arrays.asList(SchemaPath.create(false, NetworkTopology.QNAME));
+        Collection<Absolute> types = Arrays.asList(Absolute.of(NetworkTopology.QNAME));
         DOMNotificationListener listener = (notification) -> System.out.println("Notification: " + notification);
         ListenerRegistration<DOMNotificationListener> res =
                 netconfDomAccessor.doRegisterNotificationListener(listener, types);
@@ -186,7 +186,7 @@ public class TestNetconfAccessorImpl extends Mockito {
         //Capture parameters and assert them
         ArgumentCaptor<DOMNotificationListener> captor1 = ArgumentCaptor.forClass(DOMNotificationListener.class);
         @SuppressWarnings("unchecked")
-        ArgumentCaptor<Collection<SchemaPath>> captor2 = ArgumentCaptor.forClass(Collection.class);
+        ArgumentCaptor<Collection<Absolute>> captor2 = ArgumentCaptor.forClass(Collection.class);
         verify(domNotificationService).registerNotificationListener(captor1.capture(), captor2.capture());
 
         assertEquals("Listener", listener, captor1.getValue());
diff --git a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfNodeStateService.java b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfNodeStateService.java
index f03ab90e2..46b2e769e 100644
--- a/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfNodeStateService.java
+++ b/sdnr/wt/netconfnode-state-service/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/test/TestNetconfNodeStateService.java
@@ -48,7 +48,7 @@ import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.NetconfNodeS
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.impl.rpc.NetconfnodeStateServiceRpcApiImpl;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.example.ExampleConfig;
 import org.onap.ccsdk.features.sdnr.wt.netconfnodestateservice.test.example.TestNetconfHelper;
-import org.opendaylight.binding.runtime.spi.BindingRuntimeHelpers;
+import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers;
 import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.DataObjectModification;
diff --git a/sdnr/wt/websocketmanager/model/src/main/yang/websocketmanager.yang b/sdnr/wt/websocketmanager/model/src/main/yang/websocketmanager.yang
deleted file mode 100644
index 18d7bd27a..000000000
--- a/sdnr/wt/websocketmanager/model/src/main/yang/websocketmanager.yang
+++ /dev/null
@@ -1,51 +0,0 @@
-module websocketmanager {
-
-  yang-version 1;
-  namespace "urn:opendaylight:params:xml:ns:yang:websocketmanager";
-  prefix websocketmanager;
-
-  import ietf-yang-types {
-    prefix yang;
-  }
-  organization
-    "highstreet technologies GmbH";
-  contact
-    "Web:   <https://highstreet-technologies.com>
-     ONAP:  <https://wiki.onap.org/display/DW/SDN-R+Websocketmanager+Upgrade>";
-
-  description
-    "Websocketmanager Api Module
-
-     Copyright 2021 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.";
-
-  revision 2021-03-22 {
-    description
-      "Initial revision";
-  }
-
-  notification items-dropped-notification {
-      uses items-dropped-notification-g;
-      description "none";
-  }
-  grouping items-dropped-notification-g {
-      leaf amount {
-          type uint32;
-          default 0;
-          description "Counts of notifications that were dropped.";
-      }
-      description "To be sent when notifications were dropped in fact of a set ratio limit.";
-  }
-}
diff --git a/sdnr/wt/websocketmanager/provider/pom.xml b/sdnr/wt/websocketmanager/provider/pom.xml
index f1a7d2e52..0366ed2a4 100644
--- a/sdnr/wt/websocketmanager/provider/pom.xml
+++ b/sdnr/wt/websocketmanager/provider/pom.xml
@@ -87,13 +87,8 @@
             <artifactId>json</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-actor_2.13</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-cluster_2.13</artifactId>
+            <groupId>com.typesafe</groupId>
+            <artifactId>config</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/sdnr/wt/websocketmanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/test/TestSerializer.java b/sdnr/wt/websocketmanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/test/TestSerializer.java
deleted file mode 100644
index 962838489..000000000
--- a/sdnr/wt/websocketmanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/test/TestSerializer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * ONAP : ccsdk features
- * ================================================================================
- * Copyright (C) 2021 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.websocketmanager2.test;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.websocketmanager.model.data.NotificationOutput;
-import org.onap.ccsdk.features.sdnr.wt.yang.mapper.YangToolsMapper;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.ObjectCreationNotification;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.ObjectCreationNotificationBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class TestSerializer {
-
-    private static final Logger LOG = LoggerFactory.getLogger(TestSerializer.class);
-     private static final YangToolsMapper mapper = new YangToolsMapper();
-    private static final String TIMESTAMP = "2020-04-01T10:20:40.0Z";
-    private static final String NODEID = "node1";
-
-    @Test
-    public void test1() {
-        ObjectCreationNotification notification = new ObjectCreationNotificationBuilder().setCounter(Integer.valueOf(5)).build();
-        NotificationOutput output = new NotificationOutput(notification, NODEID, ObjectCreationNotification.QNAME,DateAndTime.getDefaultInstance(TIMESTAMP));
-        String sOutput=null;
-        try {
-            sOutput = mapper.writeValueAsString(output);
-            LOG.debug(sOutput);
-        } catch (JsonProcessingException e) {
-            e.printStackTrace();
-            fail(e.getMessage());
-        }
-        assertNotNull(sOutput);
-        assertTrue(sOutput.contains("\"type\""));
-    }
-}
diff --git a/sdnr/wt/websocketmanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/test/UserScopeTest.java b/sdnr/wt/websocketmanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/test/UserScopeTest.java
deleted file mode 100644
index d21bb529c..000000000
--- a/sdnr/wt/websocketmanager/provider/src/test/java/org/onap/ccsdk/features/sdnr/wt/websocketmanager2/test/UserScopeTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * ============LICENSE_START========================================================================
- * ONAP : ccsdk feature sdnr wt
- * =================================================================================================
- * Copyright (C) 2019 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.websocketmanager2.test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import java.util.Arrays;
-import java.util.List;
-import org.junit.Test;
-import org.onap.ccsdk.features.sdnr.wt.websocketmanager.model.data.ReducedSchemaInfo;
-import org.onap.ccsdk.features.sdnr.wt.websocketmanager.model.data.SchemaInfo;
-import org.onap.ccsdk.features.sdnr.wt.websocketmanager.model.data.Scope;
-import org.onap.ccsdk.features.sdnr.wt.websocketmanager.utils.UserScopes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.ObjectCreationNotification;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.devicemanager.rev190109.ProblemNotification;
-import org.opendaylight.yangtools.yang.common.QName;
-
-public class UserScopeTest {
-
-    private static final String SCOPE1 = "problem-notification";
-    private static final String SCOPE2 = "scope2";
-    private static final String SCOPE3 = "scope3";
-    private static final String SCOPE4 = "scope4";
-
-    @Test
-    public void test() {
-        UserScopes scopes1 = new UserScopes();
-        List<String> json1 = Arrays.asList(SCOPE1, SCOPE2, SCOPE3);
-        scopes1.setScopes(Arrays.asList(buildScope(null, ProblemNotification.QNAME)));
-
-        assertTrue(scopes1.hasScope(new ReducedSchemaInfo(ProblemNotification.QNAME)));
-        assertFalse(scopes1.hasScope("RoadmA", new ReducedSchemaInfo(ObjectCreationNotification.QNAME)));
-
-        assertTrue(scopes1.hasScope("RoadmA", new ReducedSchemaInfo(ProblemNotification.QNAME)));
-
-    }
-
-
-    private static final Scope buildScope(String nodeId, QName qname) {
-        Scope scope = new Scope();
-        scope.setNodeId(nodeId);
-        scope.setSchema(new SchemaInfo(qname));
-        return scope;
-    }
-
-}