Bug-194: Moved pcep configuration artifacts 55/8855/7
authorMilos Fabian <milfabia@cisco.com>
Tue, 8 Jul 2014 07:20:04 +0000 (09:20 +0200)
committerMilos Fabian <milfabia@cisco.com>
Mon, 14 Jul 2014 08:26:33 +0000 (10:26 +0200)
-moved yang modules and java files
-added reqired maven dependencies and plugins
-uniformed config yang modules name
-moved stateful parsers extensions from pcep-impl, to avoid cyclic dependencies
-configuration artifacts left with minimalistic pom.xml file

Change-Id: I40d9628ff1d1b63bf3f2457dec4b0bfb0b11293e
Signed-off-by: Milos Fabian <milfabia@cisco.com>
76 files changed:
commons/parent/pom.xml
integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepImplBundleTest.java
integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
pcep/api-config/pom.xml
pcep/api/pom.xml
pcep/api/src/main/yang/odl-pcep-api-cfg.yang [moved from pcep/api-config/src/main/yang/pcep.yang with 98% similarity]
pcep/controller-config/src/main/resources/initial/32-pcep.xml
pcep/controller-config/src/main/resources/initial/39-pcep-provider.xml
pcep/ietf-stateful02/pom.xml
pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/CrabbeInitiated00PCEPParserModule.java [new file with mode: 0644]
pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/CrabbeInitiated00PCEPParserModuleFactory.java [new file with mode: 0644]
pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/IetfStateful02PCEPParserModule.java [new file with mode: 0644]
pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/IetfStateful02PCEPParserModuleFactory.java [new file with mode: 0644]
pcep/ietf-stateful02/src/main/yang/odl-pcep-ietf-stateful02-cfg.yang
pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/CrabbeInitiated00PCEPParserModuleTest.java [moved from pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModuleTest.java with 94% similarity]
pcep/ietf-stateful02/src/test/java/org/opendaylight/protocol/pcep/ietf/IetfStateful02PCEPParserModuleTest.java [moved from pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModuleTest.java with 94% similarity]
pcep/ietf-stateful07/pom.xml
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfInitiated00PCEPParserModule.java [new file with mode: 0644]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfInitiated00PCEPParserModuleFactory.java [new file with mode: 0644]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfStateful07PCEPParserModule.java [new file with mode: 0644]
pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfStateful07PCEPParserModuleFactory.java [new file with mode: 0644]
pcep/ietf-stateful07/src/main/yang/odl-pcep-ietf-stateful07-cfg.yang
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/IetfInitiated00PCEPParserModuleTest.java [moved from pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModuleTest.java with 94% similarity]
pcep/ietf-stateful07/src/test/java/org/opendaylight/protocol/pcep/ietf/IetfStateful07PCEPParserModuleTest.java [moved from pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModuleTest.java with 94% similarity]
pcep/impl-config/pom.xml
pcep/impl/pom.xml
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java with 100% similarity]
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleFactory.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleFactory.java with 100% similarity]
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java with 100% similarity]
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleFactory.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleFactory.java with 100% similarity]
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java with 100% similarity]
pcep/impl/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleFactory.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleFactory.java with 100% similarity]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java [new file with mode: 0644]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleFactory.java [new file with mode: 0644]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModule.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModule.java with 100% similarity]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModuleFactory.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModuleFactory.java with 100% similarity]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModule.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModule.java with 100% similarity]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModuleFactory.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfInitiated00PCEPParserModuleFactory.java with 100% similarity]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModule.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModule.java with 100% similarity]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModuleFactory.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModuleFactory.java with 100% similarity]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModule.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModule.java with 100% similarity]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModuleFactory.java [moved from pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful07PCEPParserModuleFactory.java with 100% similarity]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java [new file with mode: 0644]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleFactory.java [new file with mode: 0644]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java [new file with mode: 0644]
pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleFactory.java [new file with mode: 0644]
pcep/impl/src/main/yang/odl-pcep-impl-cfg.yang [moved from pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang with 72% similarity]
pcep/impl/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleTest.java [moved from pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleTest.java with 100% similarity]
pcep/impl/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java [moved from pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java with 93% similarity]
pcep/impl/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleTest.java [moved from pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleTest.java with 94% similarity]
pcep/segment-routing/pom.xml
pcep/segment-routing/src/main/yang/odl-pcep-segment-routing02-cfg.yang
pcep/spi-config/pom.xml
pcep/spi/pom.xml
pcep/spi/src/main/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModule.java [moved from pcep/spi-config/src/main/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModule.java with 100% similarity]
pcep/spi/src/main/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModuleFactory.java [moved from pcep/spi-config/src/main/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModuleFactory.java with 100% similarity]
pcep/spi/src/main/yang/odl-pcep-spi-cfg.yang [moved from pcep/spi-config/src/main/yang/config-pcep-spi.yang with 98% similarity]
pcep/spi/src/test/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModuleTest.java [moved from pcep/spi-config/src/test/java/org/opendaylight/controller/config/yang/pcep/spi/SimplePCEPExtensionProviderContextModuleTest.java with 100% similarity]
pcep/topology-provider-config/pom.xml
pcep/topology-provider/pom.xml
pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java [moved from pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModule.java with 100% similarity]
pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleFactory.java [moved from pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleFactory.java with 100% similarity]
pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful02TopologySessionListenerModule.java [moved from pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful02TopologySessionListenerModule.java with 100% similarity]
pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful02TopologySessionListenerModuleFactory.java [moved from pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful02TopologySessionListenerModuleFactory.java with 100% similarity]
pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModule.java [moved from pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModule.java with 100% similarity]
pcep/topology-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModuleFactory.java [moved from pcep/topology-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModuleFactory.java with 100% similarity]
pcep/topology-provider/src/main/yang/odl-pcep-topology-provider-cfg.yang [moved from pcep/topology-provider-config/src/main/yang/config-pcep-topology-provider.yang with 97% similarity]
pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java [moved from pcep/topology-provider-config/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/PCEPTopologyProviderModuleTest.java with 100% similarity]
pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful02TopologySessionListenerModuleTest.java [moved from pcep/topology-provider-config/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful02TopologySessionListenerModuleTest.java with 100% similarity]
pcep/topology-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModuleTest.java [moved from pcep/topology-provider-config/src/test/java/org/opendaylight/controller/config/yang/pcep/topology/provider/Stateful07TopologySessionListenerModuleTest.java with 100% similarity]
pcep/tunnel-provider-config/pom.xml
pcep/tunnel-provider/pom.xml
pcep/tunnel-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModule.java [moved from pcep/tunnel-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModule.java with 100% similarity]
pcep/tunnel-provider/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleFactory.java [moved from pcep/tunnel-provider-config/src/main/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleFactory.java with 100% similarity]
pcep/tunnel-provider/src/main/yang/odl-pcep-tunnel-provider-cfg.yang [moved from pcep/tunnel-provider-config/src/main/yang/config-pcep-tunnel-provider.yang with 96% similarity]
pcep/tunnel-provider/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java [moved from pcep/tunnel-provider-config/src/test/java/org/opendaylight/controller/config/yang/pcep/tunnel/provider/PCEPTunnelTopologyProviderModuleTest.java with 100% similarity]

index 9edeb3e3685c042d76d2472b9edb7ac41dd765aa..de5f347ab23dc43fd6a41c14240ddef75b46611f 100644 (file)
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-spi-config</artifactId>
+                <artifactId>pcep-spi</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-impl-config</artifactId>
+                <artifactId>pcep-impl</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>pcep-topology-provider-config</artifactId>
+                <artifactId>pcep-topology-provider</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
                 <type>test-jar</type>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>tcpmd5-jni</artifactId>
+                <version>${project.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
-                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>ch.qos.logback</groupId>
index b9860bc7992d87acb67b727db85ee49b83765b7a..f4972c05d32bedff7cf3f6ea9162fdeeaee4698e 100644 (file)
@@ -8,13 +8,12 @@
 package org.opendaylight.protocol.integration;
 
 import com.google.common.collect.Lists;
-
 import java.util.Collection;
 
 public final class PcepImplBundleTest extends AbstractBundleTest {
     @Override
     protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "pcep-api", "pcep-spi", "pcep-api-config", "pcep-ietf-stateful02", "pcep-ietf-stateful07",
+        return Lists.newArrayList("concepts", "pcep-api", "pcep-spi", "pcep-ietf-stateful02", "pcep-ietf-stateful07",
                 "pcep-topology-api", "pcep-tunnel-api", "rsvp-api", "programming-api", "programming-topology-api", "topology-api",
                 "topology-tunnel-api", "programming-tunnel-api", "tcpmd5-api", "tcpmd5-netty", "util");
     }
index 84861850bbff0ce6516a5cd93094d73e75ccaef3..e9448e5dc94de0bc50315ebd78f2af16b52bd3ba 100644 (file)
@@ -14,9 +14,7 @@ import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
 import java.util.Collection;
 import java.util.Collections;
-
 import javax.inject.Inject;
-
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
 import org.opendaylight.controller.test.sal.binding.it.TestHelper;
@@ -79,7 +77,6 @@ public class AbstractPcepOsgiTest {
                 mavenBundle("org.opendaylight.bgpcep", "pcep-topology-api").versionAsInProject(), //
                 mavenBundle("org.opendaylight.bgpcep", "pcep-tunnel-api").versionAsInProject(), //
                 mavenBundle("org.opendaylight.bgpcep", "pcep-api").versionAsInProject(), //
-                mavenBundle("org.opendaylight.bgpcep", "pcep-api-config").versionAsInProject(), //
                 mavenBundle("org.opendaylight.bgpcep", "pcep-impl").versionAsInProject(), //
                 mavenBundle("org.opendaylight.bgpcep", "pcep-spi").versionAsInProject(), //
                 mavenBundle("org.opendaylight.bgpcep", "pcep-ietf-stateful02").versionAsInProject(), //
index a09fdb0dbf3a471b5618a435816e17ac9e83a681..2afa6e0365c74a65a4e7f4f7406971e07bebd8de 100644 (file)
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-api</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
index 5eb597f672716508918a12ba5d52df2b2f3533dc..e2b39af291090cc5a38c3150dac7901d507897eb 100644 (file)
             <groupId>${project.groupId}</groupId>
             <artifactId>concepts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>util</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>rsvp-api</artifactId>
             <artifactId>netty-transport</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-common</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
         <!--
             FIXME: this is in support of the generated code. This should not
                    be here, but the plugin should bring it in.
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
+
         <!-- Testing dependencies -->
         <dependency>
             <groupId>junit</groupId>
similarity index 98%
rename from pcep/api-config/src/main/yang/pcep.yang
rename to pcep/api/src/main/yang/odl-pcep-api-cfg.yang
index 842766cd5ee780a6ff540e568bd88c7d5c130958..48acfabd6bfd3bc32e2ca310774ceb74c6c788b1 100644 (file)
@@ -1,5 +1,5 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module pcep {
+module odl-pcep-api-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:pcep";
     prefix "pcep";
index 39c868280a4ada2ef47b14112607b1851eb94430..11da7aedeade03a5a0bff46bbc7592cd7f0aa331 100644 (file)
@@ -12,7 +12,7 @@
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&amp;revision=2013-11-19</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:pcep:impl?module=odl-pcep-impl-cfg&amp;revision=2013-06-27</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:pcep:spi?module=config-pcep-spi&amp;revision=2013-11-15</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:pcep:spi?module=odl-pcep-spi-cfg&amp;revision=2013-11-15</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:programming:spi?module=odl-programming-spi-cfg&amp;revision=2013-11-15</capability>
     <capability>urn:opendaylight:params:xml:ns:yang:controller:pcep:stateful02:cfg?module=odl-pcep-ietf-stateful02-cfg&amp;revision=2014-02-21</capability>
     <capability>urn:opendaylight:params:xml:ns:yang:controller:pcep:stateful07:cfg?module=odl-pcep-ietf-stateful07-cfg&amp;revision=2014-02-21</capability>
index a4b8f75fff708d7f785eb9e5424b0a29ced940e0..17c95b585d32059689bdf037e07f103eafc0b3d5 100644 (file)
@@ -12,7 +12,7 @@
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&amp;revision=2013-11-19</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:pcep:impl?module=odl-pcep-impl-cfg&amp;revision=2013-06-27</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider?module=config-pcep-topology-provider&amp;revision=2013-11-15</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider?module=odl-pcep-topology-provider-cfg&amp;revision=2013-11-15</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:programming:spi?module=odl-programming-spi-cfg&amp;revision=2013-11-15</capability>
     </required-capabilities>
     <configuration>
index 51d9cd1289452592cc6e85ffe76f9dc943b721b8..b50bd2ec0259e1a65b3b946df158cb9385efc079 100644 (file)
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-api-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-spi</artifactId>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmd5-netty</artifactId>
+        </dependency>
 
         <!--
             FIXME: this is in support of the generated code. This should not
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-spi</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/CrabbeInitiated00PCEPParserModule.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/CrabbeInitiated00PCEPParserModule.java
new file mode 100644 (file)
index 0000000..b855832
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.controller.config.yang.pcep.stateful02.cfg;
+
+import org.opendaylight.protocol.pcep.crabbe.initiated00.InitiatedActivator;
+
+/**
+*
+*/
+public final class CrabbeInitiated00PCEPParserModule extends
+        org.opendaylight.controller.config.yang.pcep.stateful02.cfg.AbstractCrabbeInitiated00PCEPParserModule {
+
+    public CrabbeInitiated00PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(identifier, dependencyResolver);
+    }
+
+    public CrabbeInitiated00PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+            final CrabbeInitiated00PCEPParserModule oldModule, final java.lang.AutoCloseable oldInstance) {
+
+        super(identifier, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        return new InitiatedActivator();
+    }
+}
diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/CrabbeInitiated00PCEPParserModuleFactory.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/CrabbeInitiated00PCEPParserModuleFactory.java
new file mode 100644 (file)
index 0000000..00ea34e
--- /dev/null
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.controller.config.yang.pcep.stateful02.cfg;
+
+/**
+*
+*/
+public class CrabbeInitiated00PCEPParserModuleFactory extends
+        org.opendaylight.controller.config.yang.pcep.stateful02.cfg.AbstractCrabbeInitiated00PCEPParserModuleFactory {
+
+}
diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/IetfStateful02PCEPParserModule.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/IetfStateful02PCEPParserModule.java
new file mode 100644 (file)
index 0000000..5b07fff
--- /dev/null
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.controller.config.yang.pcep.stateful02.cfg;
+
+import org.opendaylight.protocol.pcep.ietf.stateful02.StatefulActivator;
+
+/**
+*
+*/
+public final class IetfStateful02PCEPParserModule extends
+        org.opendaylight.controller.config.yang.pcep.stateful02.cfg.AbstractIetfStateful02PCEPParserModule {
+
+    public IetfStateful02PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(identifier, dependencyResolver);
+    }
+
+    public IetfStateful02PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+            final IetfStateful02PCEPParserModule oldModule, final java.lang.AutoCloseable oldInstance) {
+
+        super(identifier, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        return new StatefulActivator();
+    }
+}
diff --git a/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/IetfStateful02PCEPParserModuleFactory.java b/pcep/ietf-stateful02/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful02/cfg/IetfStateful02PCEPParserModuleFactory.java
new file mode 100644 (file)
index 0000000..a788eb3
--- /dev/null
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.controller.config.yang.pcep.stateful02.cfg;
+
+/**
+*
+*/
+public class IetfStateful02PCEPParserModuleFactory extends
+        org.opendaylight.controller.config.yang.pcep.stateful02.cfg.AbstractIetfStateful02PCEPParserModuleFactory {
+
+}
index 039bd5e1c651b75ce2bf3fc34a659c578044e142..eb9de859de0fc14e8d9c3eb97cb68e2bd97e1a51 100644 (file)
@@ -5,7 +5,8 @@ module odl-pcep-ietf-stateful02-cfg {
     prefix "pcep-stateful02";
 
     import config { prefix config; revision-date 2013-04-05; }
-    import pcep { prefix pcep; revision-date 2013-04-09; }
+    import odl-pcep-api-cfg { prefix pcep; revision-date 2013-04-09; }
+    import odl-pcep-spi-cfg { prefix spi; revision-date 2013-11-15; }
 
     organization "Cisco Systems, Inc.";
 
@@ -68,5 +69,29 @@ module odl-pcep-ietf-stateful02-cfg {
             }
         }
     }
