Transform initial config files to xml format

Change-Id: I33401ad6065bdf18ad65ed4c2e22a6d05ca39822
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>

diff --git a/bgp/controller-config/src/main/resources/initial/31-bgp.conf b/bgp/controller-config/src/main/resources/initial/31-bgp.conf
deleted file mode 100644 (file)
index 0bcab15..0000000
--- a/bgp/controller-config/src/main/resources/initial/31-bgp.conf
+++ /dev/null
@@ -1,103 +0,0 @@
-//MODULES START
-        <module>
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">prefix:bgp-extensions-impl</type>
-                <name>global-bgp-extensions</name>
-               <extension>
-                        <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extension</type>
-                        <name>base-bgp-parser</name>
-               </extension>
-               <extension>
-                        <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extension</type>
-                        <name>bgp-linkstate</name>
-               </extension>
-        </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:base-bgp-parser</type>
-               <name>base-bgp-parser</name>
-       </module>
-        <module>
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">prefix:bgp-rib-extensions-impl</type>
-                <name>global-rib-extensions</name>
-               <extension>
-                       <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extension</type>
-                       <name>base-bgp-rib</name>
-               </extension>
-               <extension>
-                       <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extension</type>
-                       <name>bgp-linkstate</name>
-               </extension>
-        </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:base-bgp-rib</type>
-               <name>base-bgp-rib</name>
-       </module>
-        <module>
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:linkstate">prefix:bgp-linkstate</type>
-                <name>bgp-linkstate</name>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher-impl</type>
-               <name>global-bgp-dispatcher</name>
-               <bgp-extensions>
-                        <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
-                        <name>global-bgp-extensions</name>
-               </bgp-extensions>
-               <boss-group>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
-                       <name>global-boss-group</name>
-               </boss-group>
-               <worker-group>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
-                       <name>global-worker-group</name>
-               </worker-group>
-       </module>
-//SERVICES START
-        <service>
-                <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
-                <instance>
-                        <name>global-bgp-extensions</name>
-                        <provider>/modules/module[type='bgp-extensions-impl'][name='global-bgp-extensions']</provider>
-                </instance>
-        </service>
-        <service>
-                <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extension</type>
-                <instance>
-                        <name>base-bgp-parser</name>
-                        <provider>/modules/module[type='base-bgp-parser'][name='base-bgp-parser']</provider>
-               </instance>
-               <instance>
-                        <name>bgp-linkstate</name>
-                        <provider>/modules/module[type='bgp-linkstate'][name='bgp-linkstate']</provider>
-                </instance>
-        </service>
-        <service>
-               <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extension</type>
-                <instance>
-                        <name>base-bgp-rib</name>
-                        <provider>/modules/module[type='base-bgp-rib'][name='base-bgp-rib']</provider>
-               </instance>
-               <instance>
-                        <name>bgp-linkstate</name>
-                        <provider>/modules/module[type='bgp-linkstate'][name='bgp-linkstate']</provider>
-                </instance>
-       </service>
-        <service>
-                <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
-                <instance>
-                        <name>global-rib-extensions</name>
-                        <provider>/modules/module[type='bgp-rib-extensions-impl'][name='global-rib-extensions']</provider>
-                </instance>
-        </service>
-       <service>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher</type>
-               <instance>
-                       <name>global-bgp-dispatcher</name>
-                        <provider>/modules/module[type='bgp-dispatcher-impl'][name='global-bgp-dispatcher']</provider>
-               </instance>
-       </service>
-//CAPABILITIES START
-urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi?module=config-bgp-parser-spi&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=config-bgp-rib-spi&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=bgp-rib-impl&revision=2013-04-09
-urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28
-urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19

