From 33641026fa9ea231d88b7ada341cac677b0389d1 Mon Sep 17 00:00:00 2001 From: Pavel Aharoni Date: Tue, 27 Jun 2017 17:27:56 +0300 Subject: [SDC-41] increase conformance level to 4.0 Change-Id: I974d90a25de9b495370b8ab03d845993d109db44 Signed-off-by: Pavel Aharoni --- src/main/resources/config/configuration.yaml | 2 +- .../openecomp/sdc/impl/SdcToscaParserBasicTest.java | 4 ++-- src/test/resources/config/configuration.yaml | 2 +- .../resources/csars/1service-ServiceWithPorts.csar | Bin 47257 -> 0 bytes .../resources/csars/service-Renanatst2-csar.csar | Bin 321286 -> 0 bytes .../csars/service-ServiceFdnt-csar-0904-2.csar | Bin 41437 -> 0 bytes .../csars/service-ServiceFdnt-with-allotted.csar | Bin 45194 -> 0 bytes .../csars/service-ServiceFdnt-with-get-input.csar | Bin 45490 -> 45490 bytes .../csars/service-consolidated-props-csar.csar | Bin 0 -> 321286 bytes src/test/resources/csars/service-sunny-flow.csar | Bin 0 -> 45194 bytes 10 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 src/test/resources/csars/1service-ServiceWithPorts.csar delete mode 100644 src/test/resources/csars/service-Renanatst2-csar.csar delete mode 100644 src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar delete mode 100644 src/test/resources/csars/service-ServiceFdnt-with-allotted.csar create mode 100644 src/test/resources/csars/service-consolidated-props-csar.csar create mode 100644 src/test/resources/csars/service-sunny-flow.csar diff --git a/src/main/resources/config/configuration.yaml b/src/main/resources/config/configuration.yaml index 379e962..117ebbe 100644 --- a/src/main/resources/config/configuration.yaml +++ b/src/main/resources/config/configuration.yaml @@ -1,3 +1,3 @@ conformanceLevel: minVersion: '3.0' - maxVersion: '3.0' \ No newline at end of file + maxVersion: '4.0' \ No newline at end of file diff --git a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java b/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java index 7ea231c..2039645 100644 --- a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java +++ b/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java @@ -32,10 +32,10 @@ public abstract class SdcToscaParserBasicTest { public static void init() throws SdcToscaParserException, JToscaException, IOException { factory = SdcToscaParserFactory.getInstance(); - fdntCsarHelper = getCsarHelper("csars/service-ServiceFdnt-with-allotted.csar"); + fdntCsarHelper = getCsarHelper("csars/service-sunny-flow.csar"); rainyCsarHelperMultiVfs = getCsarHelper("csars/service-ServiceFdnt-csar-rainy.csar"); rainyCsarHelperSingleVf = getCsarHelper("csars/service-ServiceFdnt-csar.csar"); - complexCps = getCsarHelper("csars/service-Renanatst2-csar.csar"); + complexCps = getCsarHelper("csars/service-consolidated-props-csar.csar"); fdntCsarHelperWithInputs = getCsarHelper("csars/service-ServiceFdnt-with-get-input.csar"); fdntCsarHelper_Data = new HashMap>>(){ diff --git a/src/test/resources/config/configuration.yaml b/src/test/resources/config/configuration.yaml index 379e962..117ebbe 100644 --- a/src/test/resources/config/configuration.yaml +++ b/src/test/resources/config/configuration.yaml @@ -1,3 +1,3 @@ conformanceLevel: minVersion: '3.0' - maxVersion: '3.0' \ No newline at end of file + maxVersion: '4.0' \ No newline at end of file diff --git a/src/test/resources/csars/1service-ServiceWithPorts.csar b/src/test/resources/csars/1service-ServiceWithPorts.csar deleted file mode 100644 index fa6577b..0000000 Binary files a/src/test/resources/csars/1service-ServiceWithPorts.csar and /dev/null differ diff --git a/src/test/resources/csars/service-Renanatst2-csar.csar b/src/test/resources/csars/service-Renanatst2-csar.csar deleted file mode 100644 index 37baffb..0000000 Binary files a/src/test/resources/csars/service-Renanatst2-csar.csar and /dev/null differ diff --git a/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar b/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar deleted file mode 100644 index 4f57b71..0000000 Binary files a/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar and /dev/null differ diff --git a/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar b/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar deleted file mode 100644 index ef6d03e..0000000 Binary files a/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar and /dev/null differ diff --git a/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar b/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar index 995fd41..c5a277b 100644 Binary files a/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar and b/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar differ diff --git a/src/test/resources/csars/service-consolidated-props-csar.csar b/src/test/resources/csars/service-consolidated-props-csar.csar new file mode 100644 index 0000000..37baffb Binary files /dev/null and b/src/test/resources/csars/service-consolidated-props-csar.csar differ diff --git a/src/test/resources/csars/service-sunny-flow.csar b/src/test/resources/csars/service-sunny-flow.csar new file mode 100644 index 0000000..ef6d03e Binary files /dev/null and b/src/test/resources/csars/service-sunny-flow.csar differ -- cgit 1.2.3-korg