From e5d6299f0a6523022900249ab7a7be9ef7d2575c Mon Sep 17 00:00:00 2001 From: Blake Harnden <32446120+bharnden@users.noreply.github.com> Date: Wed, 1 Jun 2022 11:12:20 -0700 Subject: [PATCH] daemon: fixed error in requirements check and sorted executable definitions --- daemon/core/executables.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/daemon/core/executables.py b/daemon/core/executables.py index 3d0e80f6..95c97378 100644 --- a/daemon/core/executables.py +++ b/daemon/core/executables.py @@ -1,30 +1,31 @@ from typing import List BASH: str = "bash" -VNODED: str = "vnoded" -VCMD: str = "vcmd" -SYSCTL: str = "sysctl" -IP: str = "ip" ETHTOOL: str = "ethtool" -TC: str = "tc" +IP: str = "ip" MOUNT: str = "mount" -UMOUNT: str = "umount" -OVS_VSCTL: str = "ovs-vsctl" -TEST: str = "test" NFTABLES: str = "nft" +OVS_VSCTL: str = "ovs-vsctl" +SYSCTL: str = "sysctl" +TC: str = "tc" +TEST: str = "test" +UMOUNT: str = "umount" +VCMD: str = "vcmd" +VNODED: str = "vnoded" COMMON_REQUIREMENTS: List[str] = [ BASH, - NFTABLES, ETHTOOL, IP, MOUNT, + NFTABLES, SYSCTL, TC, - UMOUNT, TEST, + UMOUNT, + VCMD, + VNODED, ] -VCMD_REQUIREMENTS: List[str] = [VNODED, VCMD] OVS_REQUIREMENTS: List[str] = [OVS_VSCTL] @@ -38,6 +39,4 @@ def get_requirements(use_ovs: bool) -> List[str]: requirements = COMMON_REQUIREMENTS if use_ovs: requirements += OVS_REQUIREMENTS - else: - requirements += VCMD_REQUIREMENTS return requirements