Added config model for mdsal.binding.codec.

Change-Id: I3ee74461e79c3332a0e8e41afe1d56af4b942a74
Signed-off-by: Tony Tkacik <tony.tkacik@gmail.com>

diff --git a/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml b/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml
index 038f060de0317222c030a102058a3abd5995e45f..947eee237d9f6266b5f2c406e2d08e9a6a442588 100644 (file)
--- a/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml
+++ b/opendaylight/md-sal/md-sal-config/src/main/resources/initial/01-md-sal.xml
@@ -256,6 +256,20 @@
                             <provider>/modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton']</provider>
                         </instance>
                     </service>
+                    <service>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:v1:codec">binding:binding-v1-codec-tree-factory</type>
+                        <instance>
+                            <name>runtime-mapping-singleton</name>
+                            <provider>/modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton']</provider>
+                        </instance>
+                    </service>
+                    <service>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:v1:codec">binding:binding-v1-normalized-node-serializer</type>
+                        <instance>
+                            <name>runtime-mapping-singleton</name>
+                            <provider>/modules/module[type='runtime-generated-mapping'][name='runtime-mapping-singleton']</provider>
+                        </instance>
+                    </service>
                     <service>
                         <type xmlns:binding-impl="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">binding-impl:binding-new-notification-service</type>
                         <instance>

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml b/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
index db405e06a783481b03210a08c3ccf5b174aef842..a8830169d29ce6ef684230efc7417b8295abb8d8 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/resources/org/opendaylight/blueprint/binding-broker.xml
@@ -17,6 +17,8 @@
     <interfaces>
       <value>org.opendaylight.yangtools.binding.data.codec.api.BindingCodecTreeFactory</value>
       <value>org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer</value>
+      <value>org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer</value>
+      <value>org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory</value>
     </interfaces>
   </service>
 

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang
index 159f9f229eb1ae2bc11c21542dd15cda7e639f38..d1383c1ec024d91e16de5b6d1f491da176b48e6e 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang
+++ b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-binding-broker-impl.yang
@@ -5,6 +5,7 @@ module opendaylight-sal-binding-broker-impl {
 
     import config { prefix config; revision-date 2013-04-05; }
     import opendaylight-md-sal-binding {prefix sal;}
+    import opendaylight-md-sal-binding-v1-codec {prefix v1codec;}
     import opendaylight-md-sal-dom {prefix dom;}
     import opendaylight-md-sal-common {prefix common;}
 
@@ -75,6 +76,8 @@ module opendaylight-sal-binding-broker-impl {
         config:provided-service binding-dom-mapping-service;
         config:provided-service sal:binding-codec-tree-factory;
         config:provided-service sal:binding-normalized-node-serializer;
+        config:provided-service v1codec:binding-v1-codec-tree-factory;
+        config:provided-service v1codec:binding-v1-normalized-node-serializer;
         config:java-name-prefix RuntimeMapping;
     }
 

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding-v1-codec.yang b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding-v1-codec.yang
new file mode 100644 (file)
index 0000000..c10af1c
--- /dev/null
+++ b/opendaylight/md-sal/sal-binding-config/src/main/yang/opendaylight-md-sal-binding-v1-codec.yang
@@ -0,0 +1,27 @@
+module opendaylight-md-sal-binding-v1-codec {
+    yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:v1:codec";
+    prefix "md-sal-binding";
+
+    import config { prefix config; revision-date 2013-04-05; }
+
+    description
+        "Service definition for Binding Aware MD-SAL.";
+
+    revision "2016-07-14" {
+        description
+            "Initial revision";
+    }
+    identity binding-v1-codec-tree-factory {
+        base "config:service-type";
+        config:java-class "org.opendaylight.mdsal.binding.dom.codec.api.BindingCodecTreeFactory";
+        config:disable-osgi-service-registration;
+    }
+
+    identity binding-v1-normalized-node-serializer {
+        base "config:service-type";
+        config:java-class "org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer";
+        config:disable-osgi-service-registration;
+    }
+
+}