From bbcad1362fe7afcf36032d84966608b150b1b175 Mon Sep 17 00:00:00 2001 From: Neetha John Date: Tue, 29 Nov 2022 12:53:58 -0800 Subject: [PATCH 01/29] [202012] [Profile separation] MMU infrastructure update for TD2 (#12739) Signed-off-by: Neetha John This is to backport #12626 Why I did it There is a need to have separate profiles on compute and storage and this infra update will help achieve that How I did it Moved buffer pool/profile and qos definitions on TD2 to a common folder and all TD2 hwsku's will reference that folder --- .../Arista-7050-QX32/BALANCED | 1 + .../Arista-7050-QX32/RDMA-CENTRIC | 1 + .../Arista-7050-QX32/TCP-CENTRIC | 1 + .../Arista-7050-QX32/buffer_ports_t0.j2 | 6 ++ .../Arista-7050-QX32/buffer_ports_t1.j2 | 6 ++ .../Arista-7050-QX32/buffers_defaults_t0.j2 | 46 +---------- .../Arista-7050-QX32/buffers_defaults_t1.j2 | 46 +---------- .../Arista-7050-QX32/pg_profile_lookup.ini | 12 +-- .../Arista-7050-QX32/qos.json.j2 | 2 +- .../Arista-7050QX-32S-S4Q31/BALANCED | 1 + .../Arista-7050QX-32S-S4Q31/RDMA-CENTRIC | 1 + .../Arista-7050QX-32S-S4Q31/TCP-CENTRIC | 1 + .../buffer_ports_t0.j2 | 10 +++ .../buffer_ports_t1.j2 | 10 +++ .../buffers_defaults_t0.j2 | 50 +----------- .../buffers_defaults_t1.j2 | 50 +----------- .../pg_profile_lookup.ini | 18 +---- .../Arista-7050QX-32S-S4Q31/qos.json.j2 | 2 +- .../Arista-7050QX32S-Q32/BALANCED | 1 + .../Arista-7050QX32S-Q32/RDMA-CENTRIC | 1 + .../Arista-7050QX32S-Q32/TCP-CENTRIC | 1 + .../Arista-7050QX32S-Q32/buffer_ports_t0.j2 | 6 ++ .../Arista-7050QX32S-Q32/buffer_ports_t1.j2 | 6 ++ .../buffers_defaults_t0.j2 | 46 +---------- .../buffers_defaults_t1.j2 | 46 +---------- .../pg_profile_lookup.ini | 12 +-- .../Arista-7050QX32S-Q32/qos.json.j2 | 2 +- .../td2/6000/BALANCED/buffers_defaults_t0.j2 | 40 ++++++++++ .../td2/6000/BALANCED/buffers_defaults_t1.j2 | 40 ++++++++++ .../td2/6000/BALANCED/pg_profile_lookup.ini | 17 ++++ .../profiles/td2/6000/BALANCED/qos.json.j2 | 1 + .../6000/RDMA-CENTRIC/buffers_defaults_t0.j2 | 40 ++++++++++ .../6000/RDMA-CENTRIC/buffers_defaults_t1.j2 | 40 ++++++++++ .../6000/RDMA-CENTRIC/pg_profile_lookup.ini | 17 ++++ .../td2/6000/RDMA-CENTRIC/qos.json.j2 | 1 + device/common/profiles/td2/6000/TCP-CENTRIC | 1 + .../td2/gen/BALANCED/buffers_defaults_t0.j2 | 40 ++++++++++ .../td2/gen/BALANCED/buffers_defaults_t1.j2 | 40 ++++++++++ .../td2/gen/BALANCED/pg_profile_lookup.ini | 17 ++++ .../profiles/td2/gen/BALANCED/qos.json.j2 | 1 + .../gen/RDMA-CENTRIC/buffers_defaults_t0.j2 | 40 ++++++++++ .../gen/RDMA-CENTRIC/buffers_defaults_t1.j2 | 40 ++++++++++ .../gen/RDMA-CENTRIC/pg_profile_lookup.ini | 17 ++++ .../profiles/td2/gen/RDMA-CENTRIC/qos.json.j2 | 1 + device/common/profiles/td2/gen/TCP-CENTRIC | 1 + .../Force10-S6000-Q20S48/BALANCED | 1 + .../Force10-S6000-Q20S48/RDMA-CENTRIC | 1 + .../Force10-S6000-Q20S48/TCP-CENTRIC | 1 + .../Force10-S6000-Q20S48/buffer_ports_t0.j2 | 24 ++++++ .../Force10-S6000-Q20S48/buffer_ports_t1.j2 | 24 ++++++ .../buffers_defaults_t0.j2 | 64 +-------------- .../buffers_defaults_t1.j2 | 64 +-------------- .../pg_profile_lookup.ini | 18 +---- .../Force10-S6000-Q20S48/qos.json.j2 | 2 +- .../Force10-S6000-Q24S32/BALANCED | 1 + .../Force10-S6000-Q24S32/RDMA-CENTRIC | 1 + .../Force10-S6000-Q24S32/TCP-CENTRIC | 1 + .../Force10-S6000-Q24S32/buffer_ports_t0.j2 | 15 ++++ .../Force10-S6000-Q24S32/buffer_ports_t1.j2 | 16 ++++ .../buffers_defaults_t0.j2 | 56 +------------ .../buffers_defaults_t1.j2 | 56 +------------ .../pg_profile_lookup.ini | 18 +---- .../Force10-S6000-Q24S32/qos.json.j2 | 2 +- .../Force10-S6000-Q28S16/BALANCED | 1 + .../Force10-S6000-Q28S16/RDMA-CENTRIC | 1 + .../Force10-S6000-Q28S16/TCP-CENTRIC | 1 + .../Force10-S6000-Q28S16/buffer_ports_t0.j2 | 39 +++++++++ .../Force10-S6000-Q28S16/buffer_ports_t1.j2 | 39 +++++++++ .../buffers_defaults_t0.j2 | 79 +------------------ .../buffers_defaults_t1.j2 | 79 +------------------ .../pg_profile_lookup.ini | 18 +---- .../Force10-S6000-Q28S16/qos.json.j2 | 2 +- .../Force10-S6000/BALANCED | 1 + .../Force10-S6000/RDMA-CENTRIC | 1 + .../Force10-S6000/TCP-CENTRIC | 1 + .../Force10-S6000/buffer_ports_t0.j2 | 7 ++ .../Force10-S6000/buffer_ports_t1.j2 | 6 ++ .../Force10-S6000/buffers_defaults_t0.j2 | 46 +---------- .../Force10-S6000/buffers_defaults_t1.j2 | 46 +---------- .../Force10-S6000/pg_profile_lookup.ini | 18 +---- .../Force10-S6000/qos.json.j2 | 2 +- 81 files changed, 657 insertions(+), 874 deletions(-) create mode 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/BALANCED create mode 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/RDMA-CENTRIC create mode 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/TCP-CENTRIC create mode 100644 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t0.j2 create mode 100644 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t1.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/BALANCED create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/RDMA-CENTRIC create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/TCP-CENTRIC create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t0.j2 create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t1.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/BALANCED create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/RDMA-CENTRIC create mode 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/TCP-CENTRIC create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t0.j2 create mode 100644 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t1.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini mode change 100644 => 120000 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2 create mode 100644 device/common/profiles/td2/6000/BALANCED/buffers_defaults_t0.j2 create mode 100644 device/common/profiles/td2/6000/BALANCED/buffers_defaults_t1.j2 create mode 100644 device/common/profiles/td2/6000/BALANCED/pg_profile_lookup.ini create mode 100644 device/common/profiles/td2/6000/BALANCED/qos.json.j2 create mode 100644 device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t0.j2 create mode 100644 device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t1.j2 create mode 100644 device/common/profiles/td2/6000/RDMA-CENTRIC/pg_profile_lookup.ini create mode 100644 device/common/profiles/td2/6000/RDMA-CENTRIC/qos.json.j2 create mode 120000 device/common/profiles/td2/6000/TCP-CENTRIC create mode 100644 device/common/profiles/td2/gen/BALANCED/buffers_defaults_t0.j2 create mode 100644 device/common/profiles/td2/gen/BALANCED/buffers_defaults_t1.j2 create mode 100644 device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini create mode 100644 device/common/profiles/td2/gen/BALANCED/qos.json.j2 create mode 100644 device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t0.j2 create mode 100644 device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t1.j2 create mode 100644 device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini create mode 100644 device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2 create mode 120000 device/common/profiles/td2/gen/TCP-CENTRIC create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/BALANCED create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/RDMA-CENTRIC create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/TCP-CENTRIC create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t0.j2 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t1.j2 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/BALANCED create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/RDMA-CENTRIC create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/TCP-CENTRIC create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t0.j2 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t1.j2 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/BALANCED create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/RDMA-CENTRIC create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/TCP-CENTRIC create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t0.j2 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t1.j2 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2 mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini mode change 100755 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2 create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/BALANCED create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/RDMA-CENTRIC create mode 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/TCP-CENTRIC create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t0.j2 create mode 100644 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t1.j2 mode change 100644 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 mode change 100644 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 mode change 100644 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini mode change 100644 => 120000 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/BALANCED b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/BALANCED new file mode 120000 index 000000000000..808c3d86217f --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/BALANCED @@ -0,0 +1 @@ +../../../common/profiles/td2/gen/BALANCED \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/RDMA-CENTRIC b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/RDMA-CENTRIC new file mode 120000 index 000000000000..8bcc02cca148 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/RDMA-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/gen/RDMA-CENTRIC \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/TCP-CENTRIC b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/TCP-CENTRIC new file mode 120000 index 000000000000..7ac6cc7160ac --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/TCP-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/gen/TCP-CENTRIC \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t0.j2 new file mode 100644 index 000000000000..48bbf2fc121e --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t0.j2 @@ -0,0 +1,6 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t1.j2 new file mode 100644 index 000000000000..48bbf2fc121e --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffer_ports_t1.j2 @@ -0,0 +1,6 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 deleted file mode 100644 index dc04b2265f33..000000000000 --- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '0m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 new file mode 120000 index 000000000000..9524e6a476ac --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t0.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 deleted file mode 100644 index dc04b2265f33..000000000000 --- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '0m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 new file mode 120000 index 000000000000..c25cc95d6d57 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t1.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini deleted file mode 100644 index d8190e4893de..000000000000 --- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini +++ /dev/null @@ -1,11 +0,0 @@ -# PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 40000 5m 46384 18432 45136 -3 2496 - 50000 5m 46592 18432 45344 -3 2496 - 100000 5m 48464 18432 47216 -3 2496 - 40000 40m 48464 18432 47216 -3 2496 - 50000 40m 49296 18432 48048 -3 2496 - 100000 40m 53872 18432 52624 -3 2496 - 40000 300m 64064 18432 62816 -3 2496 - 50000 300m 68848 18432 67600 -3 2496 - 100000 300m 92976 18432 91728 -3 2496 diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini new file mode 120000 index 000000000000..297cddb2d223 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/pg_profile_lookup.ini @@ -0,0 +1 @@ +BALANCED/pg_profile_lookup.ini \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 deleted file mode 100644 index 3e548325ea30..000000000000 --- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 new file mode 120000 index 000000000000..aef6b6765cf2 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/qos.json.j2 @@ -0,0 +1 @@ +BALANCED/qos.json.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/BALANCED b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/BALANCED new file mode 120000 index 000000000000..808c3d86217f --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/BALANCED @@ -0,0 +1 @@ +../../../common/profiles/td2/gen/BALANCED \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/RDMA-CENTRIC b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/RDMA-CENTRIC new file mode 120000 index 000000000000..8bcc02cca148 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/RDMA-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/gen/RDMA-CENTRIC \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/TCP-CENTRIC b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/TCP-CENTRIC new file mode 120000 index 000000000000..7ac6cc7160ac --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/TCP-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/gen/TCP-CENTRIC \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t0.j2 new file mode 100644 index 000000000000..102169973943 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t0.j2 @@ -0,0 +1,10 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% if PORT_ALL.append("Ethernet0") %}{% endif %} + {% if PORT_ALL.append("Ethernet1") %}{% endif %} + {% if PORT_ALL.append("Ethernet2") %}{% endif %} + {% if PORT_ALL.append("Ethernet3") %}{% endif %} + {% for port_idx in range(1,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t1.j2 new file mode 100644 index 000000000000..102169973943 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffer_ports_t1.j2 @@ -0,0 +1,10 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% if PORT_ALL.append("Ethernet0") %}{% endif %} + {% if PORT_ALL.append("Ethernet1") %}{% endif %} + {% if PORT_ALL.append("Ethernet2") %}{% endif %} + {% if PORT_ALL.append("Ethernet3") %}{% endif %} + {% for port_idx in range(1,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 deleted file mode 100644 index 3c0a68f1da88..000000000000 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 +++ /dev/null @@ -1,49 +0,0 @@ -{%- set default_cable = '0m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% if PORT_ALL.append("Ethernet0") %}{% endif %} - {% if PORT_ALL.append("Ethernet1") %}{% endif %} - {% if PORT_ALL.append("Ethernet2") %}{% endif %} - {% if PORT_ALL.append("Ethernet3") %}{% endif %} - {% for port_idx in range(1,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 new file mode 120000 index 000000000000..9524e6a476ac --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t0.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 deleted file mode 100644 index 3c0a68f1da88..000000000000 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 +++ /dev/null @@ -1,49 +0,0 @@ -{%- set default_cable = '0m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% if PORT_ALL.append("Ethernet0") %}{% endif %} - {% if PORT_ALL.append("Ethernet1") %}{% endif %} - {% if PORT_ALL.append("Ethernet2") %}{% endif %} - {% if PORT_ALL.append("Ethernet3") %}{% endif %} - {% for port_idx in range(1,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 new file mode 120000 index 000000000000..c25cc95d6d57 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t1.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini deleted file mode 100644 index 389a7da97287..000000000000 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini +++ /dev/null @@ -1,17 +0,0 @@ -# PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 1000 5m 41808 18432 40560 -3 2496 - 10000 5m 41808 18432 40560 -3 2496 - 40000 5m 46384 18432 45136 -3 2496 - 50000 5m 46592 18432 45344 -3 2496 - 100000 5m 48464 18432 47216 -3 2496 - 1000 40m 41808 18432 40560 -3 2496 - 10000 40m 41808 18432 40560 -3 2496 - 40000 40m 48464 18432 47216 -3 2496 - 50000 40m 49296 18432 48048 -3 2496 - 100000 40m 53872 18432 52624 -3 2496 - 1000 300m 41808 18432 40560 -3 2496 - 10000 300m 41808 18432 40560 -3 2496 - 40000 300m 64064 18432 62816 -3 2496 - 50000 300m 68848 18432 67600 -3 2496 - 100000 300m 92976 18432 91728 -3 2496 diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini new file mode 120000 index 000000000000..297cddb2d223 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/pg_profile_lookup.ini @@ -0,0 +1 @@ +BALANCED/pg_profile_lookup.ini \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 deleted file mode 100644 index 3e548325ea30..000000000000 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 new file mode 120000 index 000000000000..aef6b6765cf2 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/qos.json.j2 @@ -0,0 +1 @@ +BALANCED/qos.json.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/BALANCED b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/BALANCED new file mode 120000 index 000000000000..808c3d86217f --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/BALANCED @@ -0,0 +1 @@ +../../../common/profiles/td2/gen/BALANCED \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/RDMA-CENTRIC b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/RDMA-CENTRIC new file mode 120000 index 000000000000..8bcc02cca148 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/RDMA-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/gen/RDMA-CENTRIC \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/TCP-CENTRIC b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/TCP-CENTRIC new file mode 120000 index 000000000000..7ac6cc7160ac --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/TCP-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/gen/TCP-CENTRIC \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t0.j2 new file mode 100644 index 000000000000..48bbf2fc121e --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t0.j2 @@ -0,0 +1,6 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t1.j2 new file mode 100644 index 000000000000..48bbf2fc121e --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffer_ports_t1.j2 @@ -0,0 +1,6 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 deleted file mode 100644 index dc04b2265f33..000000000000 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '0m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 new file mode 120000 index 000000000000..9524e6a476ac --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t0.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t0.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 deleted file mode 100644 index dc04b2265f33..000000000000 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '0m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 new file mode 120000 index 000000000000..c25cc95d6d57 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/buffers_defaults_t1.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t1.j2 \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini deleted file mode 100644 index d8190e4893de..000000000000 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini +++ /dev/null @@ -1,11 +0,0 @@ -# PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 40000 5m 46384 18432 45136 -3 2496 - 50000 5m 46592 18432 45344 -3 2496 - 100000 5m 48464 18432 47216 -3 2496 - 40000 40m 48464 18432 47216 -3 2496 - 50000 40m 49296 18432 48048 -3 2496 - 100000 40m 53872 18432 52624 -3 2496 - 40000 300m 64064 18432 62816 -3 2496 - 50000 300m 68848 18432 67600 -3 2496 - 100000 300m 92976 18432 91728 -3 2496 diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini new file mode 120000 index 000000000000..297cddb2d223 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/pg_profile_lookup.ini @@ -0,0 +1 @@ +BALANCED/pg_profile_lookup.ini \ No newline at end of file diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2 deleted file mode 100644 index 3e548325ea30..000000000000 --- a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2 b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2 new file mode 120000 index 000000000000..aef6b6765cf2 --- /dev/null +++ b/device/arista/x86_64-arista_7050_qx32s/Arista-7050QX32S-Q32/qos.json.j2 @@ -0,0 +1 @@ +BALANCED/qos.json.j2 \ No newline at end of file diff --git a/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t0.j2 b/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t0.j2 new file mode 100644 index 000000000000..9dbcc8eb2076 --- /dev/null +++ b/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t0.j2 @@ -0,0 +1,40 @@ +{%- set default_cable = '0m' %} + +{%- include 'buffer_ports_t0.j2' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "12766208", + "type": "ingress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "12766208", + "type": "egress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "7326924", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"12766208" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t1.j2 b/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t1.j2 new file mode 100644 index 000000000000..6661031f9aea --- /dev/null +++ b/device/common/profiles/td2/6000/BALANCED/buffers_defaults_t1.j2 @@ -0,0 +1,40 @@ +{%- set default_cable = '0m' %} + +{%- include 'buffer_ports_t1.j2' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "12766208", + "type": "ingress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "12766208", + "type": "egress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "7326924", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"12766208" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/common/profiles/td2/6000/BALANCED/pg_profile_lookup.ini b/device/common/profiles/td2/6000/BALANCED/pg_profile_lookup.ini new file mode 100644 index 000000000000..9f2eacb6fc42 --- /dev/null +++ b/device/common/profiles/td2/6000/BALANCED/pg_profile_lookup.ini @@ -0,0 +1,17 @@ +# PG lossless profiles. +# speed cable size xon xoff threshold xon_offset + 10000 5m 56368 18432 55120 -3 2496 + 25000 5m 56368 18432 55120 -3 2496 + 40000 5m 56368 18432 55120 -3 2496 + 50000 5m 56368 18432 55120 -3 2496 + 100000 5m 56368 18432 55120 -3 2496 + 10000 40m 56368 18432 55120 -3 2496 + 25000 40m 56368 18432 55120 -3 2496 + 40000 40m 56368 18432 55120 -3 2496 + 50000 40m 56368 18432 55120 -3 2496 + 100000 40m 56368 18432 55120 -3 2496 + 10000 300m 56368 18432 55120 -3 2496 + 25000 300m 56368 18432 55120 -3 2496 + 40000 300m 56368 18432 55120 -3 2496 + 50000 300m 56368 18432 55120 -3 2496 + 100000 300m 56368 18432 55120 -3 2496 diff --git a/device/common/profiles/td2/6000/BALANCED/qos.json.j2 b/device/common/profiles/td2/6000/BALANCED/qos.json.j2 new file mode 100644 index 000000000000..3e548325ea30 --- /dev/null +++ b/device/common/profiles/td2/6000/BALANCED/qos.json.j2 @@ -0,0 +1 @@ +{%- include 'qos_config.j2' %} diff --git a/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t0.j2 b/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t0.j2 new file mode 100644 index 000000000000..9dbcc8eb2076 --- /dev/null +++ b/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t0.j2 @@ -0,0 +1,40 @@ +{%- set default_cable = '0m' %} + +{%- include 'buffer_ports_t0.j2' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "12766208", + "type": "ingress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "12766208", + "type": "egress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "7326924", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"12766208" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t1.j2 new file mode 100644 index 000000000000..6661031f9aea --- /dev/null +++ b/device/common/profiles/td2/6000/RDMA-CENTRIC/buffers_defaults_t1.j2 @@ -0,0 +1,40 @@ +{%- set default_cable = '0m' %} + +{%- include 'buffer_ports_t1.j2' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "12766208", + "type": "ingress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "12766208", + "type": "egress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "7326924", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"12766208" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/common/profiles/td2/6000/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/td2/6000/RDMA-CENTRIC/pg_profile_lookup.ini new file mode 100644 index 000000000000..9f2eacb6fc42 --- /dev/null +++ b/device/common/profiles/td2/6000/RDMA-CENTRIC/pg_profile_lookup.ini @@ -0,0 +1,17 @@ +# PG lossless profiles. +# speed cable size xon xoff threshold xon_offset + 10000 5m 56368 18432 55120 -3 2496 + 25000 5m 56368 18432 55120 -3 2496 + 40000 5m 56368 18432 55120 -3 2496 + 50000 5m 56368 18432 55120 -3 2496 + 100000 5m 56368 18432 55120 -3 2496 + 10000 40m 56368 18432 55120 -3 2496 + 25000 40m 56368 18432 55120 -3 2496 + 40000 40m 56368 18432 55120 -3 2496 + 50000 40m 56368 18432 55120 -3 2496 + 100000 40m 56368 18432 55120 -3 2496 + 10000 300m 56368 18432 55120 -3 2496 + 25000 300m 56368 18432 55120 -3 2496 + 40000 300m 56368 18432 55120 -3 2496 + 50000 300m 56368 18432 55120 -3 2496 + 100000 300m 56368 18432 55120 -3 2496 diff --git a/device/common/profiles/td2/6000/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/td2/6000/RDMA-CENTRIC/qos.json.j2 new file mode 100644 index 000000000000..3e548325ea30 --- /dev/null +++ b/device/common/profiles/td2/6000/RDMA-CENTRIC/qos.json.j2 @@ -0,0 +1 @@ +{%- include 'qos_config.j2' %} diff --git a/device/common/profiles/td2/6000/TCP-CENTRIC b/device/common/profiles/td2/6000/TCP-CENTRIC new file mode 120000 index 000000000000..d6f7127aa748 --- /dev/null +++ b/device/common/profiles/td2/6000/TCP-CENTRIC @@ -0,0 +1 @@ +BALANCED \ No newline at end of file diff --git a/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t0.j2 b/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t0.j2 new file mode 100644 index 000000000000..9dbcc8eb2076 --- /dev/null +++ b/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t0.j2 @@ -0,0 +1,40 @@ +{%- set default_cable = '0m' %} + +{%- include 'buffer_ports_t0.j2' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "12766208", + "type": "ingress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "12766208", + "type": "egress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "7326924", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"12766208" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t1.j2 b/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t1.j2 new file mode 100644 index 000000000000..6661031f9aea --- /dev/null +++ b/device/common/profiles/td2/gen/BALANCED/buffers_defaults_t1.j2 @@ -0,0 +1,40 @@ +{%- set default_cable = '0m' %} + +{%- include 'buffer_ports_t1.j2' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "12766208", + "type": "ingress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "12766208", + "type": "egress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "7326924", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"12766208" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini b/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini new file mode 100644 index 000000000000..389a7da97287 --- /dev/null +++ b/device/common/profiles/td2/gen/BALANCED/pg_profile_lookup.ini @@ -0,0 +1,17 @@ +# PG lossless profiles. +# speed cable size xon xoff threshold xon_offset + 1000 5m 41808 18432 40560 -3 2496 + 10000 5m 41808 18432 40560 -3 2496 + 40000 5m 46384 18432 45136 -3 2496 + 50000 5m 46592 18432 45344 -3 2496 + 100000 5m 48464 18432 47216 -3 2496 + 1000 40m 41808 18432 40560 -3 2496 + 10000 40m 41808 18432 40560 -3 2496 + 40000 40m 48464 18432 47216 -3 2496 + 50000 40m 49296 18432 48048 -3 2496 + 100000 40m 53872 18432 52624 -3 2496 + 1000 300m 41808 18432 40560 -3 2496 + 10000 300m 41808 18432 40560 -3 2496 + 40000 300m 64064 18432 62816 -3 2496 + 50000 300m 68848 18432 67600 -3 2496 + 100000 300m 92976 18432 91728 -3 2496 diff --git a/device/common/profiles/td2/gen/BALANCED/qos.json.j2 b/device/common/profiles/td2/gen/BALANCED/qos.json.j2 new file mode 100644 index 000000000000..3e548325ea30 --- /dev/null +++ b/device/common/profiles/td2/gen/BALANCED/qos.json.j2 @@ -0,0 +1 @@ +{%- include 'qos_config.j2' %} diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t0.j2 b/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t0.j2 new file mode 100644 index 000000000000..9dbcc8eb2076 --- /dev/null +++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t0.j2 @@ -0,0 +1,40 @@ +{%- set default_cable = '0m' %} + +{%- include 'buffer_ports_t0.j2' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "12766208", + "type": "ingress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "12766208", + "type": "egress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "7326924", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"12766208" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t1.j2 b/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t1.j2 new file mode 100644 index 000000000000..6661031f9aea --- /dev/null +++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/buffers_defaults_t1.j2 @@ -0,0 +1,40 @@ +{%- set default_cable = '0m' %} + +{%- include 'buffer_ports_t1.j2' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "12766208", + "type": "ingress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "12766208", + "type": "egress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "7326924", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"0", + "static_th":"12766208" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini b/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini new file mode 100644 index 000000000000..389a7da97287 --- /dev/null +++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/pg_profile_lookup.ini @@ -0,0 +1,17 @@ +# PG lossless profiles. +# speed cable size xon xoff threshold xon_offset + 1000 5m 41808 18432 40560 -3 2496 + 10000 5m 41808 18432 40560 -3 2496 + 40000 5m 46384 18432 45136 -3 2496 + 50000 5m 46592 18432 45344 -3 2496 + 100000 5m 48464 18432 47216 -3 2496 + 1000 40m 41808 18432 40560 -3 2496 + 10000 40m 41808 18432 40560 -3 2496 + 40000 40m 48464 18432 47216 -3 2496 + 50000 40m 49296 18432 48048 -3 2496 + 100000 40m 53872 18432 52624 -3 2496 + 1000 300m 41808 18432 40560 -3 2496 + 10000 300m 41808 18432 40560 -3 2496 + 40000 300m 64064 18432 62816 -3 2496 + 50000 300m 68848 18432 67600 -3 2496 + 100000 300m 92976 18432 91728 -3 2496 diff --git a/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2 b/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2 new file mode 100644 index 000000000000..3e548325ea30 --- /dev/null +++ b/device/common/profiles/td2/gen/RDMA-CENTRIC/qos.json.j2 @@ -0,0 +1 @@ +{%- include 'qos_config.j2' %} diff --git a/device/common/profiles/td2/gen/TCP-CENTRIC b/device/common/profiles/td2/gen/TCP-CENTRIC new file mode 120000 index 000000000000..c1162371df69 --- /dev/null +++ b/device/common/profiles/td2/gen/TCP-CENTRIC @@ -0,0 +1 @@ +BALANCED/ \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/BALANCED b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/BALANCED new file mode 120000 index 000000000000..af1545f14b74 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/BALANCED @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/BALANCED \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/RDMA-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/RDMA-CENTRIC new file mode 120000 index 000000000000..f65c31fb2e59 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/RDMA-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/RDMA-CENTRIC \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/TCP-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/TCP-CENTRIC new file mode 120000 index 000000000000..46569c641476 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/TCP-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/TCP-CENTRIC \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t0.j2 new file mode 100644 index 000000000000..eb2755f69f9b --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t0.j2 @@ -0,0 +1,24 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,8) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(8,14) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(14,18) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(18,24) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(24,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t1.j2 new file mode 100644 index 000000000000..eb2755f69f9b --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffer_ports_t1.j2 @@ -0,0 +1,24 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,8) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(8,14) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(14,18) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(18,24) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(24,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2 deleted file mode 100755 index 8243498dd31c..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2 +++ /dev/null @@ -1,63 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,8) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(8,14) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(14,18) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(18,24) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(24,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2 new file mode 120000 index 000000000000..9524e6a476ac --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t0.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t0.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2 deleted file mode 100755 index 8243498dd31c..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2 +++ /dev/null @@ -1,63 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,8) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(8,14) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(14,18) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(18,24) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(24,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2 new file mode 120000 index 000000000000..c25cc95d6d57 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/buffers_defaults_t1.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t1.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini deleted file mode 100755 index 9f2eacb6fc42..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini +++ /dev/null @@ -1,17 +0,0 @@ -# PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 56368 18432 55120 -3 2496 - 25000 5m 56368 18432 55120 -3 2496 - 40000 5m 56368 18432 55120 -3 2496 - 50000 5m 56368 18432 55120 -3 2496 - 100000 5m 56368 18432 55120 -3 2496 - 10000 40m 56368 18432 55120 -3 2496 - 25000 40m 56368 18432 55120 -3 2496 - 40000 40m 56368 18432 55120 -3 2496 - 50000 40m 56368 18432 55120 -3 2496 - 100000 40m 56368 18432 55120 -3 2496 - 10000 300m 56368 18432 55120 -3 2496 - 25000 300m 56368 18432 55120 -3 2496 - 40000 300m 56368 18432 55120 -3 2496 - 50000 300m 56368 18432 55120 -3 2496 - 100000 300m 56368 18432 55120 -3 2496 diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini new file mode 120000 index 000000000000..297cddb2d223 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/pg_profile_lookup.ini @@ -0,0 +1 @@ +BALANCED/pg_profile_lookup.ini \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2 deleted file mode 100755 index 3e548325ea30..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2 new file mode 120000 index 000000000000..aef6b6765cf2 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q20S48/qos.json.j2 @@ -0,0 +1 @@ +BALANCED/qos.json.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/BALANCED b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/BALANCED new file mode 120000 index 000000000000..af1545f14b74 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/BALANCED @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/BALANCED \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/RDMA-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/RDMA-CENTRIC new file mode 120000 index 000000000000..f65c31fb2e59 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/RDMA-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/RDMA-CENTRIC \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/TCP-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/TCP-CENTRIC new file mode 120000 index 000000000000..46569c641476 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/TCP-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/TCP-CENTRIC \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t0.j2 new file mode 100644 index 000000000000..8022ef6ac62f --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t0.j2 @@ -0,0 +1,15 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,16) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(16,25) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(25,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t1.j2 new file mode 100644 index 000000000000..f68696528a51 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffer_ports_t1.j2 @@ -0,0 +1,16 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,16) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(16,25) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + + {% endfor %} + {% for port_idx in range(25,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2 deleted file mode 100755 index 9d37f8a579db..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2 +++ /dev/null @@ -1,55 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,16) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(16,25) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - - {% endfor %} - {% for port_idx in range(25,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2 new file mode 120000 index 000000000000..9524e6a476ac --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t0.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t0.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2 deleted file mode 100755 index 9d37f8a579db..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2 +++ /dev/null @@ -1,55 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,16) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(16,25) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - - {% endfor %} - {% for port_idx in range(25,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2 new file mode 120000 index 000000000000..c25cc95d6d57 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/buffers_defaults_t1.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t1.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini deleted file mode 100755 index 9f2eacb6fc42..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini +++ /dev/null @@ -1,17 +0,0 @@ -# PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 56368 18432 55120 -3 2496 - 25000 5m 56368 18432 55120 -3 2496 - 40000 5m 56368 18432 55120 -3 2496 - 50000 5m 56368 18432 55120 -3 2496 - 100000 5m 56368 18432 55120 -3 2496 - 10000 40m 56368 18432 55120 -3 2496 - 25000 40m 56368 18432 55120 -3 2496 - 40000 40m 56368 18432 55120 -3 2496 - 50000 40m 56368 18432 55120 -3 2496 - 100000 40m 56368 18432 55120 -3 2496 - 10000 300m 56368 18432 55120 -3 2496 - 25000 300m 56368 18432 55120 -3 2496 - 40000 300m 56368 18432 55120 -3 2496 - 50000 300m 56368 18432 55120 -3 2496 - 100000 300m 56368 18432 55120 -3 2496 diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini new file mode 120000 index 000000000000..297cddb2d223 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/pg_profile_lookup.ini @@ -0,0 +1 @@ +BALANCED/pg_profile_lookup.ini \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2 deleted file mode 100755 index 3e548325ea30..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2 new file mode 120000 index 000000000000..aef6b6765cf2 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q24S32/qos.json.j2 @@ -0,0 +1 @@ +BALANCED/qos.json.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/BALANCED b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/BALANCED new file mode 120000 index 000000000000..af1545f14b74 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/BALANCED @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/BALANCED \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/RDMA-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/RDMA-CENTRIC new file mode 120000 index 000000000000..f65c31fb2e59 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/RDMA-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/RDMA-CENTRIC \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/TCP-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/TCP-CENTRIC new file mode 120000 index 000000000000..46569c641476 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/TCP-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/TCP-CENTRIC \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t0.j2 new file mode 100644 index 000000000000..520c2cb112a6 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t0.j2 @@ -0,0 +1,39 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,1) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(1,2) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(2,3) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(3,4) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(4,5) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(5,6) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(6,7) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(7,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t1.j2 new file mode 100644 index 000000000000..520c2cb112a6 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffer_ports_t1.j2 @@ -0,0 +1,39 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,1) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(1,2) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(2,3) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(3,4) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(4,5) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(5,6) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} + {% for port_idx in range(6,7) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} + {% endfor %} + {% for port_idx in range(7,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2 deleted file mode 100755 index b5a7336e0511..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2 +++ /dev/null @@ -1,78 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,1) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(1,2) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(2,3) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(3,4) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(4,5) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(5,6) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(6,7) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(7,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2 new file mode 120000 index 000000000000..9524e6a476ac --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t0.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t0.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2 deleted file mode 100755 index b5a7336e0511..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2 +++ /dev/null @@ -1,78 +0,0 @@ -{%- set default_cable = '300m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,1) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(1,2) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(2,3) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(3,4) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(4,5) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(5,6) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} - {% for port_idx in range(6,7) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 1)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 2)) %}{% endif %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4 + 3)) %}{% endif %} - {% endfor %} - {% for port_idx in range(7,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2 new file mode 120000 index 000000000000..c25cc95d6d57 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/buffers_defaults_t1.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t1.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini deleted file mode 100755 index 9f2eacb6fc42..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini +++ /dev/null @@ -1,17 +0,0 @@ -# PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 56368 18432 55120 -3 2496 - 25000 5m 56368 18432 55120 -3 2496 - 40000 5m 56368 18432 55120 -3 2496 - 50000 5m 56368 18432 55120 -3 2496 - 100000 5m 56368 18432 55120 -3 2496 - 10000 40m 56368 18432 55120 -3 2496 - 25000 40m 56368 18432 55120 -3 2496 - 40000 40m 56368 18432 55120 -3 2496 - 50000 40m 56368 18432 55120 -3 2496 - 100000 40m 56368 18432 55120 -3 2496 - 10000 300m 56368 18432 55120 -3 2496 - 25000 300m 56368 18432 55120 -3 2496 - 40000 300m 56368 18432 55120 -3 2496 - 50000 300m 56368 18432 55120 -3 2496 - 100000 300m 56368 18432 55120 -3 2496 diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini new file mode 120000 index 000000000000..297cddb2d223 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/pg_profile_lookup.ini @@ -0,0 +1 @@ +BALANCED/pg_profile_lookup.ini \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2 deleted file mode 100755 index 3e548325ea30..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2 new file mode 120000 index 000000000000..aef6b6765cf2 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000-Q28S16/qos.json.j2 @@ -0,0 +1 @@ +BALANCED/qos.json.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/BALANCED b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/BALANCED new file mode 120000 index 000000000000..af1545f14b74 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/BALANCED @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/BALANCED \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/RDMA-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/RDMA-CENTRIC new file mode 120000 index 000000000000..f65c31fb2e59 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/RDMA-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/RDMA-CENTRIC \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/TCP-CENTRIC b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/TCP-CENTRIC new file mode 120000 index 000000000000..46569c641476 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/TCP-CENTRIC @@ -0,0 +1 @@ +../../../common/profiles/td2/6000/TCP-CENTRIC \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t0.j2 new file mode 100644 index 000000000000..fb4c13c5c794 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t0.j2 @@ -0,0 +1,7 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} + diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t1.j2 new file mode 100644 index 000000000000..48bbf2fc121e --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffer_ports_t1.j2 @@ -0,0 +1,6 @@ +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {% for port_idx in range(0,32) %} + {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} + {% endfor %} +{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 deleted file mode 100644 index dc04b2265f33..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '0m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 new file mode 120000 index 000000000000..9524e6a476ac --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t0.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 deleted file mode 100644 index dc04b2265f33..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 +++ /dev/null @@ -1,45 +0,0 @@ -{%- set default_cable = '0m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {% for port_idx in range(0,32) %} - {% if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{% endif %} - {% endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "12766208", - "type": "ingress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "12766208", - "type": "egress", - "mode": "static" - }, - "egress_lossy_pool": { - "size": "7326924", - "type": "egress", - "mode": "dynamic" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"0", - "static_th":"12766208" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 new file mode 120000 index 000000000000..c25cc95d6d57 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 @@ -0,0 +1 @@ +BALANCED/buffers_defaults_t1.j2 \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini deleted file mode 100644 index 9f2eacb6fc42..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini +++ /dev/null @@ -1,17 +0,0 @@ -# PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 56368 18432 55120 -3 2496 - 25000 5m 56368 18432 55120 -3 2496 - 40000 5m 56368 18432 55120 -3 2496 - 50000 5m 56368 18432 55120 -3 2496 - 100000 5m 56368 18432 55120 -3 2496 - 10000 40m 56368 18432 55120 -3 2496 - 25000 40m 56368 18432 55120 -3 2496 - 40000 40m 56368 18432 55120 -3 2496 - 50000 40m 56368 18432 55120 -3 2496 - 100000 40m 56368 18432 55120 -3 2496 - 10000 300m 56368 18432 55120 -3 2496 - 25000 300m 56368 18432 55120 -3 2496 - 40000 300m 56368 18432 55120 -3 2496 - 50000 300m 56368 18432 55120 -3 2496 - 100000 300m 56368 18432 55120 -3 2496 diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini new file mode 120000 index 000000000000..297cddb2d223 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/pg_profile_lookup.ini @@ -0,0 +1 @@ +BALANCED/pg_profile_lookup.ini \ No newline at end of file diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 deleted file mode 100644 index 3e548325ea30..000000000000 --- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{%- include 'qos_config.j2' %} diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 new file mode 120000 index 000000000000..aef6b6765cf2 --- /dev/null +++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/qos.json.j2 @@ -0,0 +1 @@ +BALANCED/qos.json.j2 \ No newline at end of file From fe9667950c44e912d87f51a12c4c35792742720d Mon Sep 17 00:00:00 2001 From: jcaiMR <111116206+jcaiMR@users.noreply.github.com> Date: Wed, 30 Nov 2022 08:23:08 +0800 Subject: [PATCH 02/29] static route expiry feature support (#12865) *[Bgpcfgd] static route expiry feature --- src/sonic-bgpcfgd/bgpcfgd/main.py | 7 +++ .../bgpcfgd/managers_static_rt.py | 24 +++++++- src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py | 58 +++++++++++++++++++ 3 files changed, 86 insertions(+), 3 deletions(-) create mode 100644 src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py diff --git a/src/sonic-bgpcfgd/bgpcfgd/main.py b/src/sonic-bgpcfgd/bgpcfgd/main.py index 698e1756e654..e94597eb29f5 100644 --- a/src/sonic-bgpcfgd/bgpcfgd/main.py +++ b/src/sonic-bgpcfgd/bgpcfgd/main.py @@ -2,6 +2,7 @@ import signal import sys import syslog +import threading import traceback from swsscommon import swsscommon @@ -17,6 +18,7 @@ from .managers_intf import InterfaceMgr from .managers_setsrc import ZebraSetSrc from .managers_static_rt import StaticRouteMgr +from .static_rt_timer import StaticRouteTimer from .managers_rm import RouteMapMgr from .runner import Runner, signal_handler from .template import TemplateFabric @@ -27,6 +29,9 @@ def do_work(): """ Main function """ + st_rt_timer = StaticRouteTimer() + thr = threading.Thread(target = st_rt_timer.run) + thr.start() frr = FRR(["bgpd", "zebra", "staticd"]) frr.wait_for_daemons(seconds=20) # @@ -59,6 +64,7 @@ def do_work(): BBRMgr(common_objs, "CONFIG_DB", "BGP_BBR"), # Static Route Managers StaticRouteMgr(common_objs, "CONFIG_DB", "STATIC_ROUTE"), + StaticRouteMgr(common_objs, "APPL_DB", "STATIC_ROUTE"), # Route Advertisement Managers AdvertiseRouteMgr(common_objs, "STATE_DB", swsscommon.STATE_ADVERTISE_NETWORK_TABLE_NAME), RouteMapMgr(common_objs, "APPL_DB", swsscommon.APP_BGP_PROFILE_TABLE_NAME), @@ -67,6 +73,7 @@ def do_work(): for mgr in managers: runner.add_manager(mgr) runner.run() + thr.join() def main(): diff --git a/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py index 6fafeda8142d..e479b8edf9de 100644 --- a/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py +++ b/src/sonic-bgpcfgd/bgpcfgd/managers_static_rt.py @@ -4,6 +4,7 @@ from .template import TemplateFabric import socket from swsscommon import swsscommon +from ipaddress import ip_network, IPv4Network class StaticRouteMgr(Manager): """ This class updates static routes when STATIC_ROUTE table is updated """ @@ -93,11 +94,28 @@ def split_key(key): Split key into vrf name and prefix. :param key: key to split :return: vrf name extracted from the key, ip prefix extracted from the key + key example: APPL_DB vrf:5.5.5.0/24, 5.5.5.0/24, vrf:2001::0/64, 2001::0/64 + CONFIG_DB vrf|5.5.5.0/24, 5.5.5.0/24, vrf|2001::0/64, 2001::0/64 """ - if '|' not in key: - return 'default', key - else: + vrf = "" + prefix = "" + + if '|' in key: return tuple(key.split('|', 1)) + else: + try: + _ = ip_network(key) + vrf, prefix = 'default', key + except ValueError: + # key in APPL_DB + log_debug("static route key {} is not prefix only formart, split with ':'".format(key)) + output = key.split(':', 1) + if len(output) < 2: + log_debug("invalid input in APPL_DB {}".format(key)) + raise ValueError + vrf = output[0] + prefix = key[len(vrf)+1:] + return vrf, prefix def static_route_commands(self, ip_nh_set, cur_nh_set, ip_prefix, vrf): diff_set = ip_nh_set.symmetric_difference(cur_nh_set) diff --git a/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py b/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py new file mode 100644 index 000000000000..7042849ef426 --- /dev/null +++ b/src/sonic-bgpcfgd/bgpcfgd/static_rt_timer.py @@ -0,0 +1,58 @@ +from .log import log_err, log_info, log_debug +from swsscommon import swsscommon +import time + +class StaticRouteTimer(object): + """ This class checks the static routes and deletes those entries that have not been refreshed """ + def __init__(self): + self.db = swsscommon.SonicV2Connector() + self.db.connect(self.db.APPL_DB) + self.timer = None + self.start = None + + DEFAULT_TIMER = 180 + DEFAULT_SLEEP = 60 + MAX_TIMER = 1800 + + def set_timer(self): + """ Check for custom route expiry time in STATIC_ROUTE_EXPIRY_TIME """ + timer = self.db.get(self.db.APPL_DB, "STATIC_ROUTE_EXPIRY_TIME", "time") + if timer is not None: + if timer.isdigit(): + timer = int(timer) + if timer > 0 and timer <= self.MAX_TIMER: + self.timer = timer + return + log_err("Custom static route expiry time of {}s is invalid!".format(timer)) + return + + def alarm(self): + """ Clear unrefreshed static routes """ + static_routes = self.db.keys(self.db.APPL_DB, "STATIC_ROUTE:*") + if static_routes is not None: + for sr in static_routes: + expiry = self.db.get(self.db.APPL_DB, sr, "expiry") + if expiry == "false": + continue + refresh = self.db.get(self.db.APPL_DB, sr, "refresh") + if refresh == "true": + self.db.set(self.db.APPL_DB, sr, "refresh", "false") + log_debug("Refresh status of static route {} is set to false".format(sr)) + else: + self.db.delete(self.db.APPL_DB, sr) + log_debug("Static route {} deleted".format(sr)) + self.start = time.time() + return + + def run(self): + self.start = time.time() + while True: + self.set_timer() + if self.timer: + log_info("Static route expiry set to {}s".format(self.timer)) + time.sleep(self.timer) + self.alarm() + else: + time.sleep(self.DEFAULT_SLEEP) + if time.time() - self.start >= self.DEFAULT_TIMER: + self.alarm() From 09a485471697989973968cd7f61bfa12c09957ab Mon Sep 17 00:00:00 2001 From: Yutong Zhang <90831468+yutongzhang-microsoft@users.noreply.github.com> Date: Wed, 30 Nov 2022 22:37:08 +0800 Subject: [PATCH 03/29] Support passing the instance numbers of a testplan. (#12880) Previously, we hard code the min and max numbers of instance in a plan. In this pr, we support passing the instance numbers of a testplan. Why I did it Previously, we hard code the min and max numbers of instance in a plan. In this pr, we support passing the instance numbers of a testplan. How I did it Use a variable to set the instance number. --- .azure-pipelines/run-test-scheduler-template.yml | 4 ++-- azure-pipelines.yml | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml index 5af2f8696e8b..8e26c16a0e46 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -11,11 +11,11 @@ parameters: default: 36000 - name: MIN_WORKER - type: number + type: string default: 1 - name: MAX_WORKER - type: number + type: string default: 2 - name: TEST_SET diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4fcdcb392602..e0445ceaeadb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -173,8 +173,8 @@ stages: - template: .azure-pipelines/run-test-scheduler-template.yml parameters: TOPOLOGY: t0 - MIN_WORKER: 2 - MAX_WORKER: 3 + MIN_WORKER: $(T0_INSTANCE_NUM) + MAX_WORKER: $(T0_INSTANCE_NUM) MGMT_BRANCH: 202012 - job: t0_2vlans_testbedv2 @@ -189,7 +189,8 @@ stages: parameters: TOPOLOGY: t0 TEST_SET: t0-2vlans - MAX_WORKER: 1 + MIN_WORKER: $(T0_2VLANS_INSTANCE_NUM) + MAX_WORKER: $(T0_2VLANS_INSTANCE_NUM) DEPLOY_MG_EXTRA_PARAMS: "-e vlan_config=two_vlan_a" MGMT_BRANCH: 202012 @@ -250,8 +251,8 @@ stages: - template: .azure-pipelines/run-test-scheduler-template.yml parameters: TOPOLOGY: t1-lag - MIN_WORKER: 2 - MAX_WORKER: 3 + MIN_WORKER: $(T1_LAG_INSTANCE_NUM) + MAX_WORKER: $(T1_LAG_INSTANCE_NUM) MGMT_BRANCH: 202012 - job: @@ -292,7 +293,7 @@ stages: - template: .azure-pipelines/run-test-scheduler-template.yml parameters: TOPOLOGY: dualtor - MIN_WORKER: 1 - MAX_WORKER: 1 + MIN_WORKER: $(T0_DUALTOR_INSTANCE_NUM) + MAX_WORKER: $(T0_DUALTOR_INSTANCE_NUM) COMMON_EXTRA_PARAMS: "--disable_loganalyzer " MGMT_BRANCH: 202012 From e377b03a943c3868bf17610e7d23efb8fa423fc3 Mon Sep 17 00:00:00 2001 From: zitingguo-ms Date: Fri, 2 Dec 2022 16:01:40 +0800 Subject: [PATCH 04/29] Publish docker saiserverv2 in 202012 branch (#12903) # Why I did it Publish docker saiserverv2 in the build pipeline. # How I did it Add docker saiserverv2 target in the build template. # How to verify it Run test in #12836 and the target has been built out successfully. Signed-off-by: zitingguo-ms --- .azure-pipelines/azure-pipelines-build.yml | 10 ++++++++++ .azure-pipelines/build-template.yml | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/.azure-pipelines/azure-pipelines-build.yml b/.azure-pipelines/azure-pipelines-build.yml index 09f2c852f81c..c7cbc363d9f6 100644 --- a/.azure-pipelines/azure-pipelines-build.yml +++ b/.azure-pipelines/azure-pipelines-build.yml @@ -123,7 +123,17 @@ jobs: make $BUILD_OPTIONS target/sonic-$(GROUP_NAME).raw fi if [ $(docker_syncd_rpc_image) == yes ]; then + # workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/docker-syncd-$(platform_rpc)-rpc.gz + pushd ./src/sonic-sairedis/SAI + git stash + popd + if [ $(GROUP_NAME) == broadcom ]; then + make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-saiserverv2-brcm.gz + pushd ./src/sonic-sairedis/SAI + git stash + popd + fi fi if [ $(syncd_rpc_image) == yes ]; then make $BUILD_OPTIONS ENABLE_SYNCD_RPC=y target/sonic-$(GROUP_NAME).bin diff --git a/.azure-pipelines/build-template.yml b/.azure-pipelines/build-template.yml index 2665f46452c7..7b5ec1ed2757 100644 --- a/.azure-pipelines/build-template.yml +++ b/.azure-pipelines/build-template.yml @@ -105,6 +105,16 @@ jobs: fi if [ ${{ parameters.sync_rpc_image }} == true ]; then make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y target/docker-syncd-${{ parameters.platform_short }}-rpc.gz + # workaround for issue in rules/sairedis.dep, git ls-files will list un-exist files for cache + pushd ./src/sonic-sairedis/SAI + git stash + popd + if [ ${{ parameters.platform }} == broadcom ]; then + make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) ENABLE_SYNCD_RPC=y SAITHRIFT_V2=y target/docker-saiserverv2-brcm.gz + pushd ./src/sonic-sairedis/SAI + git stash + popd + fi fi make USERNAME=admin $CACHE_OPTIONS SONIC_BUILD_JOBS=$(nproc) target/sonic-${{ parameters.platform }}.bin From f683a8737a18ce8d4da44531f3c2de3aefc5224e Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 2 Dec 2022 18:46:44 +0800 Subject: [PATCH 05/29] [ci/build]: Upgrade SONiC package versions (#12914) --- .../build-sonic-slave-buster/versions-git | 6 ++-- files/build/versions/default/versions-git | 8 +++--- .../docker-base-buster/versions-deb-buster | 8 +++--- .../docker-sonic-mgmt-framework/versions-py3 | 6 ++-- .../sonic-slave-buster/versions-deb-buster | 28 +++++++++---------- .../dockers/sonic-slave-buster/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- .../versions/host-image/versions-deb-buster | 8 +++--- .../host-image/versions-deb-buster-arm64 | 4 +++ .../host-image/versions-deb-buster-armhf | 4 +++ files/build/versions/host-image/versions-py3 | 2 +- 11 files changed, 43 insertions(+), 35 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git index f623f1fb7efd..e392962b1f2e 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -1,10 +1,10 @@ https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9 -https://github.com/jpirko/libteam.git==5147be02262dbd18cb7283ff660a8169eaa88b8a +https://github.com/jpirko/libteam.git==4a43cd854b4b6bbc1ff3dbe99df74eae1efe2b34 https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/sflow/host-sflow==458295bcd2c598e5a121e8094eecbce56da126e4 -https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb +https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3 +https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 6c779cc9ed9f..2f5edcc07596 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,16 +1,16 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==0115386a26a457025605048d1ffbbf810a359a8e +https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9 -https://github.com/jpirko/libteam.git==5147be02262dbd18cb7283ff660a8169eaa88b8a +https://github.com/jpirko/libteam.git==4a43cd854b4b6bbc1ff3dbe99df74eae1efe2b34 https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==458295bcd2c598e5a121e8094eecbce56da126e4 -https://github.com/sflow/sflowtool==bbb242e00caa94a23b26e3f93a5cae03ac6b13cb +https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3 +https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c diff --git a/files/build/versions/dockers/docker-base-buster/versions-deb-buster b/files/build/versions/dockers/docker-base-buster/versions-deb-buster index 6c77c09bae9d..7f95f2a5d7c4 100644 --- a/files/build/versions/dockers/docker-base-buster/versions-deb-buster +++ b/files/build/versions/dockers/docker-base-buster/versions-deb-buster @@ -11,14 +11,14 @@ libexpat1==2.2.6-2+deb10u6 libfastjson4==0.99.8-2 libgdbm-compat4==1.18.1-4 libgdbm6==1.18.1-4 -libgssapi-krb5-2==1.17-3+deb10u4 +libgssapi-krb5-2==1.17-3+deb10u5 libjansson4==2.12-1 libjemalloc2==5.1.0-3 libjq1==1.5+dfsg-2+b1 -libk5crypto3==1.17-3+deb10u4 +libk5crypto3==1.17-3+deb10u5 libkeyutils1==1.6-6 -libkrb5-3==1.17-3+deb10u4 -libkrb5support0==1.17-3+deb10u4 +libkrb5-3==1.17-3+deb10u5 +libkrb5support0==1.17-3+deb10u5 libldap-2.4-2==2.4.47+dfsg-3+deb10u7 libldap-common==2.4.47+dfsg-3+deb10u7 liblognorm5==2.0.5-1 diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 index 34db954266d7..679208f4862a 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -5,21 +5,21 @@ click==8.1.3 clickclick==20.10.2 connexion==2.7.0 flask==2.2.2 -grpcio==1.50.0 +grpcio==1.51.1 grpcio-tools==1.20.0 idna==3.4 importlib-metadata==5.1.0 importlib-resources==5.10.0 inflection==0.5.1 itsdangerous==2.1.2 -jsonschema==4.17.1 +jsonschema==4.17.3 jsonschema-spec==0.1.2 lazy-object-proxy==1.8.0 openapi-schema-validator==0.3.4 openapi-spec-validator==0.5.1 pathable==0.4.3 pkgutil_resolve_name==1.3.10 -protobuf==4.21.9 +protobuf==4.21.10 pyrsistent==0.19.2 python-dateutil==2.6.0 requests==2.28.1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index 61d5b2949b0c..bb2eec377bfa 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -199,8 +199,8 @@ javahelper==0.72.9 javascript-common==11 kernel-wedge==2.99 kmod==26-1 -krb5-locales==1.17-3+deb10u4 -krb5-multidev==1.17-3+deb10u4 +krb5-locales==1.17-3+deb10u5 +krb5-multidev==1.17-3+deb10u5 lcov==1.13-4 less==487-0.1+b1 lib32asan5==8.3.0-6 @@ -567,8 +567,8 @@ libgraphite2-dev==1.3.13-7 libgs9==9.27~dfsg-2+deb10u6 libgs9-common==9.27~dfsg-2+deb10u6 libgsm1==1.0.18-2 -libgssapi-krb5-2==1.17-3+deb10u4 -libgssrpc4==1.17-3+deb10u4 +libgssapi-krb5-2==1.17-3+deb10u5 +libgssrpc4==1.17-3+deb10u5 libgstreamer-plugins-base1.0-0==1.14.4-2+deb10u1 libgstreamer1.0-0==1.14.4-1 libgtest-dev==1.8.1-3 @@ -690,16 +690,16 @@ libjudy-dev==1.0.5-5 libjudydebian1==1.0.5-5 libjxr-tools==1.1-6+b1 libjxr0==1.1-6+b1 -libk5crypto3==1.17-3+deb10u4 -libkadm5clnt-mit11==1.17-3+deb10u4 -libkadm5srv-mit11==1.17-3+deb10u4 -libkdb5-9==1.17-3+deb10u4 +libk5crypto3==1.17-3+deb10u5 +libkadm5clnt-mit11==1.17-3+deb10u5 +libkadm5srv-mit11==1.17-3+deb10u5 +libkdb5-9==1.17-3+deb10u5 libkeyutils1==1.6-6 libkmod2==26-1 libkpathsea6==2018.20181218.49446-1 -libkrb5-3==1.17-3+deb10u4 -libkrb5-dev==1.17-3+deb10u4 -libkrb5support0==1.17-3+deb10u4 +libkrb5-3==1.17-3+deb10u5 +libkrb5-dev==1.17-3+deb10u5 +libkrb5support0==1.17-3+deb10u5 libksba8==1.3.5-2+deb10u1 liblab-gamut1==2.40.1-6+deb10u1 liblcms2-2==2.9-3 @@ -1522,9 +1522,9 @@ python-soupsieve==1.8+dfsg-1 python-sphinx==1.8.4-1 python-stdeb==0.8.5-1 python-tk==2.7.16-2 -python-twisted==18.9.0-3+deb10u1 -python-twisted-bin==18.9.0-3+deb10u1 -python-twisted-core==18.9.0-3+deb10u1 +python-twisted==18.9.0-3+deb10u2 +python-twisted-bin==18.9.0-3+deb10u2 +python-twisted-core==18.9.0-3+deb10u2 python-typing==3.6.6-1 python-tz==2019.1-1 python-urllib3==1.24.1-1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 7bc91d253f28..0ee65f64e2da 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==0115386a26a457025605048d1ffbbf810a359a8e +https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 7bc91d253f28..0ee65f64e2da 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==0115386a26a457025605048d1ffbbf810a359a8e +https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster index f59c6b4d9cb9..7a87825ed09d 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -131,7 +131,7 @@ libglib2.0-0==2.58.3-2+deb10u4 libgnutls30==3.6.7-4+deb10u9 libgomp1==8.3.0-6 libgpm2==1.20.7-5 -libgssapi-krb5-2==1.17-3+deb10u4 +libgssapi-krb5-2==1.17-3+deb10u5 libhavege1==1.9.1-7 libhiredis0.14==0.14.0-3~bpo9+1 libi2c0==4.1-1 @@ -144,12 +144,12 @@ libisl19==0.20-2 libitm1==8.3.0-6 libjq1==1.5+dfsg-2+b1 libjson-c3==0.12.1+ds-2+deb10u1 -libk5crypto3==1.17-3+deb10u4 +libk5crypto3==1.17-3+deb10u5 libkeyutils1==1.6-6 libklibc==2.0.6-1+deb10u1 libkmod2==26-1 -libkrb5-3==1.17-3+deb10u4 -libkrb5support0==1.17-3+deb10u4 +libkrb5-3==1.17-3+deb10u5 +libkrb5support0==1.17-3+deb10u5 libksba8==1.3.5-2+deb10u1 libldap-2.4-2==2.4.47+dfsg-3+deb10u7 libldap-common==2.4.47+dfsg-3+deb10u7 diff --git a/files/build/versions/host-image/versions-deb-buster-arm64 b/files/build/versions/host-image/versions-deb-buster-arm64 index 7fd5c7a3b298..4e4b51a369c9 100644 --- a/files/build/versions/host-image/versions-deb-buster-arm64 +++ b/files/build/versions/host-image/versions-deb-buster-arm64 @@ -18,9 +18,13 @@ libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7 libexpat1==2.2.6-2+deb10u4 libexpat1-dev==2.2.6-2+deb10u4 libglib2.0-0==2.58.3-2+deb10u3 +libgssapi-krb5-2==1.17-3+deb10u4 libicu-dev==63.1-6+deb10u3 libicu63==63.1-6+deb10u3 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7 +libk5crypto3==1.17-3+deb10u4 +libkrb5-3==1.17-3+deb10u4 +libkrb5support0==1.17-3+deb10u4 libksba8==1.3.5-2 libncurses6==6.1+20181013-2+deb10u2 libpython3.7==3.7.3-2+deb10u3 diff --git a/files/build/versions/host-image/versions-deb-buster-armhf b/files/build/versions/host-image/versions-deb-buster-armhf index 90bb65b9aacb..a9be54966324 100644 --- a/files/build/versions/host-image/versions-deb-buster-armhf +++ b/files/build/versions/host-image/versions-deb-buster-armhf @@ -18,9 +18,13 @@ libdns-export1104==1:9.11.5.P4+dfsg-5.1+deb10u7 libexpat1==2.2.6-2+deb10u4 libexpat1-dev==2.2.6-2+deb10u4 libglib2.0-0==2.58.3-2+deb10u3 +libgssapi-krb5-2==1.17-3+deb10u4 libicu-dev==63.1-6+deb10u3 libicu63==63.1-6+deb10u3 libisc-export1100==1:9.11.5.P4+dfsg-5.1+deb10u7 +libk5crypto3==1.17-3+deb10u4 +libkrb5-3==1.17-3+deb10u4 +libkrb5support0==1.17-3+deb10u4 libksba8==1.3.5-2 libncurses6==6.1+20181013-2+deb10u2 libpython3.7==3.7.3-2+deb10u3 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 14428a7f491d..3d28af302af9 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -6,7 +6,7 @@ certifi==2022.9.24 cffi==1.15.1 charset-normalizer==2.1.1 click==7.0 -cryptography==38.0.3 +cryptography==38.0.4 docker==4.3.1 idna==3.4 ijson==2.6.1 From acd24d9804aaa566ee2539264fceb0f14fe459c4 Mon Sep 17 00:00:00 2001 From: "Richard.Yu" Date: Sun, 4 Dec 2022 14:37:18 +0800 Subject: [PATCH 06/29] [submodule]Update SAI SDK URL from package storage to public (#12835) In order to make the sai update easier, change the URL pattern to a more unified format, which can be update automated latter. Signed-off-by: richardyu-ms --- platform/broadcom/sai.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 791f6703c1a7..1e0d85f106c3 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,8 +1,12 @@ -BRCM_SAI = libsaibcm_4.3.7.1-6_amd64.deb -$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D" -BRCM_SAI_DEV = libsaibcm-dev_4.3.7.1-6_amd64.deb +LIBSAIBCM_XGS_VERSION = 4.3.7.1-6 +LIBSAIBCM_BRANCH_NAME = REL_4.3.5.2 +LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)" + +BRCM_SAI = libsaibcm_$(LIBSAIBCM_XGS_VERSION)_amd64.deb +$(BRCM_SAI)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_SAI)" +BRCM_SAI_DEV = libsaibcm-dev_$(LIBSAIBCM_XGS_VERSION)_amd64.deb $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) -$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D" +$(BRCM_SAI_DEV)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_SAI_DEV)" SONIC_ONLINE_DEBS += $(BRCM_SAI) $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI) From 2cd0fcb9dfb8636de22dc55f09778d53d074df12 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 4 Dec 2022 19:57:40 +0800 Subject: [PATCH 07/29] [ci/build]: Upgrade SONiC package versions (#12925) --- .../versions-deb-buster | 7 ++--- .../versions-deb-buster-arm64 | 4 +++ .../versions-deb-buster-armhf | 4 +++ .../build-sonic-slave-buster/versions-py3 | 1 + .../build-sonic-slave-buster/versions-web | 3 ++ files/build/versions/default/versions-git | 2 +- .../versions-deb-buster | 28 +++++++++++++++++++ .../dockers/sonic-slave-buster/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- 9 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster index be7fe179a3c0..01426c8cba36 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster @@ -8,17 +8,14 @@ isc-dhcp-relay==4.4.1-2 kernel-mft-dkms==4.18.0-106 libhiredis-dev==0.14.0-3~bpo9+1 libhiredis0.14==0.14.0-3~bpo9+1 -libnl-3-200==3.5.0-1 -libnl-3-dev==3.5.0-1 libnl-cli-3-200==3.5.0-1 libnl-cli-3-dev==3.5.0-1 libnl-genl-3-200==3.5.0-1 libnl-genl-3-dev==3.5.0-1 libnl-nf-3-200==3.5.0-1 libnl-nf-3-dev==3.5.0-1 -libnl-route-3-200==3.5.0-1 -libnl-route-3-dev==3.5.0-1 libsaibcm==4.3.7.1-6 +libsaibcm-dev==4.3.7.1-6 libsaimetadata==1.0.0 libsaimetadata-dev==1.0.0 libsairedis==1.0.0 @@ -34,6 +31,7 @@ libteam-utils==1.30-1 libteam5==1.30-1 libteamdctl0==1.30-1 libthrift-0.11.0==0.11.0-4 +libthrift-0.13.0==0.13.0-6 libthrift-dev==0.11.0-4 libyang==1.0.73 libyang-cpp==1.0.73 @@ -47,6 +45,7 @@ python-swsscommon==1.0.0 python-thrift==0.11.0-4 python2-yang==1.0.73 python3-swsscommon==1.0.0 +python3-thrift==0.13.0-6 python3-yang==1.0.73 sonic-dhcp6relay==1.0.0-0 sonic-dhcpmon==1.0.0-0 diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 index 57aad7a71092..1be11bdfd522 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-arm64 @@ -1 +1,5 @@ +libnl-3-200==3.5.0-1 +libnl-3-dev==3.5.0-1 +libnl-route-3-200==3.5.0-1 +libnl-route-3-dev==3.5.0-1 linux-headers-4.19.0-12-2-arm64==4.19.152-1 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf index a83790c30ddf..72e55bfa8606 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf +++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster-armhf @@ -1 +1,5 @@ +libnl-3-200==3.5.0-1 +libnl-3-dev==3.5.0-1 +libnl-route-3-200==3.5.0-1 +libnl-route-3-dev==3.5.0-1 linux-headers-4.19.0-12-2-armmp==4.19.152-1 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-py3 b/files/build/versions/build/build-sonic-slave-buster/versions-py3 index 500452c7633a..ea8b7de71681 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-py3 +++ b/files/build/versions/build/build-sonic-slave-buster/versions-py3 @@ -12,6 +12,7 @@ psutil==5.9.4 pyroute2==0.5.14 python-arptable==0.0.2 tabulate==0.9.0 +thrift==0.13.0 websocket-client==1.4.2 xmltodict==0.12.0 zipp==1.2.0 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web index 8cf6d38eddcc..9f40db8ae92e 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-web +++ b/files/build/versions/build/build-sonic-slave-buster/versions-web @@ -8,6 +8,9 @@ http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1-1.debia http://deb.debian.org/debian/pool/main/m/makedumpfile/makedumpfile_1.6.1.orig.tar.gz==16c0ae9902ae57be4a603a6ab1e86c53 http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg-4.debian.tar.xz==bec40e0bda23a893e76843579c68d901 http://deb.debian.org/debian/pool/main/n/ntp/ntp_4.2.8p12+dfsg.orig.tar.xz==71044a49f4ab09c9bc10ed9862d22939 +http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0-6.debian.tar.xz==4c0d6cab366b4fdb0372299ecc8a219a +http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0-6.dsc==278cfe25d286d1840ee366b557ed6ab0 +http://deb.debian.org/debian/pool/main/t/thrift//thrift_0.13.0.orig.tar.gz==38a27d391a2b03214b444cb13d5664f1 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.debian.tar.xz==ef340aedc6fd42c549cd503bffb498b2 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0-3~bpo9+1.dsc==be4ce11ef67268e59e4b6be587327c40 http://http.debian.net/debian/pool/main/h/hiredis/hiredis_0.14.0.orig.tar.gz==6d565680a4af0d2e261abbc3e3431b2b diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 2f5edcc07596..7acc646594e8 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa +https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b diff --git a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster new file mode 100644 index 000000000000..7941ad15564f --- /dev/null +++ b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster @@ -0,0 +1,28 @@ +gdb==8.2.1-2+b3 +kmod==26-1 +libbabeltrace1==1.5.6-2+deb10u1 +libboost-atomic1.71.0==1.71.0-6~bpo10+1 +libc-dev-bin==2.28-10+deb10u2 +libc6-dev==2.28-10+deb10u2 +libdouble-conversion1==3.1.0-3 +libdw1==0.176-1.1 +libglib2.0-0==2.58.3-2+deb10u4 +libicu63==63.1-6+deb10u3 +libipt2==2.0-2 +libkmod2==26-1 +libpcre2-16-0==10.32-5 +libpopt0==1.16-12 +libprotobuf-dev==3.6.1.3-2 +libprotobuf-lite17==3.6.1.3-2 +libprotobuf17==3.6.1.3-2 +libqt5core5a==5.11.3+dfsg1-1+deb10u5 +libqt5dbus5==5.11.3+dfsg1-1+deb10u5 +libqt5network5==5.11.3+dfsg1-1+deb10u5 +libsaibcm==4.3.7.1-6 +libsaithrift-dev==0.9.4 +libthrift-0.13.0==0.13.0-6 +libyaml-0-2==0.2.1-1 +libyaml-dev==0.2.1-1 +linux-libc-dev==4.19.260-1 +saiserver==0.9.4 +zlib1g-dev==1:1.2.11.dfsg-1+deb10u2 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 0ee65f64e2da..2a46a9e37208 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa +https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 0ee65f64e2da..2a46a9e37208 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==0922aaade135019beea0fe8c13568525d5ad72aa +https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file From 9d17d4294ec78457914e427ec30214c8a3f4ab5a Mon Sep 17 00:00:00 2001 From: "Richard.Yu" Date: Mon, 5 Dec 2022 13:42:57 +0800 Subject: [PATCH 08/29] [Submodule][SAI-Redis]Advance SAI Redis head pointer (#12930) Advance sairedis head pointer, include changes - https://github.com/sonic-net/sonic-sairedis/pull/1167 https://github.com/sonic-net/sonic-sairedis/commit/4a887a1b04b0509a870df9c2e4ed2baf474a4991 Signed-off-by: richardyu-ms Signed-off-by: richardyu-ms --- src/sonic-sairedis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index 315f13bec32d..4a887a1b04b0 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 315f13bec32d914590c9f37f0b34f8897ee03186 +Subproject commit 4a887a1b04b0509a870df9c2e4ed2baf474a4991 From 8fc4b050362f62fdf40822b4e38386397e4e9f31 Mon Sep 17 00:00:00 2001 From: Yutong Zhang <90831468+yutongzhang-microsoft@users.noreply.github.com> Date: Mon, 5 Dec 2022 13:56:54 +0800 Subject: [PATCH 09/29] [TestbedV2][202012]Remove timeout in each step. (#12916) Previously, we set timeout in each step such as Lock testbed, Prepare testbed, Run test and KVM dump. When some issue suck like retry happens in one step, it will cause timeout error, but actually, it only needs more time to success. In this pr, we remove the timeout limit in each step and control the timeout outside in each job. When the job runs more than four hours, it will be cancelled. Why I did it Previously, we set timeout in each step such as Lock testbed, Prepare testbed, Run test and KVM dump. When some issue suck like retry happens in one step, it will cause timeout error, but actually, it only needs more time to success. In this pr, we remove the timeout limit in each step and control the timeout outside in each job. When the job runs more than four hours, it will be cancelled. How I did it Remove the timeout parameter in each step, and control the timeout outside in each job. Signed-off-by: Yutong Zhang --- .azure-pipelines/run-test-scheduler-template.yml | 12 ++++-------- azure-pipelines.yml | 8 ++++---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml index 8e26c16a0e46..4821fb05353c 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -67,11 +67,10 @@ steps: echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID" # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED" - python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 43200 --expected-states PREPARE_TESTBED EXECUTING KVMDUMP FINISHED CANCELLED FAILED + python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states PREPARE_TESTBED EXECUTING KVMDUMP FINISHED CANCELLED FAILED env: TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL) displayName: Lock testbed - timeoutInMinutes: 240 - script: | set -ex @@ -81,11 +80,10 @@ steps: echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID" # When "PREPARE_TESTBED" finish, it changes into "EXECUTING" - python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 2400 --expected-states EXECUTING KVMDUMP FINISHED CANCELLED FAILED + python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states EXECUTING KVMDUMP FINISHED CANCELLED FAILED env: TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL) displayName: Prepare testbed - timeoutInMinutes: 40 - script: | set -ex @@ -93,11 +91,10 @@ steps: echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID" # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED" - python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 18000 --expected-states KVMDUMP FINISHED CANCELLED FAILED + python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states KVMDUMP FINISHED CANCELLED FAILED env: TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL) displayName: Run test - timeoutInMinutes: 300 - script: | set -ex @@ -105,12 +102,11 @@ steps: echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID" # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED" - python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --timeout 43200 --expected-states FINISHED CANCELLED FAILED + python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states FINISHED CANCELLED FAILED condition: succeededOrFailed() env: TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL) displayName: KVM dump - timeoutInMinutes: 20 - script: | set -ex diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e0445ceaeadb..7b80cd5f2f9e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -166,7 +166,7 @@ stages: pool: vmImage: 'ubuntu-20.04' displayName: "kvmtest-t0 by TestbedV2" - timeoutInMinutes: 1080 + timeoutInMinutes: 240 condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: @@ -181,7 +181,7 @@ stages: pool: vmImage: 'ubuntu-20.04' displayName: "kvmtest-t0-2vlans by TestbedV2" - timeoutInMinutes: 1080 + timeoutInMinutes: 240 condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: @@ -244,7 +244,7 @@ stages: pool: vmImage: 'ubuntu-20.04' displayName: "kvmtest-t1-lag by TestbedV2" - timeoutInMinutes: 600 + timeoutInMinutes: 240 condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: @@ -286,7 +286,7 @@ stages: pool: vmImage: 'ubuntu-20.04' displayName: "kvmtest-dualtor-t0 by TestbedV2" - timeoutInMinutes: 1080 + timeoutInMinutes: 240 condition: and(succeeded(), eq(variables.BUILD_IMG_RUN_TESTBEDV2_TEST, 'YES')) continueOnError: false steps: From e15acb59ff3e6d73bcc95b0734b98a580aca61ce Mon Sep 17 00:00:00 2001 From: "Richard.Yu" Date: Mon, 5 Dec 2022 14:10:28 +0800 Subject: [PATCH 10/29] enable sai-ptf logger in sai_adapter to log all the sai api invcations (#12922) Why I did it enable sai-ptf logger in sai_adapter to log all the sai api invcations How I did it add build parameter to enable the sai-ptf logger when build sai PRC How to verify it local build test test the generated sai_adapter test with pipeline Signed-off-by: richardyu-ms --- platform/broadcom/libsaithrift-dev.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk index d8ad7df77fd0..a5c009d2f346 100644 --- a/platform/broadcom/libsaithrift-dev.mk +++ b/platform/broadcom/libsaithrift-dev.mk @@ -8,7 +8,7 @@ $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI ifeq ($(SAITHRIFT_V2),y) $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_13_0) $(LIBTHRIFT_DEV_0_13_0) $(PYTHON3_THRIFT_0_13_0) $(THRIFT_COMPILER_0_13_0) $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_13_0) -$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 GEN_SAIRPC_OPTS="\"--skip_error=-2\"" +$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 GEN_SAIRPC_OPTS="--adapter_logger --skip_error=-2" else $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) From d24995223dc6a728ed38dd19af13572fa74c0285 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 8 Dec 2022 02:13:33 +0800 Subject: [PATCH 11/29] [ci/build]: Upgrade SONiC package versions (#12987) --- .../versions/build/build-sonic-slave-buster/versions-web | 6 +++--- .../versions/build/build-sonic-slave-stretch/versions-web | 4 ++-- files/build/versions/default/versions-git | 2 +- .../dockers/docker-sonic-mgmt-framework/versions-py3 | 2 +- .../versions/dockers/sonic-slave-buster/versions-deb-buster | 2 +- .../build/versions/dockers/sonic-slave-buster/versions-git | 2 +- .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +- files/build/versions/host-image/versions-deb-buster | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-web b/files/build/versions/build/build-sonic-slave-buster/versions-web index 9f40db8ae92e..cfd20d032a61 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-web +++ b/files/build/versions/build/build-sonic-slave-buster/versions-web @@ -31,8 +31,6 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209 https://sonicstorage.blob.core.windows.net/packages/20190307/bcmcmd?sv=2015-04-05&sr=b&sig=sUdbU7oVbh5exbXXHVL5TDFBTWDDBASHeJ8Cp0B0TIc%3D&se=2038-05-06T22%3A34%3A19Z&sp=r==b8aefc751bdf93218716bca6797460ff https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d -https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D==7e0446ee74052756bfd57dc1227faf5c -https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D==f8685d1b0ffbe1f629d5b669175045b7 https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.debian.tar.xz?sv=2015-04-05&sr=b&sig=H0RFeC41MCvhTQCln85DuPLn5v2goozwz%2FB9sA9p5eQ%3D&se=2046-08-20T23%3A46%3A02Z&sp=r==47a284f4762f86ba24753ea75d85e6cb https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6-1.dsc?sv=2015-04-05&sr=b&sig=IS7FKUN%2Bvq0T55f4X2hGAViB70Y%2FgzjGgvzpUJLyUfA%3D&se=2046-08-20T23%3A46%3A57Z&sp=r==151f97b46df2dafbd5bb954bb419642c https://sonicstorage.blob.core.windows.net/packages/debian/smartmontools_6.6.orig.tar.gz?sv=2015-04-05&sr=b&sig=JZx4qiLuO36T0rsGqk4V2RDuWjRw6NztsLK7vlBYAkg%3D&se=2046-08-20T23%3A47%3A13Z&sp=r==9ae2c6e7131cd2813edcc65cbe5f223f @@ -41,4 +39,6 @@ https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1-2+deb9u https://sonicstorage.blob.core.windows.net/packages/debian/socat_1.7.3.1.orig.tar.gz?sv=2015-04-05&sr=b&sig=0Ai1FM604aGsF5uBu2yN8w9O1a6zNjIDCdaiTo24DyQ%3D&se=2155-07-05T11%3A40%3A14Z&sp=r==fbab6334919cbd71433213db18dbbdf0 https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.debian.tar.xz?sv=2015-04-05&sr=b&sig=dj9uJ5YjUNupcmuxSX6%2F5IS9NqaGAyM9iF2h%2F2rROZA%3D&se=2156-02-02T17%3A19%3A34Z&sp=r==52ad383b97ad051f4d1d25b54aaad569 https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0-4.dsc?sv=2015-04-05&sr=b&sig=pWfg55owvQ2jZtZ6ylHp0OP8uZyfc9sxO6H%2BP4Ez7w4%3D&se=2156-02-02T17%3A20%3A05Z&sp=r==6917fe7b3ada9313be94713dd50fee7b -https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r==0be59730ebce071eceaf6bfdb8d3a20e \ No newline at end of file +https://sonicstorage.blob.core.windows.net/packages/debian/thrift_0.11.0.orig.tar.gz?sv=2015-04-05&sr=b&sig=%2BrAjWESiSNRCMN7NGqEqVGceLefpwwS%2FWPKEfJpPLSQ%3D&se=2156-02-02T17%3A17%3A20Z&sp=r==0be59730ebce071eceaf6bfdb8d3a20e +https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm-dev_4.3.7.1-6_amd64.deb==7e0446ee74052756bfd57dc1227faf5c +https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm_4.3.7.1-6_amd64.deb==f8685d1b0ffbe1f629d5b669175045b7 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-stretch/versions-web b/files/build/versions/build/build-sonic-slave-stretch/versions-web index 0c74c05a6998..396e45a85c04 100644 --- a/files/build/versions/build/build-sonic-slave-stretch/versions-web +++ b/files/build/versions/build/build-sonic-slave-stretch/versions-web @@ -1,2 +1,2 @@ -https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A50%3A50Z&se=2037-10-26T06%3A50%3A00Z&sr=b&sp=r&sig=bW8ORoQqQl0SGhWSge8C2KH1FcnELM5wxEZ1lMWgH6w%3D==7e0446ee74052756bfd57dc1227faf5c -https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.1-6_amd64.deb?sv=2021-04-10&st=2022-10-25T06%3A49%3A16Z&se=2037-10-26T06%3A49%3A00Z&sr=b&sp=r&sig=NceGVsZ%2BG9DwI7t82bdQRsXSI5ewZdvx6rtEx8KTB74%3D==f8685d1b0ffbe1f629d5b669175045b7 \ No newline at end of file +https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm-dev_4.3.7.1-6_amd64.deb==7e0446ee74052756bfd57dc1227faf5c +https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/REL_4.3.5.2/4.3.7.1-6/libsaibcm_4.3.7.1-6_amd64.deb==f8685d1b0ffbe1f629d5b669175045b7 \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 7acc646594e8..abf5f7555bde 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb +https://chromium.googlesource.com/chromium/tools/depot_tools.git==107142ac3853cb3ee87c34bf8cb4b93e4a0afb78 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 index 679208f4862a..89259860f3b8 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -9,7 +9,7 @@ grpcio==1.51.1 grpcio-tools==1.20.0 idna==3.4 importlib-metadata==5.1.0 -importlib-resources==5.10.0 +importlib-resources==5.10.1 inflection==0.5.1 itsdangerous==2.1.2 jsonschema==4.17.3 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index bb2eec377bfa..e6cc25815590 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -528,7 +528,7 @@ libgeronimo-interceptor-3.0-spec-java==1.0.1-4 libgetopt-long-descriptive-perl==0.103-2 libgfortran-8-dev==8.3.0-6 libgfortran5==8.3.0-6 -libgif7==5.1.4-3 +libgif7==5.1.4-3+deb10u1 libgirepository-1.0-1==1.58.3-2 libgit-wrapper-perl==0.048-1 libgitlab-api-v4-perl==0.16-1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 2a46a9e37208..c3adbdb6e488 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb +https://chromium.googlesource.com/chromium/tools/depot_tools.git==107142ac3853cb3ee87c34bf8cb4b93e4a0afb78 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 2a46a9e37208..56aa11f33e08 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==ec1882fbc24e603f5b35b81739f2ae1541d3b9bb +https://chromium.googlesource.com/chromium/tools/depot_tools.git==6e33ba049f82587c184ea9b604d9fb081a5e7c24 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster index 7a87825ed09d..40e02b3a5aff 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2 ca-certificates==20200601~deb10u2 cgroup-tools==0.41-8.1 conntrack==1:1.4.5-2 -containerd.io==1.6.10-1 +containerd.io==1.6.11-1 cpio==2.12+dfsg-9 cpp==4:8.3.0-1 cpp-8==8.3.0-6 From 5d6f8f84f81b8de48157b652149dedf8d62463e2 Mon Sep 17 00:00:00 2001 From: abdosi <58047199+abdosi@users.noreply.github.com> Date: Thu, 8 Dec 2022 01:12:28 -0800 Subject: [PATCH 12/29] [bgp] Enable BGP Graceful Restart based on device role (#9486) (#12990) What I did: Updated Jinja Template to enable BGP Graceful Restart based on device role. By default it will be enable only if the device role type is TorRouter. Why I did:- By default FRR is configured in Graceful Helper mode. Graceful Restart is needed on T0/TorRouter only since the device can go for warm-reboot. For T1/LeafRouter it need to be in Helper mode only --- dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 | 2 +- .../tests/data/sonic-cfggen/bgpd.conf.j2/all.json | 3 ++- .../tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json | 3 ++- .../tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json | 3 ++- .../tests/data/sonic-cfggen/frr.conf.j2/all.json | 3 ++- .../tests/sample_output/py2/bgpd_frr_backend_asic.conf | 4 ---- .../tests/sample_output/py2/bgpd_frr_frontend_asic.conf | 4 ---- .../tests/sample_output/py2/t2-chassis-fe-bgpd.conf | 4 ---- .../tests/sample_output/py3/bgpd_frr_backend_asic.conf | 4 ---- .../tests/sample_output/py3/bgpd_frr_frontend_asic.conf | 4 ---- .../tests/sample_output/py3/t2-chassis-fe-bgpd.conf | 4 ---- 11 files changed, 9 insertions(+), 29 deletions(-) diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 index 5c91a34737d6..ce6fc3026a74 100644 --- a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 +++ b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 @@ -53,7 +53,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }} bgp bestpath as-path multipath-relax {% endif %} ! -{% if constants.bgp.graceful_restart.enabled is defined and constants.bgp.graceful_restart.enabled %} +{% if constants.bgp.graceful_restart.enabled is defined and constants.bgp.graceful_restart.enabled and DEVICE_METADATA['localhost']['type'] == 'ToRRouter' %} bgp graceful-restart restart-time {{ constants.bgp.graceful_restart.restart_time | default(240) }} bgp graceful-restart bgp graceful-restart preserve-fw-state diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json index 34fdbe72448b..fc5016d8536e 100644 --- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json +++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.json @@ -3,7 +3,8 @@ "localhost": { "hostname": "new_hostname", "bgp_asn": "55555", - "sub_role": "FrontEnd" + "sub_role": "FrontEnd", + "type": "ToRRouter" } }, "LOOPBACK_INTERFACE": { diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json index c8f0141ec4f5..47508bb3c001 100644 --- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json +++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.json @@ -2,7 +2,8 @@ "DEVICE_METADATA": { "localhost": { "bgp_asn": "55555", - "sub_role": "FrontEnd" + "sub_role": "FrontEnd", + "type": "ToRRouter" } }, "LOOPBACK_INTERFACE": { diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json index 5b30406668ab..c1b5ae8dc449 100644 --- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json +++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.json @@ -2,7 +2,8 @@ "DEVICE_METADATA": { "localhost": { "bgp_asn": "55555", - "sub_role": "FrontEnd" + "sub_role": "FrontEnd", + "type": "ToRRouter" } }, "LOOPBACK_INTERFACE": { diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json index 92143a2a9deb..9c8a34fb4120 100644 --- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json +++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.json @@ -3,7 +3,8 @@ "localhost": { "bgp_asn": "55555", "hostname": "test_hostname", - "sub_role": "FrontEnd" + "sub_role": "FrontEnd", + "type": "ToRRouter" } }, "INTERFACE": { diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf index a4ad1c677a77..20e1d2bc3241 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf @@ -46,10 +46,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 8.0.0.5 ! diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf index b49d3ddd4dcd..223b7c189e27 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf @@ -46,10 +46,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 10.1.0.32 ! diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf index d3b9b472c5bd..20744efaa40f 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf @@ -63,10 +63,6 @@ router bgp 4000 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 4.0.0.0 ! diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf index a4ad1c677a77..20e1d2bc3241 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf @@ -46,10 +46,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 8.0.0.5 ! diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf index b49d3ddd4dcd..223b7c189e27 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf @@ -46,10 +46,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 10.1.0.32 ! diff --git a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf index d3b9b472c5bd..20744efaa40f 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf @@ -63,10 +63,6 @@ router bgp 4000 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 4.0.0.0 ! From e8c7a7c61eb88898e506fe975965fc779ee46935 Mon Sep 17 00:00:00 2001 From: Dror Prital <76714716+dprital@users.noreply.github.com> Date: Thu, 8 Dec 2022 12:16:54 +0200 Subject: [PATCH 13/29] [202012][Mellanox] Update SDK/FW to version 4.5.3196/2010_3196 (#12989) - Why I did it Update SDK/FW version - 4.5.3196/2010_3196 in order to have the following fixes: 1. ON SPC2/3 in some cases, after many ACL region resize will corrupt internal DB that in return will fail future ACLs configuration 2.. Lag Port as Analyzer Port | when removing port from distributer list SDK does not reselect another port for mirroring 3. Due to critical race at initial configuration, SDK RDQ test may test RDQ configured for WJH and fail the test Add support for new HW SKU of SN4700 - How I did it Update pointer for the SDK/FW - How to verify it Run regression tests --- platform/mellanox/fw.mk | 6 +++--- platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +- platform/mellanox/sdk.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk index 0b1cacd67b94..faef8e6f9395 100644 --- a/platform/mellanox/fw.mk +++ b/platform/mellanox/fw.mk @@ -11,17 +11,17 @@ else FW_FROM_URL = n endif -MLNX_SPC_FW_VERSION = 13.2010.3186 +MLNX_SPC_FW_VERSION = 13.2010.3196 MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH) $(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE) -MLNX_SPC2_FW_VERSION = 29.2010.3186 +MLNX_SPC2_FW_VERSION = 29.2010.3196 MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH) $(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE) -MLNX_SPC3_FW_VERSION = 30.2010.3186 +MLNX_SPC3_FW_VERSION = 30.2010.3196 MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa $(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH) $(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE) diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers index d44d801b60fa..a12968f165f6 160000 --- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers +++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers @@ -1 +1 @@ -Subproject commit d44d801b60fa49f0dcc1129baeef13ac64d48e2d +Subproject commit a12968f165f623ff3c27d6ebaabd34cc6316497e diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index c74f086c0a07..06c067cc1984 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -1,6 +1,6 @@ MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/ MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/ -MLNX_SDK_VERSION = 4.5.3186 +MLNX_SDK_VERSION = 4.5.3196 MLNX_SDK_ISSU_VERSION = 101 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION))) From d9839a8bf26df31d5cf846257350f6c6d5628b36 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 10 Dec 2022 18:55:14 +0800 Subject: [PATCH 14/29] [ci/build]: Upgrade SONiC package versions (#13014) --- .../versions-deb-buster | 34 +++++++++--------- .../build-sonic-slave-buster/versions-git | 4 +-- files/build/versions/default/versions-docker | 12 +++---- files/build/versions/default/versions-git | 6 ++-- .../versions-deb-buster | 18 +++++----- .../docker-platform-monitor/versions-py2 | 2 +- .../docker-platform-monitor/versions-py3 | 2 +- .../docker-sonic-mgmt-framework/versions-py3 | 2 +- .../docker-sonic-vs/versions-deb-buster | 4 +-- .../dockers/docker-sonic-vs/versions-py3 | 2 +- .../docker-syncd-mlnx/versions-deb-buster | 36 +++++++++---------- .../dockers/docker-syncd-mlnx/versions-py2 | 2 +- .../dockers/docker-syncd-mlnx/versions-py3 | 2 +- .../sonic-slave-buster/versions-deb-buster | 4 +-- .../dockers/sonic-slave-buster/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- .../versions/host-image/versions-deb-buster | 8 ++--- files/build/versions/host-image/versions-py3 | 2 +- 18 files changed, 72 insertions(+), 72 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster index 01426c8cba36..5c7de383dae9 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/build/build-sonic-slave-buster/versions-deb-buster @@ -1,9 +1,9 @@ -applibs==1.mlnx.4.5.3186 -applibs-dev==1.mlnx.4.5.3186 +applibs==1.mlnx.4.5.3196 +applibs-dev==1.mlnx.4.5.3196 bfnplatform==1.0.0 innovium-sai==0.107.7 innovium-sai-headers==0.107.7 -iproute2-dev==1.mlnx.4.5.3186 +iproute2-dev==1.mlnx.4.5.3196 isc-dhcp-relay==4.4.1-2 kernel-mft-dkms==4.18.0-106 libhiredis-dev==0.14.0-3~bpo9+1 @@ -54,20 +54,20 @@ sonic-mgmt-common==1.0.0 sonic-mgmt-common-codegen==1.0.0 sonic-mgmt-framework==1.0-01 swss==1.0.0 -sx-acl-helper==1.mlnx.4.5.3186 -sx-acl-helper-dev==1.mlnx.4.5.3186 -sx-complib==1.mlnx.4.5.3186 -sx-complib-dev==1.mlnx.4.5.3186 -sx-examples==1.mlnx.4.5.3186 -sx-examples-dev==1.mlnx.4.5.3186 -sx-gen-utils==1.mlnx.4.5.3186 -sx-gen-utils-dev==1.mlnx.4.5.3186 -sx-scew==1.mlnx.4.5.3186 -sx-scew-dev==1.mlnx.4.5.3186 -sxd-libs==1.mlnx.4.5.3186 -sxd-libs-dev==1.mlnx.4.5.3186 +sx-acl-helper==1.mlnx.4.5.3196 +sx-acl-helper-dev==1.mlnx.4.5.3196 +sx-complib==1.mlnx.4.5.3196 +sx-complib-dev==1.mlnx.4.5.3196 +sx-examples==1.mlnx.4.5.3196 +sx-examples-dev==1.mlnx.4.5.3196 +sx-gen-utils==1.mlnx.4.5.3196 +sx-gen-utils-dev==1.mlnx.4.5.3196 +sx-scew==1.mlnx.4.5.3196 +sx-scew-dev==1.mlnx.4.5.3196 +sxd-libs==1.mlnx.4.5.3196 +sxd-libs-dev==1.mlnx.4.5.3196 syncd==1.0.0 syncd-vs==1.0.0 thrift-compiler==0.11.0-4 -wjh-libs==1.mlnx.4.5.3186 -wjh-libs-dev==1.mlnx.4.5.3186 \ No newline at end of file +wjh-libs==1.mlnx.4.5.3196 +wjh-libs-dev==1.mlnx.4.5.3196 \ No newline at end of file diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git index e392962b1f2e..b77a5ff3b785 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -1,12 +1,12 @@ https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9 -https://github.com/jpirko/libteam.git==4a43cd854b4b6bbc1ff3dbe99df74eae1efe2b34 +https://github.com/jpirko/libteam.git==fd26b370d85d63cca0736d7e666736bb15c395aa https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 -https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 +https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index 934fa5c1cd93..be6fa036988c 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,10 +1,10 @@ -amd64:amd64/debian:buster==sha256:d0b2ae07eb30bf2ba9575f30beddc778b2b6349a973c6f9037eba5ba862524b8 +amd64:amd64/debian:buster==sha256:1487e24b974ca8b859de513d40c7f30606949c1fa1e4057df81b2dc1915edc6a amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085 -amd64:debian:buster==sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5 +amd64:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be -arm64:arm64v8/debian:buster==sha256:5fb6d294a4e1af778e459a514e5b7db71424838b274278a9115b5b3f4407dd99 -arm64:debian:buster==sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5 +arm64:arm64v8/debian:buster==sha256:143f807a473ee188663942a77f28a526e7546efea5621e64d264427b28098d7d +arm64:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be -armhf:arm32v7/debian:buster==sha256:643317b4799f740f497daf7de3a50631d99efe79ac688948db0843cd5cab110b -armhf:debian:buster==sha256:6c153b6c1b042fb70140a465e6d7c9c4a6112062afdc843c6a4d9c5bbfe5d0d5 +armhf:arm32v7/debian:buster==sha256:965acb1aa66ce1767beac782bdd9f93a27b7867fc0c681fef485adf7ead19cf7 +armhf:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index abf5f7555bde..9fc3e8e60fcc 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,10 +1,10 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==107142ac3853cb3ee87c34bf8cb4b93e4a0afb78 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b https://github.com/dyninc/OpenBFDD.git==e35f43ad8d2b3f084e96a84c392528a90d05a287 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9 -https://github.com/jpirko/libteam.git==4a43cd854b4b6bbc1ff3dbe99df74eae1efe2b34 +https://github.com/jpirko/libteam.git==fd26b370d85d63cca0736d7e666736bb15c395aa https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 @@ -12,7 +12,7 @@ https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7 https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 -https://salsa.debian.org/debian/libteam.git==f8808df228b00873926b5e7b998ad8b61368d4c5 +https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster index 83a791404500..00005a3d65fb 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster +++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster @@ -1,5 +1,5 @@ -applibs==1.mlnx.4.5.3186 -applibs-dev==1.mlnx.4.5.3186 +applibs==1.mlnx.4.5.3196 +applibs-dev==1.mlnx.4.5.3196 binutils==2.31.1-16 binutils-common==2.31.1-16 binutils-x86-64-linux-gnu==2.31.1-16 @@ -108,7 +108,7 @@ python-dev==2.7.16-1 python-minimal==2.7.16-1 python-pip==18.1-5 python-pip-whl==18.1-5 -python-sdk-api==1.mlnx.4.5.3186 +python-sdk-api==1.mlnx.4.5.3196 python-smbus==4.1-1 python-swsscommon==1.0.0 python2==2.7.16-1 @@ -129,12 +129,12 @@ sensord-dbgsym==1:3.5.0-3 smartmontools==6.6-1 sshpass==1.06-1 strace==4.26-0.2 -sx-complib==1.mlnx.4.5.3186 -sx-complib-dev==1.mlnx.4.5.3186 -sx-gen-utils==1.mlnx.4.5.3186 -sx-gen-utils-dev==1.mlnx.4.5.3186 -sxd-libs==1.mlnx.4.5.3186 -sxd-libs-dev==1.mlnx.4.5.3186 +sx-complib==1.mlnx.4.5.3196 +sx-complib-dev==1.mlnx.4.5.3196 +sx-gen-utils==1.mlnx.4.5.3196 +sx-gen-utils-dev==1.mlnx.4.5.3196 +sxd-libs==1.mlnx.4.5.3196 +sxd-libs-dev==1.mlnx.4.5.3196 ucf==3.0038+nmu1 udev==241-7~deb10u8 vim==2:8.1.0875-5+deb10u4 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py2 b/files/build/versions/dockers/docker-platform-monitor/versions-py2 index aa6fd5acb17b..cbd6d764d36e 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-py2 +++ b/files/build/versions/dockers/docker-platform-monitor/versions-py2 @@ -14,7 +14,7 @@ netaddr==0.8.0 pathlib2==2.3.7.post1 pyang==2.5.3 pyangbind==0.6.0 -python-sdk-api==4.5.3186 +python-sdk-api==4.5.3196 pyyaml==5.4.1 redis==3.5.3 redis-dump-load==1.1 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-py3 b/files/build/versions/dockers/docker-platform-monitor/versions-py3 index 7351c08c8e00..f2debc6aefc2 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-py3 +++ b/files/build/versions/dockers/docker-platform-monitor/versions-py3 @@ -1,3 +1,3 @@ jsonschema==2.6.0 -python_sdk_api==4.5.3186 +python_sdk_api==4.5.3196 thrift==0.13.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 index 89259860f3b8..baf9f9757e41 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -19,7 +19,7 @@ openapi-schema-validator==0.3.4 openapi-spec-validator==0.5.1 pathable==0.4.3 pkgutil_resolve_name==1.3.10 -protobuf==4.21.10 +protobuf==4.21.11 pyrsistent==0.19.2 python-dateutil==2.6.0 requests==2.28.1 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster index 67e25e268993..1591999dc783 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster @@ -28,8 +28,8 @@ gpg-wks-client==2.2.12-1+deb10u2 gpg-wks-server==2.2.12-1+deb10u2 gpgconf==2.2.12-1+deb10u2 gpgsm==2.2.12-1+deb10u2 -grub-common==2.06-3~deb10u2 -grub2-common==2.06-3~deb10u2 +grub-common==2.06-3~deb10u3 +grub2-common==2.06-3~deb10u3 ifupdown==0.8.35 iptables==1.8.2-4 libasan5==8.3.0-6 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-py3 b/files/build/versions/dockers/docker-sonic-vs/versions-py3 index 9ac340c32134..1a5b3670e2b2 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-vs/versions-py3 @@ -1,4 +1,4 @@ -certifi==2022.9.24 +certifi==2022.12.7 charset-normalizer==2.1.1 click==7.0 idna==3.4 diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster index 8f68ce964b97..a00de4f18435 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster @@ -1,8 +1,8 @@ -applibs==1.mlnx.4.5.3186 -applibs-dev==1.mlnx.4.5.3186 +applibs==1.mlnx.4.5.3196 +applibs-dev==1.mlnx.4.5.3196 gdb==8.2.1-2+b3 gdbserver==8.2.1-2+b3 -iproute2-dev==1.mlnx.4.5.3186 +iproute2-dev==1.mlnx.4.5.3196 libbabeltrace1==1.5.6-2+deb10u1 libbsd0==0.9.1-2+deb10u1 libc-dev-bin==2.28-10+deb10u2 @@ -41,7 +41,7 @@ python-minimal==2.7.16-1 python-pip==18.1-5 python-pip-whl==18.1-5 python-pkg-resources==40.8.0-1 -python-sdk-api==1.mlnx.4.5.3186 +python-sdk-api==1.mlnx.4.5.3196 python-setuptools==40.8.0-1 python2==2.7.16-1 python2-dev==2.7.16-1 @@ -51,21 +51,21 @@ python2.7-dev==2.7.16-2+deb10u1 python2.7-minimal==2.7.16-2+deb10u1 sshpass==1.06-1 strace==4.26-0.2 -sx-acl-helper==1.mlnx.4.5.3186 -sx-acl-helper-dev==1.mlnx.4.5.3186 -sx-complib==1.mlnx.4.5.3186 -sx-complib-dev==1.mlnx.4.5.3186 -sx-examples==1.mlnx.4.5.3186 -sx-examples-dev==1.mlnx.4.5.3186 -sx-gen-utils==1.mlnx.4.5.3186 -sx-gen-utils-dev==1.mlnx.4.5.3186 -sx-scew==1.mlnx.4.5.3186 -sx-scew-dev==1.mlnx.4.5.3186 -sxd-libs==1.mlnx.4.5.3186 -sxd-libs-dev==1.mlnx.4.5.3186 +sx-acl-helper==1.mlnx.4.5.3196 +sx-acl-helper-dev==1.mlnx.4.5.3196 +sx-complib==1.mlnx.4.5.3196 +sx-complib-dev==1.mlnx.4.5.3196 +sx-examples==1.mlnx.4.5.3196 +sx-examples-dev==1.mlnx.4.5.3196 +sx-gen-utils==1.mlnx.4.5.3196 +sx-gen-utils-dev==1.mlnx.4.5.3196 +sx-scew==1.mlnx.4.5.3196 +sx-scew-dev==1.mlnx.4.5.3196 +sxd-libs==1.mlnx.4.5.3196 +sxd-libs-dev==1.mlnx.4.5.3196 syncd==1.0.0 syncd-dbg==1.0.0 vim==2:8.1.0875-5+deb10u4 vim-runtime==2:8.1.0875-5+deb10u4 -wjh-libs==1.mlnx.4.5.3186 -wjh-libs-dev==1.mlnx.4.5.3186 \ No newline at end of file +wjh-libs==1.mlnx.4.5.3196 +wjh-libs-dev==1.mlnx.4.5.3196 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 index 8a09c5423b62..e86ef29dbed2 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py2 @@ -1 +1 @@ -python-sdk-api==4.5.3186 \ No newline at end of file +python-sdk-api==4.5.3196 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 index 87eac0d90289..ff782443e8d6 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-py3 @@ -1 +1 @@ -python_sdk_api==4.5.3186 \ No newline at end of file +python_sdk_api==4.5.3196 \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index e6cc25815590..63d3afe24c7e 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -50,7 +50,7 @@ cmake==3.13.4-1 cmake-data==3.13.4-1 cmocka-doc==1.1.3-1 comerr-dev==2.1-1.44.5-1+deb10u3 -containerd.io==1.6.10-1 +containerd.io==1.6.12-1 cowbuilder==0.88 cowdancer==0.88 cpio==2.12+dfsg-9 @@ -1145,7 +1145,7 @@ libvdpau-va-gl1==0.4.2-1+b1 libvdpau1==1.1.1-10 libvelocity-tools-java==2.0-7 libvidstab1.1==1.1.0-2 -libvirglrenderer0==0.7.0-2 +libvirglrenderer0==0.7.0-2+deb10u1 libvirt-clients==5.0.0-4+deb10u1 libvirt0==5.0.0-4+deb10u1 libvisual-0.4-0==0.4.0-15 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index c3adbdb6e488..93cadc5707ab 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==107142ac3853cb3ee87c34bf8cb4b93e4a0afb78 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 56aa11f33e08..93cadc5707ab 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==6e33ba049f82587c184ea9b604d9fb081a5e7c24 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster index 40e02b3a5aff..396cb38b1758 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2 ca-certificates==20200601~deb10u2 cgroup-tools==0.41-8.1 conntrack==1:1.4.5-2 -containerd.io==1.6.11-1 +containerd.io==1.6.12-1 cpio==2.12+dfsg-9 cpp==4:8.3.0-1 cpp-8==8.3.0-6 @@ -56,8 +56,8 @@ gpg-wks-client==2.2.12-1+deb10u2 gpg-wks-server==2.2.12-1+deb10u2 gpgconf==2.2.12-1+deb10u2 gpgsm==2.2.12-1+deb10u2 -grub-common==2.06-3~deb10u2 -grub2-common==2.06-3~deb10u2 +grub-common==2.06-3~deb10u3 +grub2-common==2.06-3~deb10u3 haveged==1.9.1-7 hdparm==9.58+ds-1 hping3==3.a2.ds2-7 @@ -314,7 +314,7 @@ squashfs-tools==1:4.3-12+deb10u2 sudo==1.8.27-1+deb10u4 swig==3.0.12-2 swig3.0==3.0.12-2 -sx-kernel==1.mlnx.4.5.3186 +sx-kernel==1.mlnx.4.5.3196 sysfsutils==2.1.0+repack-5 systemd==247.3-6~bpo10+1 systemd-sonic-generator==1.0.0 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index 3d28af302af9..cd2661caf413 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -2,7 +2,7 @@ azure-common==1.1.28 azure-nspkg==3.0.2 azure-storage==0.36.0 bitarray==1.5.3 -certifi==2022.9.24 +certifi==2022.12.7 cffi==1.15.1 charset-normalizer==2.1.1 click==7.0 From 56d364994b0fd1df39ff8cab25205dd00dd1583a Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 17 Dec 2022 18:45:53 +0800 Subject: [PATCH 15/29] [ci/build]: Upgrade SONiC package versions (#13092) --- files/build/versions/default/versions-git | 2 +- .../versions/dockers/docker-snmp/versions-py3 | 2 +- .../docker-snmp/versions-py3-all-armhf | 1 + .../docker-sonic-mgmt-framework/versions-py3 | 2 +- .../sonic-slave-buster/versions-deb-buster | 24 +++++++++---------- .../dockers/sonic-slave-buster/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- .../versions/host-image/versions-deb-buster | 2 +- 8 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 files/build/versions/dockers/docker-snmp/versions-py3-all-armhf diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 9fc3e8e60fcc..e327203ef0cd 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b diff --git a/files/build/versions/dockers/docker-snmp/versions-py3 b/files/build/versions/dockers/docker-snmp/versions-py3 index 2b0260cea69f..45ab6f7da69a 100644 --- a/files/build/versions/dockers/docker-snmp/versions-py3 +++ b/files/build/versions/dockers/docker-snmp/versions-py3 @@ -1,4 +1,4 @@ -hiredis==2.0.0 +hiredis==2.1.0 psutil==5.9.4 python-arptable==0.0.2 smbus==1.1.post2 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-snmp/versions-py3-all-armhf b/files/build/versions/dockers/docker-snmp/versions-py3-all-armhf new file mode 100644 index 000000000000..252e8c7f1140 --- /dev/null +++ b/files/build/versions/dockers/docker-snmp/versions-py3-all-armhf @@ -0,0 +1 @@ +hiredis==2.0.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 index baf9f9757e41..361d1c452b70 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -19,7 +19,7 @@ openapi-schema-validator==0.3.4 openapi-spec-validator==0.5.1 pathable==0.4.3 pkgutil_resolve_name==1.3.10 -protobuf==4.21.11 +protobuf==4.21.12 pyrsistent==0.19.2 python-dateutil==2.6.0 requests==2.28.1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index 63d3afe24c7e..59ca309b314a 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -50,7 +50,7 @@ cmake==3.13.4-1 cmake-data==3.13.4-1 cmocka-doc==1.1.3-1 comerr-dev==2.1-1.44.5-1+deb10u3 -containerd.io==1.6.12-1 +containerd.io==1.6.13-1 cowbuilder==0.88 cowdancer==0.88 cpio==2.12+dfsg-9 @@ -149,9 +149,9 @@ gir1.2-gtk-3.0==3.24.5-1 gir1.2-harfbuzz-0.0==2.3.1-1 gir1.2-packagekitglib-1.0==1.1.12-5 gir1.2-pango-1.0==1.42.4-8~deb10u1 -git==1:2.20.1-2+deb10u4 +git==1:2.20.1-2+deb10u6 git-buildpackage==0.9.14 -git-man==1:2.20.1-2+deb10u4 +git-man==1:2.20.1-2+deb10u6 glib-networking==2.58.0-2+deb10u2 glib-networking-common==2.58.0-2+deb10u2 glib-networking-services==2.58.0-2+deb10u2 @@ -413,7 +413,7 @@ libdbi1==0.9.0-5 libdbus-1-3==1.12.24-0+deb10u1 libdbus-1-dev==1.12.24-0+deb10u1 libdconf1==0.30.1-2 -libde265-0==1.0.3-1+b1 +libde265-0==1.0.3-1+deb10u1 libdevel-callchecker-perl==0.008-1 libdevel-caller-perl==2.06-2+b1 libdevel-globaldestruction-perl==0.14-1 @@ -829,7 +829,7 @@ libopencore-amrnb0==0.1.3-2.1+b2 libopencore-amrwb0==0.1.3-2.1+b2 libopencsd-dev==0.10.1-1 libopencsd0==0.10.1-1 -libopenexr23==2.2.1-4.1+deb10u1 +libopenexr23==2.2.1-4.1+deb10u2 libopengl0==1.1.0-1 libopenjp2-7==2.3.0-2+deb10u2 libopenmpi-dev==3.1.3-11 @@ -1401,13 +1401,13 @@ php-token-stream==3.0.1-1 php-tokenizer==1.1.0-1 php-webmozart-assert==1.4.0-3 php-xml==2:7.3+69 -php7.3-cli==7.3.31-1~deb10u1 -php7.3-common==7.3.31-1~deb10u1 -php7.3-json==7.3.31-1~deb10u1 -php7.3-mbstring==7.3.31-1~deb10u1 -php7.3-opcache==7.3.31-1~deb10u1 -php7.3-readline==7.3.31-1~deb10u1 -php7.3-xml==7.3.31-1~deb10u1 +php7.3-cli==7.3.31-1~deb10u2 +php7.3-common==7.3.31-1~deb10u2 +php7.3-json==7.3.31-1~deb10u2 +php7.3-mbstring==7.3.31-1~deb10u2 +php7.3-opcache==7.3.31-1~deb10u2 +php7.3-readline==7.3.31-1~deb10u2 +php7.3-xml==7.3.31-1~deb10u2 phpunit==7.5.6-1 phpunit-code-unit-reverse-lookup==1.0.1-1 phpunit-comparator==3.0.2-1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 93cadc5707ab..342dbfe4aeda 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 93cadc5707ab..342dbfe4aeda 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==a964ca1296b9238d0797aa5f25597efa7b897515 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster index 396cb38b1758..df326b52a6cd 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2 ca-certificates==20200601~deb10u2 cgroup-tools==0.41-8.1 conntrack==1:1.4.5-2 -containerd.io==1.6.12-1 +containerd.io==1.6.13-1 cpio==2.12+dfsg-9 cpp==4:8.3.0-1 cpp-8==8.3.0-6 From ccff008e206031a579479cff7a4965c49150839e Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Thu, 22 Dec 2022 08:53:13 -0800 Subject: [PATCH 16/29] [202012][utilities] advance submodule head (#13118) utilities: * f0fc333e 2022-12-15 | [db_migrator] Fix migration of Loopback data: handle all Loopback interfaces (#2560) (HEAD -> 202012, github/202012) [Vaibhav Hemant Dixit] * ad7a4d42 2022-11-30 | Support for platforms based on Clounix Networks' device (#2108) [songqh2022] Signed-off-by: Ying Xie Signed-off-by: Ying Xie --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index b2b59487c5db..f0fc333e735d 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit b2b59487c5dbeb39bca97d89492de77752229b87 +Subproject commit f0fc333e735d9cd27d98cdddaa64cf46ccbfd83d From f4e005ad37fa4407948747d85b1b416f6cfc6832 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 23 Dec 2022 07:52:32 +0800 Subject: [PATCH 17/29] [ci/build]: Upgrade SONiC package versions (#13146) --- .../build/build-sonic-slave-buster/versions-git | 2 +- files/build/versions/default/versions-docker | 12 ++++++------ files/build/versions/default/versions-git | 4 ++-- .../docker-config-engine-buster/versions-deb-buster | 2 +- .../dockers/docker-orchagent/versions-deb-buster | 2 +- .../docker-platform-monitor/versions-deb-buster | 2 +- .../docker-saiserverv2-brcm/versions-deb-buster | 2 +- .../versions/dockers/docker-snmp/versions-deb-buster | 2 +- .../docker-sonic-mgmt-framework/versions-deb-buster | 2 +- .../dockers/docker-sonic-mgmt-framework/versions-py3 | 4 ++-- .../dockers/docker-sonic-vs/versions-deb-buster | 2 +- .../dockers/docker-syncd-bfn/versions-deb-buster | 2 +- .../dockers/docker-syncd-brcm/versions-deb-buster | 2 +- .../docker-syncd-centec-rpc/versions-deb-buster | 2 +- .../dockers/docker-syncd-mlnx/versions-deb-buster | 2 +- .../dockers/sonic-slave-buster/versions-deb-buster | 8 ++++---- .../sonic-slave-buster/versions-deb-buster-armhf | 2 +- .../versions/dockers/sonic-slave-buster/versions-git | 2 +- .../versions/dockers/sonic-slave-buster/versions-py3 | 2 +- .../dockers/sonic-slave-stretch/versions-git | 2 +- .../dockers/sonic-slave-stretch/versions-py3 | 2 +- files/build/versions/host-image/versions-deb-buster | 4 ++-- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git index b77a5ff3b785..b950e123072c 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -8,7 +8,7 @@ https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c -https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70 +https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7 \ No newline at end of file diff --git a/files/build/versions/default/versions-docker b/files/build/versions/default/versions-docker index be6fa036988c..a46d3ca20151 100644 --- a/files/build/versions/default/versions-docker +++ b/files/build/versions/default/versions-docker @@ -1,10 +1,10 @@ -amd64:amd64/debian:buster==sha256:1487e24b974ca8b859de513d40c7f30606949c1fa1e4057df81b2dc1915edc6a +amd64:amd64/debian:buster==sha256:09739ccbaff5b5569817c554bad447c68707932f46b2da93cd5a0cdb218f4898 amd64:amd64/debian:stretch==sha256:16ee3e11da473f6565ef94a715f1a38b3079e0664913be78869c336a71cb6085 -amd64:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 +amd64:debian:buster==sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798 amd64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be -arm64:arm64v8/debian:buster==sha256:143f807a473ee188663942a77f28a526e7546efea5621e64d264427b28098d7d -arm64:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 +arm64:arm64v8/debian:buster==sha256:b366e2065a4d63182ab1acb0f5b7267066c181c0206dde64594e951a62e73f96 +arm64:debian:buster==sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798 arm64:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be -armhf:arm32v7/debian:buster==sha256:965acb1aa66ce1767beac782bdd9f93a27b7867fc0c681fef485adf7ead19cf7 -armhf:debian:buster==sha256:e6fb8b88b411285ac71590459aa8d0a376acc86a3d17adfe45e806f522c54cc3 +armhf:arm32v7/debian:buster==sha256:f6657e72719700232d3efe8750c1bb20fadbc0a2d22c54e631b52f60b752ee3a +armhf:debian:buster==sha256:a3b7e971fef3e488479afd0a8387b35bed4c55891a1597d64a8fc6494d61d798 armhf:debian:stretch==sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index e327203ef0cd..dcbee4555173 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -14,7 +14,7 @@ https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d71266b20a63c -https://salsa.debian.org/kernel-team/ethtool/==fb0c7e285eae27b7c1a2f16a4f1b224bf815aa70 +https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster index 0b45009c4d39..fa9b1df2e0e0 100644 --- a/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster +++ b/files/build/versions/dockers/docker-config-engine-buster/versions-deb-buster @@ -42,7 +42,7 @@ libstdc++-8-dev==8.3.0-6 libswsscommon==1.0.0 libtsan0==8.3.0-6 libubsan1==8.3.0-6 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 make==4.2.1-1.2 patch==2.7.6-3+deb10u1 python3-dev==3.7.3-1 diff --git a/files/build/versions/dockers/docker-orchagent/versions-deb-buster b/files/build/versions/dockers/docker-orchagent/versions-deb-buster index b6709f233931..c658791e2e24 100644 --- a/files/build/versions/dockers/docker-orchagent/versions-deb-buster +++ b/files/build/versions/dockers/docker-orchagent/versions-deb-buster @@ -53,7 +53,7 @@ libswsscommon-dbg==1.0.0 libtsan0==8.3.0-6 libubsan1==8.3.0-6 libunwind8==1.2.1-10~deb10u1 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 make==4.2.1-1.2 ndisc6==1.0.4-1 ndppd==0.2.5-4+deb10u1 diff --git a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster index 00005a3d65fb..031e96ee644b 100644 --- a/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster +++ b/files/build/versions/dockers/docker-platform-monitor/versions-deb-buster @@ -96,7 +96,7 @@ libxdmcp6==1:1.1.2-3 libxext6==2:1.3.3-1+b2 libxml2==2.9.4+dfsg1-7+deb10u5 libxrender1==1:0.9.10-1 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 lm-sensors==1:3.5.0-3 lm-sensors-dbgsym==1:3.5.0-3 make==4.2.1-1.2 diff --git a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster index 7941ad15564f..c4b5c984b6f2 100644 --- a/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster +++ b/files/build/versions/dockers/docker-saiserverv2-brcm/versions-deb-buster @@ -23,6 +23,6 @@ libsaithrift-dev==0.9.4 libthrift-0.13.0==0.13.0-6 libyaml-0-2==0.2.1-1 libyaml-dev==0.2.1-1 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 saiserver==0.9.4 zlib1g-dev==1:1.2.11.dfsg-1+deb10u2 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-snmp/versions-deb-buster b/files/build/versions/dockers/docker-snmp/versions-deb-buster index f35262af0036..c33e2ce203c3 100644 --- a/files/build/versions/dockers/docker-snmp/versions-deb-buster +++ b/files/build/versions/dockers/docker-snmp/versions-deb-buster @@ -47,7 +47,7 @@ libsnmp30-dbg==5.7.3+dfsg-5 libtsan0==8.3.0-6 libubsan1==8.3.0-6 libunwind8==1.2.1-10~deb10u1 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 locales==2.28-10+deb10u2 make==4.2.1-1.2 mariadb-common==1:10.3.36-0+deb10u2 diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster index f8720e6083f3..5c684434fe80 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-deb-buster @@ -50,7 +50,7 @@ libubsan1==8.3.0-6 libunwind8==1.2.1-10~deb10u1 libxml2==2.9.4+dfsg1-7+deb10u5 libyang==1.0.73 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 openssh-client==1:7.9p1-10+deb10u2 python==2.7.16-1 python-dev==2.7.16-1 diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 index 361d1c452b70..c17c7c71771f 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -1,4 +1,4 @@ -attrs==22.1.0 +attrs==22.2.0 certifi==2017.4.17 charset-normalizer==2.1.1 click==8.1.3 @@ -8,7 +8,7 @@ flask==2.2.2 grpcio==1.51.1 grpcio-tools==1.20.0 idna==3.4 -importlib-metadata==5.1.0 +importlib-metadata==5.2.0 importlib-resources==5.10.1 inflection==0.5.1 itsdangerous==2.1.2 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster index 1591999dc783..b3b55206b143 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster @@ -106,7 +106,7 @@ libunwind8==1.2.1-10~deb10u1 libyang==1.0.73 libyang-cpp==1.0.73 libyang1==1.0.184-2 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 logrotate==3.14.0-4 make==4.2.1-1.2 ndisc6==1.0.4-1 diff --git a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster index e13edcae91c6..ab582731feb7 100644 --- a/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-bfn/versions-deb-buster @@ -19,5 +19,5 @@ libunwind8==1.2.1-10~deb10u1 libusb-1.0-0==2:1.0.22-2 libusb-1.0-0-dev==2:1.0.22-2 libxml2==2.9.4+dfsg1-7+deb10u5 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 syncd==1.0.0 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster index e2fa0e18bfed..8c7e33a62733 100644 --- a/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-brcm/versions-deb-buster @@ -25,7 +25,7 @@ libswsscommon-dbg==1.0.0 libunwind8==1.2.1-10~deb10u1 libyaml-0-2==0.2.1-1 libyaml-dev==0.2.1-1 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 openssh-client==1:7.9p1-10+deb10u2 sshpass==1.06-1 strace==4.26-0.2 diff --git a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster index 8ca7577f4fd1..ed568fb8403a 100644 --- a/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-centec-rpc/versions-deb-buster @@ -54,7 +54,7 @@ libtsan0==8.3.0-6 libubsan1==8.3.0-6 libuv1==1.24.1-1+deb10u1 libxml2==2.9.4+dfsg1-7+deb10u5 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 make==4.2.1-1.2 patch==2.7.6-3+deb10u1 python==2.7.16-1 diff --git a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster index a00de4f18435..0ba99a2e490c 100644 --- a/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster +++ b/files/build/versions/dockers/docker-syncd-mlnx/versions-deb-buster @@ -31,7 +31,7 @@ libsairedis-dbg==1.0.0 libswsscommon-dbg==1.0.0 libunwind8==1.2.1-10~deb10u1 libxml2==2.9.4+dfsg1-7+deb10u5 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 mft==4.18.0-106 mlnx-sai==1.mlnx.SAIRel1.22.0.0 openssh-client==1:7.9p1-10+deb10u2 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index 59ca309b314a..cd7e95116763 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -50,7 +50,7 @@ cmake==3.13.4-1 cmake-data==3.13.4-1 cmocka-doc==1.1.3-1 comerr-dev==2.1-1.44.5-1+deb10u3 -containerd.io==1.6.13-1 +containerd.io==1.6.14-1 cowbuilder==0.88 cowdancer==0.88 cpio==2.12+dfsg-9 @@ -1316,12 +1316,12 @@ libzvbi0==0.2.35-16 libzzip-0-13==0.13.62-3.2+deb10u1 licensecheck==3.0.31-3 lintian==2.15.0 -linux-compiler-gcc-8-x86==4.19.260-1 +linux-compiler-gcc-8-x86==4.19.269-1 linux-headers-4.19.0-22-amd64==4.19.260-1 linux-headers-4.19.0-22-common==4.19.260-1 linux-headers-amd64==4.19+105+deb10u17 -linux-kbuild-4.19==4.19.260-1 -linux-libc-dev==4.19.260-1 +linux-kbuild-4.19==4.19.269-1 +linux-libc-dev==4.19.269-1 linuxdoc-tools==0.9.73-2 llvm-7==1:7.0.1-8+deb10u2 llvm-7-dev==1:7.0.1-8+deb10u2 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf index 1ea337db0008..3da861df4457 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster-armhf @@ -99,7 +99,7 @@ libunicode-linebreak-perl==0.0.20190101-1 libxapian-dev==1.4.11-1 libxslt1-dev==1.1.32-2.2~deb10u2 libyaml-tiny-perl==1.73-1 -linux-compiler-gcc-8-arm==4.19.260-1 +linux-compiler-gcc-8-arm==4.19.269-1 llvm-6.0==1:6.0.1-10 llvm-6.0-dev==1:6.0.1-10 llvm-6.0-runtime==1:6.0.1-10 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 342dbfe4aeda..a9f61fa3fe64 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index dcb19d3a8973..cc1f04578920 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -3,7 +3,7 @@ asn1crypto==0.24.0 atomicwrites==1.1.5 attrs==18.2.0 babel==2.6.0 -bitarray==2.6.0 +bitarray==2.6.1 certifi==2018.8.24 chardet==3.0.4 cov-core==1.15.0 diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 342dbfe4aeda..a9f61fa3fe64 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==5decb175432cb284b6f8ee102dc1b908b58d8e41 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3 index 1599cc05ecaa..be56a067d583 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3 @@ -1,6 +1,6 @@ alabaster==0.7.8 babel==2.3.4 -bitarray==2.6.0 +bitarray==2.6.1 chardet==2.3.0 cryptography==1.7.1 devscripts==2.17.6+deb9u2 diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster index df326b52a6cd..8c8484867c2a 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -14,7 +14,7 @@ bzip2==1.0.6-9.2~deb10u2 ca-certificates==20200601~deb10u2 cgroup-tools==0.41-8.1 conntrack==1:1.4.5-2 -containerd.io==1.6.13-1 +containerd.io==1.6.14-1 cpio==2.12+dfsg-9 cpp==4:8.3.0-1 cpp-8==8.3.0-6 @@ -231,7 +231,7 @@ libyang-cpp==1.0.73 libzstd1==1.4.4+dfsg-3~bpo10+1 linux-base==4.6 linux-image-4.19.0-12-2-amd64-unsigned==4.19.152-1 -linux-libc-dev==4.19.260-1 +linux-libc-dev==4.19.269-1 locales==2.28-10+deb10u2 logrotate==3.14.0-4 lsb-base==10.2019051400 From 8bb5e19c524fa4655c1611b8d618be245c0cbf7e Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Fri, 23 Dec 2022 18:52:19 +0800 Subject: [PATCH 18/29] [build] Add retry when make SONiC image to improve success rate. (#12325) (#13132) Why I did it Makefile needs some dependencies from the Internet. It will fail for network related issue. Retries will fix most of these issues. How I did it Add retries when running commands which maybe related with networking. How to verify it --- .azure-pipelines/template-variables.yml | 6 ++++++ Makefile | 7 ++++--- scripts/run_with_retry | 17 +++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 .azure-pipelines/template-variables.yml create mode 100755 scripts/run_with_retry diff --git a/.azure-pipelines/template-variables.yml b/.azure-pipelines/template-variables.yml new file mode 100644 index 000000000000..027dfee9986a --- /dev/null +++ b/.azure-pipelines/template-variables.yml @@ -0,0 +1,6 @@ +variables: + DEFAULT_CONTAINER_REGISTRY: 'publicmirror.azurecr.io' + COMMON_LIB_BUILD_ENVS: 'bullseye' + SONIC_SLAVE_DOCKER_DRIVER: 'overlay2' + SONIC_BUILD_RETRY_COUNT: 3 + SONIC_BUILD_RETRY_INTERVAL: 600 diff --git a/Makefile b/Makefile index e1864ea991bc..f3217bf03149 100644 --- a/Makefile +++ b/Makefile @@ -15,16 +15,17 @@ PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM)) PLATFORM_CHECKOUT := platform/checkout PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi) +MAKE_WITH_RETRY := ./scripts/run_with_retry $(MAKE) %:: @echo "+++ --- Making $@ --- +++" ifeq ($(NOJESSIE), 0) - EXTRA_DOCKER_TARGETS=$(notdir $@) make -f Makefile.work jessie + $(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) -f Makefile.work jessie endif ifeq ($(NOSTRETCH), 0) - EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch make -f Makefile.work stretch + $(MAKE_WITH_RETRY) EXTRA_DOCKER_TARGETS=$(notdir $@) BLDENV=stretch -f Makefile.work stretch endif - BLDENV=buster make -f Makefile.work $@ + $(MAKE_WITH_RETRY) BLDENV=buster -f Makefile.work $@ jessie: @echo "+++ Making $@ +++" diff --git a/scripts/run_with_retry b/scripts/run_with_retry new file mode 100755 index 000000000000..9e709bbf1bda --- /dev/null +++ b/scripts/run_with_retry @@ -0,0 +1,17 @@ +#!/bin/bash + +run_with_retry(){ + [ "$SONIC_BUILD_RETRY_COUNT" -gt 0 ] || SONIC_BUILD_RETRY_COUNT=0 + [[ "$*" == "" ]] && { echo "run_with_retry: input command can't be empty." 1>&2;exit 1; } + for ((i=0; i<=$SONIC_BUILD_RETRY_COUNT; i++)) + do + if [[ $i != 0 ]];then + echo "==============================================================================" 1>&2 + echo "Waiting $SONIC_BUILD_RETRY_INTERVAL to run again, $i/$SONIC_BUILD_RETRY_COUNT" 1>&2 + echo "==============================================================================" 1>&2 + sleep $SONIC_BUILD_RETRY_INTERVAL + fi + "$@" && break + done +} +run_with_retry "$@" From be918d5332347ae17e6af4e618412b22f4f96c01 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sun, 25 Dec 2022 20:46:59 +0800 Subject: [PATCH 19/29] [ci/build]: Upgrade SONiC package versions (#13168) --- files/build/versions/default/versions-git | 2 +- .../versions/dockers/docker-base-stretch/versions-py2 | 2 +- files/build/versions/dockers/docker-ptf/versions-py2 | 2 +- .../versions/dockers/docker-sonic-vs/versions-deb-buster | 2 +- .../dockers/sonic-slave-buster/versions-deb-buster | 8 ++++---- .../versions/dockers/sonic-slave-buster/versions-git | 2 +- .../versions/dockers/sonic-slave-stretch/versions-git | 2 +- files/build/versions/host-image/versions-deb-buster | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index dcbee4555173..6041d300f5cc 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b diff --git a/files/build/versions/dockers/docker-base-stretch/versions-py2 b/files/build/versions/dockers/docker-base-stretch/versions-py2 index 4b348d301a65..888ec533991a 100644 --- a/files/build/versions/dockers/docker-base-stretch/versions-py2 +++ b/files/build/versions/dockers/docker-base-stretch/versions-py2 @@ -1,6 +1,6 @@ j2cli==0.3.10 jinja2==2.11.3 markupsafe==1.1.1 -supervisor==4.2.4 +supervisor==4.2.5 supervisord-dependent-startup==1.4.0 toposort==1.7 \ No newline at end of file diff --git a/files/build/versions/dockers/docker-ptf/versions-py2 b/files/build/versions/dockers/docker-ptf/versions-py2 index e023f1cccd36..20b5f435dfc0 100644 --- a/files/build/versions/dockers/docker-ptf/versions-py2 +++ b/files/build/versions/dockers/docker-ptf/versions-py2 @@ -54,7 +54,7 @@ simplegeneric==0.8.1 singledispatch==3.7.0 six==1.12.0 stevedore==1.32.0 -supervisor==4.2.4 +supervisor==4.2.5 thrift==0.11.0 traitlets==4.3.3 twisted==16.0.0 diff --git a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster index b3b55206b143..4839edd5bf81 100644 --- a/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster +++ b/files/build/versions/dockers/docker-sonic-vs/versions-deb-buster @@ -64,7 +64,7 @@ libisl19==0.20-2 libitm1==8.3.0-6 libjson-c3==0.12.1+ds-2+deb10u1 libjudydebian1==1.0.5-5 -libksba8==1.3.5-2+deb10u1 +libksba8==1.3.5-2+deb10u2 liblsan0==8.3.0-6 libmpc3==1.1.0-1 libmpfr6==4.0.2-1 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index cd7e95116763..7f9ae6a0a6f5 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -700,7 +700,7 @@ libkpathsea6==2018.20181218.49446-1 libkrb5-3==1.17-3+deb10u5 libkrb5-dev==1.17-3+deb10u5 libkrb5support0==1.17-3+deb10u5 -libksba8==1.3.5-2+deb10u1 +libksba8==1.3.5-2+deb10u2 liblab-gamut1==2.40.1-6+deb10u1 liblcms2-2==2.9-3 libldap-2.4-2==2.4.47+dfsg-3+deb10u7 @@ -1317,9 +1317,9 @@ libzzip-0-13==0.13.62-3.2+deb10u1 licensecheck==3.0.31-3 lintian==2.15.0 linux-compiler-gcc-8-x86==4.19.269-1 -linux-headers-4.19.0-22-amd64==4.19.260-1 -linux-headers-4.19.0-22-common==4.19.260-1 -linux-headers-amd64==4.19+105+deb10u17 +linux-headers-4.19.0-23-amd64==4.19.269-1 +linux-headers-4.19.0-23-common==4.19.269-1 +linux-headers-amd64==4.19+105+deb10u18 linux-kbuild-4.19==4.19.269-1 linux-libc-dev==4.19.269-1 linuxdoc-tools==0.9.73-2 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index a9f61fa3fe64..1730b090d0f6 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index a9f61fa3fe64..1730b090d0f6 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==cf31045b347e24e6619f2564fdb0c2490f661745 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/host-image/versions-deb-buster b/files/build/versions/host-image/versions-deb-buster index 8c8484867c2a..79b69c379959 100644 --- a/files/build/versions/host-image/versions-deb-buster +++ b/files/build/versions/host-image/versions-deb-buster @@ -150,7 +150,7 @@ libklibc==2.0.6-1+deb10u1 libkmod2==26-1 libkrb5-3==1.17-3+deb10u5 libkrb5support0==1.17-3+deb10u5 -libksba8==1.3.5-2+deb10u1 +libksba8==1.3.5-2+deb10u2 libldap-2.4-2==2.4.47+dfsg-3+deb10u7 libldap-common==2.4.47+dfsg-3+deb10u7 liblognorm5==2.0.5-1 From 830102a3531b40afcdbc670e83a150402e9ed154 Mon Sep 17 00:00:00 2001 From: "Richard.Yu" Date: Tue, 27 Dec 2022 08:10:42 +0800 Subject: [PATCH 20/29] [202012][Submodule][SAI-Redis]Advance SAI Redis head pointer (#13157) Why I did it [202012][Submodule][SAI-Redis]Advance SAI Redis head pointer How I did it include changes: sonic-net/sonic-sairedis@dcea4cd sonic-net/sonic-sairedis@5e9bcb1 sonic-net/sonic-sairedis@8f2a53f sonic-net/sonic-sairedis@c1d7938 [202012][Submodule][SAI]Advance SAI head pointer sonic-sairedis#1184 remove parameter skip-error, which removed from [202205][Submodule][SAI]Advance SAI head pointer sonic-sairedis#1185 How to verify it local build --- platform/broadcom/libsaithrift-dev.mk | 2 +- src/sonic-sairedis | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk index a5c009d2f346..f98c0fb82e8a 100644 --- a/platform/broadcom/libsaithrift-dev.mk +++ b/platform/broadcom/libsaithrift-dev.mk @@ -8,7 +8,7 @@ $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI ifeq ($(SAITHRIFT_V2),y) $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT_0_13_0) $(LIBTHRIFT_DEV_0_13_0) $(PYTHON3_THRIFT_0_13_0) $(THRIFT_COMPILER_0_13_0) $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT_0_13_0) -$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 GEN_SAIRPC_OPTS="--adapter_logger --skip_error=-2" +$(LIBSAITHRIFT_DEV)_BUILD_ENV = SAITHRIFTV2=true SAITHRIFT_VER=v2 GEN_SAIRPC_OPTS="--adapter_logger" else $(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) diff --git a/src/sonic-sairedis b/src/sonic-sairedis index 4a887a1b04b0..c1d793867d53 160000 --- a/src/sonic-sairedis +++ b/src/sonic-sairedis @@ -1 +1 @@ -Subproject commit 4a887a1b04b0509a870df9c2e4ed2baf474a4991 +Subproject commit c1d793867d534e9263c3703c02a96a3feef0835b From 352dd7ea7f927f2a9267e78749d10e497c73d2cd Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 28 Dec 2022 19:56:49 +0800 Subject: [PATCH 21/29] [ci/build]: Upgrade SONiC package versions (#13188) --- .../versions/build/build-sonic-slave-buster/versions-git | 2 +- files/build/versions/default/versions-git | 4 ++-- files/build/versions/dockers/sonic-slave-buster/versions-git | 2 +- files/build/versions/dockers/sonic-slave-stretch/versions-git | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git index b950e123072c..7afe4d51cabb 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -3,7 +3,7 @@ https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564 https://github.com/jeroennijhof/pam_tacplus.git==4f91b0de2be88d02984bef8fb0f64c213c650ed9 https://github.com/jpirko/libteam.git==fd26b370d85d63cca0736d7e666736bb15c395aa https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 -https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3 +https://github.com/sflow/host-sflow==7cb2b83ef34ed970a7b6028e8b3d4b44ddef8452 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 6041d300f5cc..930616a34f83 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a +https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -9,7 +9,7 @@ https://github.com/lguohan/gnxi.git==f2b11e45b16ab13485ae14933f30c18ee6336499 https://github.com/Marvell-switching/mrvl-prestera.git==21a100e01b2ab00229da35dd178d9b294c66303f https://github.com/Mellanox/libpsample.git==62bb27d9a49424e45191eee81df7ce0d8c74e774 https://github.com/p4lang/scapy-vxlan.git==85ffe83da156568ee47a0750f638227e6e1d7479 -https://github.com/sflow/host-sflow==f867f90d5fb37d2493099700f9f0752a4a2d50d3 +https://github.com/sflow/host-sflow==7cb2b83ef34ed970a7b6028e8b3d4b44ddef8452 https://github.com/sflow/sflowtool==8c914e79ecb7930adcba2e5296041c3f9eb8e450 https://github.com/thom311/libnl==cbafad9ddf24caef5230fef715d34f0539603be0 https://salsa.debian.org/debian/libteam.git==48142125234a665ad5367b724af36a58fb484d3d diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 1730b090d0f6..8d343bdc8fbb 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a +https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 1730b090d0f6..8d343bdc8fbb 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==0b96058844728db8040a7348cc4c61fde453401a +https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file From 26709ffb86ba7ffcea5baedbb33cb50917e082a3 Mon Sep 17 00:00:00 2001 From: jhli-cisco <93410383+jhli-cisco@users.noreply.github.com> Date: Sun, 1 Jan 2023 11:58:59 -0800 Subject: [PATCH 22/29] [cisco]: Update cisco-8000.ini (#13182) Why I did it 1.50.x SDK based drop to fix MIGSMSFT-120 ([8102] Orchagent crash as addRoutePost failed at SAI") How I did it Update cisco-8000 submodule to v0.121 --- platform/checkout/cisco-8000.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/checkout/cisco-8000.ini b/platform/checkout/cisco-8000.ini index 493c53e7d54b..799d241e8d65 100644 --- a/platform/checkout/cisco-8000.ini +++ b/platform/checkout/cisco-8000.ini @@ -1,3 +1,3 @@ [module] repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git -ref=202012-v0.2.3 +ref=202012-v0.121 From 3fc76fdb22c44def64c668685a74831800506fcc Mon Sep 17 00:00:00 2001 From: Vivek Date: Mon, 2 Jan 2023 03:20:30 -0800 Subject: [PATCH 23/29] [202012] [dhcpv6_relay] Fix dependency of dhcp-mon on VLAN with only v6 cfg is provided (#13006) (#13040) Backport PR #13006 Signed-off-by: Vivek Reddy Karri --- dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 index 0928bac22d4d..d81573fd86f2 100644 --- a/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 +++ b/dockers/docker-dhcp-relay/dhcp-relay.monitors.j2 @@ -32,7 +32,7 @@ dhcpmon-{{ vlan_name }} {% endif %} {# Check DHCPv6 agents #} {% if DHCP_RELAY and vlan_name in DHCP_RELAY and DHCP_RELAY[vlan_name]['dhcpv6_servers']|length > 0 %} -{% for dhcpv6_server in VLAN[vlan_name]['dhcpv6_servers'] %} +{% for dhcpv6_server in DHCP_RELAY[vlan_name]['dhcpv6_servers'] %} {% if dhcpv6_server | ipv6 %} {% set _dummy = relay_for_ipv6.update({'flag': True}) %} {% endif %} From 33bf592f0916594f26ea3700eaabfbc54c5638c4 Mon Sep 17 00:00:00 2001 From: "Richard.Yu" Date: Tue, 3 Jan 2023 13:22:32 +0800 Subject: [PATCH 24/29] [Cherry-pick][SAIServer]Upgrade SAI server init script (#13175) (#13226) Why I did it why In order to apply different config across different platform, and use the code with a unified format, reuse syncd init script to init saiserver. How I did it how Reuse syncd init script How to verify it Test Test in DUT s6000 and dx010 with sonic 202205 --- platform/broadcom/docker-saiserver-brcm.mk | 8 ++++- .../docker-saiserver-brcm/Dockerfile.j2 | 3 ++ .../docker-saiserver-brcm/saiserver_start.sh | 32 +++++++++++++++++++ .../broadcom/docker-saiserver-brcm/start.sh | 11 ------- .../docker-saiserver-brcm/supervisord.conf | 2 +- 5 files changed, 43 insertions(+), 13 deletions(-) create mode 100755 platform/broadcom/docker-saiserver-brcm/saiserver_start.sh diff --git a/platform/broadcom/docker-saiserver-brcm.mk b/platform/broadcom/docker-saiserver-brcm.mk index f4f9cdd42a49..92e533bf69b5 100644 --- a/platform/broadcom/docker-saiserver-brcm.mk +++ b/platform/broadcom/docker-saiserver-brcm.mk @@ -3,7 +3,13 @@ DOCKER_SAISERVER_BRCM = docker-saiserver$(SAITHRIFT_VER)-brcm.gz $(DOCKER_SAISERVER_BRCM)_PATH = $(PLATFORM_PATH)/docker-saiserver-brcm $(DOCKER_SAISERVER_BRCM)_DEPENDS += $(SAISERVER) -$(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD) + +# Use syncd_init_common.sh to init hardware platform +SYNCD_INIT_COMMON_SCRIPT = syncd_init_common.sh +$(SYNCD_INIT_COMMON_SCRIPT)_PATH = $(SRC_PATH)/sonic-sairedis/syncd/scripts +SONIC_COPY_FILES += $(SYNCD_INIT_COMMON_SCRIPT) + +$(DOCKER_SAISERVER_BRCM)_FILES += $(DSSERVE) $(BCMCMD) $(SYNCD_INIT_COMMON_SCRIPT) $(DOCKER_SAISERVER_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER) SONIC_DOCKER_IMAGES += $(DOCKER_SAISERVER_BRCM) SONIC_BUSTER_DOCKERS += $(DOCKER_SAISERVER_BRCM) diff --git a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2 b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2 index 2fe765febcf3..3f1b9717fea6 100644 --- a/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2 +++ b/platform/broadcom/docker-saiserver-brcm/Dockerfile.j2 @@ -26,7 +26,10 @@ debs/ RUN apt-get install -yf kmod COPY ["files/dsserve", "files/bcmcmd", "start.sh", "bcmsh", "/usr/bin/"] +COPY ["saiserver_start.sh", "/usr/bin/"] +COPY ["files/syncd_init_common.sh", "/usr/bin/"] RUN chmod +x /usr/bin/dsserve /usr/bin/bcmcmd +RUN chmod +x /usr/bin/saiserver_start.sh /usr/bin/syncd_init_common.sh COPY ["supervisord.conf", "/etc/supervisor/conf.d/"] diff --git a/platform/broadcom/docker-saiserver-brcm/saiserver_start.sh b/platform/broadcom/docker-saiserver-brcm/saiserver_start.sh new file mode 100755 index 000000000000..06fcf6c3f3ae --- /dev/null +++ b/platform/broadcom/docker-saiserver-brcm/saiserver_start.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash +# Copy from src/sonic-sairedis/syncd/scripts/syncd_start.sh +# Re-use the structure for syncd setup +# Use it to start saiserver +# Script to start syncd using supervisord +# + +# Source the file that holds common code for systemd and supervisord +. /usr/bin/syncd_init_common.sh + +get_saiserver_param() +{ + IFS=' ' read -r -a array <<< "$CMD_ARGS" + for index in "${!array[@]}" + do + #echo "$index ${array[index]}" + if [[ "${array[index]}" == *"-p"* ]]; then + SAI_PROFILE="${array[index+1]}" + fi + if [[ "${array[index]}" == *"-m"* ]]; then + PORT_CONFIG="${array[index+1]}" + fi + done +} + +ENABLE_SAITHRIFT=1 +config_syncd +get_saiserver_param + +echo exec /usr/sbin/saiserver -p ${SAI_PROFILE} -f ${PORT_CONFIG} +exec /usr/sbin/saiserver -p ${SAI_PROFILE} -f ${PORT_CONFIG} +#exec ${CMD} ${CMD_ARGS} diff --git a/platform/broadcom/docker-saiserver-brcm/start.sh b/platform/broadcom/docker-saiserver-brcm/start.sh index 81813b57ff9d..6a395866c15d 100755 --- a/platform/broadcom/docker-saiserver-brcm/start.sh +++ b/platform/broadcom/docker-saiserver-brcm/start.sh @@ -1,13 +1,6 @@ #!/usr/bin/env bash HWSKU_DIR=/usr/share/sonic/hwsku -start_bcm() -{ - [ -e /dev/linux-bcm-knet ] || mknod /dev/linux-bcm-knet c 122 0 - [ -e /dev/linux-user-bde ] || mknod /dev/linux-user-bde c 126 0 - [ -e /dev/linux-kernel-bde ] || mknod /dev/linux-kernel-bde c 127 0 -} - generate_profile() { # There are two ways to specify the contents of the SAI_INIT_CONFIG_FILE and they are mutually exclusive @@ -35,10 +28,6 @@ generate_profile() } rm -f /var/run/rsyslogd.pid - supervisorctl start rsyslogd - generate_profile -start_bcm - supervisorctl start saiserver diff --git a/platform/broadcom/docker-saiserver-brcm/supervisord.conf b/platform/broadcom/docker-saiserver-brcm/supervisord.conf index 3574cd782b78..d20dac89141b 100644 --- a/platform/broadcom/docker-saiserver-brcm/supervisord.conf +++ b/platform/broadcom/docker-saiserver-brcm/supervisord.conf @@ -20,7 +20,7 @@ stdout_logfile=syslog stderr_logfile=syslog [program:saiserver] -command=/usr/sbin/saiserver -p /etc/sai.d/sai.profile -f /usr/share/sonic/hwsku/port_config.ini +command=/usr/bin/saiserver_start.sh priority=3 autostart=false autorestart=false From 933bf0605826ec8ae5edab6f07920de5b1e66ebe Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 4 Jan 2023 16:29:25 +0800 Subject: [PATCH 25/29] [build] Add environment when using dpkg hook to avoid lock loop. (#13233) Why I did it In some cases, dpkg will call dpkg to validate version. dpkg hook will get stuck in a loop to lock. How I did it How to verify it --- src/sonic-build-hooks/hooks/dpkg | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 src/sonic-build-hooks/hooks/dpkg diff --git a/src/sonic-build-hooks/hooks/dpkg b/src/sonic-build-hooks/hooks/dpkg old mode 100644 new mode 100755 index 7fbc90f9fe5c..294cb19f4c1f --- a/src/sonic-build-hooks/hooks/dpkg +++ b/src/sonic-build-hooks/hooks/dpkg @@ -3,8 +3,16 @@ . /usr/local/share/buildinfo/scripts/buildinfo_base.sh REAL_COMMAND=$(get_command dpkg) COMMAND_INFO="Locked by command: $REAL_COMMAND $@" -lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" ) +NEED_RELEASE_LOCK=n +if [[ "$DPKG_HOOK_LOCKED" != "y" ]];then + lock_result=$(acquire_apt_installation_lock "$COMMAND_INFO" ) + export DPKG_HOOK_LOCKED=y + NEED_RELEASE_LOCK=y +fi $REAL_COMMAND "$@" command_result=$? +if [[ "$NEED_RELEASE_LOCK" == "y" ]];then + unset DPKG_HOOK_LOCKED +fi [ "$lock_result" == y ] && release_apt_installation_lock exit $command_result From 9175ebad0ad00970adeb0430c6792df39ef9be6f Mon Sep 17 00:00:00 2001 From: Liu Shilong Date: Wed, 4 Jan 2023 16:29:42 +0800 Subject: [PATCH 26/29] Fix sonic slave pipeline to set correct tag on sonic slave image. (#13177) (#13244) Why I did it Currently sonic-slave-* tag is confusing. Set correct tag on sonic-slave-* image. Fix job name to fit the build. How I did it build amd image in amd64: sonic-slave-bullseye:cfe29bff67c sonic-slave-bullseye:latest sonic-slave-bullseye:master build armhf image in amd64: sonic-slave-bullseye-march-armhf:33614806dc3 sonic-slave-bullseye-march-armhf:latest sonic-slave-bullseye-march-armhf:master build arm64 image in amd64: sonic-slave-bullseye-march-arm64:f3b1b16c801 sonic-slave-bullseye-march-arm64:latest sonic-slave-bullseye-march-arm64:master build arm64 image in arm64: sonic-slave-bullseye:75cb326c9a7 sonic-slave-bullseye-arm64:latest sonic-slave-bullseye:master build armhf image in armhf: sonic-slave-bullseye:64d178951fc sonic-slave-bullseye-armhf:latest sonic-slave-bullseye:master How to verify it --- .azure-pipelines/docker-sonic-slave.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/docker-sonic-slave.yml b/.azure-pipelines/docker-sonic-slave.yml index abb785c9e422..16471368be3e 100644 --- a/.azure-pipelines/docker-sonic-slave.yml +++ b/.azure-pipelines/docker-sonic-slave.yml @@ -30,7 +30,6 @@ trigger: paths: include: - sonic-slave-* - - src/sonic-build-hooks - files/build/versions - Makefile - Makefile.work @@ -56,7 +55,7 @@ parameters: default: sonicdev stages: -- stage: Build +- stage: Build_in_amd64 jobs: - ${{ each dist in parameters.dists }}: - ${{ if endswith(variables['Build.DefinitionName'], dist) }}: @@ -66,7 +65,9 @@ stages: pool: sonicbld arch: ${{ arch }} dist: ${{ dist }} -- stage: Build_march + ${{ if ne(arch, 'amd64') }}: + march: _march_${{ arch }} +- stage: Build_native_arm dependsOn: [] jobs: - ${{ each dist in parameters.dists }}: @@ -78,4 +79,4 @@ stages: pool: sonicbld-${{ arch }} arch: ${{ arch }} dist: ${{ dist }} - march: march_ + march: _${{ arch }} From e848e3616fecb2b6be33e720ff730b9583de62b5 Mon Sep 17 00:00:00 2001 From: Yutong Zhang <90831468+yutongzhang-microsoft@users.noreply.github.com> Date: Wed, 4 Jan 2023 01:11:55 -0800 Subject: [PATCH 27/29] Improve the display of pipeline. (#13124) The display of azure pipeline is not specific now, such as when the step Run test fails, the display of itself shows successful, but the display of step Kvmdump shows fails, but actually, the step Kvmdump doesn't fail. I improve the display of azure pipeline in this pr, each step has its own success or failure, and is shown in azure pipeline. Why I did it The display of azure pipeline is not specific now, such as when the step Run test fails, the display of itself shows successful, but the display of step Kvmdump shows fails, but actually, the step Kvmdump doesn't fail. I improve the display of azure pipeline in this pr, each step has its own success or failure, and is shown in azure pipeline. How I did it Each step has its own signature of success or failure. Using the chain of responsibility pattern to manage all status. Modify the expected-state in each step. --- .azure-pipelines/run-test-scheduler-template.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/run-test-scheduler-template.yml b/.azure-pipelines/run-test-scheduler-template.yml index 4821fb05353c..da7deff9d055 100644 --- a/.azure-pipelines/run-test-scheduler-template.yml +++ b/.azure-pipelines/run-test-scheduler-template.yml @@ -67,7 +67,7 @@ steps: echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID" # When "LOCK_TESTBED" finish, it changes into "PREPARE_TESTBED" - python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states PREPARE_TESTBED EXECUTING KVMDUMP FINISHED CANCELLED FAILED + python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state LOCK_TESTBED env: TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL) displayName: Lock testbed @@ -80,7 +80,7 @@ steps: echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID" # When "PREPARE_TESTBED" finish, it changes into "EXECUTING" - python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states EXECUTING KVMDUMP FINISHED CANCELLED FAILED + python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state PREPARE_TESTBED env: TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL) displayName: Prepare testbed @@ -91,7 +91,7 @@ steps: echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID" # When "EXECUTING" finish, it changes into "KVMDUMP", "FAILED", "CANCELLED" or "FINISHED" - python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states KVMDUMP FINISHED CANCELLED FAILED + python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state EXECUTING env: TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL) displayName: Run test @@ -102,7 +102,7 @@ steps: echo "TestbedV2 is just online and might not be stable enough, for any issue, please send email to sonictestbedtools@microsoft.com" echo "Runtime detailed progress at https://www.testbed-tools.org/scheduler/testplan/$TEST_PLAN_ID" # When "KVMDUMP" finish, it changes into "FAILED", "CANCELLED" or "FINISHED" - python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-states FINISHED CANCELLED FAILED + python ./.azure-pipelines/test_plan.py poll -i "$(TEST_PLAN_ID)" --expected-state KVMDUMP condition: succeededOrFailed() env: TESTBED_TOOLS_URL: $(TESTBED_TOOLS_URL) From 0e63a94fb6adee810f0fdee0fa4262a19cb8c055 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 4 Jan 2023 19:49:04 +0800 Subject: [PATCH 28/29] [ci/build]: Upgrade SONiC package versions (#13249) --- .../versions/build/build-sonic-slave-buster/versions-git | 2 +- files/build/versions/default/versions-git | 4 ++-- files/build/versions/default/versions-web | 2 +- .../dockers/docker-sonic-mgmt-framework/versions-py3 | 6 +++--- .../versions/dockers/sonic-slave-buster/versions-deb-buster | 2 +- .../build/versions/dockers/sonic-slave-buster/versions-git | 2 +- .../build/versions/dockers/sonic-slave-buster/versions-py3 | 2 +- .../build/versions/dockers/sonic-slave-stretch/versions-git | 2 +- .../build/versions/dockers/sonic-slave-stretch/versions-py3 | 2 +- files/build/versions/host-image/versions-py3 | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/files/build/versions/build/build-sonic-slave-buster/versions-git b/files/build/versions/build/build-sonic-slave-buster/versions-git index 7afe4d51cabb..6c494e18cb16 100644 --- a/files/build/versions/build/build-sonic-slave-buster/versions-git +++ b/files/build/versions/build/build-sonic-slave-buster/versions-git @@ -11,4 +11,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d712 https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d -https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7 \ No newline at end of file +https://salsa.debian.org/ssh-team/openssh.git==51c25428249b1b2093bb1ffaff3d814b6095435d \ No newline at end of file diff --git a/files/build/versions/default/versions-git b/files/build/versions/default/versions-git index 930616a34f83..00979cdd370e 100644 --- a/files/build/versions/default/versions-git +++ b/files/build/versions/default/versions-git @@ -1,4 +1,4 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==252b19866a6a9f3de069363184e5fca72280e558 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f https://github.com/CESNET/libyang.git==f95b730cc8d8903c68f1b463a0b4d2856ad4943f https://github.com/daveolson53/libnss-tacplus.git==19008ab68d9d504aa58eb34d5f564755a1613b8b @@ -17,4 +17,4 @@ https://salsa.debian.org/dhcp-team/isc-dhcp.git==2f1bed063ac9201589f67837f39d712 https://salsa.debian.org/kernel-team/ethtool/==b24474c5f4cad2bb690ced33a3c7df397170a699 https://salsa.debian.org/kernel-team/initramfs-tools.git==40e544e13611c1b2690eb99a8096fc16c1b9c74e https://salsa.debian.org/sk-guest/monit.git==c9da7ebb1f35dfba17b50b5969a6e75e29cbec0d -https://salsa.debian.org/ssh-team/openssh.git==f1b82547e654ea81ab2f0cd40d7d98a3a30a7ef7 \ No newline at end of file +https://salsa.debian.org/ssh-team/openssh.git==51c25428249b1b2093bb1ffaff3d814b6095435d \ No newline at end of file diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index 7536564ba0b7..aaeb27134e83 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -20,7 +20,7 @@ https://deb.nodesource.com/gpgkey/nodesource.gpg.key==003b51a89a133b5db4cca98b2d https://deb.nodesource.com/node_10.x/dists/stretch/Release==22738118af583db3bfad39d6fcb4fa5a https://deb.nodesource.com/node_14.x/dists/buster/Release==d701f2bf6451c4b10cf3670af05ab217 https://deb.nodesource.com/setup_10.x==6742c0148159980e8f6e886df1f8bbe1 -https://deb.nodesource.com/setup_14.x==8b4c0534353a1bf3154e84f6b1654460 +https://deb.nodesource.com/setup_14.x==7e3b27b12367cbc79d788cd43bbc917c https://download.docker.com/linux/debian/gpg==1afae06b34a13c1b3d9cb61a26285a15 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnplatform_20220221_sai.1.7.1_deb10.deb==65de37f7834823ba69ab5e55acc5c5f4 https://github.com/barefootnetworks/sonic-release-pkgs/raw/dev/bfnsdk_20220221_sai.1.7.1_deb10.deb==75df8156b85467b501dc67f1914d6ed7 diff --git a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 index c17c7c71771f..1c67bc1b56fe 100644 --- a/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 +++ b/files/build/versions/dockers/docker-sonic-mgmt-framework/versions-py3 @@ -8,8 +8,8 @@ flask==2.2.2 grpcio==1.51.1 grpcio-tools==1.20.0 idna==3.4 -importlib-metadata==5.2.0 -importlib-resources==5.10.1 +importlib-metadata==6.0.0 +importlib-resources==5.10.2 inflection==0.5.1 itsdangerous==2.1.2 jsonschema==4.17.3 @@ -20,7 +20,7 @@ openapi-spec-validator==0.5.1 pathable==0.4.3 pkgutil_resolve_name==1.3.10 protobuf==4.21.12 -pyrsistent==0.19.2 +pyrsistent==0.19.3 python-dateutil==2.6.0 requests==2.28.1 six==1.11.0 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster index 7f9ae6a0a6f5..23a89902c264 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster +++ b/files/build/versions/dockers/sonic-slave-buster/versions-deb-buster @@ -106,7 +106,7 @@ exim4-base==4.92-8+deb10u7 exim4-config==4.92-8+deb10u7 exim4-daemon-light==4.92-8+deb10u7 expat==2.2.6-2+deb10u6 -exuberant-ctags==1:5.9~svn20110310-12 +exuberant-ctags==1:5.9~svn20110310-12+deb10u1 fakeroot==1.23-1 file==1:5.35-4+deb10u2 flex==2.6.4-6.2 diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-git b/files/build/versions/dockers/sonic-slave-buster/versions-git index 8d343bdc8fbb..05ba4803de19 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-git +++ b/files/build/versions/dockers/sonic-slave-buster/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==252b19866a6a9f3de069363184e5fca72280e558 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-buster/versions-py3 b/files/build/versions/dockers/sonic-slave-buster/versions-py3 index cc1f04578920..ea740744c91b 100644 --- a/files/build/versions/dockers/sonic-slave-buster/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-buster/versions-py3 @@ -3,7 +3,7 @@ asn1crypto==0.24.0 atomicwrites==1.1.5 attrs==18.2.0 babel==2.6.0 -bitarray==2.6.1 +bitarray==2.6.2 certifi==2018.8.24 chardet==3.0.4 cov-core==1.15.0 diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-git b/files/build/versions/dockers/sonic-slave-stretch/versions-git index 8d343bdc8fbb..05ba4803de19 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-git +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-git @@ -1,2 +1,2 @@ -https://chromium.googlesource.com/chromium/tools/depot_tools.git==03af44a5163e9448e375a6bbe7bef1fc0e2bb205 +https://chromium.googlesource.com/chromium/tools/depot_tools.git==252b19866a6a9f3de069363184e5fca72280e558 https://github.com/aristanetworks/swi-tools.git==b5f087e4774168bf536360d43c9c509c8f14ad9f \ No newline at end of file diff --git a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 b/files/build/versions/dockers/sonic-slave-stretch/versions-py3 index be56a067d583..df93f3a45c47 100644 --- a/files/build/versions/dockers/sonic-slave-stretch/versions-py3 +++ b/files/build/versions/dockers/sonic-slave-stretch/versions-py3 @@ -1,6 +1,6 @@ alabaster==0.7.8 babel==2.3.4 -bitarray==2.6.1 +bitarray==2.6.2 chardet==2.3.0 cryptography==1.7.1 devscripts==2.17.6+deb9u2 diff --git a/files/build/versions/host-image/versions-py3 b/files/build/versions/host-image/versions-py3 index cd2661caf413..5f78dbdfc18e 100644 --- a/files/build/versions/host-image/versions-py3 +++ b/files/build/versions/host-image/versions-py3 @@ -6,7 +6,7 @@ certifi==2022.12.7 cffi==1.15.1 charset-normalizer==2.1.1 click==7.0 -cryptography==38.0.4 +cryptography==39.0.0 docker==4.3.1 idna==3.4 ijson==2.6.1 From 7ae9552d253d8c04c7e573af0eda8ffabc869b2b Mon Sep 17 00:00:00 2001 From: Abhishek Dosi Date: Fri, 6 Jan 2023 04:18:03 +0000 Subject: [PATCH 29/29] Fixed UT based on merged public PR: https://github.com/sonic-net/sonic-buildimage/pull/9486 Signed-off-by: Abhishek Dosi --- .../tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t0.conf | 4 ---- .../tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t1.conf | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t0.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t0.conf index fe41473b93da..2f42bf03e0e7 100644 --- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t0.conf +++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t0.conf @@ -23,10 +23,6 @@ router bgp 55555 ! ! ! - bgp graceful-restart restart-time 480 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 55.55.55.55 ! diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t1.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t1.conf index 64722cd99c95..21af67948554 100644 --- a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t1.conf +++ b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/stbk_t1.conf @@ -20,10 +20,6 @@ router bgp 55555 ! ! ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 55.55.55.55 !