diff --git a/bgp/controller-config/src/main/resources/initial/31-bgp.xml b/bgp/controller-config/src/main/resources/initial/31-bgp.xml
new file mode 100644 (file)
index 0000000..31adf4c
--- /dev/null
+++ b/bgp/controller-config/src/main/resources/initial/31-bgp.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<snapshot>
+       <required-capabilities>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi?module=config-bgp-parser-spi&amp;revision=2013-11-15</capability>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=config-bgp-rib-spi&amp;revision=2013-11-15</capability>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=bgp-rib-impl&amp;revision=2013-04-09</capability>
+               <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>
+       </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>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">prefix:bgp-extensions-impl</type>
+                                       <name>global-bgp-extensions</name>
+                                       <extension>
+                                               <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extension</type>
+                                               <name>base-bgp-parser</name>
+                                       </extension>
+                                       <extension>
+                                               <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extension</type>
+                                               <name>bgp-linkstate</name>
+                                       </extension>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:base-bgp-parser</type>
+                                       <name>base-bgp-parser</name>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">prefix:bgp-rib-extensions-impl</type>
+                                       <name>global-rib-extensions</name>
+                                       <extension>
+                                               <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extension</type>
+                                               <name>base-bgp-rib</name>
+                                       </extension>
+                                       <extension>
+                                               <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extension</type>
+                                               <name>bgp-linkstate</name>
+                                       </extension>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:base-bgp-rib</type>
+                                       <name>base-bgp-rib</name>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:linkstate">prefix:bgp-linkstate</type>
+                                       <name>bgp-linkstate</name>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher-impl</type>
+                                       <name>global-bgp-dispatcher</name>
+                                       <bgp-extensions>
+                                               <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
+                                               <name>global-bgp-extensions</name>
+                                       </bgp-extensions>
+                                       <boss-group>
+                                               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
+                                               <name>global-boss-group</name>
+                                       </boss-group>
+                                       <worker-group>
+                                               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
+                                               <name>global-worker-group</name>
+                                       </worker-group>
+                               </module>
+                       </modules>
+
+                       <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+                               <service>
+                                       <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extensions</type>
+                                       <instance>
+                                               <name>global-bgp-extensions</name>
+                                               <provider>/modules/module[type='bgp-extensions-impl'][name='global-bgp-extensions']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:bgpspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:parser:spi">bgpspi:extension</type>
+                                       <instance>
+                                               <name>base-bgp-parser</name>
+                                               <provider>/modules/module[type='base-bgp-parser'][name='base-bgp-parser']</provider>
+                                       </instance>
+                                       <instance>
+                                               <name>bgp-linkstate</name>
+                                               <provider>/modules/module[type='bgp-linkstate'][name='bgp-linkstate']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extension</type>
+                                       <instance>
+                                               <name>base-bgp-rib</name>
+                                               <provider>/modules/module[type='base-bgp-rib'][name='base-bgp-rib']</provider>
+                                       </instance>
+                                       <instance>
+                                               <name>bgp-linkstate</name>
+                                               <provider>/modules/module[type='bgp-linkstate'][name='bgp-linkstate']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
+                                       <instance>
+                                               <name>global-rib-extensions</name>
+                                               <provider>/modules/module[type='bgp-rib-extensions-impl'][name='global-rib-extensions']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher</type>
+                                       <instance>
+                                               <name>global-bgp-dispatcher</name>
+                                               <provider>/modules/module[type='bgp-dispatcher-impl'][name='global-bgp-dispatcher']</provider>
+                                       </instance>
+                               </service>
+                       </services>
+               </data>
+
+       </configuration>
+</snapshot>
\ No newline at end of file

