diff options
| author |   andre.schmid <andre.schmid@est.tech> | 2019-07-12 12:33:10 +0000 |
|---|---|---|
| committer |   Oren Kleks <orenkle@amdocs.com> | 2019-07-21 09:37:45 +0000 |
| commit | 22360c78d550a25b9bdaea12cdb208371b69a488 (patch) | |
| tree | e8dc4fdc7ab5933ba13e68f081f185a7153bb8ae /openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter | |
| parent | 9a3add2d727723877bbc6119d9b1f4a5d49fccc6 (diff) | |
Allow relative path for SOL004 descriptors import
Allow the use of relative path on SOL004 descriptors imports. Resolves
imports with "/", "../" or "./" entries during validation and package
processing.
Validate if the reference is inside the package.
Fix problem where imported descriptor files, described as a non string
scalar yaml entry, were not being checked by the validator.
Change-Id: Ie5a32736b6090b4adf178e8714f7460bcd068def
Issue-ID: SDC-2422
Signed-off-by: andre.schmid <andre.schmid@est.tech>
Diffstat (limited to 'openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter')
2 files changed, 3 insertions, 2 deletions
diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter/sample_import2.yaml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter/sample_import2.yaml index 42816eeb73..b77ff08d52 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter/sample_import2.yaml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter/sample_import2.yaml @@ -3,4 +3,4 @@ description: ETSI NFV SOL 001 pnfd types definitions version 2.5.1 imports: - sample_import2.yaml - - Artifacts/sample_import3.yaml
\ No newline at end of file + - ../Artifacts/sample_import3.yaml
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter/sample_import3.yaml b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter/sample_import3.yaml index 99eb46be4d..8656e5befe 100644 --- a/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter/sample_import3.yaml +++ b/openecomp-be/lib/openecomp-tosca-converter-lib/openecomp-tosca-converter-core/src/test/resources/toscaSOlConverter/sample_import3.yaml @@ -2,4 +2,5 @@ tosca_definitions_version: tosca_simple_yaml_1_2 description: ETSI NFV SOL 001 pnfd types definitions version 2.5.1 imports: - - sample_import4.yaml
\ No newline at end of file + - /Artifacts/sample_import4.yaml + - /sample_import5.yaml
\ No newline at end of file |