Skip to content

Commit bf5f9c2

Browse files
KostiantynYarovyiBfKostiantynYarovyiBf
authored
[BFN] Update configuration files (sonic-net#9913)
* [Barefoot] update switch-tna-sai.conf file * remove deprecated conf files * [Barefoot] update switch-tna-sai.conf file for Accton wedge100bf_32qs platform * pdated switch-tna-sai.conf
1 parent d112e7c commit bf5f9c2

File tree

17 files changed

+105
-316
lines changed

17 files changed

+105
-316
lines changed

‎device/accton/x86_64-accton_wedge100bf_32qs-r0/montara/switch-tna-sai.conf

+10-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
{
2-
"instance": 0,
32
"chip_list": [
43
{
5-
"id": "asic-0",
64
"chip_family": "Tofino",
7-
"instance": 0,
8-
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
9-
"pcie_domain": 0,
10-
"pcie_bus": 5,
11-
"pcie_fn": 0,
12-
"pcie_dev": 0,
13-
"pcie_int_mode": 1,
14-
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
5+
"sds_fw_path": "share/tofino_sds_fw/avago/firmware",
6+
"instance": 0
157
}
168
],
179
"p4_devices": [
@@ -28,13 +20,20 @@
2820
}
2921
],
3022
"program-name": "switch",
31-
"sai": "lib/libsai.so",
3223
"bfrt-config": "share/switch/bf-rt.json",
3324
"model_json_path" : "share/switch/aug_model.json",
3425
"switchapi_port_add": false,
3526
"non_default_port_ppgs": 5
3627
}
3728
]
3829
}
30+
],
31+
"switch_options": [
32+
{
33+
"device-id": 0,
34+
"model_json_path": "share/switch/aug_model.json",
35+
"non_default_port_ppgs": 5,
36+
"switchapi_port_add": false
37+
}
3938
]
4039
}

‎device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-sai.conf

-33
This file was deleted.

‎device/arista/x86_64-arista_7170_32c/Arista-7170-32C-C32/switch-tna-sai.conf

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
{
2-
"instance": 0,
32
"chip_list": [
43
{
5-
"id": "asic-0",
64
"chip_family": "Tofino",
75
"instance": 0,
8-
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
9-
"pcie_domain": 0,
10-
"pcie_bus": 5,
11-
"pcie_fn": 0,
12-
"pcie_dev": 0,
13-
"pcie_int_mode": 1,
146
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
157
}
168
],
@@ -27,13 +19,20 @@
2719
}
2820
],
2921
"program-name": "switch",
30-
"sai": "lib/libsai.so",
3122
"bfrt-config": "share/switch/bf-rt.json",
3223
"model_json_path" : "share/switch/aug_model.json",
3324
"switchapi_port_add": false,
3425
"non_default_port_ppgs": 5
3526
}
3627
]
3728
}
29+
],
30+
"switch_options": [
31+
{
32+
"device-id": 0,
33+
"model_json_path": "share/switch/aug_model.json",
34+
"non_default_port_ppgs": 5,
35+
"switchapi_port_add": false
36+
}
3837
]
3938
}

‎device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-sai.conf

-33
This file was deleted.

‎device/arista/x86_64-arista_7170_32cd/Arista-7170-32CD-C32/switch-tna-sai.conf

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
{
2-
"instance": 0,
32
"chip_list": [
43
{
5-
"id": "asic-0",
64
"chip_family": "Tofino",
75
"instance": 0,
8-
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
9-
"pcie_domain": 0,
10-
"pcie_bus": 5,
11-
"pcie_fn": 0,
12-
"pcie_dev": 0,
13-
"pcie_int_mode": 1,
146
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
157
}
168
],
@@ -27,13 +19,20 @@
2719
}
2820
],
2921
"program-name": "switch",
30-
"sai": "lib/libsai.so",
3122
"bfrt-config": "share/switch/bf-rt.json",
3223
"model_json_path" : "share/switch/aug_model.json",
3324
"switchapi_port_add": false,
3425
"non_default_port_ppgs": 5
3526
}
3627
]
3728
}
29+
],
30+
"switch_options": [
31+
{
32+
"device-id": 0,
33+
"model_json_path": "share/switch/aug_model.json",
34+
"non_default_port_ppgs": 5,
35+
"switchapi_port_add": false
36+
}
3837
]
3938
}