diff --git a/bgp/controller-config/src/main/resources/initial/41-bgp-example.conf b/bgp/controller-config/src/main/resources/initial/41-bgp-example.conf
deleted file mode 100644 (file)
index 2d8fab9..0000000
--- a/bgp/controller-config/src/main/resources/initial/41-bgp-example.conf
+++ /dev/null
@@ -1,158 +0,0 @@
-//MODULES START
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-proposal-impl</type>
-               <name>example-bgp-proposal</name>
-               <as-number>64496</as-number>
-               <bgp-id>192.0.2.2</bgp-id>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:timed-reconnect-strategy</type>
-               <name>example-reconnect-strategy</name>
-               <min-sleep>1000</min-sleep>
-               <max-sleep>180000</max-sleep>
-               <sleep-factor>2.00</sleep-factor>
-               <connect-time>5000</connect-time>
-               <executor>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-event-executor</type>
-                       <name>global-event-executor</name>
-               </executor>
-       </module>
-       <!--module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-impl</type>
-               <name>example-bgp-peer</name>
-               <bgp-dispatcher>
-                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher</type>
-                       <name>global-bgp-dispatcher</name>
-               </bgp-dispatcher>
-               <bgp-proposal>
-                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-proposal</type>
-                       <name>example-bgp-proposal</name>
-               </bgp-proposal>
-               <host>route-reflector.example.org</host>
-       </module-->
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:rib-impl</type>
-               <name>example-bgp-rib</name>
-               <rib-id>example-bgp-rib</rib-id>
-               <local-as>64496</local-as>
-               <bgp-id>192.0.2.2</bgp-id>
-               <!--bgp>
-                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:listener">prefix:listener</type>
-                       <name>example-bgp-peer</name>
-               </bgp-->
-               <extensions>
-                        <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
-                        <name>global-rib-extensions</name>
-               </extensions>
-               <data-provider>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
-                       <name>binding-data-broker</name>
-               </data-provider>
-               <session-reconnect-strategy>
-                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:reconnect-strategy</type>
-                       <name>example-reconnect-strategy</name>
-               </session-reconnect-strategy>
-               <tcp-reconnect-strategy>
-                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:reconnect-strategy</type>
-                       <name>example-reconnect-strategy</name>
-               </tcp-reconnect-strategy>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider">prefix:bgp-reachability-ipv4</type>
-               <name>example-ipv4-topology</name>
-               <data-provider>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
-                       <name>binding-data-broker</name>
-               </data-provider>
-               <local-rib>
-                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
-                       <name>example-bgp-rib</name>
-               </local-rib>
-               <topology-id>example-ipv4-topology</topology-id>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider">prefix:bgp-reachability-ipv4</type>
-               <name>example-ipv6-topology</name>
-               <data-provider>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
-                       <name>binding-data-broker</name>
-               </data-provider>
-               <local-rib>
-                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
-                       <name>example-bgp-rib</name>
-               </local-rib>
-               <topology-id>example-ipv6-topology</topology-id>
-       </module>
-       <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider">prefix:bgp-linkstate-topology</type>
-               <name>example-linkstate-topology</name>
-               <data-provider>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
-                       <name>binding-data-broker</name>
-               </data-provider>
-               <local-rib>
-                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
-                       <name>example-bgp-rib</name>
-               </local-rib>
-               <topology-id>example-linkstate-topology</topology-id>
-       </module>
-//SERVICES START
-       <service>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-proposal</type>
-               <instance>
-                       <name>example-bgp-proposal</name>
-                        <provider>/config/modules/module[name='bgp-proposal-impl']/instance[name='example-bgp-proposal']</provider>
-               </instance>
-       </service>
-       <!--service>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:listener">prefix:listener</type>
-               <instance>
-                       <name>example-bgp-peer</name>
-                        <provider>/config/modules/module[name='bgp-impl']/instance[name='example-bgp-peer']</provider>
-               </instance>
-       </service-->
-       <service>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:reconnect-strategy</type>
-               <instance>
-                       <name>example-reconnect-strategy</name>
-                       <provider>/config/modules/module[name='timed-reconnect-strategy']/instance[name='example-reconnect-strategy']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:topology">prefix:topology-reference</type>
-               <instance>
-                       <name>example-ipv4-topology</name>
-                       <provider>/config/modules/module[name='bgp-reachability-ipv4']/instance[name='example-ipv4-topology']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
-               <instance>
-                       <name>example-bgp-rib</name>
-                       <provider>/config/modules/module[name='rib-impl']/instance[name='example-bgp-rib']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:topology">prefix:topology-reference</type>
-               <instance>
-                       <name>example-ipv6-topology</name>
-                       <provider>/config/modules/module[name='bgp-reachability-ipv6']/instance[name='example-ipv6-topology']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:topology">prefix:topology-reference</type>
-               <instance>
-                       <name>example-linkstate-topology</name>
-                       <provider>/config/modules/module[name='bgp-linkstate-topology']/instance[name='example-linkstate-topology']</provider>
-               </instance>
-       </service>
-//CAPABILITIES START
-urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg?module=config-bgp-rib&revision=2013-07-01
-urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=config-bgp-rib-spi&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=bgp-rib-impl&revision=2013-04-09
-urn:opendaylight:params:xml:ns:yang:controller:bgp:listener?module=bgp-listener&revision=2013-04-09
-urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider?module=config-bgp-topology-provider&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28
-urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19
-urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy?module=reconnect-strategy&revision=2013-11-09
-urn:opendaylight:params:xml:ns:yang:controller:topology?module=config-topology-api&revision=2013-11-15

