From 04387deeab820e75c6d37d2ddd5b514cb7bcfd9e Mon Sep 17 00:00:00 2001 From: Pavel Aharoni Date: Sun, 11 Jun 2017 14:33:57 +0300 Subject: [SDC-32] separate Tosca Parser from DC Change-Id: I7e7f31ff2bd92fec22031f75b7051d129a21d01b Signed-off-by: Pavel Aharoni --- .../src/test/resources/config/configuration.yaml | 3 --- .../test/resources/config/error-configuration.yaml | 18 ------------------ .../resources/csars/1service-ServiceWithPorts.csar | Bin 47257 -> 0 bytes .../src/test/resources/csars/csar-invalid-zip.zip | 2 -- .../test/resources/csars/service-Renanatst2-csar.csar | Bin 321286 -> 0 bytes .../csars/service-ServiceFdnt-csar-0904-2.csar | Bin 41437 -> 0 bytes .../csars/service-ServiceFdnt-csar-no-vf.csar | Bin 39954 -> 0 bytes .../csars/service-ServiceFdnt-csar-rainy.csar | Bin 39892 -> 0 bytes .../resources/csars/service-ServiceFdnt-csar.csar | Bin 40171 -> 0 bytes .../csars/service-ServiceFdnt-test-csar.csar | Bin 39938 -> 0 bytes .../csars/service-ServiceFdnt-with-allotted.csar | Bin 45194 -> 0 bytes .../csars/service-ServiceFdnt-with-get-input.csar | Bin 45214 -> 0 bytes .../csars/service-entry-definition-not-defined.csar | Bin 45157 -> 0 bytes .../csars/service-invalid-conformence-level.csar | Bin 45194 -> 0 bytes .../resources/csars/service-invalid-input-args.csar | Bin 106698 -> 0 bytes .../csars/service-invalid-yaml-content-meta.csar | Bin 45198 -> 0 bytes .../csars/service-missing-entry-definition.csar | Bin 42668 -> 0 bytes .../resources/csars/service-missing-meta-file.csar | Bin 44893 -> 0 bytes 18 files changed, 23 deletions(-) delete mode 100644 sdc-tosca-parser/src/test/resources/config/configuration.yaml delete mode 100644 sdc-tosca-parser/src/test/resources/config/error-configuration.yaml delete mode 100644 sdc-tosca-parser/src/test/resources/csars/1service-ServiceWithPorts.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/csar-invalid-zip.zip delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-Renanatst2-csar.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-test-csar.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-entry-definition-not-defined.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-invalid-conformence-level.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-invalid-input-args.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-invalid-yaml-content-meta.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-missing-entry-definition.csar delete mode 100644 sdc-tosca-parser/src/test/resources/csars/service-missing-meta-file.csar (limited to 'sdc-tosca-parser/src/test/resources') diff --git a/sdc-tosca-parser/src/test/resources/config/configuration.yaml b/sdc-tosca-parser/src/test/resources/config/configuration.yaml deleted file mode 100644 index 379e962..0000000 --- a/sdc-tosca-parser/src/test/resources/config/configuration.yaml +++ /dev/null @@ -1,3 +0,0 @@ -conformanceLevel: - minVersion: '3.0' - maxVersion: '3.0' \ No newline at end of file diff --git a/sdc-tosca-parser/src/test/resources/config/error-configuration.yaml b/sdc-tosca-parser/src/test/resources/config/error-configuration.yaml deleted file mode 100644 index 3febd33..0000000 --- a/sdc-tosca-parser/src/test/resources/config/error-configuration.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# Errors -errors: - FILE_NOT_FOUND: { - code: TP0001, - message: "Error: CSAR file not found." - } - BAD_FORMAT: { - code: TP0002, - message: "Error: CSAR file bad format. Check the log for details." - } - CONFORMANCE_LEVEL_ERROR: { - code: TP0003, - message: "Error: CSAR version is unsupported. Parser supports versions %s to %s." - } - GENERAL_ERROR: { - code: TP0004, - message: "Error: an unexpected internal error occured." - } \ No newline at end of file diff --git a/sdc-tosca-parser/src/test/resources/csars/1service-ServiceWithPorts.csar b/sdc-tosca-parser/src/test/resources/csars/1service-ServiceWithPorts.csar deleted file mode 100644 index fa6577b..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/1service-ServiceWithPorts.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/csar-invalid-zip.zip b/sdc-tosca-parser/src/test/resources/csars/csar-invalid-zip.zip deleted file mode 100644 index 04de055..0000000 --- a/sdc-tosca-parser/src/test/resources/csars/csar-invalid-zip.zip +++ /dev/null @@ -1,2 +0,0 @@ -SDC-TOSCA-Meta-File-Version: 1.0 -SDC-TOSCA-Definitions-Version: 2.0 diff --git a/sdc-tosca-parser/src/test/resources/csars/service-Renanatst2-csar.csar b/sdc-tosca-parser/src/test/resources/csars/service-Renanatst2-csar.csar deleted file mode 100644 index 37baffb..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-Renanatst2-csar.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar deleted file mode 100644 index 4f57b71..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar deleted file mode 100644 index c35baf5..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-no-vf.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar deleted file mode 100644 index f3b3a46..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar-rainy.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar.csar b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar.csar deleted file mode 100644 index 983dc9b..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-csar.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-test-csar.csar b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-test-csar.csar deleted file mode 100644 index 5a364cd..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-test-csar.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar deleted file mode 100644 index ef6d03e..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar b/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar deleted file mode 100644 index 53aea49..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-entry-definition-not-defined.csar b/sdc-tosca-parser/src/test/resources/csars/service-entry-definition-not-defined.csar deleted file mode 100644 index 47e65b6..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-entry-definition-not-defined.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-invalid-conformence-level.csar b/sdc-tosca-parser/src/test/resources/csars/service-invalid-conformence-level.csar deleted file mode 100644 index 12621f0..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-invalid-conformence-level.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-invalid-input-args.csar b/sdc-tosca-parser/src/test/resources/csars/service-invalid-input-args.csar deleted file mode 100644 index 22f9970..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-invalid-input-args.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-invalid-yaml-content-meta.csar b/sdc-tosca-parser/src/test/resources/csars/service-invalid-yaml-content-meta.csar deleted file mode 100644 index f77af6f..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-invalid-yaml-content-meta.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-missing-entry-definition.csar b/sdc-tosca-parser/src/test/resources/csars/service-missing-entry-definition.csar deleted file mode 100644 index 8fd1962..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-missing-entry-definition.csar and /dev/null differ diff --git a/sdc-tosca-parser/src/test/resources/csars/service-missing-meta-file.csar b/sdc-tosca-parser/src/test/resources/csars/service-missing-meta-file.csar deleted file mode 100644 index 79348db..0000000 Binary files a/sdc-tosca-parser/src/test/resources/csars/service-missing-meta-file.csar and /dev/null differ -- cgit 1.2.3-korg