summaryrefslogtreecommitdiffstats
path: root/asdc-controller/src
diff options
context:
space:
mode:
authorBenjamin, Max (mb388a) <mb388a@us.att.com>2019-06-07 20:28:02 -0400
committerBenjamin, Max (mb388a) <mb388a@us.att.com>2019-06-08 09:58:45 -0400
commit242e71883f59b8ad971f77c9bbdf032527fd77c0 (patch)
tree04c9c5529aa9784b10564c91bc37afb3a734e169 /asdc-controller/src
parent8534e7a2ce76697fd22f5909c907f22d302e0099 (diff)
parentd0cd4dc3d204e80a7419c97b6b0ec59273984a99 (diff)
Merge remote-tracking branch 'origin/dublin' into 'origin/master'
Change-Id: Ib8eaae7ee4a404bde568803afaf6c4e183cbbd53 Issue-ID: SO-2004 Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Diffstat (limited to 'asdc-controller/src')
-rw-r--r--asdc-controller/src/main/java/org/onap/so/asdc/activity/ActivitySpecsActions.java9
-rw-r--r--asdc-controller/src/test/java/org/onap/asdc/activity/ActivitySpecsActionsTest.java53
2 files changed, 60 insertions, 2 deletions
diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/activity/ActivitySpecsActions.java b/asdc-controller/src/main/java/org/onap/so/asdc/activity/ActivitySpecsActions.java
index a084ce7177..317296fbed 100644
--- a/asdc-controller/src/main/java/org/onap/so/asdc/activity/ActivitySpecsActions.java
+++ b/asdc-controller/src/main/java/org/onap/so/asdc/activity/ActivitySpecsActions.java
@@ -68,7 +68,9 @@ public class ActivitySpecsActions {
Response response = httpClient.post(payload);
int statusCode = response.getStatus();
- if (statusCode != HttpStatus.SC_OK) {
+ if (statusCode == HttpStatus.SC_UNPROCESSABLE_ENTITY) {
+ logger.warn(Strings.repeat("{} ", 3), "ActivitySpec", activitySpec.getName(), "already exists in SDC");
+ } else if (statusCode != HttpStatus.SC_OK && statusCode != HttpStatus.SC_CREATED) {
logger.warn(Strings.repeat("{} ", 3), "Error creating activity spec", activitySpec.getName(),
statusCode);
} else {
@@ -110,7 +112,10 @@ public class ActivitySpecsActions {
int statusCode = response.getStatus();
- if (statusCode != HttpStatus.SC_OK) {
+ if (statusCode == HttpStatus.SC_UNPROCESSABLE_ENTITY) {
+ logger.warn(Strings.repeat("{} ", 3), "ActivitySpec with id", activitySpecId,
+ "is already certified in SDC");
+ } else if (statusCode != HttpStatus.SC_OK) {
logger.warn(Strings.repeat("{} ", 3), "Error certifying activity", activitySpecId, statusCode);
} else {
certificationResult = true;
diff --git a/asdc-controller/src/test/java/org/onap/asdc/activity/ActivitySpecsActionsTest.java b/asdc-controller/src/test/java/org/onap/asdc/activity/ActivitySpecsActionsTest.java
index 438120924a..7de35b5c13 100644
--- a/asdc-controller/src/test/java/org/onap/asdc/activity/ActivitySpecsActionsTest.java
+++ b/asdc-controller/src/test/java/org/onap/asdc/activity/ActivitySpecsActionsTest.java
@@ -56,6 +56,44 @@ public class ActivitySpecsActionsTest extends BaseTest {
}
@Test
+ public void CreateActivitySpecReturnsCreated_Test() throws Exception {
+ String HOSTNAME = createURLWithPort("");
+
+ ActivitySpec activitySpec = new ActivitySpec();
+ activitySpec.setName("testActivitySpec");
+ activitySpec.setDescription("Test Activity Spec");
+ ActivitySpecCreateResponse activitySpecCreateResponse = new ActivitySpecCreateResponse();
+ activitySpecCreateResponse.setId("testActivityId");
+ ObjectMapper mapper = new ObjectMapper();
+ String body = mapper.writeValueAsString(activitySpecCreateResponse);
+ wireMockServer.stubFor(post(urlPathMatching("/v1.0/activity-spec"))
+ .willReturn(aResponse().withHeader("Content-Type", "application/json")
+ .withStatus(org.springframework.http.HttpStatus.CREATED.value()).withBody(body)));
+
+ String activitySpecId = activitySpecsActions.createActivitySpec(HOSTNAME, activitySpec);
+ assertEquals("testActivityId", activitySpecId);
+ }
+
+ @Test
+ public void CreateActivitySpecReturnsExists_Test() throws Exception {
+ String HOSTNAME = createURLWithPort("");
+
+ ActivitySpec activitySpec = new ActivitySpec();
+ activitySpec.setName("testActivitySpec");
+ activitySpec.setDescription("Test Activity Spec");
+ ActivitySpecCreateResponse activitySpecCreateResponse = new ActivitySpecCreateResponse();
+ activitySpecCreateResponse.setId("testActivityId");
+ ObjectMapper mapper = new ObjectMapper();
+ String body = mapper.writeValueAsString(activitySpecCreateResponse);
+ wireMockServer.stubFor(post(urlPathMatching("/v1.0/activity-spec"))
+ .willReturn(aResponse().withHeader("Content-Type", "application/json")
+ .withStatus(org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY.value()).withBody(body)));
+
+ String activitySpecId = activitySpecsActions.createActivitySpec(HOSTNAME, activitySpec);
+ assertEquals(null, activitySpecId);
+ }
+
+ @Test
public void CertifyActivitySpec_Test() throws Exception {
String HOSTNAME = createURLWithPort("");
@@ -70,6 +108,21 @@ public class ActivitySpecsActionsTest extends BaseTest {
assertTrue(certificationResult);
}
+ @Test
+ public void CertifyActivitySpecReturnsExists_Test() throws Exception {
+ String HOSTNAME = createURLWithPort("");
+
+ String activitySpecId = "testActivitySpec";
+ String urlPath = "/v1.0/activity-spec/testActivitySpec/versions/latest/actions";
+
+ wireMockServer.stubFor(
+ put(urlPathMatching(urlPath)).willReturn(aResponse().withHeader("Content-Type", "application/json")
+ .withStatus(org.springframework.http.HttpStatus.UNPROCESSABLE_ENTITY.value())));
+
+ boolean certificationResult = activitySpecsActions.certifyActivitySpec(HOSTNAME, activitySpecId);
+ assertFalse(certificationResult);
+ }
+
private String createURLWithPort(String uri) {
return "http://localhost:" + wireMockPort + uri;
}