changed Radisys olt model id as rlt-3200g-w
Change-Id: I6267c73fe6657244a38313e60eeb095aa502e7fc
diff --git a/BUILDING.md b/BUILDING.md
index 106335d..3a62dcd 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -19,7 +19,7 @@
* `sdk-all-6.5.13.tar.gz`
* `ACCTON_BAL_3.4.9.6-V202012040101.patch`. This is downloadable from the common CSP CS00003233745.
-The versions currently supported by the OpenOLT agent for Phoenix/Radisys RLT-3200G are:
+The versions currently supported by the OpenOLT agent for Phoenix/Radisys RLT-3200G-W are:
* `SW-BCM686OLT_3_4_9_8.tgz`
* `sdk-all-6.5.13.tar.gz`
@@ -41,7 +41,7 @@
**Software** :
-1. OpenOLT agent for Accton/Edgecore ASXvOLT16/ASGvOLT64 builds on *Debian GNU/Linux 8.11.1 (jessie)* and for Phoenix/Radisys RLT-3200G builds on *Debian GNU/Linux 9.13 (stretch)*. The *Debian 8.11.1 jessie* ISO installer image is downloadble from [here](https://cdimage.debian.org/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso) and *Debian 9.13 stretch* ISO installer image is downloadable from [here](https://cdimage.debian.org/cdimage/archive/9.13.0/amd64/iso-cd/debian-9.13.0-amd64-netinst.iso).
+1. OpenOLT agent for Accton/Edgecore ASXvOLT16/ASGvOLT64 builds on *Debian GNU/Linux 8.11.1 (jessie)* and for Phoenix/Radisys RLT-3200G-W builds on *Debian GNU/Linux 9.13 (stretch)*. The *Debian 8.11.1 jessie* ISO installer image is downloadble from [here](https://cdimage.debian.org/cdimage/archive/8.11.1/amd64/iso-cd/debian-8.11.1-amd64-netinst.iso) and *Debian 9.13 stretch* ISO installer image is downloadable from [here](https://cdimage.debian.org/cdimage/archive/9.13.0/amd64/iso-cd/debian-9.13.0-amd64-netinst.iso).
2. At least 4G of ram and 4G of swap - compilation is memory intensive
@@ -58,7 +58,7 @@
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 20
```
-Install the following packages for Phoenix/Radisys RLT-3200G based build
+Install the following packages for Phoenix/Radisys RLT-3200G-W based build
`sudo apt-get update && sudo apt-get install -y git pkg-config build-essential autoconf libgflags-dev clang libc++-dev unzip libssl-dev gawk debhelper debhelper dh-systemd init-system-helpers curl cmake ccache g++ wget ca-certificates lcov libgoogle-glog-dev libpcap-dev libjansson-dev`
@@ -135,7 +135,7 @@
1. The build environment has been validated with only Jessie 8.11.1 64bit AMD64 OS only.
2. Make sure you are using g++-4.9 as the default g++ compiler version on your build system. The grpc libraries and openolt agent code has to be compiled with this g++ version.
-**Radisys RLT-3200G build environment note** :
+**Radisys RLT-3200G-W build environment note** :
1. The build environment has been validated with only Stretch 9.13 64bit AMD64 OS only.
2. Make sure you are using g++-6 as the default g++ compiler version on your build system. The grpc libraries and openolt agent code has to be compiled with this g++ version.
@@ -262,7 +262,7 @@
make OPENOLTDEVICE=asfvolt16 distclean
```
-## Openolt build procedure for Radisys RLT-3200G
+## Openolt build procedure for Radisys RLT-3200G-W
Clone the `openolt` repository either from OpenCORD Gerrit:
@@ -290,7 +290,7 @@
build the OpenOLT agent source.
```shell
-make OPENOLTDEVICE=phoenix
+make OPENOLTDEVICE=rlt-3200g-w
```
Note that the required ONL version `4.19` is built as part of the above build
@@ -302,7 +302,7 @@
tag/branch corresponding to that specific version:
```shell
-make OPENOLTDEVICE=phoenix OPENOLT_PROTO_VER=master
+make OPENOLTDEVICE=rlt-3200g-w OPENOLT_PROTO_VER=master
```
By default, the `OPENOLT_PROTO_VER` defaults to git tag *v4.1.5* of the
@@ -318,7 +318,7 @@
requirement.
```shell
-make OPENOLTDEVICE=phoenix deb
+make OPENOLTDEVICE=rlt-3200g-w deb
```
Optionally, debian package can be built with one other NNI port speed option as below,
@@ -326,20 +326,20 @@
* 40G QSFP NNI port change to 10Gbps speed (use Break-out cable)
```shell
-make OPENOLTDEVICE=phoenix deb PORT_40G_SPEED=10g PORT_10G_SPEED=10g
+make OPENOLTDEVICE=rlt-3200g-w deb PORT_40G_SPEED=10g PORT_10G_SPEED=10g
```
If the build process succeeds, a `.deb` package will be created as well in the
`openolt/agent/build` directory.
-## Radisys RLT-3200G build cleanup
+## Radisys RLT-3200G-W build cleanup
To cleanup the repository and start the build procedure again, run:
```shell
# cleans up the agent objects, protos compiled artificats and openolt deb packages
-make OPENOLTDEVICE=phoenix clean
+make OPENOLTDEVICE=rlt-3200g-w clean
# cleans up the agent objects, protos compiled artificats, openolt deb packages and bal sources
-make OPENOLTDEVICE=phoenix distclean
+make OPENOLTDEVICE=rlt-3200g-w distclean
```
diff --git a/README.md b/README.md
index 4c98aec..1af4320 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
OpenOLT agent uses Broadcom's BAL (Broadband Adaptation Layer) software for
interfacing with the Maple/Qumran chipsets in OLTs such as the Edgecore/Accton
ASXvOLT16 and with Aspen/Qumran chipsets in OLTs such as the Radisys/Phoenix
-RLT-3200G.
+RLT-3200G-W.
```text
@@ -78,7 +78,7 @@
dpkg -i openolt_<OPENOLTDEVICE>-2.6.0-<GIT Commit ID>.deb
```
-The ONL version required for BAL v3.4.9.6 is ONL `4.14.151-OpenNetworkLinux`. Radisys RLT-3200G
+The ONL version required for BAL v3.4.9.6 is ONL `4.14.151-OpenNetworkLinux`. Radisys RLT-3200G-W
requires BAL v3.4.9.8 and ONL version `4.19-OpenNetworkLinux`. This will be built as part of
build procedure described in `Build OpenOLT` section.
@@ -162,7 +162,7 @@
./dev_mgmt_daemon -d -pcie -port_25g_speed 1000
```
-* 40G QSFP NNI port change to 10Gbps speed and 10G SFP NNI port to default speed (Phoenix/Radisys RLT-3200G).
+* 40G QSFP NNI port change to 10Gbps speed and 10G SFP NNI port to default speed (Phoenix/Radisys RLT-3200G-W).
If no speed specified QSFP port speed defaults to 40G and SFP port speed defaults to 10G
```shell
@@ -289,7 +289,7 @@
## FAQ
The information here may be specific to specific OLT and ONU hardware such as
-Edgecore ASFVOLT16 OLT, Radisys RLT-3200G OLT and Broadcom based ONUs.
+Edgecore ASFVOLT16 OLT, Radisys RLT-3200G-W OLT and Broadcom based ONUs.
### How to change speed of ASFVOLT16 NNI interface?
diff --git a/VERSION b/VERSION
index f989260..4f5e697 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.4.4
+3.4.5
diff --git a/agent/Makefile.in b/agent/Makefile.in
index dba3131..25aefc5 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -29,15 +29,15 @@
BAL_MAJOR_VER = 3
BAL_MINOR_VER = 4
BAL_REV_A_VER = 9
-BAL_REV_B_VER != if [ "$(OPENOLTDEVICE)" = "phoenix" ]; then echo "8"; else echo "6"; fi
+BAL_REV_B_VER != if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ]; then echo "8"; else echo "6"; fi
BAL_API_REV_B_VER = 6
BAL_API_VER = $(BAL_MAJOR_VER).$(BAL_MINOR_VER).$(BAL_REV_A_VER).$(BAL_API_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 != if [ "$(OPENOLTDEVICE)" = "phoenix" ]; then echo "20210420"; else echo "202012040101"; fi
+DEV_VER != if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ]; then echo "20210420"; else echo "202012040101"; fi
#
# Version of Open Network Linux (ONL).
-ONL_KERN_VER_MAJOR != if [ "$(OPENOLTDEVICE)" = "phoenix" ]; then echo "4.19"; else echo "4.14"; fi
+ONL_KERN_VER_MAJOR != if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ]; then echo "4.19"; else echo "4.14"; fi
# OpenOLT Proto version.
# This specifies the GIT tag in https://github.com/opencord/voltha-protos
@@ -93,7 +93,7 @@
PCAPPLUSPLUS_INCLUDE_PATH=-I/usr/local/include/pcapplusplus/
PCAPPLUSPLUS_LIB_PATH=-lPcap++ -lPacket++ -lCommon++
-CXX != if [ "$(OPENOLTDEVICE)" = "phoenix" ]; then echo "@CXX@-6"; else echo "@CXX@-4.9"; fi
+CXX != if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ]; then echo "@CXX@-6"; else echo "@CXX@-4.9"; fi
CXXFLAGS += @CXXFLAGS@
CXXFLAGS += $(shell pkg-config --cflags-only-I grpc++)
CXXFLAGS += $(PCAPPLUSPLUS_INCLUDE_PATH)
@@ -128,7 +128,7 @@
git clone https://github.com/opencomputeproject/OpenNetworkLinux.git $(ONL_DIR)/OpenNetworkLinux; \
cp download/Makefile.onl $(ONL_DIR)/Makefile; \
install -m 755 download/build-onl.sh $(ONL_DIR)/OpenNetworkLinux; \
- if [ "$(OPENOLTDEVICE)" = "phoenix" ]; then \
+ if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ]; then \
cp $(TOP_DIR)/device/$(OPENOLTDEVICE)/update_kernel_options.sh $(ONL_DIR)/OpenNetworkLinux/.; \
chmod 0755 $(ONL_DIR)/OpenNetworkLinux/update_kernel_options.sh; \
fi; \
@@ -167,7 +167,7 @@
##
BAL_ZIP = SW-BCM686OLT_$(subst .,_,$(BAL_VER)).tgz
SDK_ZIP = sdk-all-$(SDK_VER).tar.gz
-PATCH_FILE != if [ "$(OPENOLTDEVICE)" = "phoenix" ]; then \
+PATCH_FILE != if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ]; then \
echo "PHOENIX_BAL_$(BAL_VER)_V$(DEV_VER).patch"; else \
echo "ACCTON_BAL_$(BAL_VER)-V$(DEV_VER).patch"; fi
BAL_DIR = $(BUILD_DIR)/$(OPENOLTDEVICE)-bal
@@ -206,9 +206,9 @@
echo "setenv port_speed_for_100 $(PORT_100G_SPEED)" > $(PORT_SPEED_FILE)
echo "setenv port_speed_for_25 $(PORT_25G_SPEED)" >> $(PORT_SPEED_FILE)
endif
-ifeq ("$(strip $(OPENOLTDEVICE))","phoenix")
+ifeq ("$(strip $(OPENOLTDEVICE))","rlt-3200g-w")
chmod 0755 $(BAL_DIR)/onu_mgmt/libomcistack/me_codegen/omci_stack_codegen
- make -C $(BAL_DIR) BOARD=$(OPENOLTDEVICE) ONL=$(TOP_DIR)/$(ONL_DIR)/OpenNetworkLinux ONL_DEBIAN_SUITE=$(shell lsb_release -c -s) OPEN_SOURCE=y
+ make -C $(BAL_DIR) BOARD=phoenix ONL=$(TOP_DIR)/$(ONL_DIR)/OpenNetworkLinux ONL_DEBIAN_SUITE=$(shell lsb_release -c -s) OPEN_SOURCE=y
else
make -C $(BAL_DIR) BOARD=$(OPENOLTDEVICE) ONL_DIR=$(TOP_DIR)/$(ONL_DIR)/OpenNetworkLinux OPEN_SOURCE=y
endif
@@ -279,8 +279,8 @@
all: $(BUILD_DIR)/openolt
$(BUILD_DIR)/openolt: sdk protos $(OBJS)
$(CXX) $(LDFLAGS) -L$(BALLIBDIR) $(OBJS) $(OPENOLT_API_LIB) $(LIBPROTOBUF_PATH)/libprotobuf.a -o $@ -l$(BALLIBNAME) $(shell pkg-config --libs protobuf grpc++ grpc) $(PCAPPLUSPLUS_LIB_PATH)
-ifeq ("$(strip $(OPENOLTDEVICE))","phoenix")
- ln -sf $(TOP_DIR)/$(BAL_DIR)/build/fs/$(OPENOLTDEVICE)/release/release_$(OPENOLTDEVICE)_v$(BAL_VER).tar.gz $(BUILD_DIR)/release_$(OPENOLTDEVICE)_V$(BAL_VER).$(DEV_VER).tar.gz
+ifeq ("$(strip $(OPENOLTDEVICE))","rlt-3200g-w")
+ ln -sf $(TOP_DIR)/$(BAL_DIR)/build/fs/phoenix/release/release_phoenix_v$(BAL_VER).tar.gz $(BUILD_DIR)/release_$(OPENOLTDEVICE)_V$(BAL_VER).$(DEV_VER).tar.gz
else
ln -sf $(TOP_DIR)/$(BAL_DIR)/build/fs/$(OPENOLTDEVICE)/release/release_$(OPENOLTDEVICE)_V$(BAL_VER).$(DEV_VER).tar.gz $(BUILD_DIR)/.
endif
@@ -307,7 +307,7 @@
cp $(BUILD_DIR)/libbal_host_api.so device/$(OPENOLTDEVICE)/mkdebian/debian
cp -a scripts/init.d device/$(OPENOLTDEVICE)/mkdebian/debian
cp -a $(RXTX_POWER_EXE) device/$(OPENOLTDEVICE)/mkdebian/debian
-ifeq ("$(strip $(OPENOLTDEVICE))","phoenix")
+ifeq ("$(strip $(OPENOLTDEVICE))","rlt-3200g-w")
sed -i '/\/opt\/bcm68650\/svk_init.sh/c\ \/opt\/bcm68650\/svk_init.sh -qsfp_speed=$(PORT_40G_SPEED) -sfp_speed=$(PORT_10G_SPEED)' device/$(OPENOLTDEVICE)/mkdebian/debian/init.d/dev_mgmt_daemon
endif
cp -a scripts/watchdog device/$(OPENOLTDEVICE)/mkdebian/debian
diff --git a/agent/device/phoenix/mkdebian/debian/changelog b/agent/device/phoenix/mkdebian/debian/changelog
deleted file mode 100644
index 0a6dde0..0000000
--- a/agent/device/phoenix/mkdebian/debian/changelog
+++ /dev/null
@@ -1,7 +0,0 @@
-phoenix (3.4.9.8+radisys-V20210420) stable; urgency=high
-
- * Based on code from SW-BCM686OLT_3_4_9_8.tgz.
- * Patches required for BAL to support phoenix 3200g has been merged to
- PHOENIX_BAL_3.4.9.8_V20210420.patch.
-
- -- Thiyagarajan Subramani <thiyagarajan.subramani@radisys.com> Tue, 20 APR 2021 09:30:00 +0400
diff --git a/agent/device/phoenix/mkdebian/debian/files b/agent/device/phoenix/mkdebian/debian/files
deleted file mode 100644
index 76bc8b9..0000000
--- a/agent/device/phoenix/mkdebian/debian/files
+++ /dev/null
@@ -1,3 +0,0 @@
-phoenix-dbgsym_3.4.9.8+radisys-V20210420_amd64.deb debug extra
-phoenix_3.4.9.8+radisys-V20210420_amd64.buildinfo misc optional
-phoenix_3.4.9.8+radisys-V20210420_amd64.deb misc optional
diff --git a/agent/device/phoenix/mkdebian/build_phoenix_deb.sh b/agent/device/rlt-3200g-w/mkdebian/build_rlt-3200g-w_deb.sh
similarity index 100%
rename from agent/device/phoenix/mkdebian/build_phoenix_deb.sh
rename to agent/device/rlt-3200g-w/mkdebian/build_rlt-3200g-w_deb.sh
diff --git a/agent/device/rlt-3200g-w/mkdebian/debian/changelog b/agent/device/rlt-3200g-w/mkdebian/debian/changelog
new file mode 100644
index 0000000..880c7be
--- /dev/null
+++ b/agent/device/rlt-3200g-w/mkdebian/debian/changelog
@@ -0,0 +1,7 @@
+rlt-3200g-w (3.4.9.8+radisys-V20210420) stable; urgency=high
+
+ * Based on code from SW-BCM686OLT_3_4_9_8.tgz.
+ * Patches required for BAL to support RLT-3200G-W has been merged to
+ PHOENIX_BAL_3.4.9.8_V20210420.patch.
+
+ -- Thiyagarajan Subramani <thiyagarajan.subramani@radisys.com> Tue, 20 APR 2021 09:30:00 +0400
diff --git a/agent/device/phoenix/mkdebian/debian/compat b/agent/device/rlt-3200g-w/mkdebian/debian/compat
similarity index 99%
rename from agent/device/phoenix/mkdebian/debian/compat
rename to agent/device/rlt-3200g-w/mkdebian/debian/compat
index 3b0923b..ec63514 100644
--- a/agent/device/phoenix/mkdebian/debian/compat
+++ b/agent/device/rlt-3200g-w/mkdebian/debian/compat
@@ -1 +1 @@
-9
+9
diff --git a/agent/device/phoenix/mkdebian/debian/control b/agent/device/rlt-3200g-w/mkdebian/debian/control
similarity index 87%
rename from agent/device/phoenix/mkdebian/debian/control
rename to agent/device/rlt-3200g-w/mkdebian/debian/control
index 744f914..cb41d74 100644
--- a/agent/device/phoenix/mkdebian/debian/control
+++ b/agent/device/rlt-3200g-w/mkdebian/debian/control
@@ -1,13 +1,13 @@
-Source: phoenix
-Section: misc
-Priority: optional
-Maintainer: Thiyagarajan Subramani <thiyagarajan.subramani@radisys.com>
-Build-Depends: debhelper (>= 4.0.0)
-Standards-Version: 3.6.2
-
-Package: phoenix
-Architecture: amd64
-Depends: ${shlibs:Depends}
-Description: Broadcom OLT drivers,CLI
- ported from Broadcom SDK-3.4.9.8 package
-
+Source: rlt-3200g-w
+Section: misc
+Priority: optional
+Maintainer: Thiyagarajan Subramani <thiyagarajan.subramani@radisys.com>
+Build-Depends: debhelper (>= 4.0.0)
+Standards-Version: 3.6.2
+
+Package: rlt-3200g-w
+Architecture: amd64
+Depends: ${shlibs:Depends}
+Description: Broadcom OLT drivers,CLI
+ ported from Broadcom SDK-3.4.9.8 package
+
diff --git a/agent/device/phoenix/mkdebian/debian/copyright b/agent/device/rlt-3200g-w/mkdebian/debian/copyright
similarity index 99%
rename from agent/device/phoenix/mkdebian/debian/copyright
rename to agent/device/rlt-3200g-w/mkdebian/debian/copyright
index 6e79a98..0e527f0 100644
--- a/agent/device/phoenix/mkdebian/debian/copyright
+++ b/agent/device/rlt-3200g-w/mkdebian/debian/copyright
@@ -1 +1 @@
-(C) Copyright Broadcom Corporation 2003-2016
+(C) Copyright Broadcom Corporation 2003-2016
diff --git a/agent/device/rlt-3200g-w/mkdebian/debian/files b/agent/device/rlt-3200g-w/mkdebian/debian/files
new file mode 100644
index 0000000..c4d603c
--- /dev/null
+++ b/agent/device/rlt-3200g-w/mkdebian/debian/files
@@ -0,0 +1,3 @@
+rlt-3200g-w-dbgsym_3.4.9.8+radisys-V20210420_amd64.deb debug extra
+rlt-3200g-w_3.4.9.8+radisys-V20210420_amd64.buildinfo misc optional
+rlt-3200g-w_3.4.9.8+radisys-V20210420_amd64.deb misc optional
diff --git a/agent/device/phoenix/mkdebian/debian/logrotate.d/openolt b/agent/device/rlt-3200g-w/mkdebian/debian/logrotate.d/openolt
similarity index 99%
rename from agent/device/phoenix/mkdebian/debian/logrotate.d/openolt
rename to agent/device/rlt-3200g-w/mkdebian/debian/logrotate.d/openolt
index aa6ab06..480b59f 100644
--- a/agent/device/phoenix/mkdebian/debian/logrotate.d/openolt
+++ b/agent/device/rlt-3200g-w/mkdebian/debian/logrotate.d/openolt
@@ -1,10 +1,10 @@
-/var/log/dev_mgmt_daemon.log
-/var/log/openolt.log
-{
- rotate 7
- daily
- compress
- missingok
- delaycompress
- copytruncate
-}
+/var/log/dev_mgmt_daemon.log
+/var/log/openolt.log
+{
+ rotate 7
+ daily
+ compress
+ missingok
+ delaycompress
+ copytruncate
+}
diff --git a/agent/device/phoenix/mkdebian/debian/phoenix.install b/agent/device/rlt-3200g-w/mkdebian/debian/rlt-3200g-w.install
similarity index 100%
rename from agent/device/phoenix/mkdebian/debian/phoenix.install
rename to agent/device/rlt-3200g-w/mkdebian/debian/rlt-3200g-w.install
diff --git a/agent/device/phoenix/mkdebian/debian/phoenix.postinst b/agent/device/rlt-3200g-w/mkdebian/debian/rlt-3200g-w.postinst
old mode 100644
new mode 100755
similarity index 94%
rename from agent/device/phoenix/mkdebian/debian/phoenix.postinst
rename to agent/device/rlt-3200g-w/mkdebian/debian/rlt-3200g-w.postinst
index ab4a021..25b782f
--- a/agent/device/phoenix/mkdebian/debian/phoenix.postinst
+++ b/agent/device/rlt-3200g-w/mkdebian/debian/rlt-3200g-w.postinst
@@ -16,14 +16,14 @@
rm -rf /opt/bcm686*
rm -rf /broadcom
-tar zxf /tmp/release_phoenix_V*.tar.gz -C / 2>&1 > /dev/null
+tar zxf /tmp/release_rlt-3200g-w_V*.tar.gz -C / 2>&1 > /dev/null
mkdir -p /opt/openolt && cp /tmp/watchdog/openolt_dev_mgmt_daemon_process_watchdog /opt/openolt && cp /tmp/watchdog/watchdog.config /opt/openolt
sed -i -e '$i rm -rf \/tmp\/bcm68650_svk_init\/' /etc/rc.local
[ -f /opt/openolt/openolt_dev_mgmt_daemon_process_watchdog ] && grep -q '\/opt\/openolt\/openolt_dev_mgmt_daemon_process_watchdog' /etc/rc.local || sed -i -e '$i nohup bash \/opt\/openolt\/openolt_dev_mgmt_daemon_process_watchdog &' /etc/rc.local
-rm -f /tmp/release_phoenix_V*.tar.gz
+rm -f /tmp/release_rlt-3200g-w_V*.tar.gz
rm -f /run/bcm686*
diff --git a/agent/device/phoenix/mkdebian/debian/phoenix.postrm b/agent/device/rlt-3200g-w/mkdebian/debian/rlt-3200g-w.postrm
old mode 100644
new mode 100755
similarity index 100%
rename from agent/device/phoenix/mkdebian/debian/phoenix.postrm
rename to agent/device/rlt-3200g-w/mkdebian/debian/rlt-3200g-w.postrm
diff --git a/agent/device/phoenix/mkdebian/debian/phoenix.preinst b/agent/device/rlt-3200g-w/mkdebian/debian/rlt-3200g-w.preinst
old mode 100644
new mode 100755
similarity index 100%
rename from agent/device/phoenix/mkdebian/debian/phoenix.preinst
rename to agent/device/rlt-3200g-w/mkdebian/debian/rlt-3200g-w.preinst
diff --git a/agent/device/phoenix/mkdebian/debian/rules b/agent/device/rlt-3200g-w/mkdebian/debian/rules
similarity index 96%
rename from agent/device/phoenix/mkdebian/debian/rules
rename to agent/device/rlt-3200g-w/mkdebian/debian/rules
index fc22495..82c1083 100755
--- a/agent/device/phoenix/mkdebian/debian/rules
+++ b/agent/device/rlt-3200g-w/mkdebian/debian/rules
@@ -26,7 +26,7 @@
override_dh_auto_install:
mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/tmp
- cp -a $(CURDIR)/debian/release_phoenix_V*.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
+ cp -a $(CURDIR)/debian/release_rlt-3200g-w_V*.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libz.so.1 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libstdc++.so.6 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libbal_host_api.so $(DEB_DH_INSTALL_SOURCEDIR)/tmp
diff --git a/agent/device/phoenix/update_kernel_options.sh b/agent/device/rlt-3200g-w/update_kernel_options.sh
old mode 100644
new mode 100755
similarity index 100%
rename from agent/device/phoenix/update_kernel_options.sh
rename to agent/device/rlt-3200g-w/update_kernel_options.sh
diff --git a/agent/device/phoenix/vendor.cc b/agent/device/rlt-3200g-w/vendor.cc
similarity index 100%
rename from agent/device/phoenix/vendor.cc
rename to agent/device/rlt-3200g-w/vendor.cc
diff --git a/agent/device/phoenix/vendor.h b/agent/device/rlt-3200g-w/vendor.h
similarity index 95%
rename from agent/device/phoenix/vendor.h
rename to agent/device/rlt-3200g-w/vendor.h
index 3d08310..4c77e73 100644
--- a/agent/device/phoenix/vendor.h
+++ b/agent/device/rlt-3200g-w/vendor.h
@@ -17,8 +17,8 @@
#ifndef __VENDOR_H__
#define __VENDOR_H__
#define VENDOR_ID "Radisys"
-#define RLT3200G
-#define MODEL_ID "phoenix"
+#define RLT3200GW
+#define MODEL_ID "rlt-3200g-w"
#define MAX_SUPPORTED_PON 64
#define ONU_BIT_TRANSMISSION_DELAY 0.8038585/1000 /* unit: ns to us */
#define MINIMUM_ONU_RESPONSE_RANGING_TIME 198075 /* hardcore: this is ranging time for the shortest distance, typically 35us */
diff --git a/agent/download/Makefile.onl b/agent/download/Makefile.onl
index 97509e7..d7ac044 100644
--- a/agent/download/Makefile.onl
+++ b/agent/download/Makefile.onl
@@ -23,7 +23,7 @@
cd OpenNetworkLinux && git stash && git checkout -B $@ $(COMMIT_ID) && docker/tools/onlbuilder --non-interactive -8 -c ./build-onl.sh; \
fi;
onl-4.19:
- if [ "$(BOARD)" = "phoenix" ]; then \
+ if [ "$(BOARD)" = "rlt-3200g-w" ]; then \
cd OpenNetworkLinux && git stash && git checkout -B $@ $(COMMIT_ID) && bash update_kernel_options.sh && docker/tools/onlbuilder --non-interactive -9 -c ./build-onl.sh; \
else \
cd OpenNetworkLinux && git stash && git checkout -B $@ $(COMMIT_ID) && docker/tools/onlbuilder --non-interactive -9 -c ./build-onl.sh; \
diff --git a/agent/scripts/init.d/dev_mgmt_daemon b/agent/scripts/init.d/dev_mgmt_daemon
index e89d702..6500ac7 100755
--- a/agent/scripts/init.d/dev_mgmt_daemon
+++ b/agent/scripts/init.d/dev_mgmt_daemon
@@ -21,7 +21,7 @@
OLT_MODEL=`cat /sys/devices/virtual/dmi/id/board_name`
PRODUCT_NAME=
-# phoenix - wait for onlp driver to load
+# RLT-3200G-W - wait for onlp driver to load
if [ "$OLT_MODEL" = "Default string" ]; then
RETRY_COUNT=0
while [ -z "$PRODUCT_NAME" ]
diff --git a/agent/src/core_api_handler.cc b/agent/src/core_api_handler.cc
index 600b57f..14d3386 100644
--- a/agent/src/core_api_handler.cc
+++ b/agent/src/core_api_handler.cc
@@ -417,7 +417,7 @@
BCMOLT_MSG_FIELD_SET(&oper, inni_config.mode, BCMOLT_INNI_MODE_ALL_10_G_XFI);
BCMOLT_MSG_FIELD_SET(&oper, inni_config.mux, BCMOLT_INNI_MUX_FOUR_TO_ONE);
BCMOLT_MSG_FIELD_SET (&oper, system_mode, BCMOLT_SYSTEM_MODE_GPON__16_X);
- } else if (MODEL_ID == "phoenix") {
+ } else if (MODEL_ID == "rlt-3200g-w") {
BCMOLT_MSG_FIELD_SET(&oper, inni_config.mux, BCMOLT_INNI_MUX_NONE);
if(dev == 1) {
BCMOLT_MSG_FIELD_SET(&oper, inni_config.mux, BCMOLT_INNI_MUX_FOUR_TO_ONE);
diff --git a/agent/test/Makefile b/agent/test/Makefile
index d103d57..54bb780 100644
--- a/agent/test/Makefile
+++ b/agent/test/Makefile
@@ -30,7 +30,7 @@
##
##
-CXX != if [ "$(OPENOLTDEVICE)" = "phoenix" ]; then echo "g++-6"; else echo "g++-4.9"; fi
+CXX != if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ]; then echo "g++-6"; else echo "g++-4.9"; fi
CXXFLAGS += -g -O2
CXXFLAGS += `pkg-config --cflags-only-I grpc++` -I/usr/local/include/pcapplusplus/
CPPFLAGS += `pkg-config --cflags protobuf grpc`