Skip to content

[MultiDB]except src and dockers : replace redis-cli with sonic-db-cli and use new DBConnector#3928

Merged
qiluo-msft merged 2 commits intosonic-net:masterfrom
dzhangalibaba:others
Jan 2, 2020
Merged

[MultiDB]except src and dockers : replace redis-cli with sonic-db-cli and use new DBConnector#3928
qiluo-msft merged 2 commits intosonic-net:masterfrom
dzhangalibaba:others

Conversation

@dzhangalibaba
Copy link
Collaborator

this commit made changes in sonic-buildimage module directory except ./dockers/(this is done in another PR) amd ./src/(will do in next PR)

replace redis-cli with sonic-db-cli
replace old DBConnector with new DBConnector
vs tests passed, loaded on DUT, looks good, script works fine.

Signed-off-by: Dong Zhang [email protected]

@dzhangalibaba
Copy link
Collaborator Author

This will block until sonic-net/sonic-py-swsssdk#58 is merged

@dzhangalibaba
Copy link
Collaborator Author

retest vs

@dzhangalibaba
Copy link
Collaborator Author

retest vsimage please

@dzhangalibaba
Copy link
Collaborator Author

retest vs please

@dzhangalibaba
Copy link
Collaborator Author

@qiluo-msft looks the build docker environment didn't use the latest python swsscommon library, here is one failed case , which cannot find the new DBConnector() API , https://sonic-jenkins.westus2.cloudapp.azure.com/job/vs/job/buildimage-vs-all-pr/1898/consoleFull

Could you help confirm environment is good or not. Now the pytest at platform/vs/tests cannot find the correct new API.

[ building ] [ target/docker-sonic-vs.gz ] 
[ finished ] [ target/docker-sonic-vs.gz ] 
make[1]: Leaving directory '/data/johnar/workspace/vs/buildimage-vs-all-pr@2'
[Pipeline] }
[Pipeline] // stage
[Pipeline] stage
[Pipeline] { (Test)
[Pipeline] wrap
[Pipeline] {
[Pipeline] lock
Trying to acquire lock on [vstest_jenkins-worker-s6]
Lock acquired on [vstest_jenkins-worker-s6]
[Pipeline] {
[Pipeline] sh
+ docker load
The image docker-sonic-vs:latest already exists, renaming the old one with ID sha256:cd32cbd0be49cc546cab8e039918d845dff08cf18c53be17f9e3211ce3394cb7 to empty string
Loaded image: docker-sonic-vs:latest
+ cd platform/vs/tests
+ sudo py.test -v --junitxml=tr.xml
============================= test session starts ==============================
platform linux2 -- Python 2.7.15+, pytest-3.3.0, py-1.7.0, pluggy-0.6.0 -- /usr/bin/python
cachedir: .cache
rootdir: /data/johnar/workspace/vs/buildimage-vs-all-pr@2/platform/vs/tests, inifile:
collecting ... collected 4 items

bgp/test_gr_livelock.py::test_gr_livelock PASSED                         [ 25%]
bgp/test_invalid_nexthop.py::test_InvalidNexthop PASSED                  [ 50%]
bgp/test_no_export.py::test_bounce PASSED                                [ 75%]
teamd/test_portchannel.py::test_PortChannel FAILED                       [100%]

 generated xml file: /data/johnar/workspace/vs/buildimage-vs-all-pr@2/platform/vs/tests/tr.xml 
=================================== FAILURES ===================================
_______________________________ test_PortChannel _______________________________

dvs = <conftest.DockerVirtualSwitch object at 0x7f30ab982b10>
testlog = <function testlog at 0x7f30ad27d6e0>

    def test_PortChannel(dvs, testlog):
>       appldb = swsscommon.DBConnector("APPL_DB", 0)

teamd/test_portchannel.py:7: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

self = <swsscommon.swsscommon.DBConnector;  >, args = ('APPL_DB', 0)

    def __init__(self, *args):
>       this = _swsscommon.new_DBConnector(*args)
E       NotImplementedError: Wrong number or type of arguments for overloaded function 'new_DBConnector'.
E         Possible C/C++ prototypes are:
E           swss::DBConnector::DBConnector(int,std::string const &,int,unsigned int)
E           swss::DBConnector::DBConnector(int,std::string const &,unsigned int)

/usr/lib/python2.7/dist-packages/swsscommon/swsscommon.py:607: NotImplementedError

@qiluo-msft
Copy link
Collaborator

Retest vs please

@qiluo-msft
Copy link
Collaborator

I fixed the Jenkins worker. Please check test result again.

@dzhangalibaba
Copy link
Collaborator Author

retest this please

@dzhangalibaba
Copy link
Collaborator Author

retest broadcom please

@dzhangalibaba
Copy link
Collaborator Author

retest vsimage please

2 similar comments
@dzhangalibaba
Copy link
Collaborator Author

retest vsimage please

@dzhangalibaba
Copy link
Collaborator Author

retest vsimage please

@dzhangalibaba
Copy link
Collaborator Author

retest this please

@dzhangalibaba
Copy link
Collaborator Author

retest vsimage please

@dzhangalibaba
Copy link
Collaborator Author

retest vs please

@dzhangalibaba
Copy link
Collaborator Author

retest vsimage please

lguohan pushed a commit that referenced this pull request Dec 27, 2019
update multiDB changes in sonic-py-swsssdk, including:

- read portchannel name from LAG_NAME_MAP_TABLE in COUNTERS_DB (#51)
- Revert "read portchannel name from LAG_NAME_MAP_TABLE in COUNTERS_DB (#51)" (#57)
- [MultiDB] sonic-db-cli should support EVAL operation, app script use … (#58)

PR #3928 needs this swsssdk-py changes to work

Signed-off-by: Dong Zhang [email protected]
@dzhangalibaba
Copy link
Collaborator Author

retest vs please

@dzhangalibaba
Copy link
Collaborator Author

retest vsimage please

@dzhangalibaba
Copy link
Collaborator Author

@qiluo-msft FYI . all tests passed

@qiluo-msft qiluo-msft merged commit 0dae59a into sonic-net:master Jan 2, 2020
lguohan added a commit that referenced this pull request Jan 10, 2020
…c-db-cli and use new DBConnector (#3928)"

This reverts commit 0dae59a.
lguohan added a commit that referenced this pull request Jan 10, 2020
…c-db-cli and use new DBConnector (#3928)" (#4002)

This reverts commit 0dae59a.
mssonicbld added a commit that referenced this pull request Jul 23, 2025
…atically (#22686)

#### Why I did it
src/sonic-utilities
```
* e18640e - (HEAD -> master, origin/master, origin/HEAD) Switchport mode update for 'show interfaces status' (#3788) (3 hours ago) [Shivashankar C R]
* 809646a - Revert "Addition of prober_type in config and show commands for muxcable (#3884)" (#3979) (17 hours ago) [Xin Wang]
* 3db35d5 - `vnet_route_check.py` should not report VNET routes in APP DB but not in STATE DB and ASIC DB as mismatches (#3990) (26 hours ago) [mramezani95]
* 8647356 - [show][config][plugin] add processing of ModuleNotFoundError with log_warning (#3832) (32 hours ago) [Maksym Kovalchuk]
* 20976de - fix show bgp cli on multiple asic device (#3981) (5 days ago) [Liping Xu]
* 46c82ab - [db_migrator] Fix parse_xml fails when minigraph has SonicQosProfile (#3972) (6 days ago) [Xin Wang]
* 1c3f789 - Fix route_check.py to ignore local p2p IP prefixes (#3882) (7 days ago) [prabhataravind]
* 898a037 - Make 'show interface errors' lookup the correct oper_error_status count published by OA (#3956) (8 days ago) [Bobby McGonigle]
* eda6ada - [sonic-package-manager] Save tag that was used to install the application (#3917) (8 days ago) [DavidZagury]
* c409594 - [SPM] Add support for configuring systemd service Type in package manifests (#3946) (8 days ago) [DavidZagury]
* 09b4292 - [trim]: Add Packet Trimming Asym DSCP CLI (#3920) (9 days ago) [Nazarii Hnydyn]
* f751730 - Lodoga-Prime: lodogaprime platform support (#3954) (13 days ago) [NobutomoNakano]
* 0424ae0 - Add GCU Support for SKU Mellanox-SN4280-C48/O8C40/O8V40 (#3964) (13 days ago) [Sai Rama Mohan Reddy S]
* 57b9846 - fix issue #22476 remove quagga in show bgp cmd (#3947) (2 weeks ago) [Liping Xu]
* 5d11fc5 - Fix comparison error when replace (#3941) (3 weeks ago) [jingwenxie]
* f6d6d9a - Fix for 22138: Chassisd does not wait for the execution to complete for previous admin state change requests - Replaces PR: #3845 (#3937) (4 weeks ago) [rameshraghupathy]
* be72304 - [YANG] remove uses clause handling, now part of sonic-yang-mgmt (#3814) (4 weeks ago) [Brad House]
* 19a6b3c - Switch to using chrony instead of ntpd : gcu - services_validator.py (#3929) (4 weeks ago) [Anukul Verma]
* 5db9c27 - Fixed cli command for ECN config on voq switch (#3928) (4 weeks ago) [saksarav-nokia]
* 020f9d0 - Improved GCU's field validation logic for the WRED_PROFILE table (#3910) (4 weeks ago) [mramezani95]
* f15e2d0 - feat: support specific BP port info for show int (#3926) (4 weeks ago) [Chenyang Wang]
* 5a59f19 - [multi-asic] Fix the 'config reload' flow in case when multiple golden_config.json files provided (#3895) (5 weeks ago) [Vadym Hlushko]
* 82ec8f4 - fix show cmd for bgp (#3922) (5 weeks ago) [Liping Xu]
* e0f9da4 - Skip checking offload flags for static routes/sids in route check and add check_sids (#3919) (5 weeks ago) [Changrong Wu]
* 5ea861d - [copp]: Added CoPP show configuration commands (#3863) (6 weeks ago) [Ravi Minnikanti(Marvell)]
* 9fd8c3c - [sfputil] Use host lane mask as part of rx-output enable/disable (#3911) (6 weeks ago) [mihirpat1]
* 3e157a2 - Support reboot cause: Kernel Panic - Out of memory (#3918) (6 weeks ago) [byu343]
* 49d36ff - [gcu]: Add marvell-teralynx platform to gcu field validator (#3881) (6 weeks ago) [Ravi Minnikanti(Marvell)]
* 8415aee - [Mellanox] Collect sai.xml to sysdump (#3903) (6 weeks ago) [Sai Rama Mohan Reddy S]
* 6e26c8d - [intfstat] Align output format between cached/non-cached scenarios (#3902) (6 weeks ago) [Yair Raviv]
* 57d825e - Add version_202411_02 function (#3864) (6 weeks ago) [Ben Levi]
* d5051cd - [Smartswitch][reboot] Addition of pre shutdown and post startup function calls (#3900) (7 weeks ago) [Gagan Punathil Ellath]
* b3509b9 - Add CLI show commands to view bgp network, neighbors and summary on per-vrf basis (#3866) (7 weeks ago) [Navdha Jindal]
* dfa51d3 - Upgrade portstat to support nonzero option and sort heterogeneous interfaces names (#3894) (7 weeks ago) [Changrong Wu]
* ba255b6 - Issue #22407: ConfigReload fails when RADIUS statistics is enabled (#3860) (8 weeks ago) [Anders Linn]
* 7116edf - Fix warm-reboot script so it can be run via reboot DBus service (#3872) (8 weeks ago) [jkmar]
* 2f1c4e0 - config: Modify AAA config commands to use pass_db decorator (#3755) (8 weeks ago) [Anders Linn]
* d6d866f - show command for icmp echo offload sessions (#3889) (8 weeks ago) [manamand2020]
* 1b3498c - add TH5-512 hwsku into gcu support list (#3896) (8 weeks ago) [Dashuai Zhang]
* b106a82 - Addition of prober_type in config and show commands for muxcable (#3884) (9 weeks ago) [harjotsinghpawra]
* 733bdde - [smartswitch] Fix incorrect reboot status check and improve debug logging in reboot scripts (#3888) (9 weeks ago) [Vasundhara Volam]
* 60110fa - feat: support namespace arg for show mac (#3873) (9 weeks ago) [Chenyang Wang]
* aeba823 - feat: support namespace arg for show bfd (#3885) (9 weeks ago) [Chenyang Wang]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants