diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-01 00:27:36 +0800 |
|---|---|---|
| committer | shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-01 00:27:36 +0800 |
| commit | 528ed804c77758d8e7270ec5a76cc5279330b086 (patch) | |
| tree | 5081084439f78d6b3c9230ea2bb6d73e34c1bea6 /tosca2heat/heat-translator/translator/hot | |
| parent | 5298fb1f996ab547c518b085e8c39fc5e0665bd9 (diff) | |
Fix network info output about compute node
In the template version of 2013-05-23, the intrinsic function of
get_attr doesn't support keys or indexes, it requires 2014-10-16 or
higher, the syntax is below:
get_attr:
<resource name>
<attribute name>
<key/index 1> (optional) not support in 2013-05-23
<key/index 2> (optional) not support in 2013-05-23
So the translation about compute node's ip address only uses two
parameters currently.
JIRA:PARSER-101
Change-Id: I51e5d7c04c329ede69ff3be61bbee2941b56ea93
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/heat-translator/translator/hot')
| -rw-r--r-- | tosca2heat/heat-translator/translator/hot/tests/test_translate_outputs.py | 4 | ||||
| -rw-r--r-- | tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tosca2heat/heat-translator/translator/hot/tests/test_translate_outputs.py b/tosca2heat/heat-translator/translator/hot/tests/test_translate_outputs.py index 955150e..c02a547 100644 --- a/tosca2heat/heat-translator/translator/hot/tests/test_translate_outputs.py +++ b/tosca2heat/heat-translator/translator/hot/tests/test_translate_outputs.py @@ -33,12 +33,12 @@ class ToscaTemplateOutputTest(TestCase): 'server, http://<IP>:3000', 'value': {'get_attr': - ['app_server', 'networks', 'private', 0]}}, + ['app_server', 'networks']}}, 'mongodb_url': {'description': 'URL for the mongodb server.', 'value': {'get_attr': - ['mongo_server', 'networks', 'private', 0]}}} + ['mongo_server', 'networks']}}} hot_translation_dict = \ toscaparser.utils.yamlparser.simple_parse(hot_translation) diff --git a/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py b/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py index 45637ec..9ceb049 100644 --- a/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py +++ b/tosca2heat/heat-translator/translator/hot/tosca/tosca_compute.py @@ -332,7 +332,7 @@ class ToscaCompute(HotResource): attriute.')) if attribute == 'private_address' or \ attribute == 'public_address': - attr['get_attr'] = [self.name, 'networks', 'private', 0] + attr['get_attr'] = [self.name, 'networks'] return attr |