diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-07 16:07:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-07 16:07:04 +0000 |
| commit | 53df43e97a6e48cc1441baddb0ff621f660e5342 (patch) | |
| tree | db67866b9443fe14c40419b84d3b9e0df5fbc68b /tosca2heat/heat-translator/translator/hot | |
| parent | 5f7dfaf8af285fb94e919443bb6120f5327c067f (diff) | |
| parent | 528ed804c77758d8e7270ec5a76cc5279330b086 (diff) | |
Merge "Fix network info output about compute node"
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 |