Skip to content
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

Jump to bottom

[202205][YANG] add model for MUX_CABLE and PEER_SWITCH #15485

Merged
merged 2 commits into from
Jun 15, 2023
Merged

[202205][YANG] add model for MUX_CABLE and PEER_SWITCH #15485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07f2227
[YANG] Add MUX_CABLE yang model (#11797)
zjswhhh Sep 1, 2022
ad05e93
[YANG] add peer switch model (#11828)
zjswhhh Aug 25, 2022
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
20 changes: 20 additions & 0 deletions src/sonic-yang-models/doc/Configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@ Table of Contents
* [Management port](#management-port)
* [Management VRF](#management-vrf)
* [MAP_PFC_PRIORITY_TO_QUEUE](#map_pfc_priority_to_queue)
* [MUX_CABLE](#muxcable)
* [NTP Global Configuration](#ntp-global-configuration)
* [NTP and SYSLOG servers](#ntp-and-syslog-servers)
* [Peer Switch](#peer-switch)
* [Policer](#policer)
* [Port](#port)
* [Port Channel](#port-channel)
Expand Down Expand Up @@ -1129,6 +1131,24 @@ instead of data network.
}
}
```
### MUX_CABLE

The **MUX_CABLE** table is used for dualtor interface configuration. The `cable_type` and `soc_ipv4` objects are optional.

```
{
"MUX_CABLE": {
"Ethernet4": {
"cable_type": "active-active",
"server_ipv4": "192.168.0.2/32",
"server_ipv6": "fc02:1000::30/128",
"soc_ipv4": "192.168.0.3/32",
"state": "auto"
}
}
}
```

### NTP Global Configuration

These configuration options are used to modify the way that
Expand Down
2 changes: 2 additions & 0 deletions src/sonic-yang-models/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ def run(self):
'./yang-models/sonic-mgmt_port.yang',
'./yang-models/sonic-mgmt_vrf.yang',
'./yang-models/sonic-mirror-session.yang',
'./yang-models/sonic-mux-cable.yang',
'./yang-models/sonic-ntp.yang',
'./yang-models/sonic-nat.yang',
'./yang-models/sonic-nvgre-tunnel.yang',
Expand Down Expand Up @@ -155,6 +156,7 @@ def run(self):
'./yang-models/sonic-storm-control.yang',
'./yang-models/sonic-tc-priority-group-map.yang',
'./yang-models/sonic-tc-queue-map.yang',
'./yang-models/sonic-peer-switch.yang',
'./yang-models/sonic-pfc-priority-queue-map.yang',
'./yang-models/sonic-pfc-priority-priority-group-map.yang',
'./yang-models/sonic-port-qos-map.yang',
Expand Down
21 changes: 21 additions & 0 deletions 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 @@ -1806,6 +1806,27 @@
}
},

"PEER_SWITCH": {
"vlab-05": {
"address_ipv4": "10.1.0.33"
}
},

"MUX_CABLE": {
"Ethernet4": {
"cable_type": "active-active",
"server_ipv4": "192.168.0.2/32",
"server_ipv6": "fc02:1000::30/128",
"soc_ipv4": "192.168.0.3/32",
"state": "auto"
},
"Ethernet0": {
"server_ipv4": "192.168.0.2/32",
"server_ipv6": "fc02:1000::30/128",
"state": "auto"
}
},


"POLICER": {
"everflow_static_policer": {
Expand Down
16 changes: 16 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/mux_cable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"MUX_CABLE_ACTIVE_STANDBY_INTERFACE": {
"desc": "Load MUX_CABLE for active-standby interface."
},
"MUX_CABLE_ACTIVE_ACTIVE_INTERFACE": {
"desc":"Load MUX_CABLE for active-active interface."
},
"MUX_CABLE_INVALID_STATE": {
"desc": "Load MUX_CABLE with invalid state.",
"eStrKey": "InvalidValue"
},
"MUX_CABLE_INVALID_IP": {
"desc": "Load MUX_CABLE with invalid server ip address.",
"eStrKey": "Pattern"
}
}
13 changes: 13 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests/peer-switch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"PEER_SWITCH_LOAD_NORMAL": {
"desc": "Load PEER_SWITCH for dualtor device."
},
"PEER_SWITCH_MISSING_DEVICE__NAME": {
"desc": "Load PEER_SWITCH missing PEER Device name.",
"eStrKey": "Mandatory"
},
"PEER_SWITCH_INVALID_IP_ADDRESS": {
"desc": "Load PEER_SWITCH with invalid IPv4 Address.",
"eStrKey": "Pattern"
}
}
93 changes: 93 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/mux_cable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"MUX_CABLE_ACTIVE_STANDBY_INTERFACE": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
"PORT_LIST": [
{
"admin_status": "up",
"alias": "eth0",
"description": "Ethernet0",
"lanes": "65",
"mtu": "9000",
"name": "Ethernet0",
"tpid": "0x8100",
"speed": "25000"
}
]
}
},
"sonic-mux-cable:sonic-mux-cable": {
"sonic-mux-cable:MUX_CABLE": {
"MUX_CABLE_LIST": [
{
"ifname": "Ethernet0",
"server_ipv4": "192.168.0.2/32",
"server_ipv6": "fc02:1000::30/128",
"state": "auto"
}
]

}
}
},

"MUX_CABLE_ACTIVE_ACTIVE_INTERFACE": {
"sonic-port:sonic-port": {
"sonic-port:PORT": {
"PORT_LIST": [
{
"admin_status": "up",
"alias": "eth0",
"description": "Ethernet4",
"lanes": "65",
"mtu": "9000",
"name": "Ethernet4",
"tpid": "0x8100",
"speed": "25000"
}
]
}
},
"sonic-mux-cable:sonic-mux-cable": {
"sonic-mux-cable:MUX_CABLE": {
"MUX_CABLE_LIST": [
{
"ifname": "Ethernet4",
"cable_type": "active-active",
"server_ipv4": "192.168.0.2/32",
"server_ipv6": "fc02:1000::30/128",
"soc_ipv4": "192.168.0.3/32",
"state": "auto"
}
]

}
}
},

"MUX_CABLE_INVALID_STATE": {
"sonic-mux-cable:sonic-mux-cable": {
"sonic-mux-cable:MUX_CABLE": {
"MUX_CABLE_LIST": [
{
"state": "Standby"
}
]

}
}
},

"MUX_CABLE_INVALID_IP": {
"sonic-mux-cable:sonic-mux-cable": {
"sonic-mux-cable:MUX_CABLE": {
"MUX_CABLE_LIST": [
{
"server_ipv4": "999.999.999.999/32"
}
]

}
}
}
}
39 changes: 39 additions & 0 deletions src/sonic-yang-models/tests/yang_model_tests/tests_config/peer-switch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"PEER_SWITCH_LOAD_NORMAL": {
"sonic-peer-switch:sonic-peer-switch": {
"sonic-peer-switch:PEER_SWITCH": {
"PEER_SWITCH_LIST": [
{
"peer_switch": "vlab-05",
"address_ipv4": "10.1.0.33"
}
]
}
}
},

"PEER_SWITCH_MISSING_DEVICE__NAME": {
"sonic-peer-switch:sonic-peer-switch": {
"sonic-peer-switch:PEER_SWITCH": {
"PEER_SWITCH_LIST": [
{
"address_ipv4": "10.1.0.33"
}
]
}
}
},

"PEER_SWITCH_INVALID_IP_ADDRESS": {
"sonic-peer-switch:sonic-peer-switch": {
"sonic-peer-switch:PEER_SWITCH": {
"PEER_SWITCH_LIST": [
{
"peer_switch": "vlab-05",
"address_ipv4": "10.1.0.33/32"
}
]
}
}
}
}
92 changes: 92 additions & 0 deletions src/sonic-yang-models/yang-models/sonic-mux-cable.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
module sonic-mux-cable {
namespace "http://github.com/Azure/sonic-mux-cable";
prefix mux_cable;
yang-version 1.1;

import ietf-inet-types {
prefix inet;
}

import sonic-port {
prefix prt;
}

organization
"SONiC";

contact
"SONiC";

description
"SONiC DualToR MUX CABLE confifuration data";

revision 2022-08-19 {
description
"Initial revision";
}

container sonic-mux-cable {

container MUX_CABLE {

list MUX_CABLE_LIST {

key "ifname";

leaf ifname {
type leafref {
path "/prt:sonic-port/prt:PORT/prt:PORT_LIST/prt:name";
}
description
"Reference of port on which MUX cable to be configured.";
}

leaf cable_type {
type enumeration {
enum active-active;
enum active-standby;
}
default active-standby;
description "SONiC DualToR interface cable type.";
}

leaf server_ipv4 {
type inet:ipv4-prefix;

description "Server IPv4 Address.";
}

leaf server_ipv6 {
type inet:ipv6-prefix;

description "Server IPv6 Address.";
}

leaf soc_ipv4 {
type inet:ipv4-prefix;

description "SoC IPv4 address. Optional and for active-active ports only. ";
}

leaf soc_ipv6 {
type inet:ipv6-prefix;

description "SoC IPv6 address. Optional and for active-active ports only. ";
}

leaf state {
type enumeration {
enum auto;
enum manual;
enum detach;
enum active;
enum standby;
}

default auto;
description "MUX mode determining if auto failover is enabled. ";
}
}
}
}
}
49 changes: 49 additions & 0 deletions src/sonic-yang-models/yang-models/sonic-peer-switch.yang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
module sonic-peer-switch {
yang-version 1.1;
namespace "http://github.com/Azure/sonic-peer-switch";
prefix peer_switch;

import ietf-inet-types {
prefix inet;
}

import sonic-types {
prefix stypes;
}

organization
"SONiC";

contact
"SONiC";

description
"SONiC DualToR peer switch data";

revision 2022-08-23 {
description
"Initial revision";
}

container sonic-peer-switch {
container PEER_SWITCH {
list PEER_SWITCH_LIST {
max-elements 1;

key "peer_switch";

leaf peer_switch {
type stypes:hostname;

description "SONiC DualToR peer host name.";
}

leaf address_ipv4 {
type inet:ipv4-address;

description "SONiC DualToR peer's IPv4 address.";
}
}
}
}
}