Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Sonic-config-engine testcase #47

Merged
merged 2 commits into from
Feb 17, 2020
Merged

Fix Sonic-config-engine testcase #47

merged 2 commits into from
Feb 17, 2020

Conversation

samaity
Copy link
Collaborator

@samaity samaity commented Feb 14, 2020 •
edited
Loading

Signed-off-by: Sangita Maity [email protected]

- What I did
fixed test_cfggen_platformJson.py test script as it was broken after introduction of hwsku.json

- How I did it

  1. Added a sample hwsku.json file in "src/sonic-config-engine/tests" folder to use during test.
  2. Added new option "-S"/"--hwsku-config" to sonic-cfggen as it is necessary to have some kind of default file during image build up especially for test cases to pass.
  3. using new option "-S"/"--hwsku-config" to test file to get results.

- How to verify it
sonic_config_engine-1.0-py2-none-any.whl package got built successfully with all test cases passed.

samaity@server09:~/REPO_FACTORY/GIT_REPO/DPB/sonic-buildimage$ BLDENV=stretch make target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl
+++ --- Making target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl --- +++
EXTRA_JESSIE_TARGETS=sonic_config_engine-1.0-py2-none-any.whl make -f Makefile.work jessie
make[1]: Entering directory '/home/samaity/REPO_FACTORY/GIT_REPO/DPB/sonic-buildimage'
SONiC Build System

Build Configuration
"CONFIGURED_PLATFORM"             : "broadcom"
"CONFIGURED_ARCH"                 : "amd64"
"SONIC_CONFIG_PRINT_DEPENDENCIES" : ""
"SONIC_BUILD_JOBS"                : "1"
"SONIC_CONFIG_MAKE_JOBS"          : "24"
"SONIC_USE_DOCKER_BUILDKIT"       : ""
"USERNAME"                        : "admin"
"PASSWORD"                        : "YourPaSsWoRd"
"ENABLE_DHCP_GRAPH_SERVICE"       : ""
"SHUTDOWN_BGP_ON_START"           : ""
"ENABLE_PFCWD_ON_START"           : ""
"INSTALL_DEBUG_TOOLS"             : ""
"ROUTING_STACK"                   : "frr"
"FRR_USER_UID"                    : "300"
"FRR_USER_GID"                    : "300"
"ENABLE_SYNCD_RPC"                : ""
"ENABLE_ORGANIZATION_EXTENSIONS"  : "y"
"HTTP_PROXY"                      : ""
"HTTPS_PROXY"                     : ""
"ENABLE_SYSTEM_TELEMETRY"         : ""
"SONIC_DEBUGGING_ON"              : ""
"SONIC_PROFILING_ON"              : ""
"KERNEL_PROCURE_METHOD"           : "build"
"BUILD_TIMESTAMP"                 : "20200214.092507"
"BLDENV"                          : "stretch"
"VS_PREPARE_MEM"                  : "yes"
"ENABLE_SFLOW"                    : "y"

make: Nothing to be done for 'jessie'.
make[1]: Leaving directory '/home/samaity/REPO_FACTORY/GIT_REPO/DPB/sonic-buildimage'
BLDENV=stretch make -f Makefile.work target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl
make[1]: Entering directory '/home/samaity/REPO_FACTORY/GIT_REPO/DPB/sonic-buildimage'
SONiC Build System

Build Configuration
"CONFIGURED_PLATFORM"             : "broadcom"
"CONFIGURED_ARCH"                 : "amd64"
"SONIC_CONFIG_PRINT_DEPENDENCIES" : ""
"SONIC_BUILD_JOBS"                : "1"
"SONIC_CONFIG_MAKE_JOBS"          : "24"
"SONIC_USE_DOCKER_BUILDKIT"       : ""
"USERNAME"                        : "admin"
"PASSWORD"                        : "YourPaSsWoRd"
"ENABLE_DHCP_GRAPH_SERVICE"       : ""
"SHUTDOWN_BGP_ON_START"           : ""
"ENABLE_PFCWD_ON_START"           : ""
"INSTALL_DEBUG_TOOLS"             : ""
"ROUTING_STACK"                   : "frr"
"FRR_USER_UID"                    : "300"
"FRR_USER_GID"                    : "300"
"ENABLE_SYNCD_RPC"                : ""
"ENABLE_ORGANIZATION_EXTENSIONS"  : "y"
"HTTP_PROXY"                      : ""
"HTTPS_PROXY"                     : ""
"ENABLE_SYSTEM_TELEMETRY"         : ""
"SONIC_DEBUGGING_ON"              : ""
"SONIC_PROFILING_ON"              : ""
"KERNEL_PROCURE_METHOD"           : "build"
"BUILD_TIMESTAMP"                 : "20200214.092514"
"BLDENV"                          : "stretch"
"VS_PREPARE_MEM"                  : "yes"
"ENABLE_SFLOW"                    : "y"

make[1]: Leaving directory '/home/samaity/REPO_FACTORY/GIT_REPO/DPB/sonic-buildimage'


samaity@server09:~/REPO_FACTORY/GIT_REPO/DPB/sonic-buildimage$ ls -la target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl
-rw-r--r-- 1 samaity samaity 45343 Feb 14 09:25 target/python-wheels/sonic_config_engine-1.0-py2-none-any.whl

zhenggen-xu
zhenggen-xu reviewed Feb 14, 2020
View reviewed changes
src/sonic-config-engine/tests/test_cfggen_platformJson.py Outdated Show resolved Hide resolved
src/sonic-config-engine/portconfig.py Outdated Show resolved Hide resolved
src/sonic-config-engine/portconfig.py Outdated Show resolved Hide resolved
@samaity
Addressed review comments
4e89658 
Signed-off-by: Sangita Maity <[email protected]>
@zhenggen-xu zhenggen-xu merged commit c160fc7 into zhenggen-xu:sonic-cfg-mgmt Feb 17, 2020
praveen-li pushed a commit to praveen-li/sonic-buildimage that referenced this pull request Aug 9, 2022
@nazariig
[submodule]: Advance sonic-swss-common and sonic-linkmgrd submodules (s…
28939e9 
…onic-net#10406)

#### Why I did it
To take the following into sonic-buildimage
36e1f61 API endpoints to ConfigDBConnector to support pre-loading data without blackout (sonic-net#587)

[sonic-swss-common](https://github.com/Azure/sonic-swss-common)
```
36e1f61 API endpoints to ConfigDBConnector to support pre-loading data without blackout (sonic-net#587)
556f4ad Add SAI copy action to ACL schema (sonic-net#591)
db18c3a Fix bitwidth of mac address in SAI ACL schema (sonic-net#590)
e9442bb [ConfigDBPipeConnector]: Added set_entry API (sonic-net#586)
6c007c0 Update README for gmock (sonic-net#562)
```

[sonic-linkmgrd](https://github.com/Azure/sonic-linkmgrd)
```
83dfc99 Enforce uniform file/class naming convention (zhenggen-xu#52)
83004bf Shutdown ICMP heartbeats when default route state is missing and ToR is in `auto` mode (zhenggen-xu#44)
b81ea31 Add `LinkProberStateMachineActiveActive`  (zhenggen-xu#47)
c43cf7a Decrease link probing interval after switchover to better determine the overhead of a toggle (zhenggen-xu#43)
2239fbe Enhance clang format (zhenggen-xu#46)
```
#### How I did it
* Advanced submodules pointers

#### How to verify it
1. make configure PLATFORM=mellanox
2. make target/sonic-mellanox.bin
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zhenggen-xu zhenggen-xu zhenggen-xu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@samaity @zhenggen-xu