Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 7 commits into from
May 12, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
70006d1
Fix yang model for ICMP and ICMPV6 (#18311)
bingwang-ms Mar 11, 2024
69d9bf2
[YANG] Add valid v6 address to sonic-dhcp-sever.yang (#18690)
wen587 May 8, 2024
bfd38df
Fix YANG model for ACL (#18693)
bingwang-ms Apr 24, 2024
abd453f
[Fixbug 18418] [Yang] MACSEC_PROFILE table does not match yang defini…
Pterosaur Mar 21, 2024
75793c0
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
mssonicbld May 11, 2024
e5e8d42
[submodule] Update submodule sonic-platform-common to the latest HEAD…
mssonicbld May 11, 2024
36544eb
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld May 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/sonic-yang-mgmt/tests/test_cfghelp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@
Description: ACL_RULE part of config_db.json

key - ACL_TABLE_NAME:RULE_NAME
+-----------+-----------------------------------------+-------------+-----------+-------------+
| Field | Description | Mandatory | Default | Reference |
+===========+=========================================+=============+===========+=============+
| ICMP_TYPE | Mutually exclusive in group icmp | | | |
| | when IP_TYPE in ANY,IP,IPV4,IPv4ANY,ARP | | | |
+-----------+-----------------------------------------+-------------+-----------+-------------+
+-----------+-------------------------------------------------+-------------+-----------+-------------+
| Field | Description | Mandatory | Default | Reference |
+===========+=================================================+=============+===========+=============+
| ICMP_TYPE | Mutually exclusive in group icmp | | | |
| | when IP_TYPE in ANY,IP,IPV4,IPv4ANY,IPV4ANY,ARP | | | |
+-----------+-------------------------------------------------+-------------+-----------+-------------+

"""

Expand Down
3 changes: 2 additions & 1 deletion src/sonic-yang-models/tests/files/sample_config_db.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
},
"DHCP_SERVER": {
"192.0.0.8": {},
"192.0.0.8": {}
"192.0.0.8": {},
"2603:10e1:0:6f4::1": {}
},
"DNS_NAMESERVER": {
"1.1.1.1": {},
Expand Down
18 changes: 18 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/acl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
"ACL_RULE_WITH_VALID_OUT_PORTS": {
"desc": "Configure ACL_RULE with valid OUT_PORTS."
},
"ACL_RULE_WITH_VALID_ICMPV4_CODE": {
"desc": "Configure ACL_RULE with valid ICMPV4 type and code."
},
"ACL_RULE_WITH_VALID_ICMPV6_CODE": {
"desc": "Configure ACL_RULE with valid ICMPV6 type and code."
},
"ACL_TABLE_EMPTY_PORTS": {
"desc": "Configure ACL_TABLE with empty ports."
},
Expand All @@ -32,6 +38,12 @@
"desc": "Configure non-existing ACL_TABLE in ACL_RULE.",
"eStrKey" : "LeafRef"
},
"ACL_RULE_IP_TYPE_SRC_IPV6ANY": {
"desc": "Configure IP_TYPE as ipv6any and SRC_IPV6 in ACL_RULE."
},
"ACL_RULE_IP_TYPE_DST_IPV4ANY": {
"desc": "Configure IP_TYPE as ipv4any and DST_IP in ACL_RULE."
},
"ACL_RULE_IP_TYPE_SRC_IPV6_MISMATCH": {
"desc": "Configure IP_TYPE as ipv4any and SRC_IPV6 in ACL_RULE.",
"eStrKey" : "When",
Expand All @@ -45,6 +57,12 @@
"eStrKey" : "When",
"eStr": ["IP_TYPE"]
},
"ACL_RULE_VALID_L4_SRC_PORT_RANGE": {
"desc": "Configure l4_src_port_range as 1024-65535 in ACL_RULE"
},
"ACL_RULE_VALID_L4_DST_PORT_RANGE": {
"desc": "Configure l4_src_port_range as 0-65535 in ACL_RULE"
},
"ACL_RULE_WRONG_L4_SRC_PORT_RANGE": {
"desc": "Configure l4_src_port_range as 99999-99999 in ACL_RULE",
"eStrKey" : "Pattern"
Expand Down
Loading