BUG-2157: Fix missing programming models

This fixes the hanging tests, since the RPC registration process
requires the models to be present.

Change-Id: I2f986821a610e2664305c0f49f5ce19e7ba660b8
Signed-off-by: Robert Varga <rovarga@cisco.com>
(cherry picked from commit 04012e8960bcf91abbe58c607e8f68d116ca0f3f)

diff --git a/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java b/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java
index b26b539ca02312b83e7e6a34139ab3cf342ca54e..d7444853dfa588f9709d89c836e13927fef79de0 100644 (file)
--- a/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java
+++ b/pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java
@@ -232,6 +232,8 @@ public class PCEPTopologyProviderModuleTest extends AbstractInstructionScheduler
         final List<String> paths = super.getYangModelsPaths();
         paths.add("/META-INF/yang/network-topology@2013-10-21.yang");
         paths.add("/META-INF/yang/network-topology-pcep.yang");
+        paths.add("/META-INF/yang/network-topology-pcep-programming.yang");
+        paths.add("/META-INF/yang/network-topology-programming.yang");
         paths.add("/META-INF/yang/odl-network-topology.yang");
         paths.add("/META-INF/yang/yang-ext.yang");
         paths.add("/META-INF/yang/pcep-types.yang");

diff --git a/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java b/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java
index 1c874b566a47e176a2a766559bb2c60644073771..8331d646a622d7d802205338c646323aa35ad5c7 100644 (file)
--- a/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java
+++ b/pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java
@@ -127,6 +127,13 @@ public class PCEPTunnelTopologyProviderModuleTest extends AbstractInstructionSch
         final List<String> paths = super.getYangModelsPaths();
         paths.add("/META-INF/yang/network-topology@2013-10-21.yang");
         paths.add("/META-INF/yang/network-topology-pcep.yang");
+        paths.add("/META-INF/yang/network-topology-pcep-programming.yang");
+        paths.add("/META-INF/yang/network-topology-programming.yang");
+        paths.add("/META-INF/yang/topology-tunnel.yang");
+        paths.add("/META-INF/yang/topology-tunnel-pcep.yang");
+        paths.add("/META-INF/yang/topology-tunnel-pcep-programming.yang");
+        paths.add("/META-INF/yang/topology-tunnel-p2p.yang");
+        paths.add("/META-INF/yang/topology-tunnel-programming.yang");
         paths.add("/META-INF/yang/odl-network-topology.yang");
         paths.add("/META-INF/yang/yang-ext.yang");
         paths.add("/META-INF/yang/pcep-types.yang");