Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 93cfeed

Browse files
authored
Merge pull request #17 from barefootnetworks/address_comments
Address comments
2 parents fac70d9 + 91b0392 commit 93cfeed

38 files changed

+3053
-22
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@
7777
[submodule "platform/broadcom/sonic-platform-modules-mitac"]
7878
path = platform/broadcom/sonic-platform-modules-mitac
7979
url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git
80-
[submodule "platform/barefoot/sonic-platform-modules-ingrasys"]
81-
path = platform/barefoot/sonic-platform-modules-ingrasys
82-
url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys-barefoot.git
8380
[submodule "platform/p4/sonic-platform-modules-arista"]
8481
path = platform/p4/sonic-platform-modules-arista
8582
url = https://github.com/aristanetworks/sonic

device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-T0/buffers_defaults_t0.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"size": "11213696",
2929
"type": "ingress",
3030
"mode": "dynamic",
31-
"xoff": "8356608"
31+
"xoff": "6387264"
3232
},
3333
"egress_lossy_pool": {
3434
"size": "9532224",

device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/buffers_defaults_t1.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"size": "10443264",
1515
"type": "ingress",
1616
"mode": "dynamic",
17-
"xoff": "4625920"
17+
"xoff": "7335744"
1818
},
1919
"egress_lossy_pool": {
2020
"size": "8877440",

dockers/docker-base/Dockerfile.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ RUN apt-get -y install \
2929
vim-tiny \
3030
perl \
3131
python \
32-
psmisc \
3332
less
3433

3534
# Pre-install troubleshooting packages
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[Unit]
22
Description=Enable SONiC counters
3+
PartOf=swss.service
34

45
[Service]
56
Type=oneshot
6-
ExecStart=/bin/bash -c '/usr/bin/counterpoll queue enable ; /usr/bin/counterpoll port enable ; /usr/bin/pfcwd counter_poll enable'
7+
ExecStart=/bin/bash -c 'sleep 60 ; /usr/bin/counterpoll queue enable ; /usr/bin/counterpoll port enable ; /usr/bin/pfcwd counter_poll enable'
78
RemainAfterExit=yes

files/build_templates/enable_counters.timer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Description=Delays the SONiC counters gathering until SONiC has started
33

44
[Timer]
5-
OnBootSec=3min
5+
OnBootSec=2min
66
Unit=enable_counters.service
77

88
[Install]

files/image_config/caclmgrd/caclmgrd

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@ class ControlPlaneAclManager(object):
147147
iptables_cmds.append("ip6tables -F")
148148
iptables_cmds.append("ip6tables -X")
149149

150+
# Add iptables commands to allow all IPv4 and IPv6 traffic from localhost
151+
iptables_cmds.append("iptables -A INPUT -s 127.0.0.1 -i lo -j ACCEPT")
152+
iptables_cmds.append("ip6tables -A INPUT -s ::1 -i lo -j ACCEPT")
153+
150154
# Get current ACL tables and rules from Config DB
151155
self._tables_db_info = self.config_db.get_table(self.ACL_TABLE)
152156
self._rules_db_info = self.config_db.get_table(self.ACL_RULE)
Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Prerequisites
2+
*.d
3+
4+
# Object files
5+
*.o
6+
*.ko
7+
*.obj
8+
*.elf
9+
10+
# Linker output
11+
*.ilk
12+
*.map
13+
*.exp
14+
15+
# Precompiled Headers
16+
*.gch
17+
*.pch
18+
19+
# Libraries
20+
*.lib
21+
*.a
22+
*.la
23+
*.lo
24+
25+
# Shared objects (inc. Windows DLLs)
26+
*.dll
27+
*.so
28+
*.so.*
29+
*.dylib
30+
31+
# Executables
32+
*.exe
33+
*.out
34+
*.app
35+
*.i*86
36+
*.x86_64
37+
*.hex
38+
39+
# Debug files
40+
*.dSYM/
41+
*.su
42+
*.idb
43+
*.pdb
44+
45+
# Kernel Module Compile Results
46+
*.mod*
47+
*.cmd
48+
.tmp_versions/
49+
modules.order
50+
Module.symvers
51+
Mkfile.old
52+
dkms.conf

0 commit comments

Comments
 (0)