From 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 29 Jul 2018 16:13:45 +0300 Subject: re base code Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando --- .../runners/RunTenantIsolationCucumberCI.java | 5 +- .../steps/PrecannedTestExpectationCallback.java | 5 +- .../sdc/cucumber/steps/StepsTenantIsolationCI.java | 57 +++++++++------------ .../CI/csars/VLANTaggingFromAmdox1303_2018.csar | Bin 0 -> 47809 bytes .../src/test/resources/CI/csars/incorrect_cap.csar | Bin 0 -> 67120 bytes .../src/test/resources/CI/csars/with_groups.csar | Bin 0 -> 67119 bytes .../resources/CI/csars/with_groups_update.csar | Bin 0 -> 67118 bytes .../src/test/resources/CI/csars/without_caps.csar | Bin 0 -> 67067 bytes .../src/test/resources/CI/error-configuration.yaml | 2 +- .../config/test-apis-ci/configuration.yaml | 2 +- 10 files changed, 29 insertions(+), 42 deletions(-) create mode 100644 test-apis-ci/src/test/resources/CI/csars/VLANTaggingFromAmdox1303_2018.csar create mode 100644 test-apis-ci/src/test/resources/CI/csars/incorrect_cap.csar create mode 100644 test-apis-ci/src/test/resources/CI/csars/with_groups.csar create mode 100644 test-apis-ci/src/test/resources/CI/csars/with_groups_update.csar create mode 100644 test-apis-ci/src/test/resources/CI/csars/without_caps.csar (limited to 'test-apis-ci/src/test') diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java index d9183fc5c4..e2d324bae3 100644 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java +++ b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/runners/RunTenantIsolationCucumberCI.java @@ -1,13 +1,12 @@ package org.openecomp.sdc.cucumber.runners; +import cucumber.api.CucumberOptions; +import cucumber.api.junit.Cucumber; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.openecomp.sdc.conf.TestAPIConfDependentTest; -import cucumber.api.CucumberOptions; -import cucumber.api.junit.Cucumber; - @RunWith(Cucumber.class) @CucumberOptions(features = "classpath:cucumber/tenantIsolation.feature", glue = "org.openecomp.sdc.cucumber.steps") diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java index 56802ec7d4..0aec90479d 100644 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java +++ b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/PrecannedTestExpectationCallback.java @@ -1,14 +1,13 @@ package org.openecomp.sdc.cucumber.steps; -import static org.mockserver.model.HttpResponse.response; - +import com.google.common.net.HttpHeaders; import org.apache.http.entity.ContentType; import org.mockserver.mock.action.ExpectationCallback; import org.mockserver.model.Header; import org.mockserver.model.HttpRequest; import org.mockserver.model.HttpResponse; -import com.google.common.net.HttpHeaders; +import static org.mockserver.model.HttpResponse.response; public class PrecannedTestExpectationCallback implements ExpectationCallback { private static volatile int countRequests; diff --git a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java index 490b3e0c84..98c62912c1 100644 --- a/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java +++ b/test-apis-ci/src/test/java/org/openecomp/sdc/cucumber/steps/StepsTenantIsolationCI.java @@ -1,30 +1,16 @@ package org.openecomp.sdc.cucumber.steps; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; -import static org.mockserver.model.HttpCallback.callback; -import static org.mockserver.model.HttpRequest.request; -import static org.mockserver.model.HttpResponse.response; -import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.retryMethodOnResult; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.function.Function; -import java.util.stream.Collectors; - +import com.google.common.base.Strings; +import com.google.common.net.HttpHeaders; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import cucumber.api.java.After; +import cucumber.api.java.Before; +import cucumber.api.java.en.Given; +import cucumber.api.java.en.Then; +import cucumber.api.java.en.When; +import fj.data.Either; import org.apache.commons.collections.CollectionUtils; -//import org.openecomp.sdc.dmaap.DmaapPublisher; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpStatus; import org.apache.http.entity.ContentType; @@ -56,17 +42,20 @@ import org.openecomp.sdc.utils.DistributionActionResultEnum; import org.openecomp.sdc.utils.DistributionStatusEnum; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import com.google.common.base.Strings; -import com.google.common.net.HttpHeaders; -import com.google.gson.JsonElement; -import com.google.gson.JsonParser; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; -import cucumber.api.java.After; -import cucumber.api.java.Before; -import cucumber.api.java.en.Given; -import cucumber.api.java.en.Then; -import cucumber.api.java.en.When; -import fj.data.Either; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.mockserver.model.HttpCallback.callback; +import static org.mockserver.model.HttpRequest.request; +import static org.mockserver.model.HttpResponse.response; +import static org.openecomp.sdc.common.datastructure.FunctionalInterfaces.retryMethodOnResult; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + +//import org.openecomp.sdc.dmaap.DmaapPublisher; public class StepsTenantIsolationCI { diff --git a/test-apis-ci/src/test/resources/CI/csars/VLANTaggingFromAmdox1303_2018.csar b/test-apis-ci/src/test/resources/CI/csars/VLANTaggingFromAmdox1303_2018.csar new file mode 100644 index 0000000000..54897dc5dd Binary files /dev/null and b/test-apis-ci/src/test/resources/CI/csars/VLANTaggingFromAmdox1303_2018.csar differ diff --git a/test-apis-ci/src/test/resources/CI/csars/incorrect_cap.csar b/test-apis-ci/src/test/resources/CI/csars/incorrect_cap.csar new file mode 100644 index 0000000000..0ba608f12c Binary files /dev/null and b/test-apis-ci/src/test/resources/CI/csars/incorrect_cap.csar differ diff --git a/test-apis-ci/src/test/resources/CI/csars/with_groups.csar b/test-apis-ci/src/test/resources/CI/csars/with_groups.csar new file mode 100644 index 0000000000..823bd9a8a7 Binary files /dev/null and b/test-apis-ci/src/test/resources/CI/csars/with_groups.csar differ diff --git a/test-apis-ci/src/test/resources/CI/csars/with_groups_update.csar b/test-apis-ci/src/test/resources/CI/csars/with_groups_update.csar new file mode 100644 index 0000000000..a545480d15 Binary files /dev/null and b/test-apis-ci/src/test/resources/CI/csars/with_groups_update.csar differ diff --git a/test-apis-ci/src/test/resources/CI/csars/without_caps.csar b/test-apis-ci/src/test/resources/CI/csars/without_caps.csar new file mode 100644 index 0000000000..55d200c15a Binary files /dev/null and b/test-apis-ci/src/test/resources/CI/csars/without_caps.csar differ diff --git a/test-apis-ci/src/test/resources/CI/error-configuration.yaml b/test-apis-ci/src/test/resources/CI/error-configuration.yaml index 899a225152..7ff62b1e04 100644 --- a/test-apis-ci/src/test/resources/CI/error-configuration.yaml +++ b/test-apis-ci/src/test/resources/CI/error-configuration.yaml @@ -1494,7 +1494,7 @@ errors: # %2 - VF name # %3 - component type [VF ] GROUP_IS_MISSING: { - code: 400, + code: 404, message: "Error: Invalid Content. The groups '%1' cannot be found under %2 %3.", messageId: "SVC4624" } diff --git a/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml b/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml index f138ba15e5..70a3e5541e 100644 --- a/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml +++ b/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml @@ -23,7 +23,7 @@ beSslPort: 8443 version: 1.1.0 released: 2012-11-30 -toscaConformanceLevel: 5.0 +toscaConformanceLevel: 8.0 minToscaConformanceLevel: 3.0 titanCfgFile: /home/vagrant/catalog-be/config/catalog-be/titan.properties -- cgit 1.2.3-korg