diff options
author | Dave Wallace <dwallacelf@gmail.com> | 2019-12-20 22:46:51 +0000 |
---|---|---|
committer | Peter Mikus <pmikus@cisco.com> | 2020-01-15 07:01:56 +0000 |
commit | 2da2aa12260143bc513b4dff5e2b2ef6755172ab (patch) | |
tree | 8bbd4b177bc7e12cd942b7a91a4af8641af24935 /resources/libraries/python/VPPUtil.py | |
parent | 6ae8614cf1459f977508f9f4ba3548ac0a16b231 (diff) |
Hoststack perf infrastructure refactoring
- DUT only topology (hoststack test
apps are co-located with vpp)
- Make vpp app specific keywords generic
where applicable
- Add IP4 Prefix to topology file
- Support running wrk in linux namespace
- Refactor namespace cleanup
- Remove redundant namespace creation code
- Refactor test/keyword dirs: tcp -> hoststack
- Add hoststack utility keywords
- Refactor wrk suite setup/teardown
- Update tests with recent perf infra changes
Change-Id: Ia1cf07978d579393eef94923819a87c8c1f36f34
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'resources/libraries/python/VPPUtil.py')
-rw-r--r-- | resources/libraries/python/VPPUtil.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py index 865775f995..ca63fa6cea 100644 --- a/resources/libraries/python/VPPUtil.py +++ b/resources/libraries/python/VPPUtil.py @@ -1,4 +1,4 @@ -# Copyright (c) 2019 Cisco and/or its affiliates. +# Copyright (c) 2020 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -113,8 +113,7 @@ class VPPUtil: :param node: Topology node. :type node: dict """ - cmd = u"command -v vpp" - exec_cmd_no_error(node, cmd, message=u"VPP is not installed!") + DUTSetup.verify_program_installed(node, u"vpp") @staticmethod def adjust_privileges(node): @@ -155,7 +154,7 @@ class VPPUtil: :type node: dict :raises RuntimeError: If VPP service fails to start. """ - VPPUtil.verify_vpp_installed(node) + DUTSetup.verify_program_installed(node, 'vpp') try: # Verify responsiveness of vppctl. VPPUtil.verify_vpp_started(node) |