Conflicts:
	platform/mellanox/mlnx-fw-upgrade.sh
	src/sonic-sairedis
	src/sonic-swss

- [bgpd]: Enable forwarding state flag in graceful restart capability
- [debian]: Add autoreconf_clean

- [netlink]: Increase netlink buffer size
- [netlink]: Check return vode from nl_recvmsgs_default
- [select]: EINTR error hanlding
- [makefile]: Use full file names

- [sfputil]: Refactor and add support for presence, low-power mode and reset

This reverts commit 338a83b.

We first test the previous version of the SAI and make sure
it passes all the tests and then update the SAI version to
a later one.

* Track branch v1.0.3 for sonic-utilities

* Spaces to tabs

SAI is a submodule of sonic-sairedis repository. Remove the dependency
from this repository.

This reverts commit 44502b2.

[devices]: Update Dell s6100/z9100 platform modules

* [core dump] pass unix time to coredump-compress script

Currently we only have program name (e.g. bgpd) and PID in the core file
name. PID could collide especially after docker restart or recreate.

Passing the unix time to coredump-compress so it could also add time to
the core file name.

* [utilities] include the change to coredump_compress script

* [quagga] enable core dump for bgpd and zebra

bgpd and zebra downgrade their privilege shortly after started. For that
sysctrl kernel.suid_dumpable needs to be set to 2, so that they can dump
core.

Note that fs.suid_dumpable SHOULD NOT be set to 1. Which will bypass all
system security.

…#922)

* [bgpd]:disable ipv4 over ipv6 and enable ipv6 over ipv4 peer group

* update as comments

* Update sonic-platform-modules-ingrasys submodule.
* Fixed sfputil plugin for read QSFP EEPROM.
* Add sfputil plugin for get presence.
* Add sfputil plugin for get/set low power mode.
* Add sfputil plugin for reset QSFP.

Signed-off-by: Wade He chihen.he@gmail.com

The deadlock fix in sonic-sairedis introduce other race conditions which
is more prevelant.

moving to initramfs unifies disk allocate on different platforms.
use fallocate instead of dd to speed up the disk allocation.

By default, mkfs.ext4 has -E discard option which discards the blocks
at the mkfs time, also speed up the initialization time.

