Skip to content

Commit

Permalink
Merge pull request #1535 from grycap/devel
Browse files Browse the repository at this point in the history 
Devel
  • Loading branch information
@micafer
micafer authored Feb 27, 2024
2 parents 8ccca74 + c918cf1 commit 62ea29a
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 136 deletions.
142 changes: 36 additions & 106 deletions IM/tosca/Tosca.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import logging
import yaml
import copy
import operator
import requests_cache
import json
import re
Expand Down Expand Up @@ -1523,118 +1522,26 @@ def _final_function_result(self, func, node, inf_info=None):
# TODO: resolve function values related with run-time values as IM
# or ansible variables

def _find_host_node(self, node, nodetemplates, base_root_type="tosca.nodes.Compute"):
def _find_host_node(self, node, nodetemplates, base_root_type="tosca.nodes.Compute", node_type=None):
"""
Select the node to host each node, using the node requirements
In most of the cases the are directly specified, otherwise "node_filter" is used
Select the node to host each node
"""

# check for a HosteOn relation
root_type = Tosca._get_root_parent_type(node).type
if root_type == base_root_type:
if node_type and node.type == node_type:
return node
else:
root_type = Tosca._get_root_parent_type(node).type
if root_type == base_root_type:
return node

if node.requirements:
for r, n in node.relationships.items():
# check for a HosteOn relation
if Tosca._is_derived_from(r, r.HOSTEDON) or Tosca._is_derived_from(r, r.BINDSTO):
root_type = Tosca._get_root_parent_type(n).type
if root_type == base_root_type:
return n
else:
return self._find_host_node(n, nodetemplates)

# There are no direct HostedOn node
# check node_filter requirements
if node.requirements and base_root_type == "tosca.nodes.Compute":
for requires in node.requirements:
if 'host' in requires:
value = requires.get('host')
if isinstance(value, dict):
if 'node_filter' in value:
node_filter = value.get('node_filter')
return self._get_compute_from_node_filter(node_filter, nodetemplates)

return None

def _node_fulfill_filter(self, node, node_filter):
"""
Check if a node fulfills the features of a node filter
"""

# Get node properties
node_props = {}
for cap_type in ['os', 'host']:
if node.get_capability(cap_type):
for prop in node.get_capability(cap_type).get_properties_objects():
if prop.value is not None:
unit = None
value = self._final_function_result(prop.value, node)
if prop.name in ['disk_size', 'mem_size']:
value, unit = Tosca._get_size_and_unit(value)
node_props[prop.name] = (value, unit)

filter_props = {}
# Get node_filter properties
for elem in node_filter:
if isinstance(elem, dict):
for cap_type in ['os', 'host']:
if cap_type in elem:
for p in elem.get(cap_type).get('properties'):
p_name = list(p.keys())[0]
p_value = list(p.values())[0]
if isinstance(p_value, dict):
filter_props[p_name] = (list(p_value.keys())[0],
list(p_value.values())[0])
else:
filter_props[p_name] = ("equal", p_value)

operator_map = {
'equal': operator.eq,
'greater_than': operator.gt,
'greater_or_equal': operator.ge,
'less_than': operator.lt,
'less_or_equal': operator.le
}

# Compare the properties
for name, value in filter_props.items():
op, filter_value = value
if name in ['disk_size', 'mem_size']:
filter_value, _ = Tosca._get_size_and_unit(filter_value)

if name in node_props:
node_value, _ = node_props[name]
conv_operator = operator_map.get(op, None)
if conv_operator:
comparation = conv_operator(node_value, filter_value)
else:
if op == "in_range":
comparation = node_value >= filter_value[0] and node_value <= filter_value[1]
elif op == "valid_values":
comparation = node_value in filter_value
else:
Tosca.logger.warning("Logical operator %s not supported." % op)

if not comparation:
return False
else:
# if this property is not specified in the node, return False
# TODO: we must think about default values
return False

return True

def _get_compute_from_node_filter(self, node_filter, nodetemplates):
"""
Select the first node that fulfills the specified "node_filter"
"""

for node in nodetemplates:
root_type = Tosca._get_root_parent_type(node).type

