commit 8e7153acd6383d974c5d207bd899c0dbcdd65ecc
author Hardik Windlass <hardik_windlass@infosys.com> Mon Feb 17 14:28:20 2020 +0000
committer Hardik Windlass <hardik_windlass@infosys.com> Mon Feb 17 14:28:20 2020 +0000
tree 82d64643fde68c93b11c0047bba9c8f2f03361a8
parent 13db7ab4e7e2b36639ac0c020f22fa0cf63845ad

Fix for OLT App Config

voltha

diff --git a/voltha b/voltha
index 52ee03b..95051d0 100755
--- a/voltha
+++ b/voltha
@@ -1113,11 +1113,15 @@
     push_onos_config "file" "Push ONOS DHCP L2 Relay Configuration" "network/configuration/apps/org.opencord.dhcpl2relay" "onos-files/onos-dhcpl2relay.json"
     check_onos_app_active org.opencord.olt
     # FIXME use WITH_DHCP and WITH_EAPOL flags to configre OLT App
-    if [ $WITH_EAPOL == "yes" ]; then
-      push_onos_config "json" "Enable VOLTHA ONOS EAPOL provisioning" "configuration/org.opencord.olt.impl.OltFlowService" '{"enableEapol":true}'
+    # Default value for "enableEapol" is true in OLT App
+    if [ $WITH_EAPOL == "no" ]; then
+      push_onos_config "json" "Disable VOLTHA ONOS EAPOL provisioning" "configuration/org.opencord.olt.impl.OltFlowService" '{"enableEapol":false}'
     fi
+    # Default value for "enableDhcpOnProvisioning" is false and for "enableDhcpV4" is true in OLT App
     if [ $WITH_DHCP == "yes" ]; then
       push_onos_config "json" "Enable VOLTHA ONOS DHCP provisioning" "configuration/org.opencord.olt.impl.OltFlowService" '{"enableDhcpOnProvisioning":true,"enableDhcpV4":true}'
+    elif [ $WITH_DHCP == "no" ]; then
+      push_onos_config "json" "Disable VOLTHA ONOS DHCP provisioning" "configuration/org.opencord.olt.impl.OltFlowService" '{"enableDhcpOnProvisioning":false,"enableDhcpV4":false}'
     fi
     if [ $WITH_IGMP == "yes" ]; then
       push_onos_config "json" "Enable VOLTHA ONOS IGMP provisioning" "configuration/org.opencord.olt.impl.OltFlowService" '{"enableIgmpOnProvisioning":true}'