Fixup configuration to match base controller

Change-Id: I0a08a51a3cd59dc0beebecd2f0ddf21c91a3aea1
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf
index 6160a3fb79ad4a97d45da8ec06915044e7d4deb7..8ca07b776f3d4e71009316adc36f95480478edcd 100644 (file)
--- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf
+++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf
@@ -4,15 +4,15 @@
                 <name>global-instruction-scheduler</name>
                <notification-service>
                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-notification-service</type>
-                       <name>ref_binding-notification-broker</name>
+                       <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>ref_binding-broker-impl</name>
+                       <name>binding-rpc-broker</name>
                </rpc-registry>
                <timer>
                        <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
-                       <name>ref_global-timer</name>
+                       <name>global-timer</name>
                </timer>
         </module>
 //SERVICES START

diff --git a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf
index c48e10e60f3504f2138aa4de04504747e6bb024a..0bcab15e3c0270659bf8625e2a0e8fed9726d19d 100644 (file)
--- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf
+++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/31-bgp.conf
@@ -44,11 +44,11 @@
                </bgp-extensions>
                <boss-group>
                        <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
-                       <name>ref_global-boss-group</name>
+                       <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>ref_global-worker-group</name>
+                       <name>global-worker-group</name>
                </worker-group>
        </module>
 //SERVICES START

diff --git a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf
index f435ec8b40b1308c88137da76b1dc68e30394be1..1f78e290d3ef9e38d000f13fa28843a61c1a5bca 100644 (file)
--- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf
+++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/32-pcep.conf
@@ -36,23 +36,23 @@
                </pcep-session-proposal-factory>
                <boss-group>
                        <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-threadgroup</type>
-                       <name>ref_global-boss-group</name>
+                       <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>ref_global-worker-group</name>
+                       <name>global-worker-group</name>
                </worker-group>
                <timer>
                        <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
-                       <name>ref_global-timer</name>
+                       <name>global-timer</name>
                </timer>
        </module>
        <module>
-               <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">prefix:pcep-topology-impl</type>
+               <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>ref_binding-data-broker</name>
+                       <name>binding-data-broker</name>
                </data-provider>
                <dispatcher>
                        <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep">pcep:pcep-dispatcher</type>
@@ -60,15 +60,13 @@
                </dispatcher>
                <rpc-registry>
                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-                       <name>ref_binding-broker-impl</name>
+                       <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>ref_global-instruction-scheduler</name>
+                        <name>global-instruction-scheduler</name>
                </scheduler>
                <topology-id>pcep-topology</topology-id>
-               <listen-address>0.0.0.0</listen-address>
-               <listen-port>4189</listen-port>
        </module>
 //SERVICES START
         <service>
@@ -104,7 +102,7 @@
                </instance>
        </service>
        <service>
-               <type xmlns:pcep="urn:opendaylight:params:xml:ns:yang:controller:pcep:topology:provider">pcep:pcep-topology</type>
+               <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>

diff --git a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf
index f31321a5591bf7c5987188f3632a3c01cab2b200..7f3fb0acb81dac380e9ba3229fc3c74e932ab509 100644 (file)
--- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf
+++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/41-bgp-example.conf
@@ -10,7 +10,7 @@
                <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>ref_global-bgp-dispatcher</name>
+                       <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>
@@ -27,7 +27,7 @@
                <connect-time>5000</connect-time>
                <executor>
                        <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-event-executor</type>
-                       <name>ref_global-event-executor</name>
+                       <name>global-event-executor</name>
                </executor>
        </module>
        <module>
@@ -39,11 +39,11 @@
                </bgp>
                <extensions>
                         <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
-                        <name>ref_global-rib-extensions</name>
+                        <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>ref_binding-data-broker</name>
+                       <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>
@@ -59,7 +59,7 @@
                <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>ref_binding-data-broker</name>
+                       <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>
@@ -72,7 +72,7 @@
                <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>ref_binding-data-broker</name>
+                       <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>
@@ -85,7 +85,7 @@
                <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>ref_binding-data-broker</name>
+                       <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>