Merge "Bug 116 - Revisit SanityTest"

[controller.git] / opendaylight / distribution / opendaylight / src / main / resources / configuration / initial / 01-md-sal.conf

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 fa33215ea6e9454d5c016e5e2f2fb58474099b55..edee185c172bc32a9169e7832b5bd3605579139f 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
@@ -16,9 +16,9 @@
                <name>dom-broker</name>
                <data-store xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl">
                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-data-store</type>
-            <!-- to switch to the clustered data store, comment out the ref_hash-map-data-store <name> and uncomment the ref_cluster-data-store one -->
-            <name>ref_hash-map-data-store</name>
-            <!-- <name>ref_cluster-data-store</name> -->
+            <!-- to switch to the clustered data store, comment out the hash-map-data-store <name> and uncomment the cluster-data-store one -->
+            <name>hash-map-data-store</name>
+            <!-- <name>cluster-data-store</name> -->
                </data-store>
        </module>
        <module>
@@ -26,11 +26,11 @@
                <name>binding-broker-impl</name>
                <notification-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">binding:binding-notification-service</type>
-                       <name>ref_binding-notification-broker</name>
+                       <name>binding-notification-broker</name>
                </notification-service>
                <data-broker 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">binding:binding-data-broker</type>
-                       <name>ref_binding-data-broker</name>
+                       <name>binding-data-broker</name>
                </data-broker>
        </module>
        <module>
@@ -46,43 +46,43 @@
                <name>binding-data-broker</name>
                <dom-broker xmlns="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
                        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
-                       <name>ref_dom-broker</name>
+                       <name>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>
+                       <name>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>
                <instance>
-                       <name>ref_yang-schema-service</name>
+                       <name>yang-schema-service</name>
                        <provider>/modules/module[type='schema-service-singleton'][name='yang-schema-service']</provider>
                </instance>
        </service>
        <service>
                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-notification-service</type>
                <instance>
-                       <name>ref_binding-notification-broker</name>
+                       <name>binding-notification-broker</name>
                        <provider>/modules/module[type='binding-notification-broker'][name='binding-notification-broker']</provider>
                </instance>
        </service>
        <service>
                <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-data-store</type>
                <instance>
-                       <name>ref_hash-map-data-store</name>
+                       <name>hash-map-data-store</name>
                        <provider>/modules/module[type='hash-map-data-store'][name='hash-map-data-store']</provider>
                </instance>
                <instance>
-                       <name>ref_cluster-data-store</name>
+                       <name>cluster-data-store</name>
                        <provider>/modules/module[type='dom-clustered-store-impl'][name='cluster-data-store']</provider>
                </instance>
        </service>
        <service>
                <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
                <instance>
-                       <name>ref_binding-broker-impl</name>
+                       <name>binding-osgi-broker</name>
                        <provider>/modules/module[type='binding-broker-impl'][name='binding-broker-impl']</provider>
                </instance>
        </service>
@@ -96,21 +96,21 @@
        <service>
                <type xmlns:binding-impl="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding-impl:binding-dom-mapping-service</type>
                <instance>
-                       <name>ref_runtime-mapping-singleton</name>
+                       <name>runtime-mapping-singleton</name>
                        <provider>/modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton']</provider>
                </instance>
        </service>
        <service>
        <type xmlns:dom="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom">dom:dom-broker-osgi-registry</type>
                <instance>
-                       <name>ref_dom-broker</name>
+                       <name>dom-broker</name>
                        <provider>/modules/module[type='dom-broker-impl'][name='dom-broker']</provider>
                </instance>
        </service>
        <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>
+                       <name>binding-data-broker</name>
                        <provider>/modules/module[type='binding-data-broker'][name='binding-data-broker']</provider>
                </instance>
        </service>