From: Pavel Aharoni Date: Tue, 27 Jun 2017 14:27:56 +0000 (+0300) Subject: [SDC-41] increase conformance level to 4.0 X-Git-Tag: v1.1.32~18 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=33641026fa9ea231d88b7ada341cac677b0389d1;p=sdc%2Fsdc-tosca.git [SDC-41] increase conformance level to 4.0 Change-Id: I974d90a25de9b495370b8ab03d845993d109db44 Signed-off-by: Pavel Aharoni --- 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-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-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-Renanatst2-csar.csar b/src/test/resources/csars/service-consolidated-props-csar.csar similarity index 100% rename from src/test/resources/csars/service-Renanatst2-csar.csar rename to src/test/resources/csars/service-consolidated-props-csar.csar diff --git a/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar b/src/test/resources/csars/service-sunny-flow.csar similarity index 100% rename from src/test/resources/csars/service-ServiceFdnt-with-allotted.csar rename to src/test/resources/csars/service-sunny-flow.csar