Fixed IT breakage.

  * Load required bundles.
    * neutron.model
    * yangtools.model.ietf-yang-types-20130715
  * Add configuration for FRM.

Change-Id: Ica8931eaf2f0eeda2de11c9eea14669f6b09f9ec
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>

diff --git a/manager/common/pom.xml b/manager/common/pom.xml
index 335a52a9753050c55ca738e72b0655a5bbd3d3b3..a6d7d1f772cf5cf4359c8f98bb617440db36b99f 100644 (file)
--- a/manager/common/pom.xml
+++ b/manager/common/pom.xml
@@ -795,6 +795,11 @@
         <artifactId>transcriber</artifactId>
         <version>0.5.0-SNAPSHOT</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.neutron</groupId>
+        <artifactId>model</artifactId>
+        <version>0.5.0-SNAPSHOT</version>
+      </dependency>
 
       <!-- OpenDaylight OVSDB project -->
       <dependency>

diff --git a/manager/it/common/pom.xml b/manager/it/common/pom.xml
index 0ac8ae3a46b016723bc965573cfa7e94cdda9349..b773b4439f6c42dd70691042755b672fe233360e 100644 (file)
--- a/manager/it/common/pom.xml
+++ b/manager/it/common/pom.xml
@@ -237,6 +237,10 @@
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-topology</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-yang-types-20130715</artifactId>
+    </dependency>
 
     <!-- OpenDaylight openflowplugin -->
     <dependency>
@@ -279,6 +283,10 @@
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>transcriber</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>model</artifactId>
+    </dependency>
 
     <!-- OpenDaylight OVSDB project and requisites -->
     <dependency>

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..085f7f7cd125769e532022f99e0fafaf1d3c3dce 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
@@ -367,6 +367,8 @@ public final class TestOption {
             mavenBundle(TestHelper.CONTROLLER_MODELS, "model-inventory"),
             mavenBundle(TestHelper.CONTROLLER_MODELS, "model-topology"),
             mavenBundle(TestHelper.YANGTOOLS_MODELS, "ietf-topology"),
+            mavenBundle(TestHelper.YANGTOOLS_MODELS,
+                        "ietf-yang-types-20130715"),
             mavenBundle(OPENFLOW_MODEL, "model-flow-base"),
             mavenBundle(OPENFLOW_MODEL, "model-flow-service"),
             mavenBundle(OPENFLOW_MODEL, "model-flow-statistics"),
@@ -387,6 +389,7 @@ public final class TestOption {
             // Neutron bundles.
             mavenBundle(NEUTRON, "neutron-spi"),
             mavenBundle(NEUTRON, "transcriber"),
+            mavenBundle(NEUTRON, "model"),
 
             // OVSDB bundles.
             mavenBundle(OVSDB, "library"),

diff --git a/manager/it/option/src/main/resources/controller.xml b/manager/it/option/src/main/resources/controller.xml
index 5b1ec3a1706d39ada902a20d3e9f364bf0e4dc29..db40642b7bf3963b6ba5afcb56a47438a0884fb1 100644 (file)
--- a/manager/it/option/src/main/resources/controller.xml
+++ b/manager/it/option/src/main/resources/controller.xml
@@ -198,6 +198,28 @@
               </binding-forwarded-data-broker>
             </module>
 
+            <!-- forwardingrules-manager configuration -->
+            <module>
+              <type xmlns:frm="urn:opendaylight:params:xml:ns:yang:openflowplugin:app:forwardingrules-manager">
+                frm:forwardingrules-manager
+              </type>
+              <name>forwardingrules-manager</name>
+
+              <data-broker>
+                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
+                  binding:binding-async-data-broker
+                </type>
+                <name>binding-data-broker</name>
+              </data-broker>
+
+              <rpc-registry>
+                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
+                  binding:binding-rpc-registry
+                </type>
+                <name>binding-rpc-broker</name>
+              </rpc-registry>
+            </module>
+
             <!-- openflowplugin mock-up configuration -->
             <module>
               <type xmlns:ofmock="urn:opendaylight:vtn:it:ofmock:provider">
@@ -377,6 +399,11 @@
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:operational-dom-store?module=opendaylight-operational-dom-datastore&amp;revision=2014-06-17</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:inmemory-datastore-provider?module=opendaylight-inmemory-datastore-provider&amp;revision=2014-06-17</capability>
 
+        <!-- forwardingrules-manager capabilities -->
+        <capability>
+          urn:opendaylight:params:xml:ns:yang:openflowplugin:app:forwardingrules-manager?module=forwardingrules-manager&amp;revision=2014-09-25
+        </capability>
+
         <!-- openflowplugin mock-up capabilities -->
         <capability>
           urn:opendaylight:vtn:it:ofmock:provider?module=ofmock-provider&amp;revision=2015-02-09