Merge branch 'master' of github.com:Azure/sonic-swss into pr2

sonic-net · Nov 11, 2021 · a8a491a · a8a491a
2 parents bb18468 + 37c197d
commit a8a491a
Show file tree

Hide file tree

Showing 47 changed files with 3,557 additions and 301 deletions.
diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml
@@ -11,6 +11,8 @@ parameters:
   type: string
   values:
   - sonicbld
+  - sonicbld-armhf
+  - sonicbld-arm64
   - default
   default: default
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -32,7 +32,7 @@ stages:
     parameters:
       arch: armhf
       timeout: 240
-      pool: sonicbld
+      pool: sonicbld-armhf
       sonic_slave: sonic-slave-buster-armhf
       buildimage_artifact_name: sonic-buildimage.marvell-armhf
       buildimage_pipeline: 141
@@ -45,7 +45,7 @@ stages:
     parameters:
       arch: arm64
       timeout: 240
-      pool: sonicbld
+      pool: sonicbld-arm64
       sonic_slave: sonic-slave-buster-arm64
       swss_common_artifact_name: sonic-swss-common.arm64
       buildimage_artifact_name: sonic-buildimage.centec-arm64

diff --git a/doc/Configuration.md b/doc/Configuration.md
@@ -742,6 +742,26 @@ instance is supported in SONiC.
 
 ```
 
+
+### MPLS_TC_TO_TC_MAP
+```
+{
+"MPLS_TC_TO_TC_MAP": {
+    "AZURE": {
+        "0": "0",
+        "1": "1",
+        "2": "1",
+        "3": "2",
+        "4": "2",
+        "5": "3",
+        "6": "3",
+        "7": "4"
+    }
+  }
+}
+
+```
+
 ### FLEX_COUNTER_TABLE
 
 ```

diff --git a/doc/swss-schema.md b/doc/swss-schema.md
@@ -31,13 +31,16 @@ Stores information for physical switch ports managed by the switch chip. Ports t
     ;QOS Mappings
     map_dscp_to_tc      = ref_hash_key_reference
     map_tc_to_queue     = ref_hash_key_reference
+    map_mpls_tc_to_tc   = ref_hash_key_reference
 
     Example:
     127.0.0.1:6379> hgetall PORT_TABLE:ETHERNET4
     1) "dscp_to_tc_map"
     2) "AZURE"
     3) "tc_to_queue_map"
     4) "AZURE"
+    5) "mpls_tc_to_tc_map"
+    6) "AZURE"
 
 ---------------------------------------------
 ### INTF_TABLE
@@ -164,6 +167,8 @@ and reflects the LAG ports into the redis under: `LAG_TABLE:<team0>:port`
     blackhole     = BIT ; Set to 1 if this route is a blackhole (or null0)
     weight        = weight_list              ; List of weights.
     nexthop_group = string ; index within the NEXTHOP_GROUP_TABLE, used instead of nexthop and intf fields
+    segment       = string ; SRV6 segment name
+    seg_src       = string ; ipv6 address for SRV6 tunnel source
 
 ---------------------------------------------
 
@@ -200,6 +205,21 @@ and reflects the LAG ports into the redis under: `LAG_TABLE:<team0>:port`
     neigh         = 12HEXDIG         ;  mac address of the neighbor
     family        = "IPv4" / "IPv6"  ; address family
 
+---------------------------------------------
+### SRV6_SID_LIST_TABLE
+    ; Stores IPV6 prefixes for a SRV6 segment name
+    key           = ROUTE_TABLE:segment ; SRV6 segment name
+    ; field       = value
+    path          = STRING              ; Comma-separated list of IPV6 prefixes for a SRV6 segment
+
+---------------------------------------------
+### SRV6_MY_SID_TABLE
+    ; Stores SRV6 MY_SID table entries and associated actions
+    key           = STRING ; SRV6 MY_SID prefix string
+    ; field       = value
+    action        = STRING ; MY_SID actions like "end", "end.dt46"
+    vrf           = STRING ; VRF string for END.DT46 or END.DT4 or END.DT6
+
 ---------------------------------------------
 ### FDB_TABLE
 
@@ -279,6 +299,28 @@ and reflects the LAG ports into the redis under: `LAG_TABLE:<team0>:port`
      9) "9"
     10) "8"
 
+---------------------------------------------
+### MPLS\_TC\_TO\_TC\_MAP\_TABLE
+    ; MPLS TC to TC map
+    ;SAI mapping - qos_map object with SAI_QOS_MAP_ATTR_TYPE == sai_qos_map_type_t::SAI_QOS_MAP_EXP_TO_TC
+    key        = "MPLS_TC_TO_TC_MAP_TABLE:"name
+    ;field    value
+    mpls_tc_value = 1*DIGIT
+    tc_value   = 1*DIGIT
+
+    Example:
+    127.0.0.1:6379> hgetall "MPLS_TC_TO_TC_MAP_TABLE:AZURE"
+     1) "0" ;mpls_tc
+     2) "3" ;tc
+     3) "1"
+     4) "5"
+     5) "2"
+     6) "5"
+     7) "3"
+     8) "7"
+     9) "4"
+    10) "8"
+
 ---------------------------------------------
 ### SCHEDULER_TABLE
     ; Scheduler table

diff --git a/orchagent/Makefile.am b/orchagent/Makefile.am
@@ -83,6 +83,8 @@ orchagent_SOURCES = \
             macsecorch.cpp \
             lagid.cpp \
             response_publisher.cpp
+            bfdorch.cpp \
+            srv6orch.cpp
 
 orchagent_SOURCES += flex_counter/flex_counter_manager.cpp flex_counter/flex_counter_stat_manager.cpp
 orchagent_SOURCES += debug_counter/debug_counter.cpp debug_counter/drop_counter.cpp