Fixed and moved pcep-segment-routing initial configuration

-configuration is "disabled" (commented out) as we want to preserve stateful07 extension to be configured initially

Change-Id: I4aed882a6c8620939d3a7806c2d19b55802f16cf
Signed-off-by: Milos Fabian <milfabia@cisco.com>

diff --git a/pcep/segment-routing/src/test/resources/35-pcep-segment-routing-example.xml b/pcep/controller-config/src/main/resources/initial/33-pcep-segment-routing.xml
similarity index 52%
rename from pcep/segment-routing/src/test/resources/35-pcep-segment-routing-example.xml
rename to pcep/controller-config/src/main/resources/initial/33-pcep-segment-routing.xml
index 2c854621cb20c94d1b01e96b77e91b3e59b58643..54899efc78daa9733f96cf2591ec237188483749 100644 (file)
--- a/pcep/segment-routing/src/test/resources/35-pcep-segment-routing-example.xml
+++ b/pcep/controller-config/src/main/resources/initial/33-pcep-segment-routing.xml
@@ -1,53 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <snapshot>
     <required-capabilities>
-        <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:sr02:cfg&amp;revision=2014-06-09</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=odl-pcep-spi-cfg&amp;revision=2013-11-15</capability>
+       <capability>urn:opendaylight:params:xml:ns:yang:controller:pcep:sr02:cfg?module=odl-pcep-segment-routing02-cfg&amp;revision=2014-06-09</capability>
     </required-capabilities>
     <configuration>
         <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
             <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
-                <module>
+                <!--<module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">prefix:pcep-extensions-impl</type>
                     <name>global-pcep-extensions</name>
-                    <extension>
-                        <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
-                        <name>pcep-parser-base</name>
-                    </extension>
                     <extension>
                         <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
                         <name>pcep-parser-segment-routing02</name>
                     </extension>
-                    <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>
-                </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> -->
                 <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:fcid">prefix:pcep-parser-segment-routing02</type>
+                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:sr02:cfg">prefix:pcep-parser-segment-routing02</type>
                     <name>pcep-parser-segment-routing02</name>
                 </module>
-                <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:sr02:cfg">prefix:pcep-session-proposal-factory-sr02</type>
-                    <name>segment-routing-prop</name>
+                    <name>pcep-session-proposal-factory-sr02</name>
                 </module>
-                <module>
+                <!--<module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-dispatcher-impl</type>
                     <name>global-pcep-dispatcher</name>
                     <pcep-extensions>
@@ -56,7 +34,7 @@
                     </pcep-extensions>
                     <pcep-session-proposal-factory>
                         <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
-                        <name>segment-routing-prop</name>
+                        <name>pcep-session-proposal-factory-sr02</name>
                     </pcep-session-proposal-factory>
                     <boss-group>
                         <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
@@ -66,37 +44,21 @@
                         <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
                         <name>global-worker-group</name>
                     </worker-group>
-                    <timer>
-                        <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
-                        <name>global-timer</name>
-                    </timer>
-                </module>
+                </module> -->
             </modules>
             <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
                 <service>
                     <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extension</type>
-                    <instance>
-                        <name>pcep-parser-base</name>
-                        <provider>/config/modules/module[name='pcep-parser-base']/instance[name='pcep-parser-base']</provider>
-                    </instance>
                     <instance>
                         <name>pcep-parser-segment-routing02</name>
                         <provider>/config/modules/module[name='pcep-parser-segment-routing02']/instance[name='pcep-parser-segment-routing02']</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>
-                        <name>pcep-parser-ietf-initiated00</name>
-                        <provider>/config/modules/module[name='pcep-parser-ietf-initiated00']/instance[name='pcep-parser-ietf-initiated00']</provider>
-                    </instance>
                 </service>
                 <service>
                     <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
                     <instance>
-                        <name>segment-routing-proposal</name>
-                        <provider>/config/modules/module[name='pcep-parser-segment-routing02']/instance[name='segment-routing-prop']</provider>
+                        <name>pcep-session-proposal-factory-sr02</name>
+                        <provider>/config/modules/module[name='pcep-session-proposal-factory-sr02']/instance[name='pcep-session-proposal-factory-sr02']</provider>
                     </instance>
                 </service>
            </services>