X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fhoneynode%2F1.2.1%2Fhoneynode-plugin-impl%2Fsrc%2Fmain%2Fjava%2Fio%2Ffd%2Fhoneycomb%2Ftransportpce%2Fdevice%2Fread%2FDummyMonitoringService.java;fp=tests%2Fhoneynode%2F2.1%2Fhoneynode-plugin-impl%2Fsrc%2Fmain%2Fjava%2Fio%2Ffd%2Fhoneycomb%2Ftransportpce%2Fdevice%2Fread%2FDummyMonitoringService.java;h=d141127fb9fafdeecb7feae87360798ba050edd0;hb=c764b14f67faf1665f8814db9e5d16ddb342553e;hp=89ced202ec082e4ef832a2d8adf35fa1efde0fc2;hpb=b90fdacec82f92e07d14ed1df31e3fe53275c676;p=transportpce.git

diff --git a/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java b/tests/honeynode/1.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java
similarity index 94%
rename from tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java
rename to tests/honeynode/1.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java
index 89ced202e..d141127fb 100644
--- a/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java
+++ b/tests/honeynode/1.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/read/DummyMonitoringService.java
@@ -15,17 +15,13 @@
  */
 package io.fd.honeycomb.transportpce.device.read;
 
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import java.util.Collections;
 import java.util.Set;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.opendaylight.controller.config.util.capability.Capability;
+
+import org.opendaylight.netconf.api.capability.Capability;
 import org.opendaylight.netconf.api.monitoring.NetconfManagementSession;
 import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService;
 import org.opendaylight.netconf.api.monitoring.SessionEvent;
@@ -44,6 +40,12 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.mon
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas.SchemaBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.schemas.SchemaKey;
 
+import com.google.common.base.Function;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
 public class DummyMonitoringService implements NetconfMonitoringService {
 
     private static final Sessions EMPTY_SESSIONS = new SessionsBuilder().setSession(Collections.emptyList()).build();
@@ -60,7 +62,7 @@ public class DummyMonitoringService implements NetconfMonitoringService {
                     .setFormat(Yang.class)
                     .setVersion(capability.getRevision().get())
                     .setLocation(Collections.singletonList(new Location(Enumeration.NETCONF)))
-                    .setKey(new SchemaKey(Yang.class, capability.getModuleName().get(),
+                    .withKey(new SchemaKey(Yang.class, capability.getModuleName().get(),
                         capability.getRevision().get()))
                     .build();
         }
@@ -118,17 +120,6 @@ public class DummyMonitoringService implements NetconfMonitoringService {
         return schemas;
     }
 
-    @Override
-    public String getSchemaForCapability(final String moduleName, final Optional<String> revision) {
-
-        for (Capability capability : capabilityMultiMap.get(moduleName)) {
-            if (capability.getRevision().get().equals(revision.get())) {
-                return capability.getCapabilitySchema().get();
-            }
-        }
-        throw new IllegalArgumentException(
-            "Module with name: " + moduleName + " and revision: " + revision + " does not exist");
-    }
 
     @Override
     public Capabilities getCapabilities() {
@@ -145,4 +136,15 @@ public class DummyMonitoringService implements NetconfMonitoringService {
         return null;
     }
 
-}
\ No newline at end of file
+@Override
+public String getSchemaForCapability(String moduleName, java.util.Optional<String> revision) {
+   for (Capability capability : capabilityMultiMap.get(moduleName)) {
+            if (capability.getRevision().get().equals(revision.get())) {
+                return capability.getCapabilitySchema().get();
+            }
+        }
+        throw new IllegalArgumentException(
+            "Module with name: " + moduleName + " and revision: " + revision + " does not exist");
+}
+
+}