From: shangxdy <shang.xiaodong@zte.com.cn>
Date: Fri, 22 Apr 2016 12:04:03 +0000 (-0400)
Subject: Bug:tosca.nodes.nfv.CP definition is error
X-Git-Tag: colorado.1.0~85
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F12567%2F2;p=parser.git

Bug:tosca.nodes.nfv.CP definition is error

 1、The virtualLink requirement of tosca.nodes.nfv.CP defined below:
     - virtualLink:
         capability: tosca.capabilities.VirtualLinkable
   But the tosca.capabilities.VirtualLinkable does not exsit in simple
   tosca(which is tosca.capabilities.Linkable), it should be
   tosca.capabilities.nfv.VirtualLinkable in nfv tosca.

   Additonally, the attribute definition of IP_address in CP is not
   needed because the parent node type tosca.nodes.network.Port
   also includes the same attributes ip_address.

 2、The bug will be submitted to openstack community.

JIRA:PARSER-32

Change-Id: I8f70747675dd6623380493d0436d9516c545d705
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
---

diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/TOSCA_nfv_definition_1_0.yaml b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/TOSCA_nfv_definition_1_0.yaml
index b82250e..69cd38d 100644
--- a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/TOSCA_nfv_definition_1_0.yaml
+++ b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/TOSCA_nfv_definition_1_0.yaml
@@ -65,17 +65,13 @@ tosca.nodes.nfv.CP:
       required: false
   requirements:
     - virtualLink:
-        capability: tosca.capabilities.VirtualLinkable
+        capability: tosca.capabilities.nfv.VirtualLinkable
         relationship: tosca.relationships.nfv.VirtualLinksTo
         node: tosca.nodes.nfv.VL
     - virtualBinding:
         capability: tosca.capabilities.nfv.VirtualBindable
         relationship: tosca.relationships.nfv.VirtualBindsTo
         node: tosca.nodes.nfv.VDU
-  attributes:
-    IP_address:
-      type: string
-      required: false
 
 tosca.nodes.nfv.VL:
   derived_from: tosca.nodes.network.Network