Merge remote-tracking branch 'msft_github/master'

* msft_github/master:
  [swssconfig]: Update Mellanox buffer profile template to work with an incomplete minigraph (sonic-net#332)
  [portsyncd]: Remove deprecated sample file port_config.ini (sonic-net#330)
  [portsyncd]: Remove unused LAG related tables (sonic-net#329)
  [tunnelorch]: Minor comment update
  [aclorch]: Fix crashing when removing ACL table that has associated ACL rules (sonic-net#322)
  [pfcwdorch]: Initial support (sonic-net#317)
  [swssconfig]: Update buffer profile template to work with CONF_DB (sonic-net#319)
  [aclorch]: Refactor doAclTableTask and doAclRuleTask (sonic-net#318)
  [swssconfig]: Add Mellanox PG buffer profiles based on port configuration (sonic-net#301)
  [switchorch]: Add SwitchOrch to deal with switch attributes changes (sonic-net#314)
  [github]: Update pull request template comments
  [github]: Add pull request template (sonic-net#313)
  Optimize orch performance by pops() (sonic-net#312)
  Refactor TableConsumable (sonic-net#291)
  [buffer]: Remove failed tasks from the m_toSync queue (sonic-net#308)
  [qos]: Remove failed tasks from the m_toSync queue (sonic-net#306)
  [aclorch]: Add match TC support for ACL rule (sonic-net#302)
  [orchagent]: Set log recording directory before enable recording (sonic-net#300)
  [orchagent]: Remove duplicate SwSS recording file set code (sonic-net#298)
  Fix port speed validation (sonic-net#288)
  [fdborch]: Fix FdbOrch code to work upon SAI v1.0 (sonic-net#284)
  [config]: Add BGPv6 COPP in 00-copp.config.json (sonic-net#281)
  [aclorch]: Fix match DSCP attribute value mask length to 0x3F
  [mirrororch]: Set the VLAN header only when the packet is mirrored to a VLAN (sonic-net#282)
  [swssconfig]: Log errors instead of throwing exception when file open fails (sonic-net#277)
  [aclorch]: Remove wrong table attribute (sonic-net#280)
  [aclorch]: Fix remove_acl_counter function to remove the counter (sonic-net#274)
  [copporch]: Add SAI_HOSTIF_TRAP_ATTR_TRAP_PRIORITY support and refactor code (sonic-net#270)
  [mirrororch]: Add SAI_MIRROR_SESSION_ATTR_VLAN_HEADER_VALID (sonic-net#269)
  [bufferorch]: Add SAI_BUFFER_PROFILE_THRESHOLD_MODE_* (sonic-net#271)
  [aclorch]: Minor logs fix
  [orchagent]: Update recording file name to swss.rec
  [Make]: Fix type conversions and add more warnings (sonic-net#267)
  [aclorch]: Fix ACL table group attribute type issue (sonic-net#268)
  [portsorch]: Update default bridge port removal logic (sonic-net#263)
  [routeorch]: Need to set drop route next hop ID to NULL (sonic-net#261)
  [portsorch]: Remove SAI_PORT_ATTR_BIND_MODE (sonic-net#262)
  [portsorch]: Create a bridge port with admin status set to UP (sonic-net#259)
  Revert "[portsorch]: Set port bind mode after adding VLAN member" (sonic-net#258)
  [orchagent]: Temporarily fix pre-allocated bridge_port_list size (sonic-net#256)
  [saihelper]: Create initSaiRedis function and put related code inside it (sonic-net#254)
  [portsorch]: Set port bind mode after adding VLAN member (sonic-net#251)
  [orchagent]: Create the switch with source MAC address (sonic-net#253)
  [copporch]: Add UDLD entry in COPP (sonic-net#252)
  [orchagent]: Support LAG/VLAN with SAI 1.0 (sonic-net#250)
  use vlan oid instead of vlan id (sonic-net#247)
  Fix getBridgePort: handle non existing bridge_port_id
  Integration for SAI v1.0.1
  Remove vlan member before removing bridge port
  Fix SAI functional calls
  Fix: store bridge ports at initialization
  Refactor vector<attr>
  Resolve review comments
  Implement bridge port in portsorch
  Fix initSystemAclTable: bind system ACL to each port
  Refactor: port owns acl table group
  Resolve code review comments
  Resolve code review comments
  Adpat SAIv1.0 headers and fix compilation errors

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,19 @@
+<!--
+Please make sure you have read and understood the contribution guildlines:
+https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
+
+1. Make sure your commit includes a signature generted with `git commit -s`
+2. Make sure your commit title follows the correct format: [component]: description
+3. Make sure your commit message contains enough details about the change and related tests
+4. Make sure your pull request adds related reviewers, asignees, labels
+
+Please also provide the following information in this pull request:
+-->
+
+**What I did**
+
+**Why I did it**
+
+**How I verified it**
+
+**Details if related**

configure.ac

@@ -41,6 +41,40 @@ AM_CONDITIONAL(GTEST, test x$gtest = xtrue)
 CFLAGS_COMMON="-std=c++11 -Wall -fPIC -Wno-write-strings -I/usr/include/libnl3 -I/usr/include/swss"
 CFLAGS_COMMON+=" -Werror"
 CFLAGS_COMMON+=" -Wno-reorder"
+CFLAGS_COMMON+=" -Wcast-align"
+CFLAGS_COMMON+=" -Wcast-qual"
+CFLAGS_COMMON+=" -Wconversion"
+CFLAGS_COMMON+=" -Wdisabled-optimization"
+CFLAGS_COMMON+=" -Wextra"
+CFLAGS_COMMON+=" -Wfloat-equal"
+CFLAGS_COMMON+=" -Wformat=2"
+CFLAGS_COMMON+=" -Wformat-nonliteral"
+CFLAGS_COMMON+=" -Wformat-security"
+CFLAGS_COMMON+=" -Wformat-y2k"
+CFLAGS_COMMON+=" -Wimport"
+CFLAGS_COMMON+=" -Winit-self"
+CFLAGS_COMMON+=" -Winvalid-pch"
+CFLAGS_COMMON+=" -Wlong-long"
+CFLAGS_COMMON+=" -Wmissing-field-initializers"
+CFLAGS_COMMON+=" -Wmissing-format-attribute"
+CFLAGS_COMMON+=" -Wno-aggregate-return"
+CFLAGS_COMMON+=" -Wno-padded"
+CFLAGS_COMMON+=" -Wno-switch-enum"
+CFLAGS_COMMON+=" -Wno-unused-parameter"
+CFLAGS_COMMON+=" -Wpacked"
+CFLAGS_COMMON+=" -Wpointer-arith"
+CFLAGS_COMMON+=" -Wredundant-decls"
+CFLAGS_COMMON+=" -Wstack-protector"
+CFLAGS_COMMON+=" -Wstrict-aliasing=3"
+CFLAGS_COMMON+=" -Wswitch"
+CFLAGS_COMMON+=" -Wswitch-default"
+CFLAGS_COMMON+=" -Wunreachable-code"
+CFLAGS_COMMON+=" -Wunused"
+CFLAGS_COMMON+=" -Wvariadic-macros"
+CFLAGS_COMMON+=" -Wno-switch-default"
+CFLAGS_COMMON+=" -Wno-long-long"
+CFLAGS_COMMON+=" -Wno-redundant-decls"
+
 AC_SUBST(CFLAGS_COMMON)
 
 AC_CONFIG_FILES([

debian/swss.install

@@ -1,8 +1,7 @@
 swssconfig/sample/netbouncer.json etc/swss/config.d
 swssconfig/sample/00-copp.config.json etc/swss/config.d
-swssconfig/sample/msn2700.32ports.buffers.json etc/swss/config.d
+swssconfig/sample/msn27xx.32ports.buffers.json.j2 usr/share/sonic/templates
 swssconfig/sample/msn2700.32ports.qos.json etc/swss/config.d
-swssconfig/sample/msn2740.32ports.buffers.json etc/swss/config.d
 swssconfig/sample/msn2740.32ports.qos.json etc/swss/config.d
 swssconfig/sample/td2.32ports.buffers.json etc/swss/config.d
 swssconfig/sample/td2.32ports.qos.json etc/swss/config.d

fpmsyncd/fpmlink.cpp

@@ -109,7 +109,7 @@ void FpmLink::readMe()
         throw FpmConnectionClosedException();
     if (read < 0)
         throw system_error(errno, system_category());
-    m_pos+= read;
+    m_pos+= (uint32_t)read;
 
     /* Check for complete messages */
     while (true)
@@ -140,5 +140,5 @@ void FpmLink::readMe()
     }
 
     memmove(m_messageBuffer, m_messageBuffer + start, m_pos - start);
-    m_pos = m_pos - start;
+    m_pos = m_pos - (uint32_t)start;
 }

orchagent/Makefile.am

@@ -2,6 +2,12 @@ INCLUDES = -I $(top_srcdir)
 
 CFLAGS_SAI = -I /usr/include/sai
 
+swssdir = $(datadir)/swss
+
+dist_swss_DATA = \
+		 duration_criteria.lua  \
+		 pfc_restore_check.lua
+
 bin_PROGRAMS = orchagent routeresync
 
 if DEBUG
@@ -10,11 +16,52 @@ else
 DBGFLAGS = -g -DNDEBUG
 endif
 
-orchagent_SOURCES = main.cpp orchdaemon.cpp orch.cpp notifications.cpp routeorch.cpp neighorch.cpp intfsorch.cpp portsorch.cpp copporch.cpp tunneldecaporch.cpp qosorch.cpp bufferorch.cpp mirrororch.cpp fdborch.cpp aclorch.cpp saihelper.cpp
+orchagent_SOURCES = \
+		    main.cpp \
+		    port.cpp \
+		    orchdaemon.cpp \
+		    orch.cpp \
+		    notifications.cpp \
+		    routeorch.cpp \
+		    neighorch.cpp \
+		    intfsorch.cpp \
+		    portsorch.cpp \
+		    copporch.cpp \
+		    tunneldecaporch.cpp \
+		    qosorch.cpp \
+		    bufferorch.cpp \
+		    mirrororch.cpp \
+		    fdborch.cpp \
+		    aclorch.cpp \
+		    saihelper.cpp \
+        switchorch.cpp \
+		    pfcwdorch.cpp \
+		    pfcactionhandler.cpp \
+		    aclorch.h \
+		    bufferorch.h \
+		    copporch.h \
+		    fdborch.h \
+		    intfsorch.h \
+		    mirrororch.h \
+		    neighorch.h \
+		    notifications.h \
+		    observer.h \
+		    orch.h \
+		    orchdaemon.h \
+		    pfcactionhandler.h \
+		    pfcwdorch.h \
+		    port.h \
+		    portsorch.h \
+		    qosorch.h \
+		    routeorch.h \
+		    saihelper.h \
+        switchorch.h \
+		    swssnet.h \
+		    tunneldecaporch.h
 
 orchagent_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
 orchagent_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_SAI)
-orchagent_LDADD = -lnl-3 -lnl-route-3 -lpthread -lsairedis -lsaimetadata -lswsscommon
+orchagent_LDADD = -lnl-3 -lnl-route-3 -lpthread -lsairedis -lswsscommon -lsaimetadata
 
 routeresync_SOURCES = routeresync.cpp
 routeresync_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)