Skip to content

Commit

Permalink
[link,bridge_slave]: add support for bridge_slave, modified add_missi…
Browse files Browse the repository at this point in the history 
…ng_parents() to use xpath instead of node name

Signed-off-by: ali-aqrabawi <[email protected]>
  • Loading branch information
@Ali-aqrabawi
Ali-aqrabawi committed Jul 11, 2024
1 parent c1949ea commit 87b09d5
Show file tree
Hide file tree
Showing 2 changed files with 109 additions and 9 deletions.
10 changes: 7 additions & 3 deletions src/lib/oper_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,10 +534,10 @@ bool terminate_processing(struct json_object *cmd_out_jobj, struct json_object *
}

/**
* This function compairs schema node (s_node) parents names to lyd_node data tree node name, if the
* This function compares schema node (s_node) parents names to lyd_node data tree node name, if the
* schema node parent containers are not added to the lyd_node, this function adds them.
*
* This function is to be used before processing leafs and leaf_lists to ensure their parent continers
* This function is to be used before processing leafs and leaf_lists to ensure their parent containers
* are added to the lyd data tree.
*
* @param [in] s_node: schema node being processed (typically the s_node of a leaf or leaf_list).
Expand All @@ -546,7 +546,11 @@ bool terminate_processing(struct json_object *cmd_out_jobj, struct json_object *
void add_missing_parents(const struct lysc_node *s_node, struct lyd_node **parent_data_node)
{
struct lyd_node *new_data_node = NULL;
if (strcmp(s_node->parent->name, (*parent_data_node)->schema->name) != 0 &&
char snode_parent_xpath[1024] = { 0 };
char parent_data_node_xpath[1024] = { 0 };
lysc_path(s_node->parent, LYSC_PATH_LOG, snode_parent_xpath, 1024);
lysc_path((*parent_data_node)->schema, LYSC_PATH_LOG, parent_data_node_xpath, 1024);
if (strcmp(snode_parent_xpath, parent_data_node_xpath) != 0 &&
s_node->parent->nodetype == LYS_CONTAINER) {
// check grand_parents
add_missing_parents(s_node->parent, parent_data_node);
Expand Down
108 changes: 102 additions & 6 deletions yang/iproute2-ip-link.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ module iproute2-ip-link {

leaf mtu {
type uint32{
range "64..65536";
range "64..65575";
}
default 1500;
description "specifies the mtu size for the device";
Expand Down Expand Up @@ -465,7 +465,7 @@ module iproute2-ip-link {
}
leaf promisc {
ipr2cgen:oper-arg-name "promiscuity";
ipr2cgen:oper-value-map "0:off;1:on";
ipr2cgen:oper-value-map "0:off;1:on;2:on";
type enumeration {
enum "on";
enum "off";
Expand Down Expand Up @@ -511,6 +511,7 @@ module iproute2-ip-link {
}
}
}

grouping link-layer3{
list ip {
ipr2cgen:cmd-start;
Expand All @@ -530,54 +531,151 @@ module iproute2-ip-link {
}
}
}

grouping link-bridge {
container bridge-conf {
list vlan {
ipr2cgen:cmd-start;
ipr2cgen:cmd-add "bridge vlan add";
ipr2cgen:cmd-update "bridge vlan set";
ipr2cgen:cmd-delete "bridge vlan delete";
ipr2cgen:include-all-on-delete;
ipr2cgen:oper-cmd "bridge vlan show dev (../../name)"; // still need to be supported in oper_data.c
ipr2cgen:include-all-on-delete;
must "(../../master and /links/bridge[name=current()/../../master]) or (/links/bridge[name=current()/../../name])" {
error-message "please set the link 'master' to a bridge, before configuring bridge vlan";
}

key "vid";
unique "pvid";
leaf vid {
ipr2cgen:after-node-add-static-arg "dev (../../../name)";
ipr2cgen:oper-arg-name "vlan";
type uint16;
description
"specify vlan id";
}
leaf pvid {
ipr2cgen:flag;
ipr2cgen:oper-flag-map "PVID:true;FLAG-UNSET:false";
type boolean;
description
"when enabled, this vlan will be considered a PVID at ingress.
Any untagged frames will be assigned to this VLAN.";
}
leaf untagged {
ipr2cgen:flag;
ipr2cgen:oper-flag-map "Egress Untagged:true;FLAG-UNSET:false";
type boolean;
description
"the vlan specified is to be treated as untagged on egress.";
}
leaf self {
ipr2cgen:flag;
ipr2cgen:oper-flag-map "SELF:true;FLAG-UNSET:false";
type boolean;
description
"the vlan is configured on the specified physical device.
Required if the device is the bridge device.";
}
leaf master {
ipr2cgen:flag;
ipr2cgen:oper-flag-map "MASTER:true;FLAG-UNSET:false";
type boolean;
description
"the vlan is configured on the software bridge (default).";
}

}
container link {
when "../../master and /links/bridge[name=current()/../../master]";
ipr2cgen:oper-sub-jobj "info_slave_data";
ipr2cgen:add-static-arg "type bridge_slave";
leaf state {
description "Set port state.";
type enumeration {
enum "disabled" {value 0;}
enum "listening" {value 1;}
enum "learning" {value 2;}
enum "forwarding" {value 3;}
enum "blocking" {value 4;}

}
}
leaf cost {
type uint32;
description "the STP path cost of the specified port";
default 100;
}
leaf priority {
type uint8;
description "the STP port priority. The priority value is an unsigned
8-bit quantity (number between 0 and 255). This metric is
used in the designated port an droot port selection
algorithms";
default 32;
}
leaf guard {
ipr2cgen:oper-value-map "true:on;false:off";
type enumeration {
enum "on";
enum "off";
}
description "block incoming BPDU packets on this port.";
}
leaf hairpin {
ipr2cgen:oper-value-map "true:on;false:off";
type enumeration {
enum "on";
enum "off";
}
description "enable hairpin mode on this
port. This will allow incoming packets on this
port to be reflected back.";
}
leaf fastleave {
ipr2cgen:oper-value-map "true:on;false:off";
type enumeration {
enum "on";
enum "off";
}
description "enable multicast fast leave on this port.
";
}
leaf root_block {
ipr2cgen:oper-value-map "true:on;false:off";
type enumeration {
enum "on";
enum "off";
}
description "block this port from becoming the bridge's root port.";
}
leaf learning {
ipr2cgen:oper-value-map "true:on;false:off";
type enumeration {
enum "on";
enum "off";
}
description "allow MAC address learning on this port.";
}
leaf flood {
ipr2cgen:oper-value-map "true:on;false:off";
type enumeration {
enum "on";
enum "off";
}
description "open the flood gates on this
port, i.e. forward all unicast frames to this port
also. Requires proxy_arp to be
turned off.";
}
leaf proxy_arp {
ipr2cgen:oper-value-map "true:on;false:off";
type enumeration {
enum "on";
enum "off";
}
description "enable proxy ARP on this port.";
}
}
}
}

Expand Down Expand Up @@ -1132,7 +1230,6 @@ module iproute2-ip-link {
leaf rsc {
ipr2cgen:on-node-delete-or-val-false "norsc";
ipr2cgen:flag;
ipr2cgen:oper-value-map "true:on";
type boolean;
description
"specifies if route short circuit is turned on.";
Expand All @@ -1141,7 +1238,6 @@ module iproute2-ip-link {
leaf proxy {
ipr2cgen:on-node-delete-or-val-false "noproxy";
ipr2cgen:flag;
ipr2cgen:oper-value-map "true:on";
type boolean;
description
"specifies ARP proxy is turned on.";
Expand Down

0 comments on commit 87b09d5

Please sign in to comment.