Skip to content

Commit 0d9e192

Browse files
committed
nit
1 parent 8b09a93 commit 0d9e192

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

src/load/azext_load/data_plane/load_trigger/custom.py

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

66
from azure.core.exceptions import ResourceNotFoundError
7-
from azure.cli.core.azclierror import InvalidArgumentValueError
7+
from azure.cli.core.azclierror import InvalidArgumentValueError, ValidationError
88
from knack.log import get_logger
99
from azext_load.data_plane.utils.utils import (
1010
get_admin_data_plane_client)
@@ -191,7 +191,11 @@ def pause_trigger_schedule(
191191
response = client.create_or_update_trigger(trigger_id=trigger_id, body=existing_trigger_schedule)
192192
logger.debug("Paused schedule trigger: %s", response)
193193
return response
194-
logger.error("Schedule trigger is not active. It is in %s state.", existing_trigger_schedule.state.value)
194+
if existing_trigger_schedule.state == enums.TriggerState.COMPLETED:
195+
msg = "Schedule trigger with id: {} is already completed.".format(trigger_id)
196+
logger.error(msg)
197+
raise ValidationError(msg)
198+
logger.warning("Schedule trigger is not active. It is in %s state.", existing_trigger_schedule.state.value)
195199

196200

197201
def enable_trigger_schedule(
@@ -212,12 +216,14 @@ def enable_trigger_schedule(
212216
logger.debug(msg)
213217
raise InvalidArgumentValueError(msg)
214218
logger.debug("Existing trigger object: %s", existing_trigger_schedule)
215-
if existing_trigger_schedule.state in [enums.TriggerState.PAUSED, enums.TriggerState.DISABLED]:
219+
if existing_trigger_schedule.state != enums.TriggerState.COMPLETED:
216220
existing_trigger_schedule.state = enums.TriggerState.ACTIVE
217221
response = client.create_or_update_trigger(trigger_id=trigger_id, body=existing_trigger_schedule)
218222
logger.debug("Enabled schedule trigger: %s", response)
219223
return response
220-
logger.error("Schedule trigger is in %s state, hence cannot be enabled.", existing_trigger_schedule.state.value)
224+
msg = "Schedule trigger with id: {} is already completed. Cannot enable a completed schedule.".format(trigger_id)
225+
logger.debug(msg)
226+
raise ValidationError(msg)
221227

222228

223229
def list_trigger_schedules(

src/load/azext_load/data_plane/utils/argtypes.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -457,13 +457,6 @@
457457
help="Test IDs of the load tests to be triggered by schedule. Currently we only support one test ID per schedule.",
458458
)
459459

460-
state = CLIArgumentType(
461-
options_list=["--state"],
462-
choices=utils.get_enum_values(models.AllowedTriggerStates),
463-
type=str,
464-
help="State of the load trigger schedule",
465-
)
466-
467460
trigger_display_name = CLIArgumentType(
468461
options_list=["--display-name"],
469462
type=str,

src/load/azext_load/data_plane/utils/models.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,3 @@ class AllowedTrendsResponseTimeAggregations(str, Enum):
6464
P99 = "P99"
6565
P999 = "P999"
6666
P9999 = "P9999"
67-
68-
69-
class AllowedTriggerStates(str, Enum):
70-
ACTIVE = "ACTIVE"
71-
PAUSED = "PAUSED"

0 commit comments

Comments
 (0)