‎device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-sai.conf

-33
This file was deleted.

‎device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
{
2-
"instance": 0,
32
"chip_list": [
43
{
5-
"id": "asic-0",
64
"chip_family": "Tofino",
75
"instance": 0,
8-
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
9-
"pcie_domain": 0,
10-
"pcie_bus": 5,
11-
"pcie_fn": 0,
12-
"pcie_dev": 0,
13-
"pcie_int_mode": 1,
146
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
157
}
168
],
@@ -27,13 +19,20 @@
2719
}
2820
],
2921
"program-name": "switch",
30-
"sai": "lib/libsai.so",
3122
"bfrt-config": "share/switch/bf-rt.json",
3223
"model_json_path" : "share/switch/aug_model.json",
3324
"switchapi_port_add": false,
3425
"non_default_port_ppgs": 5
3526
}
3627
]
3728
}
29+
],
30+
"switch_options": [
31+
{
32+
"device-id": 0,
33+
"model_json_path": "share/switch/aug_model.json",
34+
"non_default_port_ppgs": 5,
35+
"switchapi_port_add": false
36+
}
3837
]
3938
}

‎device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-sai.conf

-33
This file was deleted.

‎device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
{
2-
"instance": 0,
32
"chip_list": [
43
{
5-
"id": "asic-0",
64
"chip_family": "Tofino",
75
"instance": 0,
8-
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
9-
"pcie_domain": 0,
10-
"pcie_bus": 5,
11-
"pcie_fn": 0,
12-
"pcie_dev": 0,
13-
"pcie_int_mode": 1,
146
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
157
}
168
],
@@ -27,13 +19,20 @@
2719
}
2820
],
2921
"program-name": "switch",
30-
"sai": "lib/libsai.so",
3122
"bfrt-config": "share/switch/bf-rt.json",
3223
"model_json_path" : "share/switch/aug_model.json",
3324
"switchapi_port_add": false,
3425
"non_default_port_ppgs": 5
3526
}
3627
]
3728
}
29+
],
30+
"switch_options": [
31+
{
32+
"device-id": 0,
33+
"model_json_path": "share/switch/aug_model.json",
34+
"non_default_port_ppgs": 5,
35+
"switchapi_port_add": false
36+
}
3837
]
3938
}

‎device/barefoot/x86_64-accton_as9516_32d-r0/newport/switch-tna-sai.conf

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
{
2-
"instance": 0,
32
"chip_list": [
43
{
5-
"id": "asic-0",
64
"chip_family": "Tofino2",
7-
"instance": 0,
8-
"pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
9-
"pcie_domain": 0,
10-
"pcie_bus": 5,
11-
"pcie_fn": 0,
12-
"pcie_dev": 0,
13-
"pcie_int_mode": 1,
14-
"sds_fw_path": "share/tofino_sds_fw/avago/firmware"
5+
"sds_fw_path": "share/tofino_sds_fw/avago/firmware",
6+
"instance": 0
157
}
168
],
179
"p4_devices": [
@@ -20,21 +12,28 @@
2012
"agent0": "lib/platform/x86_64-accton_as9516bf_32d-r0/libpltfm_mgr.so",
2113
"p4_programs": [
2214
{
15+
"program-name": "switch",
16+
"bfrt-config": "share/switch/bf-rt.json",
2317
"p4_pipelines": [
2418
{
2519
"p4_pipeline_name": "pipe",
2620
"config": "share/switch/pipe/tofino2.bin",
2721
"context": "share/switch/pipe/context.json"
2822
}
29-
],
30-
"program-name": "switch",
31-
"sai": "lib/libsai.so",
32-
"bfrt-config": "share/switch/bf-rt.json",
23+
],
3324
"model_json_path" : "share/switch/aug_model.json",
3425
"switchapi_port_add": false,
3526
"non_default_port_ppgs": 5
3627
}
3728
]
3829
}
30+
],
31+
"switch_options": [
32+
{
33+
"device-id": 0,
34+
"model_json_path": "share/switch/aug_model.json",
35+
"non_default_port_ppgs": 5,
36+
"switchapi_port_add": false
37+
}
3938
]
4039
}

0 commit comments

Comments
 (0)