[sonic-config-engine] Replace os.system, replace yaml.load, remove subprocess with shell=True #12607
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: maipbui <maibui@microsoft.com>
….load, remove subprocess with shell=True (sonic-net#12533)" (sonic-net#12616)" This reverts commit 661c467.
Signed-off-by: maipbui <maibui@microsoft.com>
maipbui
changed the title
qiluo-msft
reviewed
Nov 10, 2022
| @@ -351,7 +351,7 @@ def main(): | |||
| if yaml.__version__ >= "5.1": | |||
| additional_data = yaml.full_load(stream) | |||
| else: | |||
| additional_data = yaml.load(stream) | |||
| additional_data = yaml.safe_load(stream) | |||
There was a problem hiding this comment.
Here it is. Updated in description.
|
This PR looks good to me. Could you dig deeper why the reverted PR was not caught by testcases on Github repo? Do we have test gap? |
qiluo-msft
approved these changes
Nov 17, 2022
yaqiangz
pushed a commit
to yaqiangz/sonic-buildimage
that referenced
this pull request
Feb 14, 2023
Resolved merge conflicts in the following files manually device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32-Flex/buffers_defaults_t1.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers_defaults_t1.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t0.j2 device/arista/x86_64-arista_7050_qx32s/Arista-7050QX-32S-S4Q31/buffers_defaults_t1.j2 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t0.j2 device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers_defaults_t1.j2 src/sonic-config-engine/tests/test_j2files.py Related work items: sonic-net#11864, sonic-net#12585, sonic-net#12607, sonic-net#12619, sonic-net#12626, sonic-net#12707, sonic-net#12714, sonic-net#12729, sonic-net#12733, sonic-net#12736, sonic-net#12750, sonic-net#12751, sonic-net#12755, sonic-net#12757, sonic-net#12758, sonic-net#12760, sonic-net#12761, sonic-net#12769, sonic-net#12783
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: maipbui maibui@microsoft.com
Why I did it
Missing import statement in PR #12533
How I did it
Revert PR 12646
Add import statement
sonic-buildimage/src/sonic-config-engine/tests/test_j2files_t2_chassis_fe.py
Line 8 in 31f7afa
sonic-buildimage/src/sonic-config-engine/tests/test_j2files.py
Line 8 in 31f7afa
sonic-buildimage/src/sonic-config-engine/tests/test_multinpu_cfggen.py
Line 11 in 31f7afa
How to verify it
Pass UT
Which release branch to backport (provide reason below if selected)
Description for the changelog
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)