From 4b0ce5740e53fa68d0a2b8122cd997ca69121f7a Mon Sep 17 00:00:00 2001
From: Miguel Caballer <micafer1@upv.es>
Date: Wed, 14 Feb 2024 09:29:09 +0100
Subject: [PATCH] Improve code

---
 IM/tosca/Tosca.py | 52 ++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/IM/tosca/Tosca.py b/IM/tosca/Tosca.py
index d4f2aa7e..7d89d944 100644
--- a/IM/tosca/Tosca.py
+++ b/IM/tosca/Tosca.py
@@ -2119,8 +2119,33 @@ def _get_oscar_service_json(self, node):
 
         return res
 
+    def _gen_k8s_volumes(self, node, nodetemplates, value):
+        volumes = []
+        cont = 1
+        # volume format should be "volume_name:mount_path"
+        for vol in value:
+            vol_parts = vol.split(":")
+            volume = vol_parts[0]
+            mount_path = None
+            if len(vol_parts) > 1:
+                mount_path = "".join(vol_parts[1:])
+
+            # Find the volume BlockStorage node
+            for node in nodetemplates:
+                root_type = Tosca._get_root_parent_type(node).type
+                if root_type == "tosca.nodes.BlockStorage" and node.name == volume:
+                    size = self._final_function_result(node.get_property_value('size'), node)
+
+            if size:
+                if not size.endswith("B"):
+                    size += "B"
+                size = int(ScalarUnit_Size(size).get_num_from_scalar_unit('B'))
+            volumes.append((cont, size, mount_path))
+            cont += 1
+        return volumes
+
     def _gen_k8s_system(self, node, nodetemplates):
-        """Generate the system for an K8s container."""
+        """Get the volumes attached to an K8s container."""
         res = system(node.name)
         nets = []
 
@@ -2168,30 +2193,11 @@ def _gen_k8s_system(self, node, nodetemplates):
                         value = int(ScalarUnit_Size(value).get_num_from_scalar_unit('B'))
                         res.setValue("memory.size", value, 'B')
                     elif prop.name == 'volumes':
-                        cont = 1
-                        # volume format should be "volume_name:mount_path"
-                        for vol in value:
-                            vol_parts = vol.split(":")
-                            volume = vol_parts[0]
-                            mount_path = None
-                            if len(vol_parts) > 1:
-                                mount_path = "".join(vol_parts[1:])
-
-                            # Find the volume BlockStorage node
-                            for node in nodetemplates:
-                                root_type = Tosca._get_root_parent_type(node).type
-                                if root_type == "tosca.nodes.BlockStorage" and node.name == volume:
-                                    size = self._final_function_result(node.get_property_value('size'), node)
-
+                        for num, size, mount_path in self._gen_k8s_volumes(node, nodetemplates, value):
                             if size:
-                                if not size.endswith("B"):
-                                    size += "B"
-                                size = int(ScalarUnit_Size(size).get_num_from_scalar_unit('B'))
-                                res.setValue('disk.%d.size' % cont, size, 'B')
+                                res.setValue('disk.%d.size' % num, size, 'B')
                             if mount_path:
-                                res.setValue('disk.%d.mount_path' % cont, mount_path)
-                            cont += 1
-
+                                res.setValue('disk.%d.mount_path' % num, mount_path)
                     elif prop.name == 'publish_ports':
                         # Asume that publish_ports must be published as NodePort
                         pub = network("%s_pub" % node.name)