X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-it%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Ftest%2Fsal%2Fbinding%2Fit%2FTestHelper.java;h=f810d6240b1649995bdaff299571095169679bfb;hp=9f5bdd439efb102a751e1f64b5ca59986e63c688;hb=6df346bc479589f850a371f9c5932e53dbfff48a;hpb=5cd6ac6819a1dcbab05c6ffbc3ac427ea41c658d

diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
index 9f5bdd439e..f810d6240b 100644
--- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
+++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java
@@ -32,12 +32,12 @@ public class TestHelper {
                 mavenBundle(YANGTOOLS, "yang-common").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-api").versionAsInProject(), // //
                 mavenBundle(YANGTOOLS, "object-cache-guava").versionAsInProject(), // //
-                mavenBundle(CONTROLLER, "sal-common").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "sal-common-api").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "sal-common-impl").versionAsInProject(), // //
 
                 mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(), //
-                mavenBundle("com.google.guava", "guava").versionAsInProject()
+                mavenBundle("com.google.guava", "guava").versionAsInProject(),
+                mavenBundle("com.github.romix", "java-concurrent-hash-trie-map").versionAsInProject()
         );
     }
 
@@ -48,46 +48,20 @@ public class TestHelper {
                 mavenBundle("commons-codec", "commons-codec").versionAsInProject(),
 
                 systemPackages("sun.nio.ch", "sun.misc"),
-                mavenBundle("io.netty", "netty-common").versionAsInProject(), //
-                mavenBundle("io.netty", "netty-buffer").versionAsInProject(), //
-                mavenBundle("io.netty", "netty-handler").versionAsInProject(), //
-                mavenBundle("io.netty", "netty-codec").versionAsInProject(), //
-                mavenBundle("io.netty", "netty-transport").versionAsInProject(), //
 
                 mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "config-util").versionAsInProject(), // //
                 mavenBundle("commons-io", "commons-io").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), //
+                mavenBundle(CONTROLLER, "config-manager-facade-xml").versionAsInProject(), //
                 mavenBundle(CONTROLLER, "yang-jmx-generator").versionAsInProject(), //
                 mavenBundle(CONTROLLER, "logback-config").versionAsInProject(), //
                 mavenBundle(CONTROLLER, "config-persister-api").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "netconf-api").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "ietf-netconf-monitoring").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "ietf-netconf-monitoring-extension").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "netconf-monitoring").versionAsInProject(), //
-
-                mavenBundle(CONTROLLER, "netty-config-api").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "protocol-framework").versionAsInProject(), //
-
-                mavenBundle(CONTROLLER, "netconf-client").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "netconf-util").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "netconf-netty-util").versionAsInProject(), //
-                mavenBundle("org.apache.sshd", "sshd-core").versionAsInProject(), //
-                mavenBundle("org.openexi", "nagasena").versionAsInProject(), //
-                mavenBundle("org.openexi", "nagasena-rta").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "netconf-mapping-api").versionAsInProject(), //
 
                 mavenBundle(CONTROLLER, "config-persister-impl").versionAsInProject(), //
 
                 mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.xerces", "2.11.0_1"),
                 mavenBundle("org.eclipse.birt.runtime.3_7_1", "org.apache.xml.resolver", "1.2.0"),
 
-                mavenBundle(CONTROLLER, "config-netconf-connector").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "netconf-notifications-api").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "ietf-netconf").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "ietf-netconf-notifications").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "netconf-impl").versionAsInProject(), //
-
                 mavenBundle(CONTROLLER, "config-persister-file-xml-adapter").versionAsInProject().noStart(),
                 mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.moxy").versionAsInProject(),
                 mavenBundle("org.eclipse.persistence", "org.eclipse.persistence.core").versionAsInProject());
@@ -118,24 +92,25 @@ public class TestHelper {
                 mavenBundle(YANGTOOLS, "binding-data-codec").versionAsInProject(),
                 mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // //
 
-                mavenBundle(CONTROLLER, "sal-core-api").versionAsInProject().update(), //
-                mavenBundle(CONTROLLER, "sal-binding-api").versionAsInProject(), // //
-                mavenBundle(CONTROLLER, "sal-binding-config").versionAsInProject(), //
-                mavenBundle(CONTROLLER, "sal-binding-broker-impl").versionAsInProject(), // //
                 mavenBundle(CONTROLLER, "sal-binding-util").versionAsInProject(), //
                 mavenBundle(CONTROLLER, "sal-common-util").versionAsInProject(), // //
 
 
-                mavenBundle("com.lmax", "disruptor").versionAsInProject(),
-                mavenBundle(CONTROLLER, "sal-inmemory-datastore").versionAsInProject(), //
+                mavenBundle(CONTROLLER, "sal-core-api").versionAsInProject().update(), //
+                mavenBundle(CONTROLLER, "sal-binding-api").versionAsInProject(), // //
+
+                mavenBundle("com.lmax", "disruptor").versionAsInProject(), //
                 mavenBundle(CONTROLLER, "sal-broker-impl").versionAsInProject(), // //
+                mavenBundle(CONTROLLER, "sal-dom-config").versionAsInProject(), // //
+
+                mavenBundle(CONTROLLER, "sal-inmemory-datastore").versionAsInProject(), //
+                mavenBundle(CONTROLLER, "sal-dom-broker-config").versionAsInProject(), // //
+
                 mavenBundle(CONTROLLER, "sal-core-spi").versionAsInProject().update(), //
 
+                mavenBundle(CONTROLLER, "sal-binding-broker-impl").versionAsInProject(), // //
+                mavenBundle(CONTROLLER, "sal-binding-config").versionAsInProject(), //
 
-                systemProperty("netconf.tcp.address").value("0.0.0.0"), //
-                systemProperty("netconf.tcp.port").value("18383"), //
-                systemProperty("netconf.tcp.client.address").value("127.0.0.1"), //
-                systemProperty("netconf.tcp.client.port").value("18383"), //
                 systemProperty("netconf.config.persister.active").value("1"), //
                 systemProperty("netconf.config.persister.1.storageAdapterClass").value(
                         "org.opendaylight.controller.config.persist.storage.file.xml.XmlFileStorageAdapter"), //
@@ -154,6 +129,19 @@ public class TestHelper {
 
     }
 
+    public static Option protocolFrameworkBundles() {
+        return new DefaultCompositeOption(
+            mavenBundle("io.netty", "netty-common").versionAsInProject(), //
+            mavenBundle("io.netty", "netty-buffer").versionAsInProject(), //
+            mavenBundle("io.netty", "netty-handler").versionAsInProject(), //
+            mavenBundle("io.netty", "netty-codec").versionAsInProject(), //
+            mavenBundle("io.netty", "netty-transport").versionAsInProject(), //
+            mavenBundle(CONTROLLER, "netty-config-api").versionAsInProject(), //
+            mavenBundle(CONTROLLER, "protocol-framework").versionAsInProject()
+        );
+
+    }
+
     public static Option flowCapableModelBundles() {
         return new DefaultCompositeOption( //
                 mavenBundle(CONTROLLER_MODELS, "model-inventory").versionAsInProject() //