B #7176: Fix incorrect datastore handling (#3740)

Signed-off-by: Mirko Stojiljkovic <mstojiljkovic@opennebula.io>
(cherry picked from commit 2255885)

Author: ms4ons

src/schedm_mad/remotes/one_drs/lib/mapper/ilp_optimizer.py

@@ -512,8 +512,9 @@ def _add_variables(self) -> None:
             #     continue
             if (vm_id, req_id) in used_shared_dstores:
                 dstore_id = used_shared_dstores[vm_id, req_id]
-                x_next_dstore_shared[vm_id, req_id, dstore_id] = 1.0
-                continue
+                if dstore_id in set(dstore_match.shared_dstores):
+                    x_next_dstore_shared[vm_id, req_id, dstore_id] = 1.0
+                    continue
             for host_id, disk_ids in dstore_match.host_dstores.items():
                 for disk_id in disk_ids:
                     x_name_idx = f"{vm_id}_{req_id}_{host_id}_{disk_id}"

src/schedm_mad/remotes/one_drs/lib/optimizer_parser.py

@@ -704,20 +704,15 @@ def _build_disk_capacity(self, host):
 
     def _build_used_dstores(self, vm):
         _, _, host_ds = self.get_ds_map()
-        for idx, disk in enumerate(vm.template.disk):
-            ds_id = int(
-                next(
-                    e.text
-                    for e in disk.any_element
-                    if e.qname.upper() == "DATASTORE_ID"
-                )
-            )
-            # Host DS
-            if ds_id in host_ds.keys():
-                self.used_host_dstores[(vm.id, idx)] = ds_id
-            # Shared system ds or image ds
-            else:
-                self.used_shared_dstores[(vm.id, idx)] = ds_id
+        vm_hist = vm.history_records.history
+        last_rec = max(vm_hist, key=lambda item: item.seq)
+        ds_id = last_rec.ds_id
+        # Host DS
+        if ds_id in host_ds.keys():
+            self.used_host_dstores[vm.id, 0] = ds_id
+        # Shared system ds or image ds
+        else:
+            self.used_shared_dstores[vm.id, 0] = ds_id
 
     def get_ds_map(self) -> tuple[set[int], set[int], dict[int, int]]:
         shared_ds, image_ds = set(), set()
@@ -728,7 +723,8 @@ def get_ds_map(self) -> tuple[set[int], set[int], dict[int, int]]:
             }
             if ds_attrs.get("TYPE") == "IMAGE_DS":
                 image_ds.add(int(ds.id))
-            elif ds_attrs.get("SHARED") == "YES":
+            # elif ds_attrs.get("SHARED") == "YES":
+            else:
                 shared_ds.add(int(ds.id))
         host_ds_dict = {
             int(host_ds.id): int(host.id)