Skip to content

Commit

Permalink
Update for vlan stacking meta checking
Browse files Browse the repository at this point in the history 
Signed-off-by: kuanyu_chen <kuanyu_chen@edge-core.com>
  • Loading branch information
@kuanyu99
kuanyu99 committed May 16, 2022
1 parent a6dbc76 commit e80c2f2
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 36 deletions.
62 changes: 31 additions & 31 deletions doc/SAI-Proposal-VlanStack-QinQ.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,15 @@ attr.value.s32 = SAI_VLAN_STACK_ACTION_PUSH;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_ORIGINAL_VLAN_ID;
attr.value.vlanstacking_vid.outer = 10;
attr.value.vlanstackingvid.outer = 10;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_PORT;
attr.value.oid = 10;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_APPLIED_VLAN_ID;
attr.value.vlanstacking_vid.outer = 100;
attr.value.vlanstackingvid.outer = 100;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_VLAN_APPLIED_PRI;
Expand Down Expand Up @@ -138,17 +138,17 @@ attr.value.s32 = SAI_VLAN_STACK_ACTION_PUSH;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_ORIGINAL_VLAN_ID;
attr.value.vlanstacking_vid.inner = 10;
attr.value.vlanstacking_vid.outer = 0;
attr.value.vlanstackingvid.inner = 10;
attr.value.vlanstackingvid.outer = 0;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_PORT;
attr.value.oid = 10;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_APPLIED_VLAN_ID;
attr.value.vlanstacking_vid.inner = 0;
attr.value.vlanstacking_vid.outer = 100;
attr.value.vlanstackingvid.inner = 0;
attr.value.vlanstackingvid.outer = 100;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_VLAN_APPLIED_PRI;
Expand Down Expand Up @@ -182,7 +182,7 @@ attr.value.s32 = SAI_VLAN_STACK_ACTION_POP;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_ORIGINAL_VLAN_ID;
attr.value.vlanstacking_vid.outer = 100;
attr.value.vlanstackingvid.outer = 100;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_PORT;
Expand Down Expand Up @@ -220,17 +220,17 @@ attr.value.s32 = SAI_VLAN_STACK_ACTION_SWAP;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_ORIGINAL_VLAN_ID;
attr.value.vlanstacking_vid.inner = 10;
attr.value.vlanstacking_vid.outer = 0;
attr.value.vlanstackingvid.inner = 10;
attr.value.vlanstackingvid.outer = 0;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_PORT;
attr.value.oid = 10;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_APPLIED_VLAN_ID;
attr.value.vlanstacking_vid.inner = 100;
attr.value.vlanstacking_vid.outer = 0;
attr.value.vlanstackingvid.inner = 100;
attr.value.vlanstackingvid.outer = 0;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_VLAN_APPLIED_PRI;
Expand Down Expand Up @@ -264,17 +264,17 @@ attr.value.s32 = SAI_VLAN_STACK_ACTION_SWAP;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_ORIGINAL_VLAN_ID;
attr.value.vlanstacking_vid.inner = 0;
attr.value.vlanstacking_vid.outer = 10;
attr.value.vlanstackingvid.inner = 0;
attr.value.vlanstackingvid.outer = 10;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_PORT;
attr.value.oid = 10;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_APPLIED_VLAN_ID;
attr.value.vlanstacking_vid.inner = 0;
attr.value.vlanstacking_vid.outer = 100;
attr.value.vlanstackingvid.inner = 0;
attr.value.vlanstackingvid.outer = 100;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_VLAN_APPLIED_PRI;
Expand Down Expand Up @@ -308,17 +308,17 @@ attr.value.s32 = SAI_VLAN_STACK_ACTION_SWAP;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_ORIGINAL_VLAN_ID;
attr.value.vlanstacking_vid.inner = 100;
attr.value.vlanstacking_vid.outer = 0;
attr.value.vlanstackingvid.inner = 100;
attr.value.vlanstackingvid.outer = 0;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_PORT;
attr.value.oid = 20;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_APPLIED_VLAN_ID;
attr.value.vlanstacking_vid.inner = 10;
attr.value.vlanstacking_vid.outer = 0;
attr.value.vlanstackingvid.inner = 10;
attr.value.vlanstackingvid.outer = 0;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_VLAN_APPLIED_PRI;
Expand Down Expand Up @@ -352,17 +352,17 @@ attr.value.s32 = SAI_VLAN_STACK_ACTION_SWAP;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_ORIGINAL_VLAN_ID;
attr.value.vlanstacking_vid.inner = 0;
attr.value.vlanstacking_vid.outer = 100;
attr.value.vlanstackingvid.inner = 0;
attr.value.vlanstackingvid.outer = 100;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_PORT;
attr.value.oid = 20;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_APPLIED_VLAN_ID;
attr.value.vlanstacking_vid.inner = 0;
attr.value.vlanstacking_vid.outer = 10;
attr.value.vlanstackingvid.inner = 0;
attr.value.vlanstackingvid.outer = 10;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_VLAN_APPLIED_PRI;
Expand Down Expand Up @@ -396,17 +396,17 @@ attr.value.s32 = SAI_VLAN_STACK_ACTION_SWAP;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_ORIGINAL_VLAN_ID;
attr.value.vlanstacking_vid.inner = 0;
attr.value.vlanstacking_vid.outer = 200;
attr.value.vlanstackingvid.inner = 0;
attr.value.vlanstackingvid.outer = 200;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_PORT;
attr.value.oid = 10;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_APPLIED_VLAN_ID;
attr.value.vlanstacking_vid.inner = 10;
attr.value.vlanstacking_vid.outer = 100;
attr.value.vlanstackingvid.inner = 10;
attr.value.vlanstackingvid.outer = 100;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_VLAN_APPLIED_PRI;
Expand Down Expand Up @@ -440,17 +440,17 @@ attr.value.s32 = SAI_VLAN_STACK_ACTION_SWAP;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_ORIGINAL_VLAN_ID;
attr.value.vlanstacking_vid.inner = 10;
attr.value.vlanstacking_vid.outer = 100;
attr.value.vlanstackingvid.inner = 10;
attr.value.vlanstackingvid.outer = 100;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_PORT;
attr.value.oid = 20;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_APPLIED_VLAN_ID;
attr.value.vlanstacking_vid.inner = 0;
attr.value.vlanstacking_vid.outer = 200;
attr.value.vlanstackingvid.inner = 0;
attr.value.vlanstackingvid.outer = 200;
vlan_stacking_entry_attrs.push(attr);
attr.id = SAI_VLAN_STACK_ATTR_VLAN_APPLIED_PRI;
Expand Down
2 changes: 1 addition & 1 deletion inc/saitypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ typedef union _sai_attribute_value_t
sai_port_err_status_list_t porterror;

/** @validonly meta->attrvaluetype == SAI_ATTR_VALUE_TYPE_VLAN_STACKING_VID */
sai_vlan_stacking_vid_t vlanstacking_vid;
sai_vlan_stacking_vid_t vlanstackingvid;
} sai_attribute_value_t;

/**
Expand Down
1 change: 1 addition & 0 deletions meta/acronyms.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ UDF - User-Defined Field
UDP - User Datagram Protocol
USD - Ultimate Segment Decapsulation
USP - Ultimate Segment Pop
VID - Vlan Identifier
VNI - Virtual Network Interface
VNID - Virtual Network Identifier
VOQ - Virtual Output Queue
Expand Down
6 changes: 3 additions & 3 deletions meta/parse.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ sub ProcessTagDefault

return $val if $val eq "\"\"";

return $val if $val =~ /^0\,0$/;
return $val if $val =~ /^0,0$/;

LogError "invalid default tag value '$val' on $type $value";
return undef;
Expand Down Expand Up @@ -1571,7 +1571,7 @@ sub ProcessDefaultValueType

return "SAI_DEFAULT_VALUE_TYPE_CONST" if $default eq "\"\"";

return "SAI_DEFAULT_VALUE_TYPE_CONST" if $default =~ /^0\,0$/;
return "SAI_DEFAULT_VALUE_TYPE_CONST" if $default =~ /^0,0$/;

LogError "invalid default value type '$default' on $attr";

Expand Down Expand Up @@ -1644,7 +1644,7 @@ sub ProcessDefaultValue
{
WriteSource "$val = { .mac = { 0, 0, 0, 0, 0, 0 } };";
}
elsif ($default =~ /^0\,0$/ and $type =~ /^(sai_vlan_stacking_vid_t)/)
elsif ($default =~ /^0,0$/ and $type =~ /^(sai_vlan_stacking_vid_t)/)
{
WriteSource "$val = { .$VALUE_TYPES{$1} = { .outer = 0, .inner = 0 } };";
}
Expand Down
2 changes: 1 addition & 1 deletion meta/saimetadatatypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ typedef enum _sai_attr_value_type_t
SAI_ATTR_VALUE_TYPE_AUTH_KEY,

/**
* @brief Attribute value is vlan id.
* @brief Attribute value is Vlan Stacking VID.
*/
SAI_ATTR_VALUE_TYPE_VLAN_STACKING_VID,

Expand Down

0 comments on commit e80c2f2

Please sign in to comment.