Updated L2Gw changes in "neutronvpn", "elanmanager" and "dhcpservice" modules

[vpnservice.git] / neutronvpn / neutronvpn-impl / src / main / config / default-config.xml

diff --git a/neutronvpn/neutronvpn-impl/src/main/config/default-config.xml b/neutronvpn/neutronvpn-impl/src/main/config/default-config.xml
index e8c777e8d28f71bff10a87397352a61bb7d483c7..2bda4dee5c27064a9395df811b18f5ebd96407e0 100644 (file)
--- a/neutronvpn/neutronvpn-impl/src/main/config/default-config.xml
+++ b/neutronvpn/neutronvpn-impl/src/main/config/default-config.xml
@@ -39,14 +39,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                         </type>
                         <name>mdsalutil-service</name>
                     </mdsalutil>
-                    <entity-ownership-service>
-                        <type xmlns:entity-ownership="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:entity-ownership-service">entity-ownership:entity-ownership-service</type>
-                        <name>entity-ownership-service</name>
-                    </entity-ownership-service>
-                    <binding-normalized-node-serializer>
-                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-normalized-node-serializer</type>
-                        <name>runtime-mapping-singleton</name>
-                    </binding-normalized-node-serializer>
                     <notification-publish-service>
                         <type xmlns:bindingimpl="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">bindingimpl:binding-new-notification-publish-service</type>
                         <name>binding-notification-publish-adapter</name>
@@ -55,6 +47,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
                         <type xmlns:bindingimpl="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">bindingimpl:binding-new-notification-service</type>
                         <name>binding-notification-adapter</name>
                     </notification-service>
+                    <entity-ownership-service>
+                        <type xmlns:entity-ownership="urn:opendaylight:params:xml:ns:yang:controller:md:sal:core:spi:entity-ownership-service">entity-ownership:entity-ownership-service</type>
+                        <name>entity-ownership-service</name>
+                    </entity-ownership-service>
                 </module>
             </modules>
             <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">