summaryrefslogtreecommitdiffstats
path: root/tosca2heat/tosca-parser/toscaparser/extensions
diff options
context:
space:
mode:
authorshangxdy <shang.xiaodong@zte.com.cn>2016-07-08 15:15:00 +0800
committershangxdy <shang.xiaodong@zte.com.cn>2016-07-10 00:38:59 +0800
commit0997552722dc4845a854e0e6f8d7f18058e26380 (patch)
treeb90d1e808bb326612211ba56b3b941516493398d /tosca2heat/tosca-parser/toscaparser/extensions
parent7fe3011a67a239f7dc04153c54eaff78ef967eaf (diff)
Synchronise the openstack bugs
When run unittests through tox, some test cases are always error, the errors are already done in openstack community, so it's necessary to synchronise the fixes. Change-Id: Ib29078e6cc138a474e89c6a2cc90ad7a1db1bb46 JIRA: PARSER-63 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/tosca-parser/toscaparser/extensions')
-rw-r--r--tosca2heat/tosca-parser/toscaparser/extensions/exttools.py2
-rw-r--r--tosca2heat/tosca-parser/toscaparser/extensions/nfv/TOSCA_nfv_definition_1_0.yaml13
2 files changed, 1 insertions, 14 deletions
diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/exttools.py b/tosca2heat/tosca-parser/toscaparser/extensions/exttools.py
index 963b958..5310422 100644
--- a/tosca2heat/tosca-parser/toscaparser/extensions/exttools.py
+++ b/tosca2heat/tosca-parser/toscaparser/extensions/exttools.py
@@ -36,7 +36,7 @@ class ExtTools(object):
extdirs = [e for e in os.listdir(abs_path) if
not e.startswith('tests') and
- not e.endswith('.pyc') and not e.endswith('.py')]
+ os.path.isdir(os.path.join(abs_path, e))]
for e in extdirs:
log.info(e)
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 660cdc0..dc986e5 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
@@ -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
-