[yang] extend ConfigMgmt constructor to pass YANG options #2118

ayurkiv-nvda · 2022-03-27T16:12:37Z

Should be merged after sonic-net/sonic-buildimage#10359 Used SonicYang with extended list of params to init object.

What I did

Pass YANG attribute that allow do not automatically search for schemas in current working directory, which is by default searched automatically (despite not recursively).

How I did it

extend ConfigMgmt constructor

How to verify it

Create some invalid link on switch :
ln -s /usr/abc xxx
run spm list
--> There should not be these messages:

libyang[1]: Unable to get information about "xxx" file in "/tmp" when searching for (sub)modules (No such file or directory)
libyang[1]: Unable to get information about "xxx" file in "/tmp" when searching for (sub)modules (No such file or directory)
libyang[1]: Unable to get information about "xxx" file in "/tmp" when searching for (sub)modules (No such file or directory)
libyang[1]: Unable to get information about "xxx" file in "/tmp" when searching for (sub)modules (No such file or directory)

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

praveen-li · 2022-04-13T22:00:24Z

sonic_package_manager/manager.py

@@ -1002,7 +1003,7 @@ def get_manager() -> 'PackageManager':
        docker_api = DockerApi(docker.from_env(), ProgressManager())
        registry_resolver = RegistryResolver()
        metadata_resolver = MetadataResolver(docker_api, registry_resolver)
-        cfg_mgmt = config_mgmt.ConfigMgmt(source=INIT_CFG_JSON)


I did not understand this use.
So ConfigMgmt searches for yang models at a fixed location 'YANG_DIR = "/usr/local/yang-models"', then in what case it is an error ?.

Kindly elaborate, thx.

Not exactly
ConfigMgmt searches for yang models in current working directory AND "/usr/local/yang-models"

Since the expectation is to only read schema from /user/local/yang-models let's disable reading schema from CWD (current working dir) in sonic-yang-mgmt directly, no need to create a flags object and pass it.

libyang ref: https://netopeer.liberouter.org/doc/libyang/master/html/group__contextoptions.html#ga08ef1a18adb7dac8e9f4a2c9522875ba
PR to add SonicYangOptions needs to be reverted: sonic-net/sonic-buildimage#10359

@ghooo I have considered this option earlier, but after the discussion I chose the current approach. It looks more flexible to me and allows to pass different yang options to sonic-yang-mgmt

I think this change will benefit all users of sonic_yang library. It would be better if we move the change to the library directly. Approving to get this unblocked.

ayurkiv-nvda · 2022-05-03T07:28:02Z

/azpw run Azure.sonic-utilities

mssonicbld · 2022-05-03T07:28:04Z

/AzurePipelines run Azure.sonic-utilities

azure-pipelines · 2022-05-03T07:28:13Z

Azure Pipelines successfully started running 1 pipeline(s).

dprital · 2022-05-03T17:29:08Z

@praveen-li - Now that the comment was addressed, can you please approve this PR ?

liat-grozovik · 2022-05-04T14:09:34Z

/azp run Azure.sonic-utilities

azure-pipelines · 2022-05-04T14:09:44Z

Azure Pipelines successfully started running 1 pipeline(s).

zhangyanzhao · 2022-05-05T17:22:09Z

@praveen-li would you please help to review and approve if you are ok with the latest update? Thanks.

qiluo-msft · 2022-05-09T16:47:44Z

@ghooo Could you help review this PR while @praveen-li is not available?

ayurkiv-nvda · 2022-05-11T08:40:19Z

@ghooo Could you please help to review changes?

dprital · 2022-05-18T08:47:52Z

@ghooo - As the comments were addressed, can you please approve this PR ?

dprital · 2022-05-24T08:21:50Z

@ghooo - Can you please approve this PR ?

