diff options
| author |   Pavel Aharoni <pa0916@att.com> | 2017-06-27 17:27:56 +0300 |
|---|---|---|
| committer | Pavel Aharoni <pa0916@att.com> | 2017-06-27 17:28:14 +0300 |
| commit | 33641026fa9ea231d88b7ada341cac677b0389d1 (patch) | |
| tree | 79a254d3e76f7ccda37a6f8894e13d2c1b639c96 | |
| parent | 7516592d93f96273328a31e660bd9b0ee213e9d0 (diff) | |
[SDC-41] increase conformance level to 4.0
Change-Id: I974d90a25de9b495370b8ab03d845993d109db44
Signed-off-by: Pavel Aharoni <pa0916@att.com>
| -rw-r--r-- | src/main/resources/config/configuration.yaml | 2 | ||||
| -rw-r--r-- | src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java | 4 | ||||
| -rw-r--r-- | src/test/resources/config/configuration.yaml | 2 | ||||
| -rw-r--r-- | src/test/resources/csars/1service-ServiceWithPorts.csar | bin | 47257 -> 0 bytes | |||
| -rw-r--r-- | src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar | bin | 41437 -> 0 bytes | |||
| -rw-r--r-- | src/test/resources/csars/service-ServiceFdnt-with-get-input.csar | bin | 45490 -> 45490 bytes | |||
| -rw-r--r-- | src/test/resources/csars/service-consolidated-props-csar.csar (renamed from src/test/resources/csars/service-Renanatst2-csar.csar) | bin | 321286 -> 321286 bytes | |||
| -rw-r--r-- | src/test/resources/csars/service-sunny-flow.csar (renamed from src/test/resources/csars/service-ServiceFdnt-with-allotted.csar) | bin | 45194 -> 45194 bytes |
8 files changed, 4 insertions, 4 deletions
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<String, HashMap<String, List<String>>>(){ 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 Binary files differdeleted file mode 100644 index fa6577b..0000000 --- a/src/test/resources/csars/1service-ServiceWithPorts.csar +++ /dev/null diff --git a/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar b/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar Binary files differdeleted file mode 100644 index 4f57b71..0000000 --- a/src/test/resources/csars/service-ServiceFdnt-csar-0904-2.csar +++ /dev/null diff --git a/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar b/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar Binary files differindex 995fd41..c5a277b 100644 --- a/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar +++ b/src/test/resources/csars/service-ServiceFdnt-with-get-input.csar diff --git a/src/test/resources/csars/service-Renanatst2-csar.csar b/src/test/resources/csars/service-consolidated-props-csar.csar Binary files differindex 37baffb..37baffb 100644 --- a/src/test/resources/csars/service-Renanatst2-csar.csar +++ b/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 Binary files differindex ef6d03e..ef6d03e 100644 --- a/src/test/resources/csars/service-ServiceFdnt-with-allotted.csar +++ b/src/test/resources/csars/service-sunny-flow.csar |