Merge branch 'master' into topic/ietf_yang

[lispflowmapping.git] / mappingservice / implementation / src / main / config / default-config.xml

diff --git a/mappingservice/implementation/src/main/config/default-config.xml b/mappingservice/implementation/src/main/config/default-config.xml
index 01204e5df342f8a726a2dd9a509c3fc7f3a54a63..e2317de2a3645a1441bf2a56d6f7902ade098900 100644 (file)
--- a/mappingservice/implementation/src/main/config/default-config.xml
+++ b/mappingservice/implementation/src/main/config/default-config.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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:config:lfm:ms:dao?module=lfm-ms-dao&amp;revision=2015-07-13</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:impl?module=mappingservice-impl&amp;revision=2015-09-06</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-shell:impl?module=mappingservice-shell-impl&amp;revision=2015-09-25</capability>
+        <capability>urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-dao:inmemorydb?module=mappingservice-dao-inmemorydb&amp;revision=2015-10-07</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:config:lfm:mappingservice:impl">prefix:mappingservice-impl</type>
+                    <type xmlns:msi="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:impl">msi:mappingservice-impl</type>
                     <name>mappingservice-default</name>
                     <rpc-registry>
                         <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
@@ -24,23 +24,39 @@
                       <name>binding-osgi-broker</name>
                     </broker>
                     <dao>
-                      <type xmlns:dao="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:ms:dao">dao:ms-dao</type>
-                      <name>lfm-ms-inmemorydb</name>
+                      <type xmlns:dao="urn:opendaylight:lfm:mappingservice-dao">dao:mappingservice-dao</type>
+                      <name>mappingservice-dao-inmemorydb</name>
                     </dao>
-                    <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>
+                    <notification-publish-service>
+                      <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-new-notification-publish-service</type>
+                      <name>binding-notification-publish-adapter</name>
+                    </notification-publish-service>
+                </module>
+                <module>
+                    <type xmlns:shell="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice-shell:impl">shell:mappingservice-shell-impl</type>
+                    <name>mappingservice-shell-default</name>
+                    <osgi-broker>
+                      <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
+                      <name>binding-osgi-broker</name>
+                    </osgi-broker>
+                    <mappingservice>
+                      <type xmlns:ms="urn:opendaylight:lfm:mappingservice">ms:mappingservice</type>
+                      <name>mappingservice</name>
+                    </mappingservice>
                 </module>
                 <module>
-                    <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:impl">prefix:lisp-mappingservice-impl</type>
+                    <type xmlns:ms="urn:opendaylight:params:xml:ns:yang:controller:config:lfm:mappingservice:impl">ms:lisp-mappingservice-impl</type>
                     <name>lisp-mappingservice-default</name>
                     <osgi-broker>
                       <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
                       <name>binding-osgi-broker</name>
                     </osgi-broker>
+                    <notification-service>
+                      <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding:binding-new-notification-service</type>
+                      <name>binding-notification-adapter</name>
+                    </notification-service>
                     <mappingservice>
-                      <type xmlns:prefix="urn:opendaylight:lfm:mappingservice">prefix:mappingservice</type>
+                      <type xmlns:ms="urn:opendaylight:lfm:mappingservice">ms:mappingservice</type>
                       <name>mappingservice</name>
                     </mappingservice>
                 </module>
@@ -54,6 +70,14 @@
                   </provider>
                 </instance>
               </service>
+              <service>
+                <type xmlns:prefix="urn:opendaylight:lfm:mappingservice">prefix:mappingservice-shell</type>
+                <instance>
+                  <name>mappingservice-shell</name>
+                  <provider>/modules/module[type='mappingservice-shell-impl'][name='mappingservice-shell-default']
+                  </provider>
+                </instance>
+              </service>
               <service>
                 <type xmlns:prefix="urn:opendaylight:lfm:mappingservice">prefix:lisp-mappingservice</type>
                 <instance>
@@ -65,4 +89,4 @@
             </services>
         </data>
     </configuration>
-</snapshot>
\ No newline at end of file
+</snapshot>