Update sonic-utilities submodule pointer to include the following: * [GCU] Handling type1 lists ([sonic-net#2171](sonic-net/sonic-utilities#2171)) * [yang] extend ConfigMgmt constructor to pass YANG options ([sonic-net#2118](sonic-net/sonic-utilities#2118)) * [dump] implement ACL modules ([sonic-net#2153](sonic-net/sonic-utilities#2153)) * show commands for SYSTEM READY ([sonic-net#1851](sonic-net/sonic-utilities#1851)) * [GCU] Handling non-compliant leaf-list with string values ([sonic-net#2174](sonic-net/sonic-utilities#2174)) * Add sonic-delayed.target to Application Extension .timer file generator ([sonic-net#2176](sonic-net/sonic-utilities#2176)) * [portconfig] Allow to configure interface mtu for physical ports ([#l](https://github.com/Azure/sonic-utilities/pull/l)) * Broadcast Unknown-multicast and Unknown-unicast Storm-control ([sonic-net#928](sonic-net/sonic-utilities#928)) * sonic-utils: initial support for link-training ([sonic-net#2071](sonic-net/sonic-utilities#2071)) * [portchannel] Added ACL/PBH binding checks to the port before getting added to portchannel ([sonic-net#2151](sonic-net/sonic-utilities#2151)) * Modify override testcase to cover PORT admin_status ([sonic-net#2165](sonic-net/sonic-utilities#2165)) * [GCU] Validate peer_group_range ip_range are correct ([sonic-net#2145](sonic-net/sonic-utilities#2145)) * [auto-ts] add memory check ([sonic-net#2116](sonic-net/sonic-utilities#2116)) * support new interface types CR8/SR8/KR8/LR8 which are brougnt by SAI V.1.10.2 ([sonic-net#2167](sonic-net/sonic-utilities#2167)) * [scripts/fast-reboot] Add option to include ssd-upgrader-part boot option with SONiC partition ([sonic-net#2150](sonic-net/sonic-utilities#2150)) * [config reload] Fix invalid rstrip. ([sonic-net#2157](sonic-net/sonic-utilities#2157)) * Accept 0 for queue and dscp ([sonic-net#2162](sonic-net/sonic-utilities#2162)) Signed-off-by: dprital <[email protected]>

- What I did Pass YANG attribute that allow do not automatically search for schemas in current working directory, which is by default searched automatically (despite not recursively). - How I did it extend ConfigMgmt constructor - How to verify it Create some invalid link on switch : ln -s /usr/abc xxx run spm list --> There should not be these messages:

…nic-net#2118)" This reverts commit 2716ff2.

#### What I did Revert parameter from function that was mistakenly added in #2118 We don't need to pass 'sonic_yang_options' to static function get_module_name() #### How I did it remove 'sonic_yang_options' from SonicYang object creation in get_module_name()

#### What I did Revert parameter from function that was mistakenly added in sonic-net/sonic-utilities#2118 We don't need to pass 'sonic_yang_options' to static function get_module_name() #### How I did it remove 'sonic_yang_options' from SonicYang object creation in get_module_name()

ayurkiv-nvda mentioned this pull request Mar 28, 2022

[yang] add yang options for Context object sonic-net/sonic-buildimage#10359

Merged

6 tasks

dprital added the Request for 202111 Branch label Apr 4, 2022

praveen-li reviewed Apr 13, 2022

View reviewed changes

[yang] extend ConfigMgmt constructor to pass YANG options

93a0254

ayurkiv-nvda force-pushed the yang_fix_azure branch from 2b65065 to 93a0254 Compare May 5, 2022 23:14

zhangyanzhao requested a review from ghooo May 12, 2022 17:16

ghooo approved these changes May 24, 2022

View reviewed changes

liat-grozovik merged commit 4516179 into sonic-net:master May 25, 2022

dprital mentioned this pull request May 25, 2022

[submodule] Update sonic-utilities submodule sonic-net/sonic-buildimage#10928

Closed

6 tasks

judyjoseph added the Included in 202111 Branch label May 25, 2022

dprital added a commit to dprital/sonic-utilities that referenced this pull request Jun 1, 2022

Revert "[yang] extend ConfigMgmt constructor to pass YANG options (so…

0b8f222

…nic-net#2118)" This reverts commit 2716ff2.

This was referenced Jun 3, 2022

[yang] revert mistakenly added parameter for 'get_module_name' ayurkiv-nvda/sonic-utilities#18

Closed

[yang] remove mistakenly added parameter for 'get_module_name' #2193

Merged

This was referenced Jun 9, 2022

[submodule] Update sonic-utilities submodule ayurkiv-nvda/sonic-buildimage#22

Closed

[submodule] Update sonic-utilities submodule sonic-net/sonic-buildimage#11103

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[yang] extend ConfigMgmt constructor to pass YANG options #2118

[yang] extend ConfigMgmt constructor to pass YANG options #2118

ayurkiv-nvda commented Mar 27, 2022 •

edited

Loading

praveen-li Apr 13, 2022

ayurkiv-nvda Apr 19, 2022

ghooo May 16, 2022 •

edited

Loading

ayurkiv-nvda May 17, 2022

ghooo May 24, 2022

ayurkiv-nvda commented May 3, 2022

mssonicbld commented May 3, 2022

azure-pipelines bot commented May 3, 2022

dprital commented May 3, 2022

liat-grozovik commented May 4, 2022

azure-pipelines bot commented May 4, 2022

zhangyanzhao commented May 5, 2022

qiluo-msft commented May 9, 2022

ayurkiv-nvda commented May 11, 2022

dprital commented May 18, 2022

dprital commented May 24, 2022

[yang] extend ConfigMgmt constructor to pass YANG options #2118

[yang] extend ConfigMgmt constructor to pass YANG options #2118

Conversation

ayurkiv-nvda commented Mar 27, 2022 • edited Loading

What I did

How I did it

How to verify it

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

praveen-li Apr 13, 2022

Choose a reason for hiding this comment

ayurkiv-nvda Apr 19, 2022

Choose a reason for hiding this comment

ghooo May 16, 2022 • edited Loading

Choose a reason for hiding this comment

ayurkiv-nvda May 17, 2022

Choose a reason for hiding this comment

ghooo May 24, 2022

Choose a reason for hiding this comment

ayurkiv-nvda commented May 3, 2022

mssonicbld commented May 3, 2022

azure-pipelines bot commented May 3, 2022

dprital commented May 3, 2022

liat-grozovik commented May 4, 2022

azure-pipelines bot commented May 4, 2022

zhangyanzhao commented May 5, 2022

qiluo-msft commented May 9, 2022

ayurkiv-nvda commented May 11, 2022

dprital commented May 18, 2022

dprital commented May 24, 2022

ayurkiv-nvda commented Mar 27, 2022 •

edited

Loading

ghooo May 16, 2022 •

edited

Loading