diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2016-08-22 15:34:10 +0800 |
|---|---|---|
| committer | shangxdy <shang.xiaodong@zte.com.cn> | 2016-08-22 15:34:10 +0800 |
| commit | 1a0bd86750c00b06b2161426c5154dee557c3e70 (patch) | |
| tree | c7b1d7bf0d3444a59c8ea5e3cc5b3a0f8a9d53cc | |
| parent | 6fecb729f550f4f543739375df8148ab9de38668 (diff) | |
Remove the cyclic dependencies in vRNC definition
Current the high_availability definition in vRNC about active MM/CM VDUs
and passive MM/CM VDUs is cyclic dependencies, and the consequence is
deployment of vRNC may fall into a infinite loop.
The correct definition is passive VDU depend on the active VDU, but the
active VDU doesn't depend on the passive VDU.
JIRA:PARSER-95
Change-Id: I3f2fb8c0ce959878b12d7da49e2dc81596b4b528
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
| -rw-r--r-- | docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml | 3 | ||||
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml b/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml index 83283f3..281b064 100644 --- a/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml +++ b/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml @@ -96,7 +96,6 @@ topology_template: - local_storage: node: MM_BlockStorage relationship: Storage_attachesto - - high_availability: MM_Passive artifacts: #the VM image of MM vm_image: mm.image @@ -149,8 +148,6 @@ topology_template: min_instances: 1 max_instances: 126 default_instances: 1 - requirements: - - high_availability: CM_Passive artifacts: #the VM image of CM vm_image: cm.image 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 7068c7a..a134e3c 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 @@ -120,7 +120,6 @@ topology_template: - local_storage: node: MM_BlockStorage relationship: Storage_attachesto - - high_availability: MM_Passive artifacts: #the VM image of MM vm_image: mm.image @@ -184,8 +183,6 @@ topology_template: min_instances: 1 max_instances: 12 default_instances: 1 - requirements: - - high_availability: CM_Passive artifacts: #the VM image of CM vm_image: cm.image |