Fix sapha counting

Author: volodymyrkatkalov

ocw/lib/azure.py

@@ -112,6 +112,9 @@ def delete_resource(self, resource_id: str) -> None:
     def list_images(self):
         return self.list_resource(filters="resourceType eq 'Microsoft.Compute/images'")
 
+    def report_list_images(self):
+        return self.unscoped_list_resource(filters="resourceType eq 'Microsoft.Compute/images'")
+
     def list_disks(self):
         return self.list_resource(filters="resourceType eq 'Microsoft.Compute/disks'")
 
@@ -227,11 +230,25 @@ def cleanup_gallery_img_versions(self) -> None:
 
     def get_img_versions_count(self) -> int:
         self.log_dbg("Call get_img_versions_count")
-        gallery = self.compute_mgmt_client().galleries.get(self.__resource_group, self.__gallery)
-        all_img_versions = 0
-        for image_definition in self.compute_mgmt_client().gallery_images.list_by_gallery(self.__resource_group, gallery.name):
-            img_versions = len(list(self.compute_mgmt_client().gallery_image_versions.list_by_gallery_image(
-                    self.__resource_group, gallery.name, image_definition.name)))
-            self.log_dbg(f"{image_definition.name} has {img_versions} versions")
-            all_img_versions += img_versions
-        return all_img_versions
+
+        compute_client = self.compute_mgmt_client()
+        resource_client = self.resource_mgmt_client()  # You need to have this method or client setup
+
+        total_versions = 0
+
+        for rg in resource_client.resource_groups.list():
+            rg_name = rg.name
+            try:
+                galleries = compute_client.galleries.list_by_resource_group(rg_name)
+                for gallery in galleries:
+                    images = compute_client.gallery_images.list_by_gallery(rg_name, gallery.name)
+                    for image in images:
+                        versions = list(compute_client.gallery_image_versions.list_by_gallery_image(
+                            rg_name, gallery.name, image.name
+                        ))
+                        version_count = len(versions)
+                        total_versions += version_count
+            except Exception as e:
+                self.log_dbg(f"Skipping resource group {rg_name} due to error: {e}")
+
+        return total_versions

ocw/lib/dump_state.py

@@ -33,7 +33,7 @@ def dump_state():
                     ProviderChoice.AZURE.value,
                     Influx.IMAGES_QUANTITY,
                     namespace,
-                    Azure(namespace).list_images,
+                    Azure(namespace).report_list_images,
                 )
                 Influx().dump_resource(
                     ProviderChoice.AZURE.value,

tests/test_azure.py

@@ -47,27 +47,66 @@ def bs_client_one_pcw_ignore(monkeypatch):
     monkeypatch.setattr(Azure, 'bs_client', lambda *args, **kwargs: fakeblobserviceclient)
 
 
+class FakeResourceGroup:
+    def __init__(self, name):
+        self.name = name
+
+
+class FakeGallery:
+    def __init__(self, name):
+        self.name = name
+
+
+class FakeImage:
+    def __init__(self, name):
+        self.name = name
+
+
+class FakeVersion:
+    def __init__(self, name):
+        self.name = name
+
+
 @pytest.fixture
 def mock_compute_mgmt_client(monkeypatch):
-
     global deleted_images
-    # to make sure that we not failing due to other test left dirty env.
     deleted_images = list()
 
-    def mock_compute_mgmt_client(self):
-        def compute_mgmt_client():
+    def compute_mgmt_client(self):
+        def client():
             pass
-        compute_mgmt_client.images = lambda: None
-        compute_mgmt_client.galleries = lambda: None
-        compute_mgmt_client.gallery_images = lambda: None
-        compute_mgmt_client.gallery_image_versions = lambda: None
-        compute_mgmt_client.galleries.get = lambda rg, name: FakeGalleryAndImageDefinition()
-        compute_mgmt_client.gallery_images.list_by_gallery = lambda rg, name: [FakeGalleryAndImageDefinition()]
-        compute_mgmt_client.gallery_image_versions.list_by_gallery_image = lambda rg, gallery, definitionname: [1, 2, 3, 4, 5]
-        compute_mgmt_client.images.begin_delete = lambda rg, name: deleted_images.append(name)
-        return compute_mgmt_client
+        client.images = lambda: None
+        client.galleries = lambda: None
+        client.gallery_images = lambda: None
+        client.gallery_image_versions = lambda: None
+
+        client.galleries.list_by_resource_group = lambda rg: [
+            FakeGallery("gallery1"),
+            FakeGallery("gallery2")
+        ]
+
+        client.gallery_images.list_by_gallery = lambda rg, gallery: {
+            "gallery1": [FakeImage("image1")],
+            "gallery2": [FakeImage("image2")]
+        }[gallery]
+
+        client.gallery_image_versions.list_by_gallery_image = lambda rg, gallery, image: {
+            ("rg1", "gallery1", "image1"): [FakeVersion("v1"), FakeVersion("v2"), FakeVersion("v3")],
+            ("rg1", "gallery2", "image2"): [FakeVersion("v1"), FakeVersion("v2")]
+        }[(rg, gallery, image)]
+
+        client.images.begin_delete = lambda rg, name: deleted_images.append(name)
+        return client
+
+    def resource_mgmt_client(self):
+        def client():
+            pass
+        client.resource_groups = lambda: None
+        client.resource_groups.list = lambda: [FakeResourceGroup("rg1")]
+        return client
 
-    monkeypatch.setattr(Azure, 'compute_mgmt_client', mock_compute_mgmt_client)
+    monkeypatch.setattr(Azure, 'compute_mgmt_client', compute_mgmt_client)
+    monkeypatch.setattr(Azure, 'resource_mgmt_client', resource_mgmt_client)
 
 
 # This class is faking two unrelated entities: