From: Robert Varga <rovarga@cisco.com>
Date: Sun, 8 Dec 2013 17:38:45 +0000 (+0100)
Subject: Update configuration files to match current expectations
X-Git-Tag: release/lithium-sr2~220
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=89d583aa9cdbf7b8072ac187840e0fd3f7a990bb;hp=11c9b3da3c532eefc719e1a5083cad3daa322360;p=integration%2Fdistribution.git

Update configuration files to match current expectations

Change-Id: I1e04ee2974be832b04849e2a712d636b1dccb9cf
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 2f38e8e1..6160a3fb 100644
--- a/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf
+++ b/distributions/serviceprovider/src/main/resources/opendaylight/configuration/initial/30-programming.conf
@@ -8,11 +8,11 @@
 		</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-rpc-broker</name>
+			<name>ref_binding-broker-impl</name>
 		</rpc-registry>
 		<timer>
 			<type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-timer</type>
-			<name>global-timer</name>
+			<name>ref_global-timer</name>
 		</timer>
         </module>
 //SERVICES START
@@ -20,7 +20,7 @@
                 <type xmlns:pgmspi="urn:opendaylight:params:xml:ns:yang:controller:programming:spi">pgmspi:instruction-scheduler</type>
                 <instance>
                         <name>global-instruction-scheduler</name>
-                        <provider>/config/modules/module[name='instruction-scheduler-impl']/instance[name='global-instruction-scheduler']</provider>
+                        <provider>/modules/module[type='instruction-scheduler-impl'][name='global-instruction-scheduler']</provider>
                 </instance>
         </service>
 //CAPABILITIES 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 5043c835..f435ec8b 100644
--- 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,15 +36,15 @@
 		</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>
+			<name>ref_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>
+			<name>ref_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>
+			<name>ref_global-timer</name>
 		</timer>
 	</module>
 	<module>
@@ -60,11 +60,11 @@
 		</dispatcher>
 		<rpc-registry>
 			<type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
-			<name>ref_binding-rpc-broker</name>
+			<name>ref_binding-broker-impl</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>
+                        <name>ref_global-instruction-scheduler</name>
 		</scheduler>
 		<topology-id>pcep-topology</topology-id>
 		<listen-address>0.0.0.0</listen-address>
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 66b5c282..f31321a5 100644
--- 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>global-bgp-dispatcher</name>
+			<name>ref_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>global-event-executor</name>
+			<name>ref_global-event-executor</name>
 		</executor>
 	</module>
 	<module>
@@ -39,7 +39,7 @@
 		</bgp>
 		<extensions>
                         <type xmlns:ribspi="urn:opendaylight:params:xml:ns:yang:controller:bgp:rib:spi">ribspi:extensions</type>
-                        <name>global-rib-extensions</name>
+                        <name>ref_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>