aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeshu Kumar M <seshu.kumar.m@huawei.com>2020-10-15 03:48:27 +0000
committerGerrit Code Review <gerrit@onap.org>2020-10-15 03:48:27 +0000
commitfba10ad20455ff6c2bc4458afedc2f1f485d9126 (patch)
tree5e6fd631b59e308c0028ec4ab2e19ef3bea6ae4e
parent98c50c3184e915945dfe339284fc6dcbd8fdca9f (diff)
parent969745e59ab432a48685b89038d1c4c15a5ea9a1 (diff)
Merge "Fix 3gppservices URI path"
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java18
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java20
2 files changed, 19 insertions, 19 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java
index 3f05c79dad..b1486c9686 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java
@@ -88,9 +88,9 @@ import org.onap.so.db.request.beans.InfraActiveRequests;
import org.onap.so.db.request.client.RequestsDbClient;
@Component
-@Path("/onap/so/infra/onap3gppServiceInstances")
-@OpenAPIDefinition(info = @Info(title = "/onap/so/infra/onap3gppServiceInstances",
- description = "API Requests for 3GPP Service Instances"))
+@Path("/onap/so/infra/3gppservices")
+@OpenAPIDefinition(
+ info = @Info(title = "/onap/so/infra/3gppservices", description = "API Requests for 3GPP Service Instances"))
public class Onap3gppServiceInstances {
private static final Logger logger = LoggerFactory.getLogger(Onap3gppServiceInstances.class);
@@ -101,7 +101,7 @@ public class Onap3gppServiceInstances {
private static final String SAVE_TO_DB = "save instance to db";
- private static String uriPrefix = "/onap3gppServiceInstances/";
+ private static final String URI_PREFIX = "/3gppservices/";
@Autowired
private MsoRequest msoRequest;
@@ -140,7 +140,7 @@ public class Onap3gppServiceInstances {
@Context ContainerRequestContext requestContext) throws ApiException {
String requestId = requestHandlerUtils.getRequestId(requestContext);
return processServiceInstanceRequest(request, Action.createInstance, version, requestId, null,
- requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+ requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
}
/**
@@ -161,7 +161,7 @@ public class Onap3gppServiceInstances {
HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID());
return updateServiceInstances(request, Action.updateInstance, version, requestId, instanceIdMap,
- requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+ requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
}
/**
@@ -183,7 +183,7 @@ public class Onap3gppServiceInstances {
HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID());
return deleteServiceInstances(request, Action.deleteInstance, version, requestId, instanceIdMap,
- requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+ requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
}
/**
@@ -204,7 +204,7 @@ public class Onap3gppServiceInstances {
HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID());
return activateOrDeactivateServiceInstances(request, Action.activateInstance, version, requestId, instanceIdMap,
- requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+ requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
}
/**
@@ -225,7 +225,7 @@ public class Onap3gppServiceInstances {
HashMap<String, String> instanceIdMap = new HashMap<>();
instanceIdMap.put("serviceInstanceId", request.getServiceInstanceID());
return activateOrDeactivateServiceInstances(request, Action.deactivateInstance, version, requestId,
- instanceIdMap, requestHandlerUtils.getRequestUri(requestContext, uriPrefix));
+ instanceIdMap, requestHandlerUtils.getRequestUri(requestContext, URI_PREFIX));
}
/**
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java
index c3c92be013..95f00c3a39 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstancesTest.java
@@ -55,9 +55,9 @@ import org.springframework.beans.factory.annotation.Autowired;
public class Onap3gppServiceInstancesTest extends BaseTest {
- private String onap3gppServicesUri = "/onap/so/infra/onap3gppServiceInstances/";
+ private static final String ONAP3GPPSERVICES_URI = "/onap/so/infra/3gppservices/";
- private final ObjectMapper mapper = new ObjectMapper();
+ private static final ObjectMapper MAPPER = new ObjectMapper();
@Autowired
private Onap3gppServiceInstances objUnderTest;
@@ -74,11 +74,11 @@ public class Onap3gppServiceInstancesTest extends BaseTest {
wireMockServer.stubFor(get(urlPathEqualTo("/service/search/findFirstByModelNameOrderByModelVersionDesc"))
.willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
- .withBody(mapper.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK)));
+ .withBody(MAPPER.writeValueAsString(defaultService)).withStatus(HttpStatus.SC_OK)));
wireMockServer.stubFor(get(urlPathEqualTo("/serviceRecipe/search/findFirstByServiceModelUUIDAndAction"))
.willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON)
- .withBody(mapper.writeValueAsString(serviceRecipe)).withStatus(HttpStatus.SC_OK)));
+ .withBody(MAPPER.writeValueAsString(serviceRecipe)).withStatus(HttpStatus.SC_OK)));
wireMockServer.stubFor(post(urlMatching(".*/infraActiveRequests/")).willReturn(aResponse()
.withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON).withStatus(HttpStatus.SC_OK)));
Mockito.doReturn(null).when(requestsDbClient).getInfraActiveRequestbyRequestId(Mockito.any());
@@ -107,7 +107,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest {
@Test
public void createServiceInstanceTest() throws IOException {
- String uri = onap3gppServicesUri + "v1/allocate";
+ String uri = ONAP3GPPSERVICES_URI + "v1/allocate";
wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn(
aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json")
.withStatus(org.apache.http.HttpStatus.SC_ACCEPTED)));
@@ -123,7 +123,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest {
@Test
public void updateServiceInstanceTest() throws IOException {
- String uri = onap3gppServicesUri + "v1/modify";
+ String uri = ONAP3GPPSERVICES_URI + "v1/modify";
wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn(
aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json")
.withStatus(org.apache.http.HttpStatus.SC_ACCEPTED)));
@@ -139,7 +139,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest {
@Test
public void deleteServiceInstanceTest() throws IOException {
- String uri = onap3gppServicesUri + "v1/deAllocate";
+ String uri = ONAP3GPPSERVICES_URI + "v1/deAllocate";
wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn(
aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json")
.withStatus(org.apache.http.HttpStatus.SC_ACCEPTED)));
@@ -154,7 +154,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest {
@Test
public void activateServiceInstanceTest() throws IOException {
- String uri = onap3gppServicesUri + "v1/activate";
+ String uri = ONAP3GPPSERVICES_URI + "v1/activate";
wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn(
aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json")
.withStatus(org.apache.http.HttpStatus.SC_ACCEPTED)));
@@ -169,7 +169,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest {
@Test
public void deActivateServiceInstance() throws IOException {
- String uri = onap3gppServicesUri + "v1/deActivate";
+ String uri = ONAP3GPPSERVICES_URI + "v1/deActivate";
wireMockServer.stubFor(post(urlPathEqualTo("/mso/async/services/commonNssmfTest")).willReturn(
aResponse().withHeader("Content-Type", "application/json").withBodyFile("Camunda/BPMN_response.json")
.withStatus(org.apache.http.HttpStatus.SC_ACCEPTED)));
@@ -185,7 +185,7 @@ public class Onap3gppServiceInstancesTest extends BaseTest {
@Test
public void getSliceSubnetCapabilitiesTest() throws IOException, ApiException {
String request = "{\"subnetTypes\":[\"AN\"]}";
- QuerySubnetCapability subnetCapabilityRequest = mapper.readValue(request, QuerySubnetCapability.class);
+ QuerySubnetCapability subnetCapabilityRequest = MAPPER.readValue(request, QuerySubnetCapability.class);
String expectedResponse =
"{\"AN\":{\"latency\":\"5\",\"maxNumberofUEs\":\"100\",\"maxThroughput\":\"150\",\"terminalDensity\":\"50\"}}";
Response response = objUnderTest.getSliceSubnetCapabilities(subnetCapabilityRequest, "v1");