Merge pull request #105 from release-engineering/fixskuissue

Azure: Fix bug on update_skus

Author: JAVGan

cloudpub/ms_azure/utils.py

@@ -262,11 +262,16 @@ def prepare_vm_images(
         return [VMImageDefinition.from_json(json_gen1)]
 
 
-def _len_vm_images(disk_versions: List[DiskVersion]) -> int:
-    count = 0
-    for disk_version in disk_versions:
-        count = count + len(disk_version.vm_images)
-    return count
+def _all_skus_present(old_skus: List[VMISku], disk_versions: List[DiskVersion]) -> bool:
+    image_types = set()
+    for sku in old_skus:
+        image_types.add(sku.image_type)
+
+    for dv in disk_versions:
+        for img in dv.vm_images:
+            if img.image_type not in image_types:
+                return False
+    return True
 
 
 def _build_skus(
@@ -352,7 +357,7 @@ def update_skus(
 
     # If we have SKUs for each image we don't need to update them as they're already
     # properly set.
-    if len(old_skus) == _len_vm_images(disk_versions):
+    if _all_skus_present(old_skus, disk_versions):
         return old_skus
 
     # Update SKUs to create the alternate gen.

tests/ms_azure/test_utils.py

@@ -484,6 +484,34 @@ def test_update_existing_skus_arm64_single(
             ]
         ]
 
+    @pytest.mark.parametrize("generation", ["V1", "V2"])
+    def test_update_skus_return_existing_unconventional_naming(
+        self,
+        generation: str,
+        technical_config_obj: VMIPlanTechConfig,
+    ) -> None:
+        """Ensure the existing SKUs are returned even if they doesn't present expected namings."""
+        skus = [
+            VMISku.from_json(x)
+            for x in [
+                {"imageType": "x64Gen2", "skuId": "differentNaming"},
+                {"imageType": "x64Gen1", "skuId": "gen1GotDifferentNaming"},
+            ]
+        ]
+        res = update_skus(
+            disk_versions=technical_config_obj.disk_versions,
+            generation=generation,
+            plan_name="plan1",
+            old_skus=skus,
+        )
+        assert res == [
+            VMISku.from_json(x)
+            for x in [
+                {"imageType": "x64Gen2", "skuId": "differentNaming", "securityType": None},
+                {"imageType": "x64Gen1", "skuId": "gen1GotDifferentNaming"},
+            ]
+        ]
+
     def test_create_disk_version_from_scratch_x86(
         self,
         disk_version_obj: DiskVersion,