+
+    identity pcep-parser-ietf-stateful02 {
+        base config:module-type;
+        config:provided-service spi:extension;
+        config:java-name-prefix IetfStateful02PCEPParser;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case pcep-parser-ietf-stateful02 {
+            when "/config:modules/config:module/config:type = 'pcep-parser-ietf-stateful02'";
+        }
+    }
+
+    identity pcep-parser-crabbe-initiated00 {
+        base config:module-type;
+        config:provided-service spi:extension;
+        config:java-name-prefix CrabbeInitiated00PCEPParser;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case pcep-parser-crabbe-initiated00 {
+            when "/config:modules/config:module/config:type = 'pcep-parser-crabbe-initiated00'";
+        }
+    }
 }
 
@@ -5,12 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.config.yang.pcep.impl;
+package org.opendaylight.protocol.pcep.ietf;
 
 import com.google.common.collect.Lists;
-
 import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.jmx.CommitStatus;
@@ -19,6 +17,7 @@ import org.opendaylight.controller.config.manager.impl.factoriesresolver.Hardcod
 import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleFactory;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleTest;
+import org.opendaylight.controller.config.yang.pcep.stateful02.cfg.CrabbeInitiated00PCEPParserModuleFactory;
 
 public class CrabbeInitiated00PCEPParserModuleTest extends AbstractConfigTest {
 
@@ -5,12 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.config.yang.pcep.impl;
+package org.opendaylight.protocol.pcep.ietf;
 
 import com.google.common.collect.Lists;
-
 import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.jmx.CommitStatus;
@@ -19,6 +17,7 @@ import org.opendaylight.controller.config.manager.impl.factoriesresolver.Hardcod
 import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleFactory;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleTest;
+import org.opendaylight.controller.config.yang.pcep.stateful02.cfg.IetfStateful02PCEPParserModuleFactory;
 
 public class IetfStateful02PCEPParserModuleTest extends AbstractConfigTest {
 
index 06b61a7c8532370495cdf59a5a911cf89564e72f..6d88d00e08374197cc17f80e1ef543a5646809cf 100644 (file)
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-api-config</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-spi</artifactId>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-impl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmd5-netty</artifactId>
+        </dependency>
 
         <!--
             FIXME: this is in support of the generated code. This should not
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-spi</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfInitiated00PCEPParserModule.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfInitiated00PCEPParserModule.java
new file mode 100644 (file)
index 0000000..dfd7b43
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-initiated00
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Jan 22 14:05:37 CET 2014
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.stateful07.cfg;
+
+import org.opendaylight.protocol.pcep.ietf.initiated00.CrabbeInitiatedActivator;
+
+/**
+*
+*/
+public final class IetfInitiated00PCEPParserModule extends
+    org.opendaylight.controller.config.yang.pcep.stateful07.cfg.AbstractIetfInitiated00PCEPParserModule {
+
+    public IetfInitiated00PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(identifier, dependencyResolver);
+    }
+
+    public IetfInitiated00PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+            final IetfInitiated00PCEPParserModule oldModule, final java.lang.AutoCloseable oldInstance) {
+
+        super(identifier, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        return new CrabbeInitiatedActivator();
+    }
+}
diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfInitiated00PCEPParserModuleFactory.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfInitiated00PCEPParserModuleFactory.java
new file mode 100644 (file)
index 0000000..603ba04
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-initiated00
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Jan 22 14:05:37 CET 2014
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.stateful07.cfg;
+
+/**
+*
+*/
+public class IetfInitiated00PCEPParserModuleFactory extends
+    org.opendaylight.controller.config.yang.pcep.stateful07.cfg.AbstractIetfInitiated00PCEPParserModuleFactory {
+
+}
diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfStateful07PCEPParserModule.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfStateful07PCEPParserModule.java
new file mode 100644 (file)
index 0000000..74c15ee
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-stateful07
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Jan 22 14:05:37 CET 2014
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.stateful07.cfg;
+
+import org.opendaylight.protocol.pcep.ietf.stateful07.StatefulActivator;
+
+/**
+*
+*/
+public final class IetfStateful07PCEPParserModule extends
+    org.opendaylight.controller.config.yang.pcep.stateful07.cfg.AbstractIetfStateful07PCEPParserModule {
+
+    public IetfStateful07PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(identifier, dependencyResolver);
+    }
+
+    public IetfStateful07PCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+            final IetfStateful07PCEPParserModule oldModule, final java.lang.AutoCloseable oldInstance) {
+
+        super(identifier, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        return new StatefulActivator();
+    }
+}
diff --git a/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfStateful07PCEPParserModuleFactory.java b/pcep/ietf-stateful07/src/main/java/org/opendaylight/controller/config/yang/pcep/stateful07/cfg/IetfStateful07PCEPParserModuleFactory.java
new file mode 100644 (file)
index 0000000..c188cb0
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-stateful07
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Jan 22 14:05:37 CET 2014
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.stateful07.cfg;
+
+/**
+*
+*/
+public class IetfStateful07PCEPParserModuleFactory extends
+    org.opendaylight.controller.config.yang.pcep.stateful07.cfg.AbstractIetfStateful07PCEPParserModuleFactory {
+
+}
index 000c87e3fbf7c96c2191956605d8b2ba39e29fbb..72df85f856099343564509401796064ced54c98f 100644 (file)
@@ -5,7 +5,8 @@ module odl-pcep-ietf-stateful07-cfg {
     prefix "pcep-stateful07";
 
     import config { prefix config; revision-date 2013-04-05; }
-    import pcep { prefix pcep; revision-date 2013-04-09; }
+    import odl-pcep-api-cfg { prefix pcep; revision-date 2013-04-09; }
+    import odl-pcep-spi-cfg { prefix spi; revision-date 2013-11-15; }
 
     organization "Cisco Systems, Inc.";
 
@@ -63,5 +64,29 @@ module odl-pcep-ietf-stateful07-cfg {
             }
         }
     }
