Fixed build breakage.

  * Revert "Fixed manager.neutron UT build error due to ovsdb change.".
    This reverts commit 09c825f0ee5819124f4ccae2ff5be8620a7f37ec.
    Since the ovsdb change corresponding to the commit was reverted,
    the commit also needs to be reverted.

  * Load java-concurrent-hash-trie-map bundle explicitly on IT.
    It is required by yangtools.

Change-Id: I87a26155fad620383ba2a4c08423f201878718cc
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>

diff --git a/manager/it/option/src/main/java/org/opendaylight/vtn/manager/it/option/TestOption.java b/manager/it/option/src/main/java/org/opendaylight/vtn/manager/it/option/TestOption.java
index 0f6afac168f2f3822b430cb699614c59581c0240..c9e199f901c187ae5cedabe139af113622c86e72 100644 (file)
--- a/manager/it/option/src/main/java/org/opendaylight/vtn/manager/it/option/TestOption.java
+++ b/manager/it/option/src/main/java/org/opendaylight/vtn/manager/it/option/TestOption.java
@@ -356,6 +356,9 @@ public final class TestOption {
             TestHelper.bindingAwareSalBundles(),
             TestHelper.configMinumumBundles(),
 
+            // Load java-concurrent-hash-trie-map required by yangtools.
+            mavenBundle("com.github.romix", "java-concurrent-hash-trie-map"),
+
             // Override the location of the MD-SAL module configuration file.
             systemProperty(PROP_FILE_STORAGE).value(ctlrXmlPath),
 

diff --git a/manager/neutron/src/test/java/org/opendaylight/vtn/manager/neutron/PortStub.java b/manager/neutron/src/test/java/org/opendaylight/vtn/manager/neutron/PortStub.java
index 932512a37f27f6ed21b0e91cf0e31b84fc20331d..5ef0958fee4b693f4570755813587c5f2b0ac900 100644 (file)
--- a/manager/neutron/src/test/java/org/opendaylight/vtn/manager/neutron/PortStub.java
+++ b/manager/neutron/src/test/java/org/opendaylight/vtn/manager/neutron/PortStub.java
@@ -102,17 +102,12 @@ public class PortStub implements Port{
     }
 
     @Override
-    public Column<GenericTableSchema, Set<Integer>> getTrunksColumn() {
+    public Column<GenericTableSchema, Set<Long>> getTrunksColumn() {
         return null;
     }
 
     @Override
-    public Set<Integer> getTrunks() {
-        return null;
-    }
-
-    @Override
-    public void setTrunks(Set<Integer> trunks) {
+    public void setTrunks(Set<Long> trunks) {
     }
 
     @Override
@@ -121,12 +116,7 @@ public class PortStub implements Port{
     }
 
     @Override
-    public int getTag() {
-        return 0;
-    }
-
-    @Override
-    public void setTag(int tag) {
+    public void setTag(Set<Long> tag) {
     }
 
     @Override