Created stateful and initiated 02 configuration files and make them default.

Change-Id: I12923a279e5601599c7ccf90a0368b2b9e26d26b
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/pcep/controller-config/src/main/resources/initial/32-pcep.xml b/pcep/controller-config/src/main/resources/initial/32-pcep.xml
index 7db50724033e8b09c395074e0042621916ba5f17..9c2b3572e36a413d4d23344071f14d99163773e7 100644 (file)
--- a/pcep/controller-config/src/main/resources/initial/32-pcep.xml
+++ b/pcep/controller-config/src/main/resources/initial/32-pcep.xml
@@ -21,26 +21,44 @@
                                                <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
                                                <name>pcep-parser-base</name>
                                        </extension>
-                                       <extension>
+                    <!-- Only one pair of stateful & initiated parsers can be loaded at a time -->
+                                       <!--extension>
                                                <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
                                                <name>pcep-parser-ietf-stateful07</name>
                                        </extension>
                                        <extension>
                                                <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
                                                <name>pcep-parser-ietf-initiated00</name>
+                                       </extension-->
+                                       <extension>
+                                               <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
+                                               <name>pcep-parser-ietf-stateful02</name>
                                        </extension>
-                               </module>
+                                       <extension>
+                                               <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
+                                               <name>pcep-parser-crabbe-initiated00</name>
+                                       </extension>
+                </module>
                                <module>
                                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-base</type>
                                        <name>pcep-parser-base</name>
                                </module>
-                               <module>
+                <!-- Only one pair of stateful & initiated parsers can be loaded at a time -->
+                               <!--module>
                                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-ietf-stateful07</type>
                                        <name>pcep-parser-ietf-stateful07</name>
                                </module>
                                <module>
                                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-ietf-initiated00</type>
                                        <name>pcep-parser-ietf-initiated00</name>
+                               </module-->
+               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-ietf-stateful02</type>
+                                       <name>pcep-parser-ietf-stateful02</name>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-crabbe-initiated00</type>
+                                       <name>pcep-parser-crabbe-initiated00</name>
                                </module>
                                <module>
                                        <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-session-proposal-factory-impl</type>
@@ -107,14 +125,23 @@
                                                <name>pcep-parser-base</name>
                                                <provider>/config/modules/module[name='pcep-parser-base']/instance[name='pcep-parser-base']</provider>
                                        </instance>
-                                       <instance>
+                     <!-- Only one pair of stateful & initiated parsers can be loaded at a time -->
+                                       <!--instance>
                                                <name>pcep-parser-ietf-initiated00</name>
                                                <provider>/config/modules/module[name='pcep-parser-ietf-initiated00']/instance[name='pcep-parser-ietf-initiated00']</provider>
                                        </instance>
                                        <instance>
                                                <name>pcep-parser-ietf-stateful07</name>
                                                <provider>/config/modules/module[name='pcep-parser-ietf-stateful07']/instance[name='pcep-parser-ietf-stateful07']</provider>
-                                       </instance>
+                                       </instance-->
+                    <instance>
+                        <name>pcep-parser-crabbe-initiated00</name>
+                        <provider>/config/modules/module[name='pcep-parser-crabbe-initiated00']/instance[name='pcep-parser-crabbe-initiated00']</provider>
+                    </instance>
+                    <instance>
+                        <name>pcep-parser-ietf-stateful02</name>
+                        <provider>/config/modules/module[name='pcep-parser-ietf-stateful02']/instance[name='pcep-parser-ietf-stateful02']</provider>
+                    </instance>
                                </service>
                                <service>
                                        <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModule.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModule.java
new file mode 100644 (file)
index 0000000..148ea34
--- /dev/null
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModule.java
@@ -0,0 +1,36 @@
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-crabbe-initiated00
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Jan 22 15:11:39 CET 2014
+ *
+ * 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.crabbe.initiated00.InitiatedActivator;
+
+/**
+*
+*/
+public final class CrabbeInitiated00PCEPParserModule extends
+               org.opendaylight.controller.config.yang.pcep.impl.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/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModuleFactory.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModuleFactory.java
new file mode 100644 (file)
index 0000000..6417679
--- /dev/null
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/CrabbeInitiated00PCEPParserModuleFactory.java
@@ -0,0 +1,19 @@
+/**
+* Generated file
+
+* Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-crabbe-initiated00
+* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+* Generated at: Wed Jan 22 15:11:39 CET 2014
+*
+* Do not modify this file unless it is present under src/main directory
+*/
+package org.opendaylight.controller.config.yang.pcep.impl;
+
+/**
+*
+*/
+public class CrabbeInitiated00PCEPParserModuleFactory extends org.opendaylight.controller.config.yang.pcep.impl.AbstractCrabbeInitiated00PCEPParserModuleFactory
+{
+
+
+}

diff --git a/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModule.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModule.java
new file mode 100644 (file)
index 0000000..62f0013
--- /dev/null
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModule.java
@@ -0,0 +1,36 @@
+/**
+ * Generated file
+
+ * Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-stateful02
+ * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+ * Generated at: Wed Jan 22 15:11:39 CET 2014
+ *
+ * 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.ietf.stateful02.StatefulActivator;
+
+/**
+*
+*/
+public final class IetfStateful02PCEPParserModule extends
+               org.opendaylight.controller.config.yang.pcep.impl.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/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModuleFactory.java b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModuleFactory.java
new file mode 100644 (file)
index 0000000..d80b2b5
--- /dev/null
+++ b/pcep/impl-config/src/main/java/org/opendaylight/controller/config/yang/pcep/impl/IetfStateful02PCEPParserModuleFactory.java
@@ -0,0 +1,19 @@
+/**
+* Generated file
+
+* Generated from: yang module name: odl-pcep-impl-cfg  yang module local name: pcep-parser-ietf-stateful02
+* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+* Generated at: Wed Jan 22 15:11:39 CET 2014
+*
+* Do not modify this file unless it is present under src/main directory
+*/
+package org.opendaylight.controller.config.yang.pcep.impl;
+
+/**
+*
+*/
+public class IetfStateful02PCEPParserModuleFactory extends org.opendaylight.controller.config.yang.pcep.impl.AbstractIetfStateful02PCEPParserModuleFactory
+{
+
+
+}

diff --git a/pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang b/pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang
index 489842019eb65ced90d72f73ecbc5b997d7eb51f..b0d74b766ca2a1fd64bafc303dd990a02f72314f 100644 (file)
--- a/pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang
+++ b/pcep/impl-config/src/main/yang/odl-pcep-impl-cfg.yang
@@ -49,7 +49,7 @@ module odl-pcep-impl-cfg {
     identity pcep-parser-ietf-stateful07 {
         base config:module-type;
         config:provided-service spi:extension;
-        config:java-name-prefix IetfStateful07PCEPParser;
+       config:java-name-prefix IetfStateful07PCEPParser;
     }
 
     augment "/config:modules/config:module/config:configuration" {
@@ -67,6 +67,30 @@ module odl-pcep-impl-cfg {
     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'";
         }
     }
 

diff --git a/pcep/impl/pom.xml b/pcep/impl/pom.xml
index 366f35f8000a10cdb994b178829e09caabe98879..cd9bacd6288eabfa7957999f4360184b79e697a9 100644 (file)
--- a/pcep/impl/pom.xml
+++ b/pcep/impl/pom.xml
@@ -37,6 +37,10 @@
             <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>