if root_type == "tosca.nodes.Compute":
if self._node_fulfill_filter(node, node_filter.get('capabilities')):
return node
return self._find_host_node(n, nodetemplates, base_root_type, node_type)

return None

Expand Down Expand Up @@ -1789,6 +1696,25 @@ def _add_ansible_roles(self, node, nodetemplates, system):
feature = Feature('disk.0.applications', 'contains', app_features)
system.addFeature(feature)

def _get_operator(self, value):
"""
Get the operator for a value
"""
operator_map = {
'equal': '=',
'greater_than': '>',
'greater_or_equal': '>=',
'less_than': '<',
'less_or_equal': '<='
}

if isinstance(value, dict) and len(value) == 1:
operator = operator_map.get(list(value.keys())[0])
value = list(value.values())[0]
else:
operator = None
return operator, value

def _gen_system(self, node, nodetemplates):
"""
Take a node of type "Compute" and get the RADL.system to represent it
Expand Down Expand Up @@ -1867,10 +1793,14 @@ def _gen_system(self, node, nodetemplates):
elif prop.name in ["preemtible_instance", "sgx"]:
value = 'yes' if value else 'no'

if isinstance(value, float) or isinstance(value, int):
operator = ">="
operator, new_value = self._get_operator(value)
if operator:
value = new_value
else:
operator = "="
if isinstance(value, float) or isinstance(value, int):
operator = ">="
else:
operator = "="

feature = Feature(name, operator, value, unit)
res.addFeature(feature)
Expand Down Expand Up @@ -2276,7 +2206,7 @@ def _gen_k8s_system(self, node, nodetemplates):
variables += "%s=%s" % (k, v)
res.setValue("environment.variables", variables)

runtime = self._find_host_node(node, nodetemplates, base_root_type="tosca.nodes.SoftwareComponent")
runtime = self._find_host_node(node, nodetemplates, node_type="tosca.nodes.Container.Runtime.Docker")

if runtime:
# Get the properties of the runtime
Expand Down
15 changes: 1 addition & 14 deletions examples/tosca.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,7 @@ topology_template:
properties:
root_password: { get_input: mysql_root_password }
requirements:
- host:
node_filter:
capabilities:
# Constraints for selecting “host” (Container Capability)
- host:
properties:
- num_cpus: { in_range: [1,4] }
- mem_size: { greater_or_equal: 1 GB }
# Constraints for selecting “os” (OperatingSystem Capability)
- os:
properties:
- architecture: { equal: x86_64 }
- type: linux
- distribution: ubuntu
- host: db_server

db_server:
type: tosca.nodes.Compute
Expand Down
17 changes: 1 addition & 16 deletions test/files/tosca_long.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ topology_template:
properties:
# host Operating System image properties
type: linux
architecture: { equal: x86_64 }
#distribution: scientific
#version: 6.6
requirements:
Expand All @@ -198,22 +199,6 @@ topology_template:
size: 10 GB
type: ssd

mysql:
type: tosca.nodes.DBMS
requirements:
- host:
node_filter:
capabilities:
# Constraints for selecting "host" (Container Capability)
- host:
properties:
- num_cpus: { in_range: [ 1, 4 ] }
- mem_size: { greater_or_equal: 2 GB }
# Constraints for selecting "os" (OperatingSystem Capability)
- os:
properties:
- type: linux

outputs:
galaxy_url:
value: { concat: [ 'http://', get_attribute: [ lrms_server, public_address, 0 ], ':8080' ] }
Expand Down
1 change: 1 addition & 0 deletions test/unit/Tosca.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def test_tosca_to_radl(self):

lrms_wn = radl.get_system_by_name('lrms_wn')
self.assertEqual(lrms_wn.getValue('memory.size'), 2000000000)
self.assertEqual(lrms_wn.getValue('cpu.arch'), 'x86_64')
lrms_server = radl.get_system_by_name('lrms_server')
self.assertEqual(lrms_server.getValue('instance_name'), 'myslurmserver')
self.assertEqual(lrms_server.getValue('memory.size'), 1000000000)
Expand Down

0 comments on commit 62ea29a

Please sign in to comment.