Bug 8474: Enable openstack-vni-enforcement on data plane

Change-Id: I5f87df4b45e35a3b857f616437b6ede4c0b5f029
Signed-off-by: Vivekanandan Narasimhan <n.vivekanandan@ericsson.com>

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml b/vpnservice/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml
index 01be3bc069a5b376fba84ff52d17132cf7492d50..cf223e2e96697e8a563b0d01b44a9575766ccda8 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml
@@ -9,5 +9,5 @@
   -->
   <auto-config-transport-zones>true</auto-config-transport-zones>
   <use-of-tunnels>false</use-of-tunnels>
-  <openstack-vni-semantics-enforced>false</openstack-vni-semantics-enforced>
+  <openstack-vni-semantics-enforced>true</openstack-vni-semantics-enforced>
 </elanmanager-config>

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang b/vpnservice/elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang
index 54f4e49bdcd6439329e09c8243bc8dcf48af6cd9..62d392a5b419f26abdf99f17db8215d9329a8b73 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/yang/elanmanager-config.yang
@@ -58,7 +58,7 @@ module elan-config {
         }
         leaf openstack-vni-semantics-enforced {
             type boolean;
-            default false;
+            default true;
         }
     }
 }