Merge pull request #1562 from grycap/devel

Devel
grycap · May 28, 2024 · dbe796b · dbe796b
2 parents bcd1649 + 80ebf91
commit dbe796b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/IM/connectors/Kubernetes.py b/IM/connectors/Kubernetes.py
@@ -269,6 +269,7 @@ def _create_volumes(self, namespace, system, pod_name, auth_data):
                     res.append((name, disk_size, disk_mount_path))
                 else:
                     self.log_error("Error creating PersistentVolumeClaim:" + name)
+                    self.error_messages += "Error creating PersistentVolumeClaim for pod %s" % name
 
             cont += 1
 

diff --git a/IM/tosca/Tosca.py b/IM/tosca/Tosca.py
@@ -468,13 +468,7 @@ def _get_node_endpoints(self, node, nodetemplates):
         """ Get all endpoint associated with a node """
         endpoints = []
 
-        # First add its own endpoints
-        node_caps = node.get_capabilities()
-        if node_caps:
-            if "endpoint" in node_caps and node_caps["endpoint"]:
-                endpoints.append(node_caps["endpoint"])
-
-        # Now other hosted nodes ones
+        # First add hosted nodes ones
         for other_node in nodetemplates:
             root_type = Tosca._get_root_parent_type(other_node).type
             compute = None
@@ -489,6 +483,12 @@ def _get_node_endpoints(self, node, nodetemplates):
                     if root_type == "tosca.capabilities.Endpoint":
                         endpoints.append(cap)
 
+        # Then add its own endpoints
+        node_caps = node.get_capabilities()
+        if node_caps:
+            if "endpoint" in node_caps and node_caps["endpoint"]:
+                endpoints.append(node_caps["endpoint"])
+
         return endpoints
 
     def _add_node_nets(self, node, radl, system, nodetemplates):