X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fhoneynode%2F1.2.1%2Fminimal-distribution-core%2Fsrc%2Fmain%2Fjava%2Fio%2Ffd%2Fhoneycomb%2Finfra%2Fdistro%2Fdata%2FDataTreeProvider.java;fp=tests%2Fhoneynode%2F2.1%2Fminimal-distribution-core%2Fsrc%2Fmain%2Fjava%2Fio%2Ffd%2Fhoneycomb%2Finfra%2Fdistro%2Fdata%2FDataTreeProvider.java;h=5f5ef66aa178a038babdfcb7f6fe5396fdef5c0f;hb=c764b14f67faf1665f8814db9e5d16ddb342553e;hp=039a0ad826d3f6c8f0eb53a56d60348a3c18cd48;hpb=b90fdacec82f92e07d14ed1df31e3fe53275c676;p=transportpce.git

diff --git a/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java b/tests/honeynode/1.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java
similarity index 70%
rename from tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java
rename to tests/honeynode/1.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java
index 039a0ad82..5f5ef66aa 100644
--- a/tests/honeynode/2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java
+++ b/tests/honeynode/1.2.1/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java
@@ -19,40 +19,39 @@ package io.fd.honeycomb.infra.distro.data;
 import com.google.inject.Inject;
 import io.fd.honeycomb.binding.init.ProviderTrait;
 import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TipProducingDataTree;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration;
 import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
 
 public abstract class DataTreeProvider extends ProviderTrait<DataTree> {
 
     @Inject
-    private SchemaService schemaService;
+    private DOMSchemaService schemaService;
     @Inject
     private HoneycombConfiguration config;
 
     @Override
-    public TipProducingDataTree create() {
-        TipProducingDataTree delegate = InMemoryDataTreeFactory.getInstance().create(getType());
+    public DataTree create() {
+        DataTree delegate = new InMemoryDataTreeFactory().create(getType());
         delegate.setSchemaContext(schemaService.getGlobalContext());
         return delegate;
     }
 
-    public abstract TreeType getType();
+    public abstract DataTreeConfiguration getType();
 
     public static class ConfigDataTreeProvider extends DataTreeProvider {
         @Override
-        public TreeType getType() {
-            return TreeType.CONFIGURATION;
+        public DataTreeConfiguration getType() {
+            return DataTreeConfiguration.DEFAULT_CONFIGURATION;
         }
 
     }
 
     public static class ContextDataTreeProvider extends DataTreeProvider {
         @Override
-        public TreeType getType() {
-            return TreeType.OPERATIONAL;
+        public DataTreeConfiguration getType() {
+            return DataTreeConfiguration.DEFAULT_OPERATIONAL;
         }
 
     }