diff --git a/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml b/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml
new file mode 100644 (file)
index 0000000..cac6d9f
--- /dev/null
+++ b/bgp/controller-config/src/main/resources/initial/41-bgp-example.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<snapshot>
+       <required-capabilities>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg?module=config-bgp-rib&amp;revision=2013-07-01</capability>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi?module=config-bgp-rib-spi&amp;revision=2013-11-15</capability>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl?module=bgp-rib-impl&amp;revision=2013-04-09</capability>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:listener?module=bgp-listener&amp;revision=2013-04-09</capability>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider?module=config-bgp-topology-provider&amp;revision=2013-11-15</capability>
+               <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:reconnectstrategy?module=reconnect-strategy&amp;revision=2013-11-09</capability>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:topology?module=config-topology-api&amp;revision=2013-11-15</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>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-proposal-impl</type>
+                                       <name>example-bgp-proposal</name>
+                                       <as-number>64496</as-number>
+                                       <bgp-id>192.0.2.2</bgp-id>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:timed-reconnect-strategy</type>
+                                       <name>example-reconnect-strategy</name>
+                                       <min-sleep>1000</min-sleep>
+                                       <max-sleep>180000</max-sleep>
+                                       <sleep-factor>2.00</sleep-factor>
+                                       <connect-time>5000</connect-time>
+                                       <executor>
+                                               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-event-executor</type>
+                                               <name>global-event-executor</name>
+                                       </executor>
+                               </module>
+                               <!--module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-impl</type>
+                                       <name>example-bgp-peer</name>
+                                       <bgp-dispatcher>
+                                               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-dispatcher</type>
+                                               <name>global-bgp-dispatcher</name>
+                                       </bgp-dispatcher>
+                                       <bgp-proposal>
+                                               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-proposal</type>
+                                               <name>example-bgp-proposal</name>
+                                       </bgp-proposal>
+                                       <host>route-reflector.example.org</host>
+                               </module-->
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:rib-impl</type>
+                                       <name>example-bgp-rib</name>
+                                       <rib-id>example-bgp-rib</rib-id>
+                                       <local-as>64496</local-as>
+                                       <bgp-id>192.0.2.2</bgp-id>
+                                       <!--bgp>
+                                               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:listener">prefix:listener</type>
+                                               <name>example-bgp-peer</name>
+                                       </bgp-->
+                                       <extensions>
+                                               <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
+                                               <name>global-rib-extensions</name>
+                                       </extensions>
+                                       <data-provider>
+                                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                                               <name>binding-data-broker</name>
+                                       </data-provider>
+                                       <session-reconnect-strategy>
+                                               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:reconnect-strategy</type>
+                                               <name>example-reconnect-strategy</name>
+                                       </session-reconnect-strategy>
+                                       <tcp-reconnect-strategy>
+                                               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:reconnect-strategy</type>
+                                               <name>example-reconnect-strategy</name>
+                                       </tcp-reconnect-strategy>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider">prefix:bgp-reachability-ipv4</type>
+                                       <name>example-ipv4-topology</name>
+                                       <data-provider>
+                                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                                               <name>binding-data-broker</name>
+                                       </data-provider>
+                                       <local-rib>
+                                               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
+                                               <name>example-bgp-rib</name>
+                                       </local-rib>
+                                       <topology-id>example-ipv4-topology</topology-id>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider">prefix:bgp-reachability-ipv4</type>
+                                       <name>example-ipv6-topology</name>
+                                       <data-provider>
+                                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                                               <name>binding-data-broker</name>
+                                       </data-provider>
+                                       <local-rib>
+                                               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
+                                               <name>example-bgp-rib</name>
+                                       </local-rib>
+                                       <topology-id>example-ipv6-topology</topology-id>
+                               </module>
+                               <module>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:topology:provider">prefix:bgp-linkstate-topology</type>
+                                       <name>example-linkstate-topology</name>
+                                       <data-provider>
+                                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                                               <name>binding-data-broker</name>
+                                       </data-provider>
+                                       <local-rib>
+                                               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
+                                               <name>example-bgp-rib</name>
+                                       </local-rib>
+                                       <topology-id>example-linkstate-topology</topology-id>
+                               </module>
+                       </modules>
+
+                       <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+                               <service>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:impl">prefix:bgp-proposal</type>
+                                       <instance>
+                                               <name>example-bgp-proposal</name>
+                                               <provider>/config/modules/module[name='bgp-proposal-impl']/instance[name='example-bgp-proposal']</provider>
+                                       </instance>
+                               </service>
+                               <!--service>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:listener">prefix:listener</type>
+                                       <instance>
+                                               <name>example-bgp-peer</name>
+                                                                       <provider>/config/modules/module[name='bgp-impl']/instance[name='example-bgp-peer']</provider>
+                                       </instance>
+                               </service-->
+                               <service>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:reconnectstrategy">prefix:reconnect-strategy</type>
+                                       <instance>
+                                               <name>example-reconnect-strategy</name>
+                                               <provider>/config/modules/module[name='timed-reconnect-strategy']/instance[name='example-reconnect-strategy']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:topology">prefix:topology-reference</type>
+                                       <instance>
+                                               <name>example-ipv4-topology</name>
+                                               <provider>/config/modules/module[name='bgp-reachability-ipv4']/instance[name='example-ipv4-topology']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:cfg">prefix:rib</type>
+                                       <instance>
+                                               <name>example-bgp-rib</name>
+                                               <provider>/config/modules/module[name='rib-impl']/instance[name='example-bgp-rib']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:topology">prefix:topology-reference</type>
+                                       <instance>
+                                               <name>example-ipv6-topology</name>
+                                               <provider>/config/modules/module[name='bgp-reachability-ipv6']/instance[name='example-ipv6-topology']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:topology">prefix:topology-reference</type>
+                                       <instance>
+                                               <name>example-linkstate-topology</name>
+                                               <provider>/config/modules/module[name='bgp-linkstate-topology']/instance[name='example-linkstate-topology']</provider>
+                                       </instance>
+                               </service>
+                       </services>
+               </data>
+
+       </configuration>
+</snapshot>
\ No newline at end of file

