Skip to content

[nvgre] Added YANG model and tests#9136

Merged
liat-grozovik merged 7 commits intosonic-net:masterfrom
vadymhlushko-mlnx:nvgre_yang_model
Feb 17, 2022
Merged

[nvgre] Added YANG model and tests#9136
liat-grozovik merged 7 commits intosonic-net:masterfrom
vadymhlushko-mlnx:nvgre_yang_model

Conversation

@vadymhlushko-mlnx
Copy link
Copy Markdown
Contributor

@vadymhlushko-mlnx vadymhlushko-mlnx commented Nov 1, 2021

Signed-off-by: Vadym Hlushko vadymh@nvidia.com

Why I did it

NVGRE Tunnel feature extends the Config DB with new tables. These tables require a new YANG model.

How I did it

Added a new YANG model sonic-nvgre-tunnel.yang

How to verify it

Added YANG test cases.

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106

Description for the changelog

A picture of a cute animal (not mandatory but encouraged)

This was referenced Nov 1, 2021
Merged
Merged
vadymhlushko-mlnx
vadymhlushko-mlnx commented Nov 5, 2021
View reviewed changes
vadymhlushko-mlnx
vadymhlushko-mlnx commented Nov 5, 2021
View reviewed changes
@vadymhlushko-mlnx vadymhlushko-mlnx mentioned this pull request Nov 8, 2021
Merged
@vadymhlushko-mlnx
Copy link
Copy Markdown
Contributor Author

vadymhlushko-mlnx commented Nov 15, 2021

@praveen-li could you please review?

@liat-grozovik
Copy link
Copy Markdown
Collaborator

liat-grozovik commented Nov 15, 2021

@kperumalbfn could you please help to review?

@vadymhlushko-mlnx
Copy link
Copy Markdown
Contributor Author

vadymhlushko-mlnx commented Nov 18, 2021

@kperumalbfn, kind reminder, could you please help to review this PR

@kperumalbfn
Copy link
Copy Markdown
Contributor

kperumalbfn commented Nov 18, 2021

@mickeyspiegel please check the NVGRE PRs

venkatmahalingam
venkatmahalingam requested changes Nov 30, 2021
View reviewed changes
Copy link
Copy Markdown
Collaborator

@venkatmahalingam venkatmahalingam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please address the pending comments.

@dprital dprital added the Request for 202111 Branch For PRs being requested for 202111 branch label Dec 1, 2021
@vadymhlushko-mlnx
Copy link
Copy Markdown
Contributor Author

vadymhlushko-mlnx commented Dec 3, 2021

/azpw run

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Dec 3, 2021

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Dec 3, 2021

Pull request contains merge conflicts.

@qiluo-msft qiluo-msft requested a review from ganglyu December 4, 2021 02:02
ganglyu
ganglyu previously approved these changes Dec 6, 2021
View reviewed changes
@vadymhlushko-mlnx
Copy link
Copy Markdown
Contributor Author

vadymhlushko-mlnx commented Dec 13, 2021

/azpw run

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Dec 13, 2021

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Dec 13, 2021

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

@vadymhlushko-mlnx
Copy link
Copy Markdown
Contributor Author

vadymhlushko-mlnx commented Dec 17, 2021

/azpw run

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Dec 17, 2021

/AzurePipelines run

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Feb 14, 2022

/AzurePipelines run

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Feb 14, 2022

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

@vadymhlushko-mlnx
Copy link
Copy Markdown
Contributor Author

vadymhlushko-mlnx commented Feb 14, 2022

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Feb 14, 2022

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Feb 14, 2022

Azure Pipelines successfully started running 1 pipeline(s).

@qiluo-msft
Copy link
Copy Markdown
Collaborator

qiluo-msft commented Feb 14, 2022

Please resolve conflicts.

@vadymhlushko-mlnx
[nvgre]: Added YANG model and tests
47a787a 
Signed-off-by: Vadym Hlushko <vadymh@nvidia.com>
@vadymhlushko-mlnx
Fixed comments
6bc054d 
Signed-off-by: Vadym Hlushko <vadymh@nvidia.com>
@vadymhlushko-mlnx
Changed type of src_ip leaf to ip-address
c484396 
Signed-off-by: Vadym Hlushko <vadymh@nvidia.com>
@vadymhlushko-mlnx
Fixed test case
7687cb1 
Signed-off-by: Vadym Hlushko <vadymh@nvidia.com>
@vadymhlushko-mlnx
Fixed tunnel map key
7cbc965 
Signed-off-by: Vadym Hlushko <vadymh@nvidia.com>
@vadymhlushko-mlnx
Added NVGRE yang model to setup.py
b687e8e 
Signed-off-by: Vadym Hlushko <vadymh@nvidia.com>
@vadymhlushko-mlnx
Minor codestyle improvements
e89dac2 
Signed-off-by: Vadym Hlushko <vadymh@nvidia.com>
@vadymhlushko-mlnx
Copy link
Copy Markdown
Contributor Author

vadymhlushko-mlnx commented Feb 15, 2022

/azpw run Azure.sonic-buildimage

@mssonicbld
Copy link
Copy Markdown
Collaborator

mssonicbld commented Feb 15, 2022

