Skip to content

Commit c58a3d0

Browse files
LiliDengsquirrelsc
authored andcommitted
Remove the serial console feature from required feature list
1 parent e145ede commit c58a3d0

1 file changed

Lines changed: 20 additions & 27 deletions

File tree

microsoft/testsuites/core/provisioning.py

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ class Provisioning(TestSuite):
7171
priority=0,
7272
requirement=simple_requirement(
7373
environment_status=EnvironmentStatus.Deployed,
74-
supported_features=[SerialConsole],
7574
),
7675
)
7776
def smoke_test(self, log: Logger, node: RemoteNode, log_path: Path) -> None:
@@ -86,7 +85,6 @@ def smoke_test(self, log: Logger, node: RemoteNode, log_path: Path) -> None:
8685
requirement=simple_requirement(
8786
environment_status=EnvironmentStatus.Deployed,
8887
network_interface=Synthetic(),
89-
supported_features=[SerialConsole],
9088
),
9189
)
9290
def verify_deployment_provision_synthetic_nic(
@@ -105,7 +103,6 @@ def verify_deployment_provision_synthetic_nic(
105103
requirement=simple_requirement(
106104
environment_status=EnvironmentStatus.Deployed,
107105
disk=DiskStandardSSDLRS(),
108-
supported_features=[SerialConsole],
109106
),
110107
)
111108
def verify_deployment_provision_standard_ssd_disk(
@@ -124,10 +121,7 @@ def verify_deployment_provision_standard_ssd_disk(
124121
requirement=simple_requirement(
125122
environment_status=EnvironmentStatus.Deployed,
126123
disk=DiskEphemeral(),
127-
supported_features=[
128-
SerialConsole,
129-
CvmDisabled(),
130-
], # TODO: Fix disk deployment for CVM
124+
supported_features=[CvmDisabled()], # TODO: Fix disk deployment for CVM
131125
),
132126
)
133127
def verify_deployment_provision_ephemeral_managed_disk(
@@ -146,7 +140,6 @@ def verify_deployment_provision_ephemeral_managed_disk(
146140
requirement=simple_requirement(
147141
environment_status=EnvironmentStatus.Deployed,
148142
disk=DiskPremiumSSDLRS(),
149-
supported_features=[SerialConsole],
150143
),
151144
)
152145
def verify_deployment_provision_premium_disk(
@@ -168,7 +161,7 @@ def verify_deployment_provision_premium_disk(
168161
data_disk_count=search_space.IntRange(min=1),
169162
),
170163
environment_status=EnvironmentStatus.Deployed,
171-
supported_features=[SerialConsole, AvailabilityZoneEnabled()],
164+
supported_features=[AvailabilityZoneEnabled()],
172165
),
173166
)
174167
def verify_deployment_provision_premiumv2_disk(
@@ -187,7 +180,6 @@ def verify_deployment_provision_premiumv2_disk(
187180
requirement=simple_requirement(
188181
environment_status=EnvironmentStatus.Deployed,
189182
network_interface=Sriov(),
190-
supported_features=[SerialConsole],
191183
),
192184
)
193185
def verify_deployment_provision_sriov(
@@ -206,7 +198,7 @@ def verify_deployment_provision_sriov(
206198
priority=2,
207199
requirement=simple_requirement(
208200
environment_status=EnvironmentStatus.Deployed,
209-
supported_features=[SerialConsole, StartStop],
201+
supported_features=[StartStop],
210202
),
211203
)
212204
def verify_reboot_in_platform(
@@ -232,7 +224,6 @@ def verify_reboot_in_platform(
232224
data_disk_count=search_space.IntRange(min=1),
233225
),
234226
environment_status=EnvironmentStatus.Deployed,
235-
supported_features=[SerialConsole],
236227
),
237228
)
238229
def verify_deployment_provision_ultra_datadisk(
@@ -254,7 +245,7 @@ def verify_deployment_provision_ultra_datadisk(
254245
priority=1,
255246
requirement=simple_requirement(
256247
environment_status=EnvironmentStatus.Deployed,
257-
supported_features=[SerialConsole, StartStop],
248+
supported_features=[StartStop],
258249
),
259250
)
260251
def verify_stop_start_in_platform(
@@ -280,7 +271,6 @@ def verify_stop_start_in_platform(
280271
timeout=10800,
281272
requirement=simple_requirement(
282273
environment_status=EnvironmentStatus.Deployed,
283-
supported_features=[SerialConsole],
284274
),
285275
)
286276
def stress_reboot(self, log: Logger, node: RemoteNode, log_path: Path) -> None:
@@ -320,10 +310,11 @@ def _smoke_test(
320310
timeout=self.TIME_OUT,
321311
)
322312
if not is_ready:
323-
serial_console = node.features[SerialConsole]
324-
serial_console.check_panic(
325-
saved_path=log_path, stage="bootup", force_run=True
326-
)
313+
if node.features.is_supported(SerialConsole):
314+
serial_console = node.features[SerialConsole]
315+
serial_console.check_panic(
316+
saved_path=log_path, stage="bootup", force_run=True
317+
)
327318
raise TcpConnectionException(
328319
node.connection_info[constants.ENVIRONMENTS_NODES_REMOTE_ADDRESS],
329320
node.connection_info[constants.ENVIRONMENTS_NODES_REMOTE_PORT],
@@ -350,10 +341,11 @@ def _smoke_test(
350341
timeout=self.PLATFORM_TIME_OUT,
351342
)
352343
if not is_ready:
353-
serial_console = node.features[SerialConsole]
354-
serial_console.check_panic(
355-
saved_path=log_path, stage="reboot", force_run=True
356-
)
344+
if node.features.is_supported(SerialConsole):
345+
serial_console = node.features[SerialConsole]
346+
serial_console.check_panic(
347+
saved_path=log_path, stage="reboot", force_run=True
348+
)
357349
raise TcpConnectionException(
358350
node.connection_info[
359351
constants.ENVIRONMENTS_NODES_REMOTE_ADDRESS
@@ -366,11 +358,12 @@ def _smoke_test(
366358
node.reboot()
367359
log.info(f"node '{node.name}' rebooted in {timer}")
368360
except Exception as e:
369-
serial_console = node.features[SerialConsole]
370-
# if there is any panic, fail before partial pass
371-
serial_console.check_panic(
372-
saved_path=log_path, stage="reboot", force_run=True
373-
)
361+
if node.features.is_supported(SerialConsole):
362+
serial_console = node.features[SerialConsole]
363+
# if there is any panic, fail before partial pass
364+
serial_console.check_panic(
365+
saved_path=log_path, stage="reboot", force_run=True
366+
)
374367

375368
# if node cannot be connected after reboot, it should be failed.
376369
if isinstance(e, TcpConnectionException):

0 commit comments

Comments
 (0)