Skip to content

Fix update_skus bug when a single gen is set #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JAVGan merged 1 commit into from
Nov 21, 2024
Merged

Fix update_skus bug when a single gen is set #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 21 additions & 9 deletions cloudpub/ms_azure/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def update_skus(
disk_versions (list)
List of existing DiskVersion in the technical config
generation (str)
The main generation for publishing
The main generation for publishing when there are no old_skus
plan-name (str)
The destination plan name.
old_skus (list, optional)
Expand All @@ -306,14 +306,26 @@ def update_skus(
# The alternate plan name ends with the suffix "-genX" and we can't change that once
# the offer is live, otherwise it will raise "BadRequest" with the message:
# "The property 'PlanId' is locked by a previous submission".
default_gen = "V2"
alt_gen = "V1"
for osku in old_skus:
if osku.security_type is not None:
security_type = osku.security_type
if osku.id.endswith("-gen2"): # alternate is gen2 hence V1 is the default.
default_gen = "V1"
alt_gen = "V2"
osku = old_skus[0]
# Get the security type for all gens
if osku.security_type is not None:
security_type = osku.security_type

# Default Gen2 cases
if osku.image_type.endswith("Gen1") and osku.id.endswith("gen1"):
default_gen = "V2"
alt_gen = "V1"
elif osku.image_type.endswith("Gen2") and not osku.id.endswith("gen2"):
default_gen = "V2"
alt_gen = "V1"

# Default Gen1 cases
elif osku.image_type.endswith("Gen1") and not osku.id.endswith("gen1"):
default_gen = "V1"
alt_gen = "V2"
elif osku.image_type.endswith("Gen2") and osku.id.endswith("gen2"):
default_gen = "V1"
alt_gen = "V2"

return _build_skus(
disk_versions,
Expand Down
40 changes: 40 additions & 0 deletions tests/ms_azure/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,46 @@ def test_update_existing_skus_gen1_default(
]
]

@pytest.mark.parametrize("generation", ["V1", "V2"])
def test_update_existing_skus_gen1_single(
self, generation: str, technical_config_obj: VMIPlanTechConfig
) -> None:
skus = [VMISku.from_json({"imageType": "x64Gen1", "skuId": "plan1"})]
technical_config_obj.skus = skus
res = update_skus(
disk_versions=technical_config_obj.disk_versions,
generation=generation,
plan_name="plan1",
old_skus=technical_config_obj.skus,
)
assert res == [
VMISku.from_json(x)
for x in [
{"imageType": "x64Gen1", "skuId": "plan1", "securityType": None},
{"imageType": "x64Gen2", "skuId": "plan1-gen2", "securityType": None},
]
]

@pytest.mark.parametrize("generation", ["V1", "V2"])
def test_update_existing_skus_gen2_single(
self, generation: str, technical_config_obj: VMIPlanTechConfig
) -> None:
skus = [VMISku.from_json({"imageType": "x64Gen2", "skuId": "plan1"})]
technical_config_obj.skus = skus
res = update_skus(
disk_versions=technical_config_obj.disk_versions,
generation=generation,
plan_name="plan1",
old_skus=technical_config_obj.skus,
)
assert res == [
VMISku.from_json(x)
for x in [
{"imageType": "x64Gen2", "skuId": "plan1", "securityType": None},
{"imageType": "x64Gen1", "skuId": "plan1-gen1", "securityType": None},
]
]

def test_create_disk_version_from_scratch(
self,
disk_version_obj: DiskVersion,
Expand Down