Skip to content

Commit c538f32

Browse files
committed
Support different logic for azure_deploy and azure_delete transformer
1 parent d6d5118 commit c538f32

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

lisa/sut_orchestrator/azure/transformers.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from dataclasses import dataclass, field
55
from pathlib import PurePosixPath
6-
from typing import Any, Dict, List, Type, cast
6+
from typing import Any, Dict, List, Optional, Type, Union, cast
77

88
from azure.mgmt.compute.models import GrantAccessData
99
from dataclasses_json import dataclass_json
@@ -102,12 +102,15 @@ class VhdTransformerSchema(schema.Transformer):
102102
class DeployTransformerSchema(schema.Transformer):
103103
requirement: schema.Capability = field(default_factory=schema.Capability)
104104
resource_group_name: str = ""
105+
deploy: bool = True
105106

106107

107108
@dataclass_json
108109
@dataclass
109110
class DeleteTransformerSchema(schema.Transformer):
110111
resource_group_name: str = field(default="", metadata=field_metadata(required=True))
112+
keep_environment: Optional[Union[str, bool]] = constants.ENVIRONMENT_KEEP_NO
113+
wait_delete: bool = True
111114

112115

113116
class VhdTransformer(Transformer):
@@ -338,7 +341,7 @@ def _internal_run(self) -> Dict[str, Any]:
338341
assert environment
339342

340343
platform.prepare_environment(environment=environment)
341-
344+
platform._azure_runbook.deploy = runbook.deploy
342345
platform.deploy_environment(environment)
343346

344347
resource_group_name = get_environment_context(environment).resource_group_name
@@ -385,6 +388,8 @@ def _internal_run(self) -> Dict[str, Any]:
385388
environment_context.resource_group_name = runbook.resource_group_name
386389
environment_context.resource_group_is_specified = True
387390

391+
platform.runbook.keep_environment = runbook.keep_environment
392+
platform._azure_runbook.wait_delete = runbook.wait_delete
388393
platform.delete_environment(environment)
389394

390395
return {}

0 commit comments

Comments
 (0)