+
+    identity pcep-parser-ietf-stateful07 {
+        base config:module-type;
+        config:provided-service spi:extension;
+        config:java-name-prefix IetfStateful07PCEPParser;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case pcep-parser-ietf-stateful07 {
+            when "/config:modules/config:module/config:type = 'pcep-parser-ietf-stateful07'";
+        }
+    }
+
+    identity pcep-parser-ietf-initiated00 {
+        base config:module-type;
+        config:provided-service spi:extension;
+        config:java-name-prefix IetfInitiated00PCEPParser;
+    }
+
+    augment "/config:modules/config:module/config:configuration" {
+        case pcep-parser-ietf-initiated00 {
+            when "/config:modules/config:module/config:type = 'pcep-parser-ietf-initiated00'";
+        }
+    }
 }
 
@@ -5,12 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.config.yang.pcep.impl;
+package org.opendaylight.protocol.pcep.ietf;
 
 import com.google.common.collect.Lists;
-
 import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.jmx.CommitStatus;
@@ -19,6 +17,7 @@ import org.opendaylight.controller.config.manager.impl.factoriesresolver.Hardcod
 import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleFactory;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleTest;
+import org.opendaylight.controller.config.yang.pcep.stateful07.cfg.IetfInitiated00PCEPParserModuleFactory;
 
 public class IetfInitiated00PCEPParserModuleTest extends AbstractConfigTest {
 
@@ -5,12 +5,10 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.controller.config.yang.pcep.impl;
+package org.opendaylight.protocol.pcep.ietf;
 
 import com.google.common.collect.Lists;
-
 import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.jmx.CommitStatus;
@@ -19,6 +17,7 @@ import org.opendaylight.controller.config.manager.impl.factoriesresolver.Hardcod
 import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleFactory;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleTest;
+import org.opendaylight.controller.config.yang.pcep.stateful07.cfg.IetfStateful07PCEPParserModuleFactory;
 
 public class IetfStateful07PCEPParserModuleTest extends AbstractConfigTest {
 
index 96f938fc94956f9f07645e5dabc3e127545411df..b8b08517e7478d870a6e77cb88c0dabd8bf0ed68 100644 (file)
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-api-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-spi-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-ietf-stateful07</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-ietf-stateful02</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-netty</artifactId>
-        </dependency>
-
-        <!--test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-timer-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-spi-config</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-ietf-stateful02</artifactId>
-            <type>test-jar</type>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
index 4e2e512d2f29bcccc43becc41f1446e01718b51a..604004db0db40e12aa9ad141beb6330a19edd911 100644 (file)
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-config-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmd5-netty</artifactId>
+        </dependency>
+
         <!-- Test dependencies -->
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>protocol-framework</artifactId>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>mockito-configuration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-threadgroup-config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-timer-config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-spi</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java b/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModule.java
new file mode 100644 (file)
index 0000000..1c7c349
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-base
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Tue Dec 03 09:34:06 CET 2013
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.impl;
+
+import org.opendaylight.protocol.pcep.impl.Activator;
+
+/**
+ *
+ */
+public final class BasePCEPParserModule extends org.opendaylight.controller.config.yang.pcep.impl.AbstractBasePCEPParserModule {
+
+    public BasePCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(identifier, dependencyResolver);
+    }
+
+    public BasePCEPParserModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final BasePCEPParserModule oldModule,
+            final java.lang.AutoCloseable oldInstance) {
+
+        super(identifier, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        return new Activator();
+    }
+}
diff --git a/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleFactory.java b/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/BasePCEPParserModuleFactory.java
new file mode 100644 (file)
index 0000000..38c8e4c
--- /dev/null
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-base
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Tue Dec 03 09:34:06 CET 2013
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.impl;
+
+/**
+*
+*/
+public class BasePCEPParserModuleFactory extends org.opendaylight.controller.config.yang.pcep.impl.AbstractBasePCEPParserModuleFactory {
+
+}
diff --git a/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java b/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModule.java
new file mode 100644 (file)
index 0000000..3f469e5
--- /dev/null
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: pcep-impl  yang module local name: pcep-dispatcher-impl
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Nov 06 13:16:39 CET 2013
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.impl;
+
+import org.opendaylight.controller.config.api.JmxAttributeValidationException;
+import org.opendaylight.protocol.pcep.impl.DefaultPCEPSessionNegotiatorFactory;
+import org.opendaylight.protocol.pcep.impl.PCEPDispatcherImpl;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.Open;
+
+/**
+ *
+ */
+public final class PCEPDispatcherImplModule extends org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPDispatcherImplModule {
+
+    public PCEPDispatcherImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier name,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(name, dependencyResolver);
+    }
+
+    public PCEPDispatcherImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier name,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final PCEPDispatcherImplModule oldModule,
+            final java.lang.AutoCloseable oldInstance) {
+        super(name, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public void validate() {
+        super.validate();
+        JmxAttributeValidationException.checkNotNull(getMaxUnknownMessages(), "value is not set.", maxUnknownMessagesJmxAttribute);
+        JmxAttributeValidationException.checkCondition(getMaxUnknownMessages() > 0, "Parameter 'maxUnknownMessages' "
+                + "must be greater than 0", maxUnknownMessagesJmxAttribute);
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        Open localPrefs = getPcepSessionProposalFactoryDependency().getSessionProposal(null, 0);
+        DefaultPCEPSessionNegotiatorFactory negFactory = new DefaultPCEPSessionNegotiatorFactory(getTimerDependency(), localPrefs, getMaxUnknownMessages());
+
+        final PCEPDispatcherImpl instance = new PCEPDispatcherImpl(getPcepExtensionsDependency().getMessageHandlerRegistry(), negFactory, getBossGroupDependency(), getWorkerGroupDependency(), getMd5ChannelFactoryDependency(), getMd5ServerChannelFactoryDependency());
+        return instance;
+    }
+}
diff --git a/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleFactory.java b/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleFactory.java
new file mode 100644 (file)
index 0000000..b54ca96
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: pcep-impl  yang module local name: pcep-dispatcher-impl
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Nov 06 13:16:39 CET 2013
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.impl;
+
+/**
+*
+*/
+public class PCEPDispatcherImplModuleFactory extends
+        org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPDispatcherImplModuleFactory {
+
+}
diff --git a/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java b/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModule.java
new file mode 100644 (file)
index 0000000..36866ed
--- /dev/null
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: pcep-impl  yang module local name: pcep-session-proposal-factory-impl
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Nov 06 13:16:39 CET 2013
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.impl;
+
+import java.net.InetSocketAddress;
+
+import org.opendaylight.controller.config.api.JmxAttributeValidationException;
+import org.opendaylight.protocol.pcep.PCEPSessionProposalFactory;
+import org.opendaylight.protocol.pcep.impl.BasePCEPSessionProposalFactory;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.pcep.types.rev131005.open.object.Open;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ *
+ */
+public final class PCEPSessionProposalFactoryImplModule extends
+        org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPSessionProposalFactoryImplModule {
+
+    private static final Logger LOG = LoggerFactory.getLogger(PCEPSessionProposalFactoryImplModule.class);
+
+    public PCEPSessionProposalFactoryImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier name,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(name, dependencyResolver);
+    }
+
+    public PCEPSessionProposalFactoryImplModule(final org.opendaylight.controller.config.api.ModuleIdentifier name,
+            final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+            final PCEPSessionProposalFactoryImplModule oldModule, final java.lang.AutoCloseable oldInstance) {
+        super(name, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public void customValidation() {
+        JmxAttributeValidationException.checkNotNull(getDeadTimerValue(), "value is not set.", deadTimerValueJmxAttribute);
+        JmxAttributeValidationException.checkNotNull(getKeepAliveTimerValue(), "value is not set.", keepAliveTimerValueJmxAttribute);
+        if (getKeepAliveTimerValue() != 0) {
+            JmxAttributeValidationException.checkCondition(getKeepAliveTimerValue() >= 1, "minimum value is 1.",
+                    keepAliveTimerValueJmxAttribute);
+            if (getDeadTimerValue() != 0 && (getDeadTimerValue() / getKeepAliveTimerValue() != 4)) {
+                LOG.warn("DeadTimerValue should be 4 times greater than KeepAliveTimerValue");
+            }
+        }
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        final BasePCEPSessionProposalFactory inner = new BasePCEPSessionProposalFactory(getDeadTimerValue(), getKeepAliveTimerValue());
+        return new PCEPSessionProposalFactoryCloseable(inner);
+    }
+
+    private static final class PCEPSessionProposalFactoryCloseable implements PCEPSessionProposalFactory, AutoCloseable {
+
+        private final BasePCEPSessionProposalFactory inner;
+
+        public PCEPSessionProposalFactoryCloseable(final BasePCEPSessionProposalFactory inner) {
+            this.inner = inner;
+        }
+
+        @Override
+        public void close() {
+            // Nothing to do
+        }
+
+        @Override
+        public Open getSessionProposal(final InetSocketAddress inetSocketAddress, final int i) {
+            return this.inner.getSessionProposal(inetSocketAddress, i);
+        }
+    }
+}
diff --git a/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleFactory.java b/pcep/impl/src/main/resources/org/opendaylight/controller/config/yang/pcep/impl/PCEPSessionProposalFactoryImplModuleFactory.java
new file mode 100644 (file)
index 0000000..fef911e
--- /dev/null
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+/**
+ * Generated file
+
+ * Generated from: yang module name: pcep-impl  yang module local name: pcep-session-proposal-factory-impl
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Nov 06 13:16:39 CET 2013
+ *
+ * Do not modify this file unless it is present under src/main directory
+ */
+package org.opendaylight.controller.config.yang.pcep.impl;
+
+/**
+*
+*/
+public class PCEPSessionProposalFactoryImplModuleFactory extends
+        org.opendaylight.controller.config.yang.pcep.impl.AbstractPCEPSessionProposalFactoryImplModuleFactory {
+
+}
similarity index 72%
rename from pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang
rename to pcep/impl/src/main/yang/odl-pcep-impl-cfg.yang
index a38c56aae6a5a81d919220b3479759a6bb470018..3ce13aaf62eda049b90ff5cccb216f5136e84607 100644 (file)
@@ -5,8 +5,8 @@ module odl-pcep-impl-cfg {
     prefix "pcep-impl";
 
     import config { prefix config; revision-date 2013-04-05; }
-    import pcep { prefix pcep; revision-date 2013-04-09; }
-    import config-pcep-spi { prefix spi; revision-date 2013-11-15; }
+    import odl-pcep-api-cfg { prefix pcep; revision-date 2013-04-09; }
+    import odl-pcep-spi-cfg { prefix spi; revision-date 2013-11-15; }
     import netty { prefix netty; revision-date 2013-11-19; }
     import odl-tcpmd5-netty-cfg { prefix tcpmd5; revision-date 2014-04-27; }
 
@@ -47,54 +47,6 @@ module odl-pcep-impl-cfg {
         }
     }
 
-    identity pcep-parser-ietf-stateful07 {
-        base config:module-type;
-        config:provided-service spi:extension;
-        config:java-name-prefix IetfStateful07PCEPParser;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case pcep-parser-ietf-stateful07 {
-            when "/config:modules/config:module/config:type = 'pcep-parser-ietf-stateful07'";
-        }
-    }
-
-    identity pcep-parser-ietf-initiated00 {
-        base config:module-type;
-        config:provided-service spi:extension;
-        config:java-name-prefix IetfInitiated00PCEPParser;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case pcep-parser-ietf-initiated00 {
-            when "/config:modules/config:module/config:type = 'pcep-parser-ietf-initiated00'";
-        }
-    }
-
-    identity pcep-parser-ietf-stateful02 {
-        base config:module-type;
-        config:provided-service spi:extension;
-        config:java-name-prefix IetfStateful02PCEPParser;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case pcep-parser-ietf-stateful02 {
-            when "/config:modules/config:module/config:type = 'pcep-parser-ietf-stateful02'";
-        }
-    }
-
-    identity pcep-parser-crabbe-initiated00 {
-        base config:module-type;
-        config:provided-service spi:extension;
-        config:java-name-prefix CrabbeInitiated00PCEPParser;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case pcep-parser-crabbe-initiated00 {
-            when "/config:modules/config:module/config:type = 'pcep-parser-crabbe-initiated00'";
-        }
-    }
-
     identity pcep-dispatcher-impl {
         base config:module-type;
         config:provided-service pcep:pcep-dispatcher;
similarity index 93%
rename from pcep/impl-config/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java
rename to pcep/impl/src/test/java/org/opendaylight/controller/config/yang/pcep/impl/PCEPDispatcherImplModuleTest.java
index 8961ccc66119da3abbb327fe116765c5ad912544..ca5ffff5fc7a116e786fadf77573d9bac3c4f25f 100644 (file)
@@ -12,7 +12,6 @@ import static org.junit.Assert.fail;
 
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.ValidationException;
@@ -26,8 +25,6 @@ import org.opendaylight.controller.config.yang.netty.timer.HashedWheelTimerModul
 import org.opendaylight.controller.config.yang.netty.timer.HashedWheelTimerModuleMXBean;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleFactory;
 import org.opendaylight.controller.config.yang.pcep.spi.SimplePCEPExtensionProviderContextModuleMXBean;
-import org.opendaylight.controller.config.yang.pcep.stateful02.cfg.Stateful02PCEPSessionProposalFactoryModuleFactory;
-import org.opendaylight.protocol.pcep.ietf.Stateful02PCEPSessionProposalFactoryModuleTest;
 
 public class PCEPDispatcherImplModuleTest extends AbstractConfigTest {
 
@@ -46,7 +43,7 @@ public class PCEPDispatcherImplModuleTest extends AbstractConfigTest {
 
     @Before
     public void setUp() throws Exception {
-        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext, new PCEPDispatcherImplModuleFactory(), new PCEPSessionProposalFactoryImplModuleFactory(), new NettyThreadgroupModuleFactory(), new SimplePCEPExtensionProviderContextModuleFactory(), new HashedWheelTimerModuleFactory(), new Stateful02PCEPSessionProposalFactoryModuleFactory()));
+        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(mockedContext, new PCEPDispatcherImplModuleFactory(), new PCEPSessionProposalFactoryImplModuleFactory(), new NettyThreadgroupModuleFactory(), new SimplePCEPExtensionProviderContextModuleFactory(), new HashedWheelTimerModuleFactory()));
     }
 
     @Test
@@ -109,7 +106,7 @@ public class PCEPDispatcherImplModuleTest extends AbstractConfigTest {
             throws Exception {
         final ObjectName nameCreated = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
         final PCEPDispatcherImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, PCEPDispatcherImplModuleMXBean.class);
-        mxBean.setPcepSessionProposalFactory(Stateful02PCEPSessionProposalFactoryModuleTest.createStateful02SessionProposalInstance(transaction));
+        mxBean.setPcepSessionProposalFactory(PCEPSessionProposalFactoryImplModuleTest.createSessionInstance(transaction));
         mxBean.setMaxUnknownMessages(maxUnknownMessages);
         mxBean.setBossGroup(createThreadGroupInstance(transaction, 10, BOSS_TG_INSTANCE_NAME));
         mxBean.setWorkerGroup(createThreadGroupInstance(transaction, 10, WORKER_TG_INSTANCE_NAME));
@@ -12,7 +12,6 @@ import static org.junit.Assert.fail;
 
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.ObjectName;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.config.api.ValidationException;
@@ -102,7 +101,7 @@ public class PCEPSessionProposalFactoryImplModuleTest extends AbstractConfigTest
         return transaction.commit();
     }
 
-    public static ObjectName createSessionInstance(final ConfigTransactionJMXClient transaction, final Short deadTimer,
+    private static ObjectName createSessionInstance(final ConfigTransactionJMXClient transaction, final Short deadTimer,
             final Short keepAlive) throws InstanceAlreadyExistsException {
         final ObjectName nameCreated = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
         final PCEPSessionProposalFactoryImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated,
@@ -111,4 +110,8 @@ public class PCEPSessionProposalFactoryImplModuleTest extends AbstractConfigTest
         mxBean.setKeepAliveTimerValue(keepAlive);
         return nameCreated;
     }
+
+    public static ObjectName createSessionInstance(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
+        return createSessionInstance(transaction, (short) 180, (short) 30);
+    }
 }
index d89a5003b300b743bc38c4077c30969fba190e89..02572c6aaddced2f3c9a4c10f61c8fcb51ced032 100644 (file)
@@ -36,7 +36,7 @@
       </dependency>
          <dependency>
          <groupId>${project.groupId}</groupId>
-         <artifactId>pcep-spi-config</artifactId>
+         <artifactId>pcep-spi</artifactId>
       </dependency>
       <!--test dependencies -->
       <dependency>
@@ -62,7 +62,7 @@
       </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-spi-config</artifactId>
+            <artifactId>pcep-spi</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
index a6fc417dc0b1e907c1eb446dcc6ad62f3b2d270a..614267635f3383dd11e02acf419a7b2adb3599c7 100644 (file)
@@ -5,9 +5,8 @@ module odl-pcep-segment-routing02-cfg {
     prefix "pcep-sr02";
 
     import config { prefix config; revision-date 2013-04-05; }
-    import pcep { prefix pcep; revision-date 2013-04-09; }
-    import odl-pcep-ietf-stateful07-cfg { prefix pcep-stateful07; revision-date 2014-02-21; }
-    import config-pcep-spi { prefix spi; revision-date 2013-11-15; }
+    import odl-pcep-api-cfg { prefix pcep; revision-date 2013-04-09; }
+    import odl-pcep-spi-cfg { prefix spi; revision-date 2013-11-15; }
 
     organization "Cisco Systems, Inc.";
 
index 9d75961f4dc0e3471edcacb5402d2c048102c16c..dadc7eb0c635ce97524a5067a64876aaff867b63 100644 (file)
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-spi</artifactId>
-        </dependency>
-        <!--test dependencies -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
index eaad9aea91232e109cff3801aa91584c2ae46e8a..851871632d2666ec1e1d3325496c2ff2a62c2fed 100644 (file)
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
-        <!-- Testing dependencies -->
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>util</artifactId>
+        </dependency>
+
+        <!--test dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-util</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
                    </instructions>
                </configuration>
            </plugin>
+           <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
similarity index 98%
rename from pcep/spi-config/src/main/yang/config-pcep-spi.yang
rename to pcep/spi/src/main/yang/odl-pcep-spi-cfg.yang
index b22c2e98af9f56d46c497d4c359fd30d7a9e9adf..4e994712649e0462e6509e629c59bc579ef6e396 100644 (file)
@@ -1,5 +1,5 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module config-pcep-spi {
+module odl-pcep-spi-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:pcep:spi";
     prefix "spi";
index 795f815df223a87c2ab9b7e1b8b99ab935a055e2..9937594294edc4e56d1d279fd88239eecbcb863d 100644 (file)
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-topology-provider</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-api-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-impl-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>programming-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>topology-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools.model</groupId>
-            <artifactId>ietf-inet-types</artifactId>
-        </dependency>
-        <!--test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-timer-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>programming-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-ietf-stateful02</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>programming-impl</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-impl-config</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-jni-cfg</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>tcpmd5-jni</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
index b632566e813d6f280cfa6524963b29e527660a21..e0356dc5d5dfff9c3e58cfae27b0af9d02c505d4 100644 (file)
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>programming-spi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>topology-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmd5-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-tunnel-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-impl</artifactId>
+        </dependency>
 
         <!-- Test dependencies -->
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-util</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-timer-config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-threadgroup-config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>programming-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-ietf-stateful02</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>programming-impl</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>pcep-impl</artifactId>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmd5-jni-cfg</artifactId>
+            <scope>test</scope>
         </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>tcpmd5-jni</artifactId>
+                <type>test-jar</type>
+                <scope>test</scope>
+            </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
            <plugin>
                <groupId>org.apache.felix</groupId>
                <artifactId>maven-bundle-plugin</artifactId>
similarity index 97%
rename from pcep/topology-provider-config/src/main/yang/config-pcep-topology-provider.yang
rename to pcep/topology-provider/src/main/yang/odl-pcep-topology-provider-cfg.yang
index 7ff4678fd6e9ad21bc9bac0b0142d84c10ba5e4a..d8254fc57c795e4f6eae87873ee3632cbe4aa256 100644 (file)
@@ -1,5 +1,5 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module config-pcep-topology-provider {
+module odl-pcep-topology-provider-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider";
     prefix "p2p";
@@ -9,7 +9,7 @@ module config-pcep-topology-provider {
     import odl-topology-api-cfg { prefix topo; revision-date 2013-11-15; }
     import ietf-inet-types { prefix inet; revision-date 2010-09-24; }
     import network-topology { prefix nt; revision-date 2013-10-21; }
-    import pcep { prefix pcep; revision-date 2013-04-09; }
+    import odl-pcep-api-cfg { prefix pcep; revision-date 2013-04-09; }
     import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
     import odl-tcpmd5-cfg { prefix tcpmd5; revision-date 2014-04-27; }
 
index 7062a74a16bdc166cefd4da404c1f5b59f876f15..80f6e4f82f3a6bda2cfcc96b25f59a44ec7f82c8 100644 (file)
         <maven>3.0.4</maven>
     </prerequisites>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-api-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-tunnel-provider</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-topology-provider-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>topology-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>programming-spi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-config</artifactId>
-        </dependency>
-        <!--test dependencies -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-manager</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>mockito-configuration</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal-binding-broker-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-timer-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-impl-config</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>netty-threadgroup-config</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>programming-impl</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>programming-impl</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-ietf-stateful02</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-topology-provider-config</artifactId>
-            <type>test-jar</type>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>pcep-impl-config</artifactId>
-            <type>test-jar</type>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
index 0aa9292abe5c2ce8b534926ef44b08bbed6f23eb..8f9e88f0134d505eeeeae11e6fa139f954d425b7 100644 (file)
             <artifactId>ietf-topology-l3-unicast-igp</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-topology-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmd5-netty</artifactId>
+        </dependency>
+
         <!-- Testing dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-manager</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>config-util</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>mockito-configuration</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-timer-config</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-threadgroup-config</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>programming-impl</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>programming-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-ietf-stateful02</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-topology-provider</artifactId>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>pcep-impl</artifactId>
+            <type>test-jar</type>
+        </dependency>
     </dependencies>
 
     <build>
                    </instructions>
                </configuration>
            </plugin>
+           <plugin>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
similarity index 96%
rename from pcep/tunnel-provider-config/src/main/yang/config-pcep-tunnel-provider.yang
rename to pcep/tunnel-provider/src/main/yang/odl-pcep-tunnel-provider-cfg.yang
index dd01c3ca34d4563c8f172c671f07caef36e204ed..3e050bbeb1c3a956ba5cc2626df1ea4ed9362806 100644 (file)
@@ -1,12 +1,12 @@
 // vi: set smarttab et sw=4 tabstop=4:
-module config-pcep-tunnel-provider {
+module odl-pcep-tunnel-provider-cfg {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:pcep:tunnel:provider";
     prefix "tun";
 
     import config { prefix config; revision-date 2013-04-05; }
     import odl-programming-spi-cfg { prefix pgmspi; revision-date 2013-11-15; }
-    import config-pcep-topology-provider { prefix pceptopo; revision-date 2013-11-15; }
+    import odl-pcep-topology-provider-cfg { prefix pceptopo; revision-date 2013-11-15; }
     import odl-topology-api-cfg { prefix topo; revision-date 2013-11-15; }
     import ietf-inet-types { prefix inet; revision-date 2010-09-24; }
     import network-topology { prefix nt; revision-date 2013-10-21; }