Activate modules by default, but do not use them

Change-Id: I29d4ca38cd0d6fb7dd9e9bc72205c872d9a8992d
Signed-off-by: Robert Varga <rovarga@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 040a348fe093f64524b97ab3d8dc42304a5cf3bc..c6784080819906bb0a5f940dfec0ea0d85f94604 100644 (file)
--- a/pcep/controller-config/src/main/resources/initial/32-pcep.xml
+++ b/pcep/controller-config/src/main/resources/initial/32-pcep.xml
@@ -28,7 +28,12 @@
                         <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
                         <name>pcep-parser-base</name>
                     </extension>
-                    <!-- Only one pair of stateful & initiated parsers can be loaded at a time -->
+
+                    <!--
+                         Only one pair of stateful & initiated parsers can be loaded at a time
+                         -->
+
+                    <!-- This block is draft-ietf-pce-stateful-pce-07 + draft-ietf-pce-inititated-pce-00 -->
                     <extension>
                         <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
                         <name>pcep-parser-ietf-stateful07</name>
@@ -37,6 +42,9 @@
                         <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
                         <name>pcep-parser-ietf-initiated00</name>
                     </extension>
+
+
+                    <!-- This block is draft-ietf-pce-stateful-pce-02 + draft-crabbe-pce-inititated-pce-00 -->
                     <!--extension>
                         <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
                         <name>pcep-parser-ietf-stateful02</name>
@@ -50,7 +58,6 @@
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-base</type>
                     <name>pcep-parser-base</name>
                 </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>
@@ -59,14 +66,14 @@
                     <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>
+                <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>
                 <module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-session-proposal-factory-impl</type>
                     <name>global-pcep-session-proposal-factory</name>
@@ -132,7 +139,6 @@
                         <name>pcep-parser-base</name>
                         <provider>/config/modules/module[name='pcep-parser-base']/instance[name='pcep-parser-base']</provider>
                     </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>
@@ -141,14 +147,14 @@
                         <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-->
+                    </instance>
                 </service>
                 <service>
                     <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>