Upgrade BAL version to 3.4.7.5
Fix watchdog script - fetch vlan-ids from the config file before trying to reference it
Release 2.6.0
Change-Id: I5e131c7d247cca0512ff94c57343a9a89297cf5d
diff --git a/agent/Makefile.in b/agent/Makefile.in
index 32e4c62..8faa11d 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -28,12 +28,12 @@
# ACCTON_BAL_<BAL_VER>-<DEV_VER>.patch - Accton/Edgecore's patch.
BAL_MAJOR_VER = 3
BAL_MINOR_VER = 4
-BAL_REV_A_VER = 3
-BAL_REV_B_VER = 3
+BAL_REV_A_VER = 7
+BAL_REV_B_VER = 5
BAL_API_VER = $(BAL_MAJOR_VER).$(BAL_MINOR_VER).$(BAL_REV_A_VER).$(BAL_REV_B_VER)
BAL_VER = $(BAL_MAJOR_VER).$(BAL_MINOR_VER).$(BAL_REV_A_VER).$(BAL_REV_B_VER)
SDK_VER = 6.5.13
-DEV_VER ?= 202002100101
+DEV_VER ?= 202008030101
#
# Version of Open Network Linux (ONL).
ONL_KERN_VER_MAJOR = 4.14
diff --git a/agent/device/asfvolt16/mkdebian/debian/asfvolt16.postinst b/agent/device/asfvolt16/mkdebian/debian/asfvolt16.postinst
index 50e8d89..845ecf6 100644
--- a/agent/device/asfvolt16/mkdebian/debian/asfvolt16.postinst
+++ b/agent/device/asfvolt16/mkdebian/debian/asfvolt16.postinst
@@ -17,7 +17,7 @@
rm -rf /opt/bcm68620
rm -rf /broadcom
-tar zxf /tmp/release_asfvolt16_V3.4.3.3.202002100101.tar.gz -C / 2>&1 > /dev/null
+tar zxf /tmp/release_asfvolt16_V3.4.7.5.202008030101.tar.gz -C / 2>&1 > /dev/null
grep -q '\/opt\/bcm68620\/svk_init.sh' /etc/rc.local || sed -i -e '$i \/opt\/bcm68620\/svk_init.sh' /etc/rc.local
rm -f /run/bcm68620
mkdir -p /opt/openolt && cp /tmp/watchdog/openolt_dev_mgmt_daemon_process_watchdog /opt/openolt && cp /tmp/watchdog/watchdog.config /opt/openolt
diff --git a/agent/device/asfvolt16/mkdebian/debian/changelog b/agent/device/asfvolt16/mkdebian/debian/changelog
index 3409fb4..86e8f51 100644
--- a/agent/device/asfvolt16/mkdebian/debian/changelog
+++ b/agent/device/asfvolt16/mkdebian/debian/changelog
@@ -1,6 +1,6 @@
-asfvolt16 (3.4.3.3+edgecore-V202002100101) stable; urgency=high
+asfvolt16 (3.4.7.5+edgecore-V202008030101) stable; urgency=high
- * Based on code from SW-BCM686OLT_3_4_3_3.tgz.
- * Merged the Accton's fixed to ACCTON_BAL_3.4.3.3-V202002100101.patch.
+ * Based on code from SW-BCM686OLT_3_4_7_5.tgz.
+ * Merged the Accton's fixed to ACCTON_BAL_3.4.7.5-V202008030101.patch.
- -- Jason Huang <jasonsc_huang@edge-core.com> Mon, 10 FEB 2020 01:01:03 +0800
+ -- Jason Huang <jasonsc_huang@edge-core.com> Mon, 03 AUG 2020 01:01:03 +0800
diff --git a/agent/device/asfvolt16/mkdebian/debian/control b/agent/device/asfvolt16/mkdebian/debian/control
index ca4f431..abacf17 100644
--- a/agent/device/asfvolt16/mkdebian/debian/control
+++ b/agent/device/asfvolt16/mkdebian/debian/control
@@ -9,5 +9,5 @@
Architecture: amd64
Depends: ${shlibs:Depends}
Description: Broadcom OLT drivers,CLI
- ported from Broadcom SDK-3.4.3.3 package
+ ported from Broadcom SDK-3.4.7.5 package
diff --git a/agent/device/asfvolt16/mkdebian/debian/files b/agent/device/asfvolt16/mkdebian/debian/files
index a5d466e..8ce7e13 100644
--- a/agent/device/asfvolt16/mkdebian/debian/files
+++ b/agent/device/asfvolt16/mkdebian/debian/files
@@ -1 +1 @@
-asfvolt16_3.4.3.3+edgecore-V202002100101_amd64.deb misc optional
+asfvolt16_3.4.7.5+edgecore-V202008030101_amd64.deb misc optional
diff --git a/agent/device/asfvolt16/mkdebian/debian/rules b/agent/device/asfvolt16/mkdebian/debian/rules
index 0869afa..199bdb4 100755
--- a/agent/device/asfvolt16/mkdebian/debian/rules
+++ b/agent/device/asfvolt16/mkdebian/debian/rules
@@ -26,7 +26,7 @@
override_dh_auto_install:
mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/tmp
- cp -a $(CURDIR)/debian/release_asfvolt16_V3.4.3.3.202002100101.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
+ cp -a $(CURDIR)/debian/release_asfvolt16_V3.4.7.5.202008030101.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libgrpc++.so.1 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libgrpc.so.6 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libstdc++.so.6 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
diff --git a/agent/device/asgvolt64/mkdebian/debian/asgvolt64.postinst b/agent/device/asgvolt64/mkdebian/debian/asgvolt64.postinst
index 6ce8b44..558251a 100644
--- a/agent/device/asgvolt64/mkdebian/debian/asgvolt64.postinst
+++ b/agent/device/asgvolt64/mkdebian/debian/asgvolt64.postinst
@@ -17,7 +17,7 @@
rm -rf /opt/bcm68620
rm -rf /broadcom
-tar zxf /tmp/release_asgvolt64_V3.4.3.3.202002100101.tar.gz -C / 2>&1 > /dev/null
+tar zxf /tmp/release_asgvolt64_V3.4.7.5.202008030101.tar.gz -C / 2>&1 > /dev/null
grep -q '\/opt\/bcm68620\/svk_init.sh' /etc/rc.local || sed -i -e '$i \/opt\/bcm68620\/svk_init.sh' /etc/rc.local
rm -f /run/bcm68620
mkdir -p /opt/openolt && cp /tmp/watchdog/openolt_dev_mgmt_daemon_process_watchdog /opt/openolt && cp /tmp/watchdog/watchdog.config /opt/openolt
diff --git a/agent/device/asgvolt64/mkdebian/debian/changelog b/agent/device/asgvolt64/mkdebian/debian/changelog
index 119bf15..0d57e00 100644
--- a/agent/device/asgvolt64/mkdebian/debian/changelog
+++ b/agent/device/asgvolt64/mkdebian/debian/changelog
@@ -1,6 +1,6 @@
-asgvolt64 (3.4.3.3+edgecore-V202002100101) stable; urgency=high
+asgvolt64 (3.4.7.5+edgecore-V202008030101) stable; urgency=high
- * Based on code from SW-BCM686OLT_3_4_3_3.tgz.
- * Merged the Accton's fixed to ACCTON_BAL_3.4.3.3-V202002100101.patch.
+ * Based on code from SW-BCM686OLT_3_4_7_5.tgz.
+ * Merged the Accton's fixed to ACCTON_BAL_3.4.7.5-V202008030101.patch.
- -- Jason Huang <jasonsc_huang@edge-core.com> Mon, 10 FEB 2020 01:01:03 +0800
+ -- Jason Huang <jasonsc_huang@edge-core.com> Mon, 03 AUG 2020 01:01:03 +0800
diff --git a/agent/device/asgvolt64/mkdebian/debian/control b/agent/device/asgvolt64/mkdebian/debian/control
index 872305f..e82223e 100644
--- a/agent/device/asgvolt64/mkdebian/debian/control
+++ b/agent/device/asgvolt64/mkdebian/debian/control
@@ -9,5 +9,5 @@
Architecture: amd64
Depends: ${shlibs:Depends}
Description: Broadcom OLT drivers,CLI
- ported from Broadcom SDK-3.4.3.3 package
+ ported from Broadcom SDK-3.4.7.5 package
diff --git a/agent/device/asgvolt64/mkdebian/debian/files b/agent/device/asgvolt64/mkdebian/debian/files
index 6724103..436e715 100644
--- a/agent/device/asgvolt64/mkdebian/debian/files
+++ b/agent/device/asgvolt64/mkdebian/debian/files
@@ -1 +1 @@
-asgvolt64_3.4.3.3+edgecore-V202002100101_amd64.deb misc optional
+asgvolt64_3.4.7.5+edgecore-V202008030101_amd64.deb misc optional
diff --git a/agent/device/asgvolt64/mkdebian/debian/rules b/agent/device/asgvolt64/mkdebian/debian/rules
index 561c092..ad85e4b 100755
--- a/agent/device/asgvolt64/mkdebian/debian/rules
+++ b/agent/device/asgvolt64/mkdebian/debian/rules
@@ -26,7 +26,7 @@
override_dh_auto_install:
mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/tmp
- cp -a $(CURDIR)/debian/release_asgvolt64_V3.4.3.3.202002100101.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
+ cp -a $(CURDIR)/debian/release_asgvolt64_V3.4.7.5.202008030101.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libgrpc++.so.1 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libgrpc.so.6 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libstdc++.so.6 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
diff --git a/agent/scripts/watchdog/openolt_dev_mgmt_daemon_process_watchdog b/agent/scripts/watchdog/openolt_dev_mgmt_daemon_process_watchdog
index 45d9374..0dee07b 100755
--- a/agent/scripts/watchdog/openolt_dev_mgmt_daemon_process_watchdog
+++ b/agent/scripts/watchdog/openolt_dev_mgmt_daemon_process_watchdog
@@ -113,6 +113,7 @@
monitor_openolt_and_dev_mgmt_daemon_process() {
LOG "start monitor openolt and dev_mgmt_daemon processes"
+ get_vlan_ids
if [ "${OLT_MODEL}" = ${ASF16_MODEL} ]; then
INBAND_IF="eth2.${ASFVOLT16_VLAN_ID_ETH2}"
else
@@ -123,7 +124,6 @@
# elapsed since the shell started. We can reset to 0 and the timer
# starts from here
SECONDS=0
- get_vlan_ids
while true; do
DEV_MGMT_DAEMON_PID=`pidof /broadcom/dev_mgmt_daemon`
diff --git a/agent/test/Makefile b/agent/test/Makefile
index 87f03a1..0272102 100644
--- a/agent/test/Makefile
+++ b/agent/test/Makefile
@@ -64,7 +64,7 @@
export CXX CXXFLAGS OPENOLT_PROTO_VER
-BAL_API_VER ?= bal-api-3.4.3.3
+BAL_API_VER ?= bal-api-3.4.7.5
BAL_API_DIR=$(BAL_API_VER)
BALLIBNAME=bcm_host_api_stubs
BALLIBDIR=$(BAL_API_DIR)/stubs