Skip to content

Commit 74d8b4a

Browse files
authored
[caclmgrd] Add support for multi-ASIC platforms (#5022)
* Support for Control Plane ACL's for Multi-asic Platforms. Following changes were done: 1) Moved from using blocking listen() on Config DB to the select() model via python-swsscommon since we have to wait on event from multiple config db's 2) Since python-swsscommon is not available on host added libswsscommon and python-swsscommon and dependent packages in the base image (host enviroment) 3) Made iptables programmed in all namespace using ip netns exec Signed-off-by: Abhishek Dosi <[email protected]> * Address Review Comments Signed-off-by: Abhishek Dosi <[email protected]> * Fix Review Comments * Fix Comments * Added Change for Multi-asic to have iptables rules to accept internal docker tcp/udp traffic needed for syslog and redis-tcp connection. Signed-off-by: Abhishek Dosi <[email protected]> * Fix Review Comments * Added more comments on logic. * Fixed all warning/errors reported by http://pep8online.com/ other than line > 80 characters. * Fix Comment Signed-off-by: Abhishek Dosi <[email protected]> * Verified with swsscommon package. Fix issue for single asic platforms. * Moved to new python package * Address Review Comments. Signed-off-by: Abhishek Dosi <[email protected]> * Address Review Comments.
1 parent ba3f5ca commit 74d8b4a

File tree

3 files changed

+170
-85
lines changed

3 files changed

+170
-85
lines changed

files/build_templates/sonic_debian_extension.j2

+7
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,13 @@ sudo DEBIAN_FRONTEND=noninteractive dpkg --root=$FILESYSTEM_ROOT -i $debs_path/k
221221
sudo LANG=C DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true chroot $FILESYSTEM_ROOT apt-get -q --no-install-suggests --no-install-recommends --force-no install
222222
fi
223223

224+
# Install python-swss-common package and all its dependent packages
225+
{% if python_swss_debs.strip() -%}
226+
{% for deb in python_swss_debs.strip().split(' ') -%}
227+
sudo dpkg --root=$FILESYSTEM_ROOT -i {{deb}} || sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
228+
{% endfor %}
229+
{% endif %}
230+
224231
# Install custom-built monit package and SONiC configuration files
225232
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/monit_*.deb || \
226233
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f

0 commit comments

Comments
 (0)