7f4ab8fbd8
Submodule updates include the following commits: * src/sonic-utilities 9dc58ea...f9eb739 (18): > Remove unnecessary calls to str.encode() now that the package is Python 3; Fix deprecation warning (#1260) > [generate_dump] Ignoring file/directory not found Errors (#1201) > Fixed porstat rate and util issues (#1140) > fix error: interface counters is mismatch after warm-reboot (#1099) > Remove unnecessary calls to str.decode() now that the package is Python 3 (#1255) > [acl-loader] Make list sorting compliant with Python 3 (#1257) > Replace hard-coded fast-reboot with variable. And some typo corrections (#1254) > [configlet][portconfig] Remove calls to dict.has_key() which is not available in Python 3 (#1247) > Remove unnecessary conversions to list() and calls to dict.keys() (#1243) > Clean up LGTM alerts (#1239) > Add 'requests' as install dependency in setup.py (#1240) > Convert to Python 3 (#1128) > Fix mock SonicV2Connector in python3: use decode_responses mode so caller code will be the same as python2 (#1238) > [tests] Do not trim from PATH if we did not append to it; Clean up/fix shebangs in scripts (#1233) > Updates to bgp config and show commands with BGP_INTERNAL_NEIGHBOR table (#1224) > [cli]: NAT show commands newline issue after migrated to Python3 (#1204) > [doc]: Update Command-Reference.md (#1231) > Added 'import sys' in feature.py file (#1232) * src/sonic-py-swsssdk 9d9f0c6...1664be9 (2): > Fix: no need to decode() after redis client scan, so it will work for both python2 and python3 (#96) > FieldValueMap `contains`(`in`) will also work when migrated to libswsscommon(C++ with SWIG wrapper) (#94) - Also fix Python 3-related issues: - Use integer (floor) division in config_samples.py (sonic-config-engine) - Replace print statement with print function in eeprom.py plugin for x86_64-kvm_x86_64-r0 platform - Update all platform plugins to be compatible with both Python 2 and Python 3 - Remove shebangs from plugins files which are not intended to be executable - Replace tabs with spaces in Python plugin files and fix alignment, because Python 3 is more strict - Remove trailing whitespace from plugins files
58 lines
2.4 KiB
Makefile
58 lines
2.4 KiB
Makefile
# docker image for virtual switch based sonic docker image
|
|
|
|
DOCKER_SONIC_VS = docker-sonic-vs.gz
|
|
$(DOCKER_SONIC_VS)_PATH = $(PLATFORM_PATH)/docker-sonic-vs
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(SWSS) \
|
|
$(SYNCD_VS) \
|
|
$(PYTHON_SWSSCOMMON) \
|
|
$(PYTHON3_SWSSCOMMON) \
|
|
$(LIBTEAMDCTL) \
|
|
$(LIBTEAM_UTILS) \
|
|
$(SONIC_DEVICE_DATA) \
|
|
$(LIBYANG) \
|
|
$(LIBYANG_CPP) \
|
|
$(LIBYANG_PY2) \
|
|
$(LIBYANG_PY3) \
|
|
$(SONIC_UTILITIES_DATA) \
|
|
$(SONIC_HOST_SERVICES_DATA)
|
|
|
|
# swsssdk is a dependency of sonic-py-common
|
|
# TODO: sonic-py-common should depend on swsscommon instead
|
|
$(DOCKER_SONIC_VS)_PYTHON_WHEELS += $(SWSSSDK_PY2) \
|
|
$(SWSSSDK_PY3) \
|
|
$(SONIC_PY_COMMON_PY2) \
|
|
$(SONIC_PY_COMMON_PY3) \
|
|
$(SONIC_YANG_MODELS_PY3) \
|
|
$(SONIC_YANG_MGMT_PY2) \
|
|
$(SONIC_YANG_MGMT_PY3) \
|
|
$(SONIC_UTILITIES_PY3) \
|
|
$(SONIC_HOST_SERVICES_PY3)
|
|
|
|
ifeq ($(INSTALL_DEBUG_TOOLS), y)
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(SWSS_DBG) \
|
|
$(LIBSWSSCOMMON_DBG) \
|
|
$(LIBSAIREDIS_DBG) \
|
|
$(LIBSAIVS_DBG) \
|
|
$(SYNCD_VS_DBG)
|
|
endif
|
|
|
|
ifeq ($(SONIC_ROUTING_STACK), quagga)
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(QUAGGA)
|
|
else ifeq ($(SONIC_ROUTING_STACK), frr)
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(FRR)
|
|
else
|
|
$(DOCKER_SONIC_VS)_DEPENDS += $(GOBGP)
|
|
endif
|
|
|
|
$(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \
|
|
$(ARP_UPDATE_SCRIPT) \
|
|
$(ARP_UPDATE_VARS_TEMPLATE) \
|
|
$(BUFFERS_CONFIG_TEMPLATE) \
|
|
$(QOS_CONFIG_TEMPLATE) \
|
|
$(SONIC_VERSION) \
|
|
$(UPDATE_CHASSISDB_CONFIG_SCRIPT) \
|
|
$(COPP_CONFIG_TEMPLATE)
|
|
|
|
$(DOCKER_SONIC_VS)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)
|
|
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_VS)
|