….2 (#938)

This library will be archived in to BRCM_SAI library

…s if they exist (#941)

no longer needed in the build image

* [rsyslog]: Use timegenerated instead of timestamp

This is useful when rsyslog is used to put markers generated on other machines.
This way all messages will have a timestamp from a single system.

* [rsyslog] Use subseconds from local machine

….user (#950)

Should rebuild both Dockerfile and Dockerfile.user when any of the two
files change.

* Bump sonic-platform-modules-arista submodule

* Allow image specific mount option for containers

* Add led plugin for DCS-7060CX-32S

* Add led plugin for DCS-7260CX3-64

Modify minigraph parser output format so it fit DB schema
Modify configuration templates to fit new schema
Systemd services dependencies are modified so database starts before any configuration consumer

…952)

* [Ingrasys] update port_config.ini and sfputil for ingrasys platforms

- What I did

Update port_config.ini on S8810-32Q/S8900-54XC/S8900-64XC/S9100-C32 platforms

- How I did it

Update alias field and add port field in port_config.ini

- How to verify it

Check with the "sfputil show eeprom" command. If no error occurs, it is passed.

- Description for the changelog

Update port_config.ini on S8810-32Q/S8900-54XC/S8900-64XC/S9100-C32 platforms

* [Ingrasys] remove debug message in sfputil.py on S8810-32Q

- What I did

remove debug message in sfputil.py on S8810-32Q

- How I did it

remove print in get_low_power_mode() and set_low_power_mode()

- How to verify it

There should be no debug message when executing "sfputil show lpmode"
and "sfputil lpmode on Ethernet0"command.

- Description for the changelog

remove debug message in sfputil.py on S8810-32Q

- A picture of a cute animal (not mandatory but encouraged)

* Fix an issue that bgp asn data type is not consistent from minigraph parser and DB

* Fix test typo

…946)

Existing dockers has paths mounted according to the HWSKU. When HWSKU
changes, these dockers need to be destroyed and recreated with the
correct paths mounted.

This submodule update includes the deadlock fixes.

…ther NOS (#949)

* Install grub for SONiC post migration from another NOS

* Install grub from bundled debian package instead of using ONIE's. Address review comments

- What I did

Update Ingrasys submodule for S8900-54XC QSFP reset function.

- How I did it

Add reset init scripts in S8900-54XC init function.

- How to verify it

Used the command "sfputil reset Ethernet48" to verify reset function.
If no error occurs, it is passed.

- Description for the changelog

Update Ingrasys submodule for S8900-54XC QSFP reset function

- A picture of a cute animal (not mandatory but encouraged)

…uild (#951)

* Framework to plugin Organization specific scripts

* Framework to plugin Organization specific scripts

* Framework to plugin Organization specific scripts

* add getopt option to organization script

* Updated MTU to the widely used value with other devices

- Increase the rx_buffer_size to 9238, the same MTU szie as in the hardware

* [config]: Fix management interface configuration

* [config]: Fix management interface configuration

* Fix comments

* [device/accton]: Add a new supported device and platform, AS7312-54X
Switch Vendor: Edge-core

Switch SKU: AS7312-54X

ASIC Vendor: Broadcom

Swich ASIC: Tomahawk

Port Configuration: 48x25G + 6x100G

SONiC Image: SONiC-ONIE-Broadcom
Signed-off-by: polly_hsu@accton.com

* Update port_config.ini

* Update sai.profile

* Update installer.conf

* Update led_proc_init.soc

* Update minigraph.xml

Update Ingrasys/Accton config.bcm files

With the fixes in /etc/network/interfaces file, host interfaces
could be added into the corresponding LAGs automatically. Thus,
the logic of checking if port initialization is ready is no longer
needed.

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>

… disks (#977)

* Revert "snmpd ignores unavailable disks (#607)"

This reverts commit d70e973.

* Disable snmpd module disk_hw, so no syslog messages about unavailable disks

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>

* Strip white spaces

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>

Introducing the fix for SAI 1.0 FDB entry fix

…er (#903)

* Fixing a couple of issues to enable FRR to run with latest SONiC code.

* Adjusting FRR's jinja template to meet latest sonic-cfgen requirements. Basically, i'm just extending #448 changes into FRR.

* Eliminate FRR's integrated-config file to prevent daemons from bypassing their own config files. FRR daemons now default to an integrated-config file for config-parsing purposes. But we are still interested in having each daemon looking in their specific config file (bgpd.conf, zebra.conf, etc). So here i'm just deleting this integrating-config file to prevent FRR from running from a bogus config-file.

* Allows interactive session with the slave docker-container after conclusion of the building process.

Proposed changes provide a more direct access to the building pipeline,
by allowing users to launch consecutive compilation tasks from the same
slave container.

change hwmon kernel modules installation order on S8810-32Q/S8900-54XC/S8900-64XC/S9100-32X
change hwmon kernel modules installation order in i2c_utils.sh and update related fancontrol file
Check the hwmon kernel module insertion order in /sys/class/hwmon/hwmonX.
w83795 should be in /sys/class/hwmon/hwmon1, and jc42 should be the last one.
change hwmon kernel modules installation order on S8810-32Q/S8900-54XC/S8900-64XC/S9100-32X

Signed-off-by: Volodymyr Samotiy <volodymyrs@mellanox.com>

…dule (#984)

* Add S8900-64XC SFP QSFP CPLD kernel module.
* Fixed QSFP function call in i2c_utils.sh.
* Add QSFP monitor service for SFP and QSFP SI.

Signed-off-by: Wade He <chihen.he@gmail.com>

- Update Seastone config.bcm files
- bugfix: Fix set attribute for ipv6 neighbor

[rfc4363]: Add key check logic for SAI bridge port objects (#38)

FW upgrade is done outside the container.
This piece of code was left accidentally during the merge.

* Add timestamp suffix to the dirty images version string

This will allow to build different debug images without
having to update BUILD_NUMBER variable before the build

* Changed timestamp format to YYYYMMDD.HHMMSS

update the minigraph to the latest.
the previous one causes MSN2410 failing to start up properly.

- Add additional DropCancel and CopyToCpuCancel action rules for every redirect

sonic-py-swsssdk
- Commond utility functions for bridge/port mapping
snmp
- Update the code to use common library API for bridge/port mapping

* Update swss submodule reference
* Update swss-common submodule reference

This pull request introduces changes including
1. Use unified buffer configurations fro all Mellanox 27xx platforms
2. Refactor TableConsumable and optimize popping empty logics
3. Add SwitchOrch to deal with switch attributes changes
4. Refactor doAclTableTask and doAclRuleTask
5. Add PFC watchdog tables and runRedisScript function in common library

Signed-off-by: Andriy Moroz <c_andriym@mellanox.com>

…s) before starting fancontrol (#1002)

…dress (#998)

Use ipv4_loopback_addresses variable to store all IPv4 loopback addresses.
The source IP for encapsulation is chosen from one of the addresses.
The destination IPs for decapsulation is the list of the addresses.

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>

* [mibs]: Fix bug module has no attribute 'get_index_from_str'

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>

…1005)

The current DEVICE_NEIGHBOR format doesn't support multiple different
ports connecting with same neighbor. Thus the lldpd.conf file is not
generated correctly, causing missing information for LAG members.

This fix reverts the data structure in the previous version of
minigraph parser - using local port as the key and remote port/device
as the value of the map. Sample format is:

DEVICE_NEIGHBOR['Ethernet124'] = {
    'name': 'ARISTA04T1',
    'port': 'Ethernet1/1'
}

The corresponding unit test in test_cfggen is updated.
Add one more unit test for lldpd.conf.j2 verification.

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>

* Make supervisor controlled one-shot program autorestart 0 time, so the status will become FATAL instead of EXITED if failure happens

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>

* Make swssconfig.sh strictly exit on any failure

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>

* Tune startretries, tested in supervisor 3.3.2-1

Signed-off-by: Qi Luo <qiluo-msft@users.noreply.github.com>