commit 8a742a05079313a65dd2b04172715b5e894809e8
author David Bainbridge <davidk.bainbridge@gmail.com> Mon Feb 17 08:42:57 2020 -0800
committer GitHub <noreply@github.com> Mon Feb 17 08:42:57 2020 -0800
tree a572e0c2dd3e009d0d9edb7123b24af6470c4be5
parent 13db7ab4e7e2b36639ac0c020f22fa0cf63845ad
parent 95391e181d25fa9a06aa6459443313326f5bef43

Merge pull request #26 from hwindlass/oltAppConfigFix

Fix for OLT App Config

voltha

diff --git a/voltha b/voltha
index 52ee03b..9386502 100755
--- a/voltha
+++ b/voltha
@@ -1113,14 +1113,23 @@
     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
+    # Default value for "enableEapol" is true in OLT App
     if [ $WITH_EAPOL == "yes" ]; then
       push_onos_config "json" "Enable VOLTHA ONOS EAPOL provisioning" "configuration/org.opencord.olt.impl.OltFlowService" '{"enableEapol":true}'
+    elif [ $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
+    # Default value for "enableIgmpOnProvisioning" is false in OLT App
     if [ $WITH_IGMP == "yes" ]; then
       push_onos_config "json" "Enable VOLTHA ONOS IGMP provisioning" "configuration/org.opencord.olt.impl.OltFlowService" '{"enableIgmpOnProvisioning":true}'
+    elif [ $WITH_IGMP == "no" ]; then
+      push_onos_config "json" "Disable VOLTHA ONOS IGMP provisioning" "configuration/org.opencord.olt.impl.OltFlowService" '{"enableIgmpOnProvisioning":false}'
     fi
     push_onos_config "file" "Enabling extraneous rules for ONOS" "configuration/org.onosproject.net.flow.impl.FlowRuleManager" "onos-files/olt-onos-enableExtraneousRules.json"
     if [ -f onos-files/onos-sadis.json ]; then