From 10ac81e353b0c5f6e59928bc96faed26292b4520 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Wed, 25 May 2016 20:30:02 -0400 Subject: [PATCH] Fixes NFV VNFFG and groups Fixes Include: - nfv.VNFFG type does not include "targets" in its properties in the TOSCA NFV spec. The usage of "targets" should actually be "members" which is defined in the core group.Root definition. - Removes vnf.VNFFG requirements which are not part of the spec. - Fixes reference to TARGETS in groups.py SECTIONS Change-Id: I0990eb9c1339943b420a2896c4cc59663a328393 Signed-off-by: Tim Rozet --- .../extensions/nfv/TOSCA_nfv_definition_1_0.yaml | 13 ------------- toscaparser/groups.py | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/toscaparser/extensions/nfv/TOSCA_nfv_definition_1_0.yaml b/toscaparser/extensions/nfv/TOSCA_nfv_definition_1_0.yaml index 660cdc0f..dc986e56 100644 --- a/toscaparser/extensions/nfv/TOSCA_nfv_definition_1_0.yaml +++ b/toscaparser/extensions/nfv/TOSCA_nfv_definition_1_0.yaml @@ -235,16 +235,3 @@ tosca.groups.nfv.VNFFG: type: string required: true description: Reference to a list of VNFD used in this VNF Forwarding Graph - - targets: - type: list - entry_schema: - type: string - required: false - description: list of Network Forwarding Path within the VNFFG - - requirements: - - forwarder: - capability: tosca.capabilities.nfv.Forwarder - relationship: tosca.relationships.nfv.ForwardsTo - diff --git a/toscaparser/groups.py b/toscaparser/groups.py index 5fd5dece..6a3e5c73 100644 --- a/toscaparser/groups.py +++ b/toscaparser/groups.py @@ -15,7 +15,7 @@ from toscaparser.common.exception import UnknownFieldError from toscaparser.entity_template import EntityTemplate from toscaparser.utils import validateutils -SECTIONS = (TYPE, METADATA, DESCRIPTION, PROPERTIES, TARGETS, INTERFACES) = \ +SECTIONS = (TYPE, METADATA, DESCRIPTION, PROPERTIES, MEMBERS, INTERFACES) = \ ('type', 'metadata', 'description', 'properties', 'members', 'interfaces')