From 4093d23ee81c1cbdf77f31323445f61efe22d5ba Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 27 Oct 2021 13:01:21 +0200 Subject: [PATCH 1/2] Fix #1231 --- IM/tosca/Tosca.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/IM/tosca/Tosca.py b/IM/tosca/Tosca.py index 823778b3e..2654afe96 100644 --- a/IM/tosca/Tosca.py +++ b/IM/tosca/Tosca.py @@ -397,7 +397,14 @@ def _add_node_nets(self, node, radl, system, nodetemplates): if cap_props and "private_ip" in cap_props: private_ip = self._final_function_result(cap_props["private_ip"].value, node) if cap_props and "ports" in cap_props: - ports = self._final_function_result(cap_props["ports"].value, node) + node_ports = self._final_function_result(cap_props["ports"].value, node) + if node_ports: + for p in node_ports.values(): + protocol = "tcp" + if "protocol" in p: + protocol = self._final_function_result(p["protocol"], node) + port = self._final_function_result(p["source"], node) + ports["im-%s-%s" % (protocol, port)] = {"protocol": protocol, "source": port} if cap_props and "port" in cap_props: port = self._final_function_result(cap_props["port"].value, node) protocol = "tcp" From be0aab8f41c8e36f058b572dde35ee92373170f0 Mon Sep 17 00:00:00 2001 From: Miguel Caballer Date: Wed, 27 Oct 2021 13:08:53 +0200 Subject: [PATCH 2/2] Fix #1231 --- IM/tosca/Tosca.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/IM/tosca/Tosca.py b/IM/tosca/Tosca.py index 2654afe96..1f4e65bf9 100644 --- a/IM/tosca/Tosca.py +++ b/IM/tosca/Tosca.py @@ -400,11 +400,7 @@ def _add_node_nets(self, node, radl, system, nodetemplates): node_ports = self._final_function_result(cap_props["ports"].value, node) if node_ports: for p in node_ports.values(): - protocol = "tcp" - if "protocol" in p: - protocol = self._final_function_result(p["protocol"], node) - port = self._final_function_result(p["source"], node) - ports["im-%s-%s" % (protocol, port)] = {"protocol": protocol, "source": port} + ports[id(p)] = p if cap_props and "port" in cap_props: port = self._final_function_result(cap_props["port"].value, node) protocol = "tcp"