Remove netconf-monitoring

[netconf.git] / netconf / tools / netconf-testtool / src / main / java / org / opendaylight / netconf / test / tool / monitoring / NetconfMonitoringOperationService.java

diff --git a/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/osgi/NetconfMonitoringOperationService.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationService.java
similarity index 66%
rename from netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/osgi/NetconfMonitoringOperationService.java
rename to netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationService.java
index e1d8b1e82ce149aadd5d876870298cd7872ddc0f..668cf763842cc7883540e2ede0cb5d240ebad741 100644 (file)
--- a/netconf/netconf-monitoring/src/main/java/org/opendaylight/netconf/monitoring/osgi/NetconfMonitoringOperationService.java
+++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationService.java
@@ -5,27 +5,29 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.monitoring.osgi;
 
-import com.google.common.collect.ImmutableSet;
+package org.opendaylight.netconf.test.tool.monitoring;
+
+import com.google.common.collect.Sets;
 import java.util.Set;
+import org.opendaylight.controller.config.yang.netconf.mdsal.monitoring.GetSchema;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.netconf.mapping.api.NetconfOperation;
 import org.opendaylight.netconf.mapping.api.NetconfOperationService;
-import org.opendaylight.netconf.monitoring.Get;
-import org.opendaylight.netconf.monitoring.GetSchema;
 
 public class NetconfMonitoringOperationService implements NetconfOperationService {
 
-    private final ImmutableSet<NetconfOperation> netconfOperations;
+    private static final String TESTTOOL_SESSION = "testtool-session";
+
+    private final NetconfMonitoringService monitor;
 
     public NetconfMonitoringOperationService(final NetconfMonitoringService monitor) {
-        netconfOperations = ImmutableSet.of(new Get(monitor), new GetSchema(monitor));
+        this.monitor = monitor;
     }
 
     @Override
     public Set<NetconfOperation> getNetconfOperations() {
-        return netconfOperations;
+        return Sets.newHashSet(new Get(monitor), new GetSchema(TESTTOOL_SESSION, monitor));
     }
 
     @Override