Enabling tunnel counters in counterpoll

.azure-pipelines/azure-pipelines-build.yml

@@ -65,7 +65,7 @@ jobs:
 
  - name: centec-arm64
  pool: sonicbld_8c
- timeoutInMinutes: 2160
+ timeoutInMinutes: 2880
  variables:
  PLATFORM_ARCH: arm64
 
@@ -79,7 +79,7 @@ jobs:
 
  - name: marvell-armhf
  pool: sonicbld_8c
- timeoutInMinutes: 2160
+ timeoutInMinutes: 2880
  variables:
  PLATFORM_ARCH: armhf
 

.gitignore

@@ -74,6 +74,7 @@ platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
 platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py
+platform/cisco-8000
 
 # buildinfo
 files/build/buildinfo

.gitmodules

@@ -40,6 +40,9 @@
 [submodule "src/sonic-platform-daemons"]
  path = src/sonic-platform-daemons
  url = https:/Azure/sonic-platform-daemons
+[submodule "src/sonic-platform-pde"]
+ path = src/sonic-platform-pde
+ url = https:/Azure/sonic-platform-pdk-pde
 [submodule "src/sonic-frr/frr"]
  path = src/sonic-frr/frr
  url = https:/Azure/sonic-frr.git

Makefile

@@ -5,6 +5,27 @@ NOSTRETCH ?= 0
 NOBUSTER ?= 0
 NOBULLSEYE ?= 1
 
+ifeq ($(NOJESSIE),0)
+BUILD_JESSIE=1
+endif
+
+ifeq ($(NOSTRETCH),0)
+BUILD_STRETCH=1
+endif
+
+ifeq ($(NOBUSTER),0)
+BUILD_BUSTER=1
+endif
+
+ifeq ($(NOBULLSEYE),0)
+BUILD_BULLSEYE=1
+endif
+
+PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
+PLATFORM_CHECKOUT := platform/checkout
+PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
+PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
+
 %::
  @echo "+++ --- Making $@ --- +++"
 ifeq ($(NOJESSIE), 0)
@@ -42,20 +63,28 @@ init:
  @echo "+++ Making $@ +++"
  make -f Makefile.work $@
 
-clean configure reset showtag sonic-slave-build sonic-slave-bash :
+#
+# Function to invoke target $@ in Makefile.work with proper BLDENV
+#
+define make_work
  @echo "+++ Making $@ +++"
-ifeq ($(NOJESSIE), 0)
- make -f Makefile.work $@
-endif
-ifeq ($(NOSTRETCH), 0)
- BLDENV=stretch make -f Makefile.work $@
-endif
-ifeq ($(NOBUSTER), 0)
- BLDENV=buster make -f Makefile.work $@
-endif
-ifeq ($(NOBULLSEYE), 0)
- BLDENV=bullseye make -f Makefile.work $@
-endif
+ $(if $(BUILD_JESSIE),make -f Makefile.work $@,)
+ $(if $(BUILD_STRETCH),BLDENV=stretch make -f Makefile.work $@,)
+ $(if $(BUILD_BUSTER),BLDENV=buster make -f Makefile.work $@,)
+ $(if $(BUILD_BULLSEYE),BLDENV=bullseye make -f Makefile.work $@,)
+endef
+
+.PHONY: $(PLATFORM_PATH)
+
+$(PLATFORM_PATH):
+ @echo "+++ Cheking $@ +++"
+ $(PLATFORM_CHECKOUT_CMD)
+
+configure : $(PLATFORM_PATH)
+ $(call make_work, $@)
+
+clean reset showtag sonic-slave-build sonic-slave-bash :
+ $(call make_work, $@)
 
 # Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h
 freeze:

Makefile.work

@@ -249,6 +249,7 @@ SONIC_BUILD_INSTRUCTION := make \
  SONIC_IMAGE_VERSION=$(SONIC_IMAGE_VERSION) \
  ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
  ENABLE_ZTP=$(ENABLE_ZTP) \
+ INCLUDE_PDE=$(INCLUDE_PDE) \
  SHUTDOWN_BGP_ON_START=$(SHUTDOWN_BGP_ON_START) \
  INCLUDE_KUBERNETES=$(INCLUDE_KUBERNETES) \
  KUBERNETES_VERSION=$(KUBERNETES_VERSION) \

device/accton/x86_64-accton_as4630_54te-r0/pmon_daemon_control.json

@@ -1,5 +1,5 @@
 {
  "skip_ledd": true,
- "skip_thermalctld": true
+ "skip_pcied": true
 }
 

device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/__init__.py

@@ -1,2 +1,2 @@
-__all__ = ['chassis', 'eeprom', 'platform', 'psu', 'sfp', 'thermal', 'fan']
+__all__ = [ "platform", "chassis", "sfp", "eeprom", "component", "psu", "thermal", "fan", "fan_drawer" ]
 from . import platform 

device/accton/x86_64-accton_as4630_54te-r0/sonic_platform/chassis.py

@@ -27,6 +27,13 @@
 REBOOT_CAUSE_FILE = "reboot-cause.txt"
 PREV_REBOOT_CAUSE_FILE = "previous-reboot-cause.txt"
 HOST_CHK_CMD = "docker > /dev/null 2>&1"
+SYSLED_FNODE = "/sys/class/leds/diag/brightness"
+SYSLED_MODES = {
+ "0" : "STATUS_LED_COLOR_OFF",
+ "1" : "STATUS_LED_COLOR_GREEN",
+ "2" : "STATUS_LED_COLOR_AMBER",
+ "5" : "STATUS_LED_COLOR_GREEN_BLINK"
+}
 
 
 class Chassis(ChassisBase):
@@ -55,12 +62,11 @@ def __initialize_sfp(self):
  self.sfp_module_initialized = True
 
  def __initialize_fan(self):
- from sonic_platform.fan import Fan
- for fant_index in range(0, NUM_FAN_TRAY):
- for fan_index in range(0, NUM_FAN):
- fan = Fan(fant_index, fan_index)
- self._fan_list.append(fan)
-
+ from sonic_platform.fan_drawer import FanDrawer
+ for fant_index in range(NUM_FAN_TRAY):
+ fandrawer = FanDrawer(fant_index)
+ self._fan_drawer_list.append(fandrawer)
+ self._fan_list.extend(fandrawer._fan_list)
  def __initialize_psu(self):
  from sonic_platform.psu import Psu
  for index in range(0, NUM_PSU):
@@ -192,3 +198,39 @@ def get_sfp(self, index):
  sys.stderr.write("SFP index {} out of range (1-{})\n".format(
  index, len(self._sfp_list)))
  return sfp
+
+ def get_position_in_parent(self):
+ """
+ Retrieves 1-based relative physical position in parent device. If the agent cannot determine the parent-relative position
+ for some reason, or if the associated value of entPhysicalContainedIn is '0', then the value '-1' is returned
+ Returns:
+ integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
+ """
+ return -1
+
+ def is_replaceable(self):
+ """
+ Indicate whether this device is replaceable.
+ Returns:
+ bool: True if it is replaceable.
+ """
+ return False
+
+
+ def initizalize_system_led(self):
+ return True
+
+ def get_status_led(self):
+ val = self._api_helper.read_txt_file(SYSLED_FNODE)
+ return SYSLED_MODES[val] if val in SYSLED_MODES else "UNKNOWN"
+
+ def set_status_led(self, color):
+ mode = None
+ for key, val in SYSLED_MODES.items():
+ if val == color:
+ mode = key
+ break
+ if mode is None:
+ return False
+ else:
+ return self._api_helper.write_txt_file(SYSLED_FNODE, mode)