Merge "Update base configuration to expose RPC broker service"

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf
index ffee9c6da80b926437c19c4e851f10edae543646..e83fdcc5c885eac73f9d9837e0f5758ea2240499 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/00-netty.conf
@@ -31,7 +31,7 @@
                <type xmlns:netty="urn:opendaylight:params:xml:ns:yang:controller:netty">netty:netty-event-executor</type>
                <instance>
                        <name>global-event-executor</name>
-                       <provider>/config/modules/module[name='netty-global-eventexecutor']/instance[name='global-event-executor']</provider>
+                       <provider>/config/modules/module[name='netty-global-event-executor']/instance[name='global-event-executor']</provider>
                </instance>
        </service>
        <service>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf
index acae8866cee17788f73ed482f3723775f2069ace..07c21261bb4d9fad5d4ecbd002119a07d2f0163b 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.conf
@@ -43,16 +43,16 @@
                        <name>ref_dom-broker</name>
                </dom-broker>
                <mapping-service xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
-               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
-               <name>ref_runtime-mapping-singleton</name>
+                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-dom-mapping-service</type>
+                       <name>ref_runtime-mapping-singleton</name>
                </mapping-service>
        </module>
 //SERVICES START
        <service>
-       <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
+               <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:schema-service</type>
                <instance>
-               <name>ref_yang-schema-service</name>
-               <provider>/config/modules/module[name='schema-service-singleton']/instance[name='yang-schema-service']</provider>
+                       <name>ref_yang-schema-service</name>
+                       <provider>/config/modules/module[name='schema-service-singleton']/instance[name='yang-schema-service']</provider>
                </instance>
        </service>
        <service>
@@ -76,6 +76,13 @@
                        <provider>/config/modules/module[name='binding-broker-impl']/instance[name='binding-broker-impl']</provider>
                </instance>
        </service>
+       <service>
+               <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
+               <instance>
+                       <name>ref_binding-rpc-broker</name>
+                       <provider>/config/modules/module[name='binding-broker-impl']/instance[name='binding-broker-impl']</provider>
+               </instance>
+       </service>
        <service>
                <type xmlns:binding-impl="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding-impl:binding-dom-mapping-service</type>
                <instance>
@@ -93,9 +100,9 @@
        <service>
                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-data-broker</type>
                <instance>
-               <name>ref_binding-data-broker</name>
-               <provider>/config/modules/module[name='binding-data-broker']/instance[name='binding-data-broker']</provider>
-       </instance>
+                       <name>ref_binding-data-broker</name>
+                       <provider>/config/modules/module[name='binding-data-broker']/instance[name='binding-data-broker']</provider>
+               </instance>
        </service>
 //CAPABILITIES START
 urn:opendaylight:l2:types?module=opendaylight-l2-types&revision=2013-08-27