summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshangxdy <shang.xiaodong@zte.com.cn>2016-09-08 00:30:24 +0800
committerxiaodong shang <shang.xiaodong@zte.com.cn>2016-09-07 16:38:04 +0000
commit25f5fcf39276a4658179aa8a6477cb92a65a2a0d (patch)
tree1c2d478290caccd23b382b70887f3bc4bc8f6b69
parentab3d502d62346220a9ddb6432964fe14424267e3 (diff)
Emergence merged for unit test.
Reversed merged caused the unit test error, i think this is the ci system's bug. Change-Id: I6d29f7f11cc0a78c695f179aa30c93545a575584 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn> (cherry picked from commit 23f466831a8284433609e9f770737830d0b448bf)
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml8
1 files changed, 0 insertions, 8 deletions
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml
index 26864a6..b8cc518 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml
@@ -474,8 +474,6 @@ outputs:
get_attr:
- MM_Active_Host
- networks
- - private
- - 0
private_ip_of_CM:
description: The private IP address of the CM.
@@ -483,8 +481,6 @@ outputs:
get_attr:
- CM_Active_Host
- networks
- - private
- - 0
private_ip_of_DM:
description: The private IP address of the DM.
@@ -492,8 +488,6 @@ outputs:
get_attr:
- DM_Host
- networks
- - private
- - 0
private_ip_of_LB:
description: The private IP address of the LB.
@@ -501,5 +495,3 @@ outputs:
get_attr:
- LB_Host
- networks
- - private
- - 0