From fe7fad083398b2a793288a7397bcefbe12d14e5e Mon Sep 17 00:00:00 2001
From: abdosi <58047199+abdosi@users.noreply.github.com>
Date: Fri, 21 Feb 2020 10:20:07 -0800
Subject: [PATCH] Made Change to have Configurable option to enable/disable
 docker image (#4171)

* Made Change to have Configurable option to enable/disable docker image

* [Submodule-Update] sonic-utilities .
Following PR has been merged tp 201911
* Platform Driver Development Framework (PDDF): Adding PDDF CLI utils
* [config] Add 'feature' subcommand
* [fwutil]: Command-line utility for interacting with platform components
* [show] Add subcommand to display the status of auto-restart feature
                                                for each container
* [config] Add subcommand to configure the status of auto-restart
                                                feature for each
                                                container
* [Command Reference] Document CLI commands related to container
                                                auto-restart feature
* [config/main.py] Modify reload() function to load configuration from
                                                init_cfg.json
* Fix for dhcp_relay deletion on a VLAN
* [config] Check if service exists before start/stop/restart of service
* Multi-Db changes for NAT feature
* [reboot] make sure the reboot happens even if platform reboot failed
---
 rules/config        | 3 +++
 rules/docker-nat.mk | 4 ++++
 slave.mk            | 7 +++++++
 src/sonic-utilities | 2 +-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/rules/config b/rules/config
index 2ba9dcf301fe..5d4f01e05746 100644
--- a/rules/config
+++ b/rules/config
@@ -104,3 +104,6 @@ ENABLE_MGMT_FRAMEWORK = y
 
 # ENABLE_RESTAPI - build docker-sonic-restapi for configuring the switch using REST APIs
 ENABLE_RESTAPI = n
+
+# ENABLE_NAT - build docker-sonic-nat for nat support
+ENABLE_NAT = y
diff --git a/rules/docker-nat.mk b/rules/docker-nat.mk
index f41c8f06647c..dcccc24ba2ff 100644
--- a/rules/docker-nat.mk
+++ b/rules/docker-nat.mk
@@ -13,13 +13,17 @@ $(DOCKER_NAT)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_STRETCH)_DBG_IMAGE_P
 
 $(DOCKER_NAT)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_STRETCH)
 
+ifeq ($(ENABLE_NAT), y)
 SONIC_DOCKER_IMAGES += $(DOCKER_NAT)
 SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_NAT)
 SONIC_STRETCH_DOCKERS += $(DOCKER_NAT)
+endif
 
+ifeq ($(ENABLE_NAT), y)
 SONIC_DOCKER_DBG_IMAGES += $(DOCKER_NAT_DBG)
 SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_NAT_DBG)
 SONIC_STRETCH_DBG_DOCKERS += $(DOCKER_NAT_DBG)
+endif
 
 $(DOCKER_NAT)_CONTAINER_NAME = nat
 $(DOCKER_NAT)_RUN_OPT += --privileged -t
diff --git a/slave.mk b/slave.mk
index dc15d7ad2577..f630aaf47f4e 100644
--- a/slave.mk
+++ b/slave.mk
@@ -116,6 +116,11 @@ ifeq ($(SONIC_ENABLE_SFLOW),y)
 ENABLE_SFLOW = y
 endif
 
+ifeq ($(SONIC_ENABLE_NAT),y)
+ENABLE_NAT = y
+endif
+
+
 include $(RULES_PATH)/functions
 include $(RULES_PATH)/*.mk
 ifneq ($(CONFIGURED_PLATFORM), undefined)
@@ -203,6 +208,7 @@ $(info "BUILD_TIMESTAMP"                 : "$(BUILD_TIMESTAMP)")
 $(info "BLDENV"                          : "$(BLDENV)")
 $(info "VS_PREPARE_MEM"                  : "$(VS_PREPARE_MEM)")
 $(info "ENABLE_SFLOW"                    : "$(ENABLE_SFLOW)")
+$(info "ENABLE_NAT"                      : "$(ENABLE_NAT)")
 $(info )
 
 ifeq ($(SONIC_USE_DOCKER_BUILDKIT),y)
@@ -649,6 +655,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
 	export enable_system_telemetry="$(ENABLE_SYSTEM_TELEMETRY)"
 	export enable_restapi="$(ENABLE_RESTAPI)"
 	export enable_ztp="$(ENABLE_ZTP)"
+	export enable_nat="$(ENABLE_NAT)"
 	export shutdown_bgp_on_start="$(SHUTDOWN_BGP_ON_START)"
 	export enable_pfcwd_on_start="$(ENABLE_PFCWD_ON_START)"
 	export installer_debs="$(addprefix $(STRETCH_DEBS_PATH)/,$($*_INSTALLS))"
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 6a36a6be6a0d..eeb312d85e8d 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 6a36a6be6a0df48062902528970a97460c675bcf
+Subproject commit eeb312d85e8d044573521e574bd09889ffa744b9