diff --git a/pcep/controller-config/src/main/resources/initial/32-pcep.conf b/pcep/controller-config/src/main/resources/initial/32-pcep.conf
deleted file mode 100644 (file)
index 1f78e29..0000000
--- a/pcep/controller-config/src/main/resources/initial/32-pcep.conf
+++ /dev/null
@@ -1,117 +0,0 @@
-//MODULES START
-        <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-crabbe-initiated</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>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-crabbe-initiated</type>
-               <name>pcep-parser-crabbe-initiated</name>
-        </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>
-       </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>
-                       <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extensions</type>
-                       <name>global-pcep-extensions</name>
-               </pcep-extensions>
-               <pcep-session-proposal-factory>
-                       <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
-                       <name>global-pcep-session-proposal-factory</name>
-               </pcep-session-proposal-factory>
-               <boss-group>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
-                       <name>global-boss-group</name>
-               </boss-group>
-               <worker-group>
-                       <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>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">prefix:pcep-topology-provider</type>
-               <name>pcep-topology</name>
-               <data-provider>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
-                       <name>binding-data-broker</name>
-               </data-provider>
-               <dispatcher>
-                       <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-dispatcher</type>
-                       <name>global-pcep-dispatcher</name>
-               </dispatcher>
-               <rpc-registry>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                       <name>binding-rpc-broker</name>
-               </rpc-registry>
-               <scheduler>
-                       <type xmlns:pgmspi="urn:opendaylight:params:xml:ns:yang:controller:programming:spi">pgmspi:instruction-scheduler</type>
-                        <name>global-instruction-scheduler</name>
-               </scheduler>
-               <topology-id>pcep-topology</topology-id>
-       </module>
-//SERVICES START
-        <service>
-                <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extensions</type>
-                <instance>
-                        <name>global-pcep-extensions</name>
-                        <provider>/config/modules/module[name='pcep-extensions-impl']/instance[name='global-pcep-extensions']</provider>
-                </instance>
-        </service>
-        <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-crabbe-initiated</name>
-                        <provider>/config/modules/module[name='pcep-parser-crabbe-initiated']/instance[name='pcep-parser-crabbe-initiated']</provider>
-                </instance>
-        </service>
-       <service>
-               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
-               <instance>
-                       <name>global-pcep-session-proposal-factory</name>
-                       <provider>/config/modules/module[name='pcep-session-proposal-factory-impl']/instance[name='global-pcep-session-proposal-factory']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-dispatcher</type>
-               <instance>
-                       <name>global-pcep-dispatcher</name>
-                       <provider>/config/modules/module[name='pcep-dispatcher-impl']/instance[name='global-pcep-dispatcher']</provider>
-               </instance>
-       </service>
-       <service>
-               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">pcep:pcep-topology-reference</type>
-               <instance>
-                       <name>pcep-topology</name>
-                       <provider>/config/modules/module[name='pcep-topology-provider']/instance[name='pcep-topology']</provider>
-               </instance>
-       </service>
-//CAPABILITIES START
-urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28
-urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19
-urn:opendaylight:params:xml:ns:yang:controller:pcep:impl?module=odl-pcep-impl-cfg&revision=2013-06-27
-urn:opendaylight:params:xml:ns:yang:controller:pcep:spi?module=config-pcep-spi&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider?module=config-pcep-topology-provider&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:programming:spi?module=config-programming-spi&revision=2013-11-15

