From a04cdab7bd95502d9b537db790f4ecbbbf82b7d0 Mon Sep 17 00:00:00 2001
From: shangxdy <shang.xiaodong@zte.com.cn>
Date: Mon, 19 Sep 2016 23:18:22 +0800
Subject: Delete not used property from vRNC
Delete not used property from vRNC,such as activestatus
and id.
Change-Id: I14b4563663d220c241440dff0244ccbadff7912b
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
---
tests/functest_run.sh | 2 +-
.../translator/tests/data/vRNC/Definitions/vRNC.yaml | 10 ----------
.../extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml | 10 ----------
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/tests/functest_run.sh b/tests/functest_run.sh
index c3ce601..7b65da0 100755
--- a/tests/functest_run.sh
+++ b/tests/functest_run.sh
@@ -142,7 +142,7 @@ make_patch_for_translated_file() {
# Replace the signal_transport
echo " Patch yaml file: ${VRNC_OUTPUT_TEMPLATE_FILE}"
echo ""
- echo " Patching compute:signal_transport:"
+ echo " Patching compute:signal_transport"
sed -i '1,$s/HEAT_SIGNAL/NO_SIGNAL/g' ${VRNC_OUTPUT_TEMPLATE_FILE}
}
diff --git a/tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/vRNC.yaml b/tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/vRNC.yaml
index bf57c70..6c9b092 100644
--- a/tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/vRNC.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/vRNC/Definitions/vRNC.yaml
@@ -108,9 +108,6 @@ topology_template:
MM_Active_Host:
type: rnc.nodes.compute.MM
- properties:
- activestatus: 1
- id: MM_Active
capabilities:
os:
properties: *compute_props_os_DEF
@@ -139,9 +136,6 @@ topology_template:
MM_Passive_Host:
type: rnc.nodes.compute.MM
- properties:
- activestatus: 0
- id: MM_Passive
capabilities:
os:
properties: *compute_props_os_DEF
@@ -180,8 +174,6 @@ topology_template:
CM_Active_Host:
type: rnc.nodes.compute.CM
- properties:
- activestatus: 1
capabilities:
os:
properties: *compute_props_os_DEF
@@ -211,8 +203,6 @@ topology_template:
CM_Passive_Host:
type: rnc.nodes.compute.CM
- properties:
- activestatus: 0
capabilities:
os:
properties: *compute_props_os_DEF
diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml
index 15ca91b..921301b 100644
--- a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml
@@ -108,9 +108,6 @@ topology_template:
MM_Active_Host:
type: rnc.nodes.compute.MM
- properties:
- activestatus: 1
- id: MM_Active
capabilities:
os:
properties: *compute_props_os_DEF
@@ -139,9 +136,6 @@ topology_template:
MM_Passive_Host:
type: rnc.nodes.compute.MM
- properties:
- activestatus: 0
- id: MM_Passive
capabilities:
os:
properties: *compute_props_os_DEF
@@ -180,8 +174,6 @@ topology_template:
CM_Active_Host:
type: rnc.nodes.compute.CM
- properties:
- activestatus: 1
capabilities:
os:
properties: *compute_props_os_DEF
@@ -211,8 +203,6 @@ topology_template:
CM_Passive_Host:
type: rnc.nodes.compute.CM
- properties:
- activestatus: 0
capabilities:
os:
properties: *compute_props_os_DEF
--
cgit