Skip to content

Commit e6a45b3

Browse files
committed
Use SUSE as condition checker
1 parent adcae19 commit e6a45b3

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

lisa/tools/docker.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
from lisa.base_tools import Service, Wget
66
from lisa.executable import Tool
7-
from lisa.operating_system import BSD, SLES, CBLMariner, CentOs, Debian, Redhat
7+
from lisa.operating_system import BSD, CBLMariner, CentOs, Debian, Redhat, Suse
88
from lisa.util import (
99
LisaException,
1010
ReleaseEndOfLifeException,
@@ -144,7 +144,7 @@ def _install(self) -> bool:
144144
)
145145
elif isinstance(self.node.os, CBLMariner):
146146
self.node.os.install_packages(["moby-engine", "moby-cli"])
147-
elif isinstance(self.node.os, SLES):
147+
elif isinstance(self.node.os, Suse):
148148
self.node.os.install_packages(["docker"])
149149
elif isinstance(self.node.os, BSD):
150150
raise UnsupportedDistroException(

lisa/tools/nfs_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the MIT license.
33

44
from lisa.executable import Tool
5-
from lisa.operating_system import SLES, CBLMariner, Debian, Redhat
5+
from lisa.operating_system import CBLMariner, Debian, Redhat, Suse
66
from lisa.tools import Firewall, Mount
77
from lisa.tools.mkfs import FileSystem
88
from lisa.tools.rm import Rm
@@ -56,7 +56,7 @@ def _install(self) -> bool:
5656
self.node.os.install_packages("nfs-utils")
5757
elif isinstance(self.node.os, Debian):
5858
self.node.os.install_packages("nfs-common")
59-
elif isinstance(self.node.os, SLES):
59+
elif isinstance(self.node.os, Suse):
6060
pass
6161
else:
6262
raise UnsupportedDistroException(self.node.os)

lisa/tools/nfs_server.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from typing import List
66

77
from lisa.executable import Tool
8-
from lisa.operating_system import SLES, CBLMariner, Debian, Redhat
8+
from lisa.operating_system import CBLMariner, Debian, Redhat, Suse
99
from lisa.tools import Echo, Firewall, Service
1010
from lisa.util import UnsupportedDistroException
1111

@@ -49,7 +49,7 @@ def create_shared_dir(self, client_ips: List[str], dir_name: str) -> None:
4949
self.node.tools[Service].restart_service(
5050
"nfs-kernel-server",
5151
)
52-
elif isinstance(self.node.os, SLES):
52+
elif isinstance(self.node.os, Suse):
5353
self.node.tools[Service].restart_service(
5454
"nfsserver",
5555
)
@@ -62,7 +62,7 @@ def is_running(self) -> bool:
6262
return service.check_service_exists("nfs-server")
6363
elif isinstance(self.node.os, Debian):
6464
return service.check_service_exists("nfs-kernel-server")
65-
elif isinstance(self.node.os, SLES):
65+
elif isinstance(self.node.os, Suse):
6666
return service.check_service_exists("nfsserver")
6767
else:
6868
raise UnsupportedDistroException(self.node.os)
@@ -73,7 +73,7 @@ def stop(self) -> None:
7373
service.stop_service("nfs-server")
7474
elif isinstance(self.node.os, Debian):
7575
service.stop_service("nfs-kernel-server")
76-
elif isinstance(self.node.os, SLES):
76+
elif isinstance(self.node.os, Suse):
7777
service.stop_service("nfsserver")
7878
else:
7979
raise UnsupportedDistroException(self.node.os)
@@ -83,7 +83,7 @@ def _install(self) -> bool:
8383
self.node.os.install_packages("nfs-utils")
8484
elif isinstance(self.node.os, Debian):
8585
self.node.os.install_packages("nfs-kernel-server")
86-
elif isinstance(self.node.os, SLES):
86+
elif isinstance(self.node.os, Suse):
8787
self.node.os.install_packages("nfs-kernel-server")
8888
else:
8989
raise UnsupportedDistroException(self.node.os)
@@ -95,7 +95,7 @@ def _check_exists(self) -> bool:
9595
return self.node.tools[Service].check_service_exists("nfs-utils")
9696
elif isinstance(self.node.os, Debian):
9797
return self.node.tools[Service].check_service_exists("nfs-kernel-server")
98-
elif isinstance(self.node.os, SLES):
98+
elif isinstance(self.node.os, Suse):
9999
return self.node.tools[Service].check_service_exists("nfs-server")
100100
else:
101101
raise UnsupportedDistroException(self.node.os)

microsoft/testsuites/performance/storageperf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from lisa.features.network_interface import Sriov, Synthetic
2424
from lisa.messages import DiskSetupType, DiskType
2525
from lisa.node import RemoteNode
26-
from lisa.operating_system import SLES, Debian, Redhat
26+
from lisa.operating_system import Debian, Redhat, Suse
2727
from lisa.testsuite import TestResult, node_requirement
2828
from lisa.tools import FileSystem, Lscpu, Mkfs, Mount, NFSClient, NFSServer, Sysctl
2929
from lisa.util import SkippedException
@@ -473,11 +473,11 @@ def _perf_nfs(
473473
server_node = cast(RemoteNode, environment.nodes[0])
474474
client_node = cast(RemoteNode, environment.nodes[1])
475475

476-
# Run test only on Debian, SLES and Redhat distributions
476+
# Run test only on Debian, Suse and Redhat distributions
477477
if (
478478
not isinstance(server_node.os, Redhat)
479479
and not isinstance(server_node.os, Debian)
480-
and not isinstance(server_node.os, SLES)
480+
and not isinstance(server_node.os, Suse)
481481
):
482482
raise SkippedException(f"{server_node.os.name} not supported")
483483

0 commit comments

Comments
 (0)