diff options
| author |   julien zhang <zhang.jun3g@zte.com.cn> | 2016-07-08 06:06:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-07-08 06:06:46 +0000 |
| commit | 870d910efa510e768b19785ec677ddb731c49bb0 (patch) | |
| tree | a82cc076d744875b2631e61aeed1c4f9c37196fb /tosca2heat/heat-translator/translator/hot/syntax | |
| parent | eac8aa9137c62d3f1a8fe20ef7bde7560b6d4aca (diff) | |
| parent | 35292c4c212962cff59c2c35420435d77804375b (diff) | |
Merge "Affinity and anti-affinity translate to heat resource type"
Diffstat (limited to 'tosca2heat/heat-translator/translator/hot/syntax')
| -rw-r--r-- | tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py b/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py index d7d0100..bbbeb46 100644 --- a/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py +++ b/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py @@ -320,7 +320,9 @@ class HotResource(object): node_type = node.type_definition if isinstance(node_type, str) or \ - node_type.type == "tosca.policies.Placement": + node_type.type == "tosca.policies.Placement"or \ + node_type.type == "tosca.policies.Colocate" or \ + node_type.type == "tosca.policies.Antilocate": return operations while True: @@ -338,7 +340,9 @@ class HotResource(object): def _get_interface_operations_from_type(node_type, node, lifecycle_name): operations = {} if isinstance(node_type, str) or \ - node_type.type == "tosca.policies.Placement": + node_type.type == "tosca.policies.Placement" or \ + node_type.type == "tosca.policies.Colocate" or \ + node_type.type == "tosca.policies.Antilocate": return operations if node_type.interfaces and lifecycle_name in node_type.interfaces: for name, elems in node_type.interfaces[lifecycle_name].items(): @@ -354,7 +358,9 @@ class HotResource(object): @staticmethod def get_base_type(node_type): if node_type.parent_type is not None: - if node_type.parent_type.type.endswith('.Root'): + if node_type.parent_type.type.endswith('.Root') or \ + node_type.type == "tosca.policies.Colocate" or \ + node_type.type == "tosca.policies.Antilocate": return node_type else: return HotResource.get_base_type(node_type.parent_type) |