diff --git a/pcep/controller-config/src/main/resources/initial/32-pcep.xml b/pcep/controller-config/src/main/resources/initial/32-pcep.xml
new file mode 100644 (file)
index 0000000..96ffab7
--- /dev/null
+++ b/pcep/controller-config/src/main/resources/initial/32-pcep.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<snapshot>
+       <required-capabilities>
+               <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:topology:provider?module=config-pcep-topology-provider&amp;revision=2013-11-15</capability>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:programming:spi?module=config-programming-spi&amp;revision=2013-11-15</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>
+                                       <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-crabbe-initiated</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>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:impl">prefix:pcep-parser-crabbe-initiated</type>
+                                       <name>pcep-parser-crabbe-initiated</name>
+                               </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>
+                               </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>
+                                               <type xmlns:pcepspi="urn:opendaylight:params:xml:ns:yang:controller:pcep:spi">pcepspi:extensions</type>
+                                               <name>global-pcep-extensions</name>
+                                       </pcep-extensions>
+                                       <pcep-session-proposal-factory>
+                                               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
+                                               <name>global-pcep-session-proposal-factory</name>
+                                       </pcep-session-proposal-factory>
+                                       <boss-group>
+                                               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
+                                               <name>global-boss-group</name>
+                                       </boss-group>
+                                       <worker-group>
+                                               <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>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">prefix:pcep-topology-provider</type>
+                                       <name>pcep-topology</name>
+                                       <data-provider>
+                                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                                               <name>binding-data-broker</name>
+                                       </data-provider>
+                                       <dispatcher>
+                                               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-dispatcher</type>
+                                               <name>global-pcep-dispatcher</name>
+                                       </dispatcher>
+                                       <rpc-registry>
+                                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
+                                               <name>binding-rpc-broker</name>
+                                       </rpc-registry>
+                                       <scheduler>
+                                               <type xmlns:pgmspi="urn:opendaylight:params:xml:ns:yang:controller:programming:spi">pgmspi:instruction-scheduler</type>
+                                               <name>global-instruction-scheduler</name>
+                                       </scheduler>
+                                       <topology-id>pcep-topology</topology-id>
+                               </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:extensions</type>
+                                       <instance>
+                                               <name>global-pcep-extensions</name>
+                                               <provider>/config/modules/module[name='pcep-extensions-impl']/instance[name='global-pcep-extensions']</provider>
+                                       </instance>
+                               </service>
+                               <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-crabbe-initiated</name>
+                                               <provider>/config/modules/module[name='pcep-parser-crabbe-initiated']/instance[name='pcep-parser-crabbe-initiated']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-session-proposal-factory</type>
+                                       <instance>
+                                               <name>global-pcep-session-proposal-factory</name>
+                                               <provider>/config/modules/module[name='pcep-session-proposal-factory-impl']/instance[name='global-pcep-session-proposal-factory']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-dispatcher</type>
+                                       <instance>
+                                               <name>global-pcep-dispatcher</name>
+                                               <provider>/config/modules/module[name='pcep-dispatcher-impl']/instance[name='global-pcep-dispatcher']</provider>
+                                       </instance>
+                               </service>
+                               <service>
+                                       <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">pcep:pcep-topology-reference</type>
+                                       <instance>
+                                               <name>pcep-topology</name>
+                                               <provider>/config/modules/module[name='pcep-topology-provider']/instance[name='pcep-topology']</provider>
+                                       </instance>
+                               </service>
+                       </services>
+               </data>
+
+       </configuration>
+</snapshot>
\ No newline at end of file

diff --git a/programming/controller-config/src/main/resources/initial/30-programming.conf b/programming/controller-config/src/main/resources/initial/30-programming.conf
deleted file mode 100644 (file)
index 8f46900..0000000
--- a/programming/controller-config/src/main/resources/initial/30-programming.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-//MODULES START
-        <module>
-                <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:programming:impl">prefix:instruction-scheduler-impl</type>
-                <name>global-instruction-scheduler</name>
-               <data-provider>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
-                       <name>binding-data-broker</name>
-               </data-provider>
-               <notification-service>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-notification-service</type>
-                       <name>binding-notification-broker</name>
-               </notification-service>
-               <rpc-registry>
-                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                       <name>binding-rpc-broker</name>
-               </rpc-registry>
-               <timer>
-                       <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
-                       <name>global-timer</name>
-               </timer>
-        </module>
-//SERVICES START
-        <service>
-                <type xmlns:pgmspi="urn:opendaylight:params:xml:ns:yang:controller:programming:spi">pgmspi:instruction-scheduler</type>
-                <instance>
-                        <name>global-instruction-scheduler</name>
-                        <provider>/modules/module[type='instruction-scheduler-impl'][name='global-instruction-scheduler']</provider>
-                </instance>
-        </service>
-//CAPABILITIES START
-urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28
-urn:opendaylight:params:xml:ns:yang:controller:netty?module=netty&revision=2013-11-19
-urn:opendaylight:params:xml:ns:yang:controller:programming:impl?module=config-programming-impl&revision=2013-11-15
-urn:opendaylight:params:xml:ns:yang:controller:programming:spi?module=config-programming-spi&revision=2013-11-15

diff --git a/programming/controller-config/src/main/resources/initial/30-programming.xml b/programming/controller-config/src/main/resources/initial/30-programming.xml
new file mode 100644 (file)
index 0000000..377af92
--- /dev/null
+++ b/programming/controller-config/src/main/resources/initial/30-programming.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<snapshot>
+       <required-capabilities>
+               <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:programming:impl?module=config-programming-impl&amp;revision=2013-11-15</capability>
+               <capability>urn:opendaylight:params:xml:ns:yang:controller:programming:spi?module=config-programming-spi&amp;revision=2013-11-15</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>
+                                       <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:programming:impl">prefix:instruction-scheduler-impl</type>
+                                       <name>global-instruction-scheduler</name>
+                                       <data-provider>
+                                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
+                                               <name>binding-data-broker</name>
+                                       </data-provider>
+                                       <notification-service>
+                                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-notification-service</type>
+                                               <name>binding-notification-broker</name>
+                                       </notification-service>
+                                       <rpc-registry>
+                                               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
+                                               <name>binding-rpc-broker</name>
+                                       </rpc-registry>
+                                       <timer>
+                                               <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
+                                               <name>global-timer</name>
+                                       </timer>
+                               </module>
+                       </modules>
+
+                       <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+                               <service>
+                                       <type xmlns:pgmspi="urn:opendaylight:params:xml:ns:yang:controller:programming:spi">pgmspi:instruction-scheduler</type>
+                                       <instance>
+                                               <name>global-instruction-scheduler</name>
+                                               <provider>/modules/module[type='instruction-scheduler-impl'][name='global-instruction-scheduler']</provider>
+                                       </instance>
+                               </service>
+                       </services>
+               </data>
+
+       </configuration>
+</snapshot>
\ No newline at end of file