Commit Graph

186 Commits

Author SHA1 Message Date
Ying Xie
6c4914b62c Revert "[dhcpmon] Monitor Mgmt Interface For DHCP Packets (#5317)"
This reverts commit 44d6e03df3.
2020-09-14 22:03:55 +00:00
Tamer Ahmed
44d6e03df3 [dhcpmon] Monitor Mgmt Interface For DHCP Packets (#5317)
When BGP routes are missing, DHCP packets get relayed over mgmt
interface. This results in dhcpmon alerting that DHCP packets are
not being relayed. This is PR include mgmt interface as uplink
device, and so, if DHCP packet gets relayed over mgmt interface,
regular dhcpmon alert will not be issues. Instead, dhcpmon will
check the mgmt interface counts and issue a separate alert regarding
packets travelling through mgmt network.

In addition, this PR includes the following enhancements:
1. Add SIGUSR1 handler that prints out current packet counts
2. Increase alert grace window to 3 minutes from currently 2 minutes
3. Time is now computed more accurately
4. Print vlan name before counters

signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>
2020-09-14 16:56:01 +00:00
Qi Luo
e02de1dc89 Fix bug: check port alias even when port_config_file parameter is not provided (#4787) 2020-06-18 01:21:53 +00:00
Qi Luo
8d200300ca
[minigraph] Support FECDisabled in minigraph parser (#4556) (#4567)
Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>
2020-05-09 15:54:39 -07:00
Neetha John
3d41c271a4 [qos]: Alpha and ECN settings change for Th (#4564)
Dynamic threshold setting changed to 0 and WRED profile green min threshold set to 250000 for Tomahawk devices

Changed the dynamic threshold settings in pg_profile_lookup.ini
Added a macro for WRED profiles in qos.json.j2 for Tomahawk devices
Necessary changes made in qos.config.j2 to use the macro if present

Signed-off-by: Neetha John <nejo@microsoft.com>
2020-05-09 18:25:17 +00:00
Joe LeVeque
28512122bc [minigraph.py] Add support for 'OutAcl' keyword and attaching ACLs to VLAN interfaces (#4229)
- Support parsing egress ACLs from minigraph file specified by the "OutAcl" element
- Support attaching ACLs to VLAN interfaces
2020-04-03 19:42:17 +00:00
pavel-shirshov
a881a23908
[bgpcfgd]: Generate set src configuration dynamically (#4273)
* [bgpcfgd]: Generate set src configuration dynamically

Sometimes zebra starts faster then swss configures Loopback0
In this case "set src" inside of the route map will not be
inserted to the configuration because zebra doesn't see Loopback
ips in the list of available ip addresses.

I've added extra logic to push the "set src" configuration only
when Loopback has been configured by swss.
2020-03-18 08:48:03 -07:00
Joe LeVeque
7a095dc103 [sonic-cfggen] Load JSON files before minigraph file (#4202)
If sonic-cfggen is passed the -m argument (to load the minigraph file) along with one or more -j <json_file> arguments, load the JSON files before loading the minigraph file.

This ensures that the init_cfg.json file is loaded before the minigraph, therefore the minigraph can override any default configuration options specified in init_cfg.json. Currently, the behavior is reversed.

Note: This is not an issue if loading loading multiple JSON files, because sonic-cfggen loads them in the left-to-right order they were specified on the command line, therefore providing flexibility for loading JSON files in a specific order. As long as init_cfg.json is specified before config_db.json, the values specified in config_db.json will take precedence.
2020-03-02 16:24:38 +00:00
Tamer Ahmed
1fd4a36371
[dhcp-relay]: Add DHCP Relay Monitor (#3886) (#4004)
* [dhcp-relay]: Add DHCP Relay Monitor (#3886)

DHCP relay MONitor (dhcpmon) keeps track of DORA messages. If DHCP Relay
is detected to be not forwarding DORA message, dhcpmon will log such event
to syslog. Under the hood dhcpmon keeps counts of clients DR messages,
forwarded DR messages, DHCP server OA messages, and forwarded OA messages.
dhcpmon will check every 12 sec (configurable) if counts are monotonically
increasing and record snapshot of those counters. dhcpmon will report
discrepancies when detected between current counters and snapshot counters.

pull-request: https://github.com/Azure/sonic-buildimage/pull/3886
signed-off-by: Tamer Ahmed <tamer.ahmed@microsoft.com>

* Eliminate dependency on libexplain

* Remove dependency on libexplain
2020-01-14 10:33:20 -08:00
pavel-shirshov
6d1530f753
[docker-fpm-quagga]: Enable sending ipv6 prefixes over ipv4 BGPMON session. (#3828)
* Enable ipv6 prefixes over ipv4 BGPMON session

* Fix testcases

* Update bgpd_quagga.conf
2019-11-30 22:28:46 -08:00
Wenda Ni
8788f4f783 cherry-picking diff between #3628 and #3561
Revert "Configure buffer profile to all ports (#3561)" (#3628)
Configure buffer profile to all ports (#3561)

This reverts commit 8861cbe98e.

Signed-off-by: Wenda Ni <wenni@microsoft.com>
2019-11-08 03:12:59 +00:00
pavel-shirshov
b9b56c91ff [minigraph.py]: Use default namespace for <Address> (#3695)
* [minigraph.py]: Use default namespace for <Address>
2019-11-07 21:36:43 +00:00
pavel-shirshov
a96ed09ff3 Downport BGPM and addrack patches to configlet_201811 branch (#3669)
* BGPm for 201811 (#3601)

* Feature is downported

* Add monitors to the test minigraphs

* Test

* No pfx filer

* Fix bgp sample

* Quagga requires to activate peer-group before configuration

* Add bgpcfgd and bgpd.peer template

* Catch exception if rendering external template

* Fix tests
2019-11-07 20:08:02 +00:00
Danny Allen
aa6adc1384 [minigraph.py] Update minigraph parsing logic to include only active ports for mirror tables (#3592) (#3634)
* Update minigraph.py to filter out front-panel ports that are not active
* Update cfggen tests to reflect new behavior

Signed-off-by: Danny Allen <daall@microsoft.com>

* Incorporate PR comments
- Update t0 tests to include additional device neighbors
- Refactor xml parsing logic
2019-11-07 00:24:07 +00:00
Wenda Ni
f616cec7f4 Adopt per-port buffer and qos profile (#3542)
Signed-off-by: Wenda Ni <wenni@microsoft.com>
2019-11-07 00:21:52 +00:00
pavel-shirshov
c259f40477 BGPm for 201811 (#3601)
* Feature is downported

* Add monitors to the test minigraphs

* Test

* No pfx filer

* Fix bgp sample

* Quagga requires to activate peer-group before configuration
2019-10-15 18:43:52 -07:00
Wenda Ni
e7f1d4f3e2 Remove the divide by 4 operation to the under the hood SAI (#1532)
* Remove the divide by 4 operation to the under the hood SAI

This is to avoid the need and thus the confusion for application program to know
the mmu internal architecture

This change must have support from SAI change to reach the correct
config

Signed-off-by: Wenda <wenni@microsoft.com>

* Relegate the divide by 4 operation to the under the hood SAI for egress
lossless pool

Extend to 7060 and 6100

Signed-off-by: Wenda <wenni@microsoft.com>

* Add more TH/TH2 hwskus

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Update config test

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Add TH2 ingress lossy profile

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Move the divide by 4 operation to SAI internal

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* [bcm SAI] Upgrade Broadcom SAI to version 3.5.3.1-15

- Broadcom SAI 3.5 GA release 20190924.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
2019-09-25 23:01:54 +00:00
Joe LeVeque
92d359dcc8
[201811][dhcp_relay] Properly wait for routed interfaces to be ready before starting relay agent (#3442) 2019-09-12 10:57:36 -07:00
Shuotian Cheng
614475feaf [minigraph]: Ignore mirror session portion in minigraph (#3410)
This piece of information is currently not used. Revert this
pull request in the future to add back the default mirror
session information into the configuration database.

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2019-09-09 18:53:35 +00:00
Shuotian Cheng
66245e29a3 [minigraph]: Add mirror type v6 condition (#2836)
Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2019-08-21 21:40:35 +00:00
Shuotian Cheng
16bfd7200f [minigraph]: Fix bug in copying list in Python (#2831)
'=' cannot be used for copying the list

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2019-08-21 21:39:13 +00:00
Shuotian Cheng
950bc059d0 [minigraph]: Mark both ERSPAN and ERSPANv6 as mirror ACL tables (#2732)
- Support ERSPAN and ERSPANv6 two types of ACL tables.
- Update the unit test to cover this case.

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2019-08-21 19:50:31 +00:00
Joe LeVeque
29bbd86862
[services] Restart SwSS service upon unexpected critical process exit (#2845) (#2852) 2019-07-29 18:10:26 -07:00
Shuotian Cheng
bce8fee86a [config-engine]: Add admin_status up to l2switch.json template (#3210)
Bring up all ports by default by adding the admin_status:up
to each of the ports.

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2019-07-24 17:45:00 +00:00
Kebo Liu
0ef7e3be18 [sonic-cfggen] fix name conflict between sonic_platform package and sonic_platform.py (#2875)
* fix name conflict between sonic_platfrom package and sonic_platform.py

* update sonic-utility submodule to pickup lastest fix

* Revert "update sonic-utility submodule to pickup lastest fix"

This reverts commit f66aa99738.

* update sonic-utility sub module
2019-07-16 21:27:26 +00:00
Sumukha Tumkur Vani
24e5a62ccc [sonic-cfggen]: Fix for management port speed issue (#2945) 2019-07-03 23:19:26 +00:00
Joe LeVeque
bd7b96fea3 [201811][dhcp_relay] Add support for DHCP client(s) on one VLAN and DHCP server(s) on another (#2919)
* Change URL for isc-dhcp source repository

* Modify supervisor conf to generate dhcrelay commands with '-id' and '-iu' options

* Comments; Also clean up jinja2 syntax

* Patch relay to open one socket per interface and send to all servers on all upstream interfaces

* Patch relay agent to properly forward BOOTREQUEST only on appropriate interface if it is a directed broadcast

* Port upstream patches to isc-dhcp-relay to support upstream/downstream interfaces

* Update patch to properly support interfaces with multiple IP addresses assigned

* Pass --enable-use-sockets to configure instead of uncommenting USE_SOCKETS directly
2019-05-18 10:33:26 -07:00
Shuotian Cheng
34734e4c55 [minigraph]: Fix bug in copying list in Python (#2831)
'=' cannot be used for copying the list

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2019-04-26 22:29:03 +00:00
pavel-shirshov
fde3a4f035 [sonic-cfggen]: Output differences for bgp configurations (#2768) 2019-04-16 15:36:21 +00:00
pavel-shirshov
144fe975e5 [docker-fpm-quagga]: Add support for PeerAsn and UpdateAddress (#2766) 2019-04-16 15:35:51 +00:00
Ying Xie
19813c2924 [bgp quagga] increase BGP graceful restart timeout to 240 seconds (#2754)
There are some platforms with less powerful CPU/hard-drive could take
longer to get ready for BGP. For these platforms, 240 seconds would be
a safer threshold.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
2019-04-16 15:35:09 +00:00
Wenda Ni
f720c2a9a3 [qos]: Map tc 1, 2, 5, and 6 back to pg 0 (#2650)
Lossy traffic does not need to be mapped to different ingress PGs. They can all share the same ingress PG.

Signed-off-by: Wenda Ni <wenni@microsoft.com>
2019-03-19 03:04:46 +00:00
Mykola F
1ddf4b75c9 revert 'Remove MAC alignment WA for Mellanox platforms.' (#2677)
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
2019-03-18 08:52:31 -07:00
Nazarii Hnydyn
8a602c67f9 [mellanox]: Remove MAC alignment WA for Mellanox platforms. (#2632)
Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>
2019-03-07 17:40:40 +00:00
Mykola F
797b21e5da [config engine] update test_cfggen test_port_description test (#2593)
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
2019-02-21 21:27:37 +00:00
Mykola F
2a12684fbe [minigraph] asymmetric pfc is disabled by default (#2481)
Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

Conflicts:
	src/sonic-config-engine/tests/sample_output/ports.json
	src/sonic-config-engine/tests/test_cfggen.py
2019-02-21 18:25:17 +00:00
RAMA CHANDRA REDDY GADDAM
490f47e059 'show vlan config' is not displaying the VLAN members, after the clear config and reload with default l2 configuration. (#2536)
'show vlan config' not displaying the VLAN members, after clear config done loaded with default l2 configuration.
2019-02-21 18:21:06 +00:00
Guohan Lu
bab38e4310 setup port description if minigraph has neighbor information
Signed-off-by: Guohan Lu <gulv@microsoft.com>
2019-02-14 17:31:16 +00:00
Guohan Lu
41bb13b834 configure the hostname for lldpd
Signed-off-by: Guohan Lu <gulv@microsoft.com>
2019-02-14 17:31:01 +00:00
Mykola F
ab19d1398c [minigraph.py] generate port description for every port (#2395)
* [minigraph.py] generate mandatory default port description

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

* use port name as default description

* [config-engine] update test exaple output

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

* [minigraph.py] use alias/port name as default description instead of neighbor data

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>
2019-02-14 17:31:01 +00:00
Mykola F
a65e47fb62 [lldpmgr] add mgmt ip to lldpd conf template, handle port description/alias changes (#2396)
* [lldpmgr] add mgmt ip to lldpd conf templte, handle port description/alias config

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

* fix typo

* [config-engine] update test sample output lldpd.conf

Signed-off-by: Mykola Faryma <mykolaf@mellanox.com>

* fix the log message

* fix lldpd.conf.j2
2019-02-14 17:21:32 +00:00
Wenda Ni
b1bdecb1c0 [QoS]: Link pg 2 and 6 to lossy buffer profile (#2511)
* Link pg 2 and 6 to lossy buffer profile

Signed-off-by: Wenda <wenni@microsoft.com>
2019-02-03 04:41:19 +00:00
Wenda Ni
cdbbb7eb4d [QoS]: QoS Config change for multiple devices (#2505)
* QoS config change: 1) DSCP mapping; 2) link pg/queue 6 to lossy buffer;
3) redistribute scheduler

Signed-off-by: Wenda <wenni@microsoft.com>

* Add scheduling weight to queue 2

Signed-off-by: Wenda <wenni@microsoft.com>

* Link pg/queue 2 to lossy buffer

Signed-off-by: Wenda <wenni@microsoft.com>

* Update the pg headroom for a7060-D48C8 50G

Signed-off-by: Wenda <wenni@microsoft.com>

* Update config gen test for qos

Signed-off-by: Wenda <wenni@microsoft.com>

* Update pg headroom size, and update egress lossy pool size accordingly

Signed-off-by: Wenda <wenni@microsoft.com>

* Update headroom pool size; Update ingress service pool and egress lossy
pool sizes accordingly;

Signed-off-by: Wenda <wenni@microsoft.com>

* a7260: update headroom pool size; Update ingress service pool and egress lossy pool sizes accordingly;

Signed-off-by: Wenda <wenni@microsoft.com>

* Update config gen test for buffer

Signed-off-by: Wenda <wenni@microsoft.com>
2019-02-02 19:34:35 +00:00
Ying Xie
d9c076dada [quagga bgp] set quagga graceful restart timeout to 180 seconds (#2362)
Signed-off-by: Ying Xie <ying.xie@microsoft.com>
2018-12-08 11:38:31 -08:00
Wenda Ni
f5e678cf84 Port QoS & buffer changes in 0330 to master (#2239)
* 1) DSCP 46 to 5; 2) ecn config for lossless traffic; 3) ecn on by default; 4) DWRR equal weight;

Signed-off-by: Wenda <wenni@microsoft.com>

* 1) link pg & queue 5 to lossy buffer profile; 2) ingress lossless alpha 1/8

Signed-off-by: Wenda <wenni@microsoft.com>

* Update the test case for qos & buffer json template

Signed-off-by: Wenda <wenni@microsoft.com>

* Migrate a7050-qx32 and s6000 to use pg_profile lookup architecture

Signed-off-by: Wenda <wenni@microsoft.com>

* Update pg headroom egress service pool for a7050-qx-32s, a7050-qx32, and s6000

Signed-off-by: Wenda <wenni@microsoft.com>

* Link queue 5 to lossy profile

Signed-off-by: Wenda <wenni@microsoft.com>
2018-12-04 20:51:55 -08:00
Taoyu Li
aedfd6e708 [sonic-cfggen] Multi-key should be in form of (a,b) instead of 'a|b' (#2337) 2018-12-04 10:07:44 -08:00
Nikos
7056b49af7 Routing application split config support (#2286)
* Routing application split config support

Signed-off-by: nikos <ntriantafillis@gmail.com>

* Routing application split config support
Routing application split config support

Signed-off-by: nikos <Nikos Triantafillis>
2018-11-26 18:19:12 -08:00
Shuotian Cheng
e5a031b5d5
[minigraph.py]: Set default admin_status up to LAG/VLAN members (#2209)
By default, port channel members and VLAN members are set to admin
status UP. This configuration could be updated via the command:
config interface <interface_name> startup/shutdown

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2018-10-30 16:42:38 -07:00
Shuotian Cheng
7313e7d9bc [teamd]: Add teammgrd in docker-teamd (#2064)
Remove the teamd.j2 templates used for starting the teamd. Add
teammgrd instead to manage all port channel related configuration
changes. Remove front panel port related configurations in
interfaces.j2 templates as well.

Remove teamd.sh script and use teammgrd to start all the teamd
processes. Remove all the logics in the start.sh script as well.

Update the sonic-swss submodule.

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
2018-10-19 03:41:53 -07:00
Prince Sunny
4a22de42c6 Encap src_ip is not required for the IPinIP decap tunnels (#2162)
* Encap src_ip is not required for the IPinIP decap tunnels

* Removed unused variables
2018-10-17 18:31:19 -07:00