/AzurePipelines run Azure.sonic-buildimage

@azure-pipelines
Copy link
Copy Markdown

azure-pipelines bot commented Feb 15, 2022

Azure Pipelines successfully started running 1 pipeline(s).

@liat-grozovik
Copy link
Copy Markdown
Collaborator

liat-grozovik commented Feb 17, 2022

FYI, moving a head with merging this PR as prev it was approved by @ganglyu

@liat-grozovik liat-grozovik merged commit 5ce75ac into sonic-net:master Feb 17, 2022
@ghooo ghooo mentioned this pull request Feb 19, 2022
Closed
ghooo added a commit to ghooo/sonic-buildimage that referenced this pull request Feb 19, 2022
@ghooo
Revert "[nvgre] Added YANG model and tests (sonic-net#9136)"
b686efe 
This reverts commit 5ce75ac.
@ghooo ghooo mentioned this pull request Feb 19, 2022
Merged
6 tasks
qiluo-msft added a commit to qiluo-msft/sonic-buildimage that referenced this pull request Feb 20, 2022
@qiluo-msft
Revert "[nvgre] Added YANG model and tests (sonic-net#9136)"
6855105 
This reverts commit 5ce75ac.
qiluo-msft pushed a commit that referenced this pull request Feb 21, 2022
@ghooo
[build] fix build exception and revert #9136 (#10037)
f21a45b 
#### Why I did it

1. Fix Build exception [example](https://dev.azure.com/mssonic/build/_build/results?buildId=73911&view=logs&jobId=88ce9a53-729c-5fa9-7b6e-3d98f2488e3f&j=cef3d8a9-152e-5193-620b-567dc18af272&t=ac3bce9f-b126-5a26-3fee-28ce0ec1679d)

```
2022-02-19T01:54:23.4200556Z ImportError: cannot import name 'soft_unicode' from 'markupsafe' (/usr/local/lib/python3.8/dist-packages/markupsafe/__init__.py)
```

This is because Jinja2 uses MarkupSafe without specifying an upper limit to the version, MarkupSafe version that was released today removed 'soft_unicode'. So now Jinja2 is complaining.

Related issues:
pallets/jinja#1591
aws/aws-sam-cli#3661


2. Reverts #9136

Fixing build failures in SONiC utils [example](https://dev.azure.com/mssonic/build/_build/results?buildId=73784&view=logs&jobId=83516c17-6666-5250-abde-63983ce72a49&j=83516c17-6666-5250-abde-63983ce72a49&t=6177235f-d4f1-5f72-835a-90ebb93a1784)

One of the errors:
```
 TestPathAddressing.test_find_ref_paths__ref_is_the_whole_key__returns_ref_paths 

self = <tests.generic_config_updater.gu_common_test.TestPathAddressing testMethod=test_find_ref_paths__ref_is_the_whole_key__returns_ref_paths>

    def test_find_ref_paths__ref_is_the_whole_key__returns_ref_paths(self):
        # Arrange
        path = "/PORT/Ethernet0"
        expected = [
            "/ACL_TABLE/NO-NSW-PACL-V4/ports/0",
            "/VLAN_MEMBER/Vlan1000|Ethernet0",
        ]
    
        # Act
        actual = self.path_addressing.find_ref_paths(path, Files.CROPPED_CONFIG_DB_AS_JSON)
    
        # Assert
>       self.assertEqual(expected, actual)
E       AssertionError: Lists differ: ['/ACL_TABLE/NO-NSW-PACL-V4/ports/0', '/VLAN_MEMBER/Vlan1000|Ethernet0'] != ['/ACL_TABLE/NO-NSW-PACL-V4/ports/0']
E       
E       First list contains 1 additional elements.
E       First extra element 1:
E       '/VLAN_MEMBER/Vlan1000|Ethernet0'
E       
E       - ['/ACL_TABLE/NO-NSW-PACL-V4/ports/0', '/VLAN_MEMBER/Vlan1000|Ethernet0']
E       + ['/ACL_TABLE/NO-NSW-PACL-V4/ports/0']
```

The VLAN_MEMBER backlink (can be called referrer link or ref link) is not found.

Issue introduced by #9136
I don't know how this PR passed the build system, it should have failed.

Known YANG issue #9312

#### How I did it
The import to `sonic-vlan` is breaking the build
```
    import sonic-vlan {
        prefix vlan;
    }
```

I am not sure if that's the only issue, so I think reverting the whole PR should be the safer option.

#### How to verify it
Ran sonic-utils tests locally.
@zhangyanzhao zhangyanzhao mentioned this pull request Mar 31, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@volodymyrsamotiy volodymyrsamotiy volodymyrsamotiy approved these changes

@liat-grozovik liat-grozovik liat-grozovik approved these changes

@venkatmahalingam venkatmahalingam venkatmahalingam left review comments

@ganglyu ganglyu ganglyu left review comments

@lguohan lguohan Awaiting requested review from lguohan

@qiluo-msft qiluo-msft Awaiting requested review from qiluo-msft qiluo-msft is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@vadymhlushko-mlnx @liat-grozovik @kperumalbfn @mssonicbld @qiluo-msft @volodymyrsamotiy @venkatmahalingam @ganglyu @dprital