Commit 9e578a77 authored by Spiros Koulouzis's avatar Spiros Koulouzis

fixed bug with ports

parent 1c0afedc
...@@ -91,6 +91,8 @@ def handle_delivery(message): ...@@ -91,6 +91,8 @@ def handle_delivery(message):
try: try:
for node_pair in nodes_pairs: for node_pair in nodes_pairs:
updated_node = deployService.deploy(node_pair) updated_node = deployService.deploy(node_pair)
if not updated_node:
print(updated_node)
if isinstance(updated_node, list): if isinstance(updated_node, list):
for node in updated_node: for node in updated_node:
tosca_template_dict = tosca_helper.set_node(node,tosca_template_dict) tosca_template_dict = tosca_helper.set_node(node,tosca_template_dict)
......
...@@ -32,6 +32,8 @@ class DeployService: ...@@ -32,6 +32,8 @@ class DeployService:
def deploy(self,nodes_pair): def deploy(self,nodes_pair):
target = nodes_pair[0] target = nodes_pair[0]
source = nodes_pair[1] source = nodes_pair[1]
if source.name == 'mongo':
print(source)
interface_types = tosca_helper.get_interface_types(source) interface_types = tosca_helper.get_interface_types(source)
if interface_types: if interface_types:
ansible_service = AnsibleService(self.semaphore_base_url, self.semaphore_username, self.semaphore_password) ansible_service = AnsibleService(self.semaphore_base_url, self.semaphore_username, self.semaphore_password)
...@@ -42,7 +44,10 @@ class DeployService: ...@@ -42,7 +44,10 @@ class DeployService:
if 'Kubernetes' in interface_types: if 'Kubernetes' in interface_types:
task_outputs = ansible_service.execute(nodes_pair, 'Kubernetes', self.vms, env_vars=env_vars) task_outputs = ansible_service.execute(nodes_pair, 'Kubernetes', self.vms, env_vars=env_vars)
source = self.set_attributes(task_outputs,source) source = self.set_attributes(task_outputs,source)
if not source:
print(source)
if not source:
print(source)
return source return source
def get_env_vars(self, nodes_pair): def get_env_vars(self, nodes_pair):
...@@ -59,6 +64,8 @@ class DeployService: ...@@ -59,6 +64,8 @@ class DeployService:
def set_attributes(self, task_outputs,source): def set_attributes(self, task_outputs,source):
# target = nodes_pair[0] # target = nodes_pair[0]
# source = nodes_pair[1] # source = nodes_pair[1]
if not source:
print(source)
if source.node_template.type == 'tosca.nodes.QC.docker.Orchestrator.Kubernetes': if source.node_template.type == 'tosca.nodes.QC.docker.Orchestrator.Kubernetes':
source = self.set_kubernetes_attributes(source=source,task_outputs=task_outputs) source = self.set_kubernetes_attributes(source=source,task_outputs=task_outputs)
if source.node_template.type == 'tosca.nodes.QC.Container.Application.Docker': if source.node_template.type == 'tosca.nodes.QC.Container.Application.Docker':
...@@ -66,6 +73,8 @@ class DeployService: ...@@ -66,6 +73,8 @@ class DeployService:
# lst = list(nodes_pair) # lst = list(nodes_pair)
# lst[1] = source # lst[1] = source
# nodes_pair = tuple(lst) # nodes_pair = tuple(lst)
if not source:
print(source)
return source return source
......
...@@ -76,6 +76,8 @@ class ToscaHelper: ...@@ -76,6 +76,8 @@ class ToscaHelper:
def set_node(self, updated_node, tosca_template_dict): def set_node(self, updated_node, tosca_template_dict):
node_templates = tosca_template_dict['topology_template']['node_templates'] node_templates = tosca_template_dict['topology_template']['node_templates']
for node_name in node_templates: for node_name in node_templates:
if not hasattr(updated_node, 'name'):
print(updated_node)
if node_name == updated_node.name: if node_name == updated_node.name:
node_templates[node_name] = updated_node.node_template.to_dict() node_templates[node_name] = updated_node.node_template.to_dict()
return tosca_template_dict return tosca_template_dict
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment