Switchport Modes Port & Port Channel Yang Model Configurations by ridahanif96 · Pull Request #13580 · sonic-net/sonic-buildimage

ridahanif96 · 2023-02-01T11:37:07Z

Why I did it

Modified "sonic-port.yang" for adding support in Port Yang model for the "mode" attribute for adding port modes
Modified "sonic-portchannel.yang" for adding support in Port Channel Yang model for the "mode" attribute for adding port modes
Updated tests for these modifications

How to verify it

Added support to align SONiC yang with Config_db

zhangyanzhao · 2023-02-02T18:58:43Z

Please help on the review. Thanks.

src/sonic-yang-models/yang-models/sonic-port.yang

src/sonic-yang-models/yang-models/sonic-portchannel.yang

src/sonic-yang-models/yang-models/sonic-port.yang

src/sonic-yang-models/yang-templates/sonic-types.yang.j2

src/sonic-yang-models/yang-models/sonic-portchannel.yang

ganglyu · 2023-02-04T02:17:17Z

Please fix unit test:

libyang[0]: Invalid keyword "routed|access|trunk.". (path: /sonic-port:sonic-port/PORT/PORT_LIST/mode)
libyang[0]: Module "sonic-port" parsing failed.
libyang[0]: Importing "sonic-port" module into "sonic-buffer-port-egress-profile-list" failed.
libyang[0]: Module "sonic-buffer-port-egress-profile-list" parsing failed.

src/sonic-yang-models/yang-models/sonic-portchannel.yang

zhangyanzhao · 2023-02-07T16:59:34Z

This will target 202305 release.

zhangyanzhao · 2023-03-09T18:39:07Z

@ridahanif96 will fix the build failure.

…c-buildimage into Switchport_Vlan

ganglyu · 2024-01-03T05:56:59Z

src/sonic-yang-models/tests/files/sample_config_db.json

        }
    }
-}
+}


Please check end of file

Please fix this issue

added space at end of file. Fixed.

ganglyu · 2024-01-03T05:58:06Z

src/sonic-yang-models/tests/yang_model_tests/tests_config/portchannel.json

            "sonic-portchannel:PORTCHANNEL": {
                "PORTCHANNEL_LIST": [
                    {
-                        "admin_status": "up",


Why do you remove admin_status?

ganglyu · 2024-01-03T05:59:34Z

src/sonic-yang-models/yang-models/sonic-vlan.yang

 					type inet:ipv6-address;
 				}

+


unnecessary empty line.

ganglyu · 2024-01-03T05:59:42Z

src/sonic-yang-models/yang-models/sonic-vlan.yang

 					type yang:mac-address;
 				}
+
+


unnecessary empty line.

ganglyu · 2024-01-03T06:00:14Z

src/sonic-yang-models/yang-models/sonic-vlan.yang


-				leaf port {
+				leaf port
+				{


Don't change format here.

ganglyu · 2024-01-03T06:00:23Z

src/sonic-yang-models/yang-models/sonic-vlan.yang

 					/* key elements are mandatory by default */
 					type union {
-						type leafref {
+						type leafref


Don't change format here.

src/sonic-yang-models/yang-models/sonic-vlan.yang

ganglyu · 2024-01-07T12:18:16Z

src/sonic-yang-models/tests/yang_model_tests/tests_config/vlan.json

                        "mtu": 9000,
                        "name": "Ethernet0",
-                        "speed": 25000
+                        "speed": 25000   


space at end of line

ganglyu · 2024-01-07T12:18:27Z

src/sonic-yang-models/tests/yang_model_tests/tests_config/vlan.json

                        "mtu": 9000,
                        "name": "Ethernet1",
-                        "speed": 25000
+                        "speed": 25000 


space at end of line

src/sonic-yang-models/yang-models/sonic-vlan.yang

ganglyu

lgtm

ridahanif96 · 2024-01-12T09:38:26Z

@qiluo-msft please help merge this PR! Thanks!

ridahanif96 · 2024-01-16T15:44:29Z

@qiluo-msft can you pls help merge this PR! Thanks

zongbintu · 2024-01-25T06:14:03Z

@qiluo-msft can you pls help merge this PR! Thanks

We need the port mode change.
Thanks for the PR.
May I ask when this PR is planned to be merge.

ridahanif96 · 2024-01-26T04:59:51Z

@qiluo-msft pls merge this PR

zhangyanzhao · 2024-03-21T17:17:04Z

This is disruptive change per @qiluo-msft

qiluo-msft · 2024-03-21T17:27:32Z

src/sonic-yang-models/yang-models/sonic-port.yang

+				leaf mode {
+					description "SwitchPort Modes possible values are routed|access|trunk. Default value  for mode is routed"; 
+					type stypes:switchport_mode; 
+					default "routed";


The default value will introduce disruptive change. The current behavior is conditional "default value".

#### Why I did it Removed Default Mode value from sonic-port.yang & sonic-portchannel.yang to avoid disruptive change #### How I did it This PR is created in reference with [PR](#13580)

ridahanif96 added 3 commits December 21, 2022 12:41

Modified SONiC VS image path

eb5e0d1

Port & Port Channel configurations for yang model

a88fed6

Merge branch 'sonic-net:master' into Switchport_Vlan

0cb73cb

ham-xa mentioned this pull request Feb 1, 2023

Switch Port Modes and VLAN CLI Enhancement sonic-net/SONiC#912

Merged

Some Fix in Port.yang

81b0917

ridahanif96 marked this pull request as ready for review February 2, 2023 18:28

ridahanif96 requested a review from qiluo-msft as a code owner February 2, 2023 18:28

zhangyanzhao added the YANG YANG model related changes label Feb 2, 2023

qiluo-msft requested review from ganglyu and isabelmsft February 2, 2023 18:55

zhangyanzhao requested a review from venkatmahalingam February 2, 2023 18:58

ganglyu reviewed Feb 3, 2023

View reviewed changes

src/sonic-yang-models/yang-models/sonic-port.yang Outdated Show resolved Hide resolved

ganglyu reviewed Feb 3, 2023

View reviewed changes

src/sonic-yang-models/yang-models/sonic-portchannel.yang Outdated Show resolved Hide resolved

venkatmahalingam reviewed Feb 3, 2023

View reviewed changes

src/sonic-yang-models/yang-models/sonic-port.yang Outdated Show resolved Hide resolved

Modified Code as per suggestions

ffa3aa3

ganglyu reviewed Feb 3, 2023

View reviewed changes

src/sonic-yang-models/yang-templates/sonic-types.yang.j2 Outdated Show resolved Hide resolved

ganglyu reviewed Feb 3, 2023

View reviewed changes

src/sonic-yang-models/yang-models/sonic-portchannel.yang Outdated Show resolved Hide resolved

ridahanif96 added 2 commits February 3, 2023 21:08

small fixes

ca12402

fixes

a943665

ganglyu reviewed Feb 4, 2023

View reviewed changes

src/sonic-yang-models/yang-models/sonic-portchannel.yang Outdated Show resolved Hide resolved

code fixes for PORT

d242392

ganglyu previously approved these changes Feb 6, 2023

View reviewed changes

fixes in code

2ab6864

ridahanif96 added 2 commits March 6, 2023 15:58

Merge branch 'master' into Switchport_Vlan

aad224c

Fixes

b1234a9

Merge branch 'Switchport_Vlan' of https://github.com/ridahanif96/soni…

ccfc565

…c-buildimage into Switchport_Vlan

ganglyu reviewed Jan 3, 2024

View reviewed changes

src/sonic-yang-models/yang-models/sonic-vlan.yang Outdated Show resolved Hide resolved

ridahanif96 added 2 commits January 3, 2024 09:51

Removed unnecessary lines along with typo indentation errors

0995ca8

Fix for unnessary lines

92e7569

ganglyu reviewed Jan 7, 2024

View reviewed changes

src/sonic-yang-models/yang-models/sonic-vlan.yang Outdated Show resolved Hide resolved

ganglyu reviewed Jan 7, 2024

View reviewed changes

src/sonic-yang-models/yang-models/sonic-vlan.yang Outdated Show resolved Hide resolved

ridahanif96 added 2 commits January 7, 2024 17:44

Fix for spaces at end of lines

9d6594c

Fix for spaces

f180e4a

ganglyu reviewed Jan 8, 2024

View reviewed changes

src/sonic-yang-models/yang-models/sonic-vlan.yang Show resolved Hide resolved

fix for deleted space

4f08b17

ganglyu approved these changes Jan 10, 2024

View reviewed changes

ridahanif96 mentioned this pull request Jan 11, 2024

Fix for Switch Port Modes and VLAN CLI Enhancement sonic-net/sonic-utilities#3108

Merged

venkatmahalingam approved these changes Jan 26, 2024

View reviewed changes

qiluo-msft approved these changes Jan 26, 2024

View reviewed changes

qiluo-msft merged commit 88f80fb into sonic-net:master Jan 26, 2024

qiluo-msft reviewed Mar 21, 2024

View reviewed changes

ridahanif96 mentioned this pull request Mar 21, 2024

Fix for YANG Mode Attribute #18428

Merged

                       }
                   }
-              }
+              }

                
                    No newline at end of file

Conversation

ridahanif96 commented Feb 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Why I did it

How to verify it

Uh oh!

zhangyanzhao commented Feb 2, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ganglyu commented Feb 4, 2023

Uh oh!

Uh oh!

zhangyanzhao commented Feb 7, 2023

Uh oh!

zhangyanzhao commented Mar 9, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ganglyu left a comment

Choose a reason for hiding this comment

Uh oh!

ridahanif96 commented Jan 12, 2024

Uh oh!

ridahanif96 commented Jan 16, 2024

Uh oh!

zongbintu commented Jan 25, 2024

Uh oh!

ridahanif96 commented Jan 26, 2024

Uh oh!

zhangyanzhao commented Mar 21, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

ridahanif96 commented Feb 1, 2023 •

edited

Loading