-# 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:
: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):
:param node: Topology node.
:type node: dict
"""
- cmd = u"echo \"show ver\" | sudo socat - UNIX-CONNECT:/run/vpp/cli.sock"
+ cmd = u"echo \"show pci\" | sudo socat - UNIX-CONNECT:/run/vpp/cli.sock"
exec_cmd_no_error(
node, cmd, sudo=False, message=u"VPP failed to start!", retries=120
)
- cmd = u"vppctl show ver 2>&1 | fgrep -v \"Connection refused\" | " \
+ cmd = u"vppctl show pci 2>&1 | fgrep -v \"Connection refused\" | " \
u"fgrep -v \"No such file or directory\""
exec_cmd_no_error(
node, cmd, sudo=True, message=u"VPP failed to start!", retries=120
: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)