From de13070bca04828cb1ece04c5a01cef91544026e Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 25 Feb 2019 15:29:01 +0200 Subject: Remove unused test-controllers Change-Id: I3ed9f9df04f733dde91adad98d74d446c124c7a4 Issue-ID: VID-426 Signed-off-by: Ittay Stern --- .../vid/controller/test/TestAaiController.java | 87 --- .../vid/controller/test/TestAsdcController.java | 106 --- .../vid/controller/test/TestMsoController.java | 723 --------------------- .../vid/controller/test/TestPageController.java | 55 -- .../vid/controller/test/TestAaiControllerTest.java | 27 - .../controller/test/TestAsdcControllerTest.java | 26 - .../vid/controller/test/TestMsoControllerTest.java | 29 - .../controller/test/TestPageControllerTest.java | 31 - 8 files changed, 1084 deletions(-) delete mode 100644 vid-app-common/src/main/java/org/onap/vid/controller/test/TestAaiController.java delete mode 100644 vid-app-common/src/main/java/org/onap/vid/controller/test/TestAsdcController.java delete mode 100644 vid-app-common/src/main/java/org/onap/vid/controller/test/TestMsoController.java delete mode 100644 vid-app-common/src/main/java/org/onap/vid/controller/test/TestPageController.java delete mode 100644 vid-app-common/src/test/java/org/onap/vid/controller/test/TestAaiControllerTest.java delete mode 100644 vid-app-common/src/test/java/org/onap/vid/controller/test/TestAsdcControllerTest.java delete mode 100644 vid-app-common/src/test/java/org/onap/vid/controller/test/TestMsoControllerTest.java delete mode 100644 vid-app-common/src/test/java/org/onap/vid/controller/test/TestPageControllerTest.java diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/test/TestAaiController.java b/vid-app-common/src/main/java/org/onap/vid/controller/test/TestAaiController.java deleted file mode 100644 index 511e8631b..000000000 --- a/vid-app-common/src/main/java/org/onap/vid/controller/test/TestAaiController.java +++ /dev/null @@ -1,87 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * VID - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.vid.controller.test; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.onap.portalsdk.core.controller.RestrictedBaseController; -import org.onap.vid.model.ExceptionResponse; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * The Class TestAaiController. - */ -@RestController -@RequestMapping("testaai") -public class TestAaiController extends RestrictedBaseController { - - /** - * Gets the subscription service type list. - * - * @param globalCustomerId the global customer id - * @param request the request - * @return the subscription service type list - * @throws Exception the exception - */ - @RequestMapping(value = "/getSubscriptionServiceTypeList/{globalCustomerId}", method = RequestMethod.GET) - public String getSubscriptionServiceTypeList(@PathVariable("globalCustomerId") String globalCustomerId, HttpServletRequest request) - throws Exception { - - System.err.println("GET SUBSCRIPTION SERVICE TYPE LIST: globalCustomerId: " + globalCustomerId); - - return "[\"vMOG\", \"sevice type 2\", \"sevice type 3\", \"sevice type 4\"]"; - } - - /** - * Exception. - * - * @param e the e - * @param response the response - * @throws IOException Signals that an I/O exception has occurred. - */ - @ExceptionHandler(Exception.class) - private void exception(Exception e, HttpServletResponse response) throws IOException { - - /* - * This logging step should preferably be replaced with an appropriate - * logging method consistent whatever logging mechanism the rest of the - * application code uses. - */ - - e.printStackTrace(System.err); - - response.setContentType("application/json; charset=UTF-8"); - response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - - ExceptionResponse exceptionResponse = new ExceptionResponse(); - exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", "")); - exceptionResponse.setMessage(e.getMessage()); - - response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse)); - - response.flushBuffer(); - - } - -} diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/test/TestAsdcController.java b/vid-app-common/src/main/java/org/onap/vid/controller/test/TestAsdcController.java deleted file mode 100644 index da79ef9b0..000000000 --- a/vid-app-common/src/main/java/org/onap/vid/controller/test/TestAsdcController.java +++ /dev/null @@ -1,106 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * VID - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.vid.controller.test; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.onap.portalsdk.core.controller.RestrictedBaseController; -import org.onap.vid.model.ExceptionResponse; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; - -/** - * The Class TestAsdcController. - */ -@RestController -@RequestMapping("testasdc") -public class TestAsdcController extends RestrictedBaseController { - - /** - * Gets the model. - * - * @param modelId the model id - * @param request the request - * @return the model - * @throws Exception the exception - */ - @RequestMapping(value = "/getModel/{modelId}", method = RequestMethod.GET) - public String getModel(@PathVariable("modelId") String modelId, HttpServletRequest request) throws Exception { - - System.err.println("SDC: GET MODEL: modelId: " + modelId); - - // @formatter:off - return - "{" + - "\"uuid\": \"5be686dc-fdca-4d54-8548-5d0ed23e962b\"," + - "\"invariantUUID\": \"e5962da9-fe4f-433a-bc99-b43e0d88a9a1\"," + - "\"name\": \"DE220127\"," + - "\"version\": \"0.1\"," + - "\"inputs\": {" + - "\"defaultGateway\": {" + - "\"type\": \"String\"," + - "\"default\": \"192.168.1.1\"," + - "\"description\": \"Router default gateway - use any valid IPv4 address\"" + - "}," + - "\"subnetMask\": {" + - "\"type\": \"String\"," + - "\"default\": \"255.255.255.0\"," + - "\"description\": \"Router subnet mask - example (255.255.255.0)\"" + - "}" + - "}" + - "}"; - // @formatter:on - } - - /** - * Exception. - * - * @param e the e - * @param response the response - * @throws IOException Signals that an I/O exception has occurred. - */ - @ExceptionHandler(Exception.class) - private void exception(Exception e, HttpServletResponse response) throws IOException { - - /* - * This logging step should preferably be replaced with an appropriate - * logging method consistent whatever logging mechanism the rest of the - * application code uses. - */ - - e.printStackTrace(System.err); - - response.setContentType("application/json; charset=UTF-8"); - response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - - ExceptionResponse exceptionResponse = new ExceptionResponse(); - exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", "")); - exceptionResponse.setMessage(e.getMessage()); - - response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse)); - - response.flushBuffer(); - - } - -} diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/test/TestMsoController.java b/vid-app-common/src/main/java/org/onap/vid/controller/test/TestMsoController.java deleted file mode 100644 index 4cb0d6c16..000000000 --- a/vid-app-common/src/main/java/org/onap/vid/controller/test/TestMsoController.java +++ /dev/null @@ -1,723 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * VID - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.vid.controller.test; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.onap.portalsdk.core.controller.RestrictedBaseController; -import org.onap.vid.model.ExceptionResponse; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.stream.Collectors; - -/* - * The "TestMsoController" class is primarily designed to help test "msoCommitController.js" - * - * This class expects and receives JSON data in the same format as expected - * in the "real" application version of this code. However, string versions of JSON are - * maintained internally here instead of marshalled / unmarshalled JSON objects. - * The primary reasons for this were to encapsulate all the test code in this single file and - * minimize the time required to support initial test cases. - * - * The non-test equivalent of this controller could alternatively incorporate POJO objects - * instead of strings. However, the same data format sent to / received from the browser - * JavaScript code would still be expected. - * - * Two specific mechanisms used in this test class may be useful to the application version: - * - * 1) The use of "{variable}" elements in @RequestMappings along with the corresponding - * @PathVariable declarations. - * - * 2) The use of @ExceptionHandler for general purpose exception handler. - * (See @ExceptionHandler comments) - * - * This class is intended to be used in either: - * - * A) Eclipse environments - * OR - * B) Linux environments with ONLY a single user running tests. - * The "quick and dirty" error simulation approach used here makes use of static states for some - * scenarios. Thus multiple users simultaneously testing in Linux environments - * may have contention issues. - */ - -/** - * The Class TestMsoController. - */ -@RestController -@RequestMapping("testmso") -public class TestMsoController extends RestrictedBaseController { - - /* - * Artificial delay (in milliseconds) added before responding to create / - * delete requests - */ - - /** The Constant TEST_DELAY_SHORT_MSEC. */ - private final static int TEST_DELAY_SHORT_MSEC = 1000; - - /* - * Long delay to simulate non-responsive server test - */ - - /** The Constant TEST_DELAY_LONG_MSEC. */ - private final static int TEST_DELAY_LONG_MSEC = 15000; - - /* - * Default number of polls expected before transaction complete. - */ - - /** The Constant MAXIMUM_POLLS_DEFAULT. */ - private final static int MAXIMUM_POLLS_DEFAULT = 4; - - /* - * Number of polls to simulate "maximum polls exceeded" test. - */ - - /** The Constant MAXIMUM_POLLS_LARGE. */ - private final static int MAXIMUM_POLLS_LARGE = 10; - - /* - * Simulated error types. The GUI front end is expected to set these values - * in the "modelName" field of the "mso_create_svc_instance" request. - */ - - /** The Constant ERROR_POLICY_EXCEPTION. */ - private final static String ERROR_POLICY_EXCEPTION = "ERROR_POLICY_EXCEPTION"; - - /** The Constant ERROR_SERVICE_EXCEPTION. */ - private final static String ERROR_SERVICE_EXCEPTION = "ERROR_SERVICE_EXCEPTION"; - - /** The Constant ERROR_POLL_FAILURE. */ - private final static String ERROR_POLL_FAILURE = "ERROR_POLL_FAILURE"; - - /** The Constant ERROR_INVALID_FIELD_INITIAL. */ - private final static String ERROR_INVALID_FIELD_INITIAL = "ERROR_INVALID_FIELD_INITIAL"; - - /** The Constant ERROR_INVALID_FIELD_POLL. */ - private final static String ERROR_INVALID_FIELD_POLL = "ERROR_INVALID_FIELD_POLL"; - - /** The Constant ERROR_GENERAL_SERVER_EXCEPTION. */ - private final static String ERROR_GENERAL_SERVER_EXCEPTION = "ERROR_GENERAL_SERVER_EXCEPTION"; - - /** The Constant ERROR_MAX_POLLS. */ - private final static String ERROR_MAX_POLLS = "ERROR_MAX_POLLS"; - - /** The Constant ERROR_SERVER_TIMEOUT_INITIAL. */ - private final static String ERROR_SERVER_TIMEOUT_INITIAL = "ERROR_SERVER_TIMEOUT_INITIAL"; - - /** The Constant ERROR_SERVER_TIMEOUT_POLL. */ - private final static String ERROR_SERVER_TIMEOUT_POLL = "ERROR_SERVER_TIMEOUT_POLL"; - - /** The simulated error. */ - private String simulatedError = ""; - - /** The maximum polls. */ - private int maximumPolls = 0; - - /** The attempt count. */ - private int attemptCount = 0; - - /** - * Creates the svc instance. - * - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - @RequestMapping(value = "/mso_create_svc_instance", method = RequestMethod.POST) - public ResponseEntity createSvcInstance(HttpServletRequest request) throws Exception { - readAndLogRequest("CREATE SERVICE INSTANCE", request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - - /* - * This block of code simulates various errors and would NOT be expected - * in a non-test method - */ - System.err.println("simulatedError: " + simulatedError); - - if (simulatedError.equals(ERROR_POLICY_EXCEPTION)) { - return new ResponseEntity(policyExceptionResponse, HttpStatus.OK); - } - if (simulatedError.equals(ERROR_SERVICE_EXCEPTION)) { - return new ResponseEntity(serviceExceptionResponse, HttpStatus.OK); - } - if (simulatedError.equals(ERROR_INVALID_FIELD_INITIAL)) { - /* - * Force invalid response field name. Return - * "XXXXXrequestReferences" instead of "requestReferences" - */ - return new ResponseEntity(acceptResponse.replace("requestReferences", "XXXXXrequestReferences"), - HttpStatus.OK); - } - - if (simulatedError.equals(ERROR_GENERAL_SERVER_EXCEPTION)) { - throw new IOException("an example of an IO exception"); - } - - if (simulatedError.equals(ERROR_SERVER_TIMEOUT_INITIAL)) { - Thread.sleep(TEST_DELAY_LONG_MSEC); - } - - if (simulatedError.equals(ERROR_MAX_POLLS)) { - maximumPolls = MAXIMUM_POLLS_LARGE; - } - - /* - * End of block of simulated error code. - */ - - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - /** - * Delete svc instance. - * - * @param serviceInstanceId the service instance id - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - @RequestMapping(value = "/mso_delete_svc_instance/{serviceInstanceId}", method = RequestMethod.POST) - public ResponseEntity deleteSvcInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, - HttpServletRequest request) throws Exception { - readAndLogRequest("DELETE SERVICE INSTANCE: serviceInstanceId: " + serviceInstanceId, request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - /** - * Creates the vnf instance. - * - * @param serviceInstanceId the service instance id - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - @RequestMapping(value = "/mso_create_vnf_instance/{serviceInstanceId}", method = RequestMethod.POST) - public ResponseEntity createVnfInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, - HttpServletRequest request) throws Exception { - readAndLogRequest("CREATE VNF INSTANCE: serviceInstanceId: " + serviceInstanceId, request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - /** - * Delete vnf instance. - * - * @param serviceInstanceId the service instance id - * @param vnfInstanceId the vnf instance id - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - @RequestMapping(value = "/mso_delete_vnf_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST) - public ResponseEntity deleteVnfInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, - @PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception { - readAndLogRequest( - "DELETE VNF INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: " + vnfInstanceId, - request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - /** - * Creates the vf module instance. - * - * @param serviceInstanceId the service instance id - * @param vnfInstanceId the vnf instance id - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - // /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs/ff305d54-75b4-ff1b-adb2-eb6b9e5460ff/vfModules - @RequestMapping(value = "/mso_create_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST) - public ResponseEntity createVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, - @PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception { - readAndLogRequest("CREATE VF MODULE INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: " - + vnfInstanceId, request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - /** - * Delete vf module instance. - * - * @param serviceInstanceId the service instance id - * @param vnfInstanceId the vnf instance id - * @param vfModuleInstanceId the vf module instance id - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - // /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/vnfs/ff305d54-75b4-ff1b-adb2-eb6b9e5460ff/vfModules/ff305d54-75b4-ff1b-bdb2-eb6b9e5460ff - @RequestMapping(value = "/mso_delete_vfmodule_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfModuleInstanceId}", method = RequestMethod.POST) - public ResponseEntity deleteVfModuleInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, - @PathVariable("vnfInstanceId") String vnfInstanceId, - @PathVariable("vfModuleInstanceId") String vfModuleInstanceId, HttpServletRequest request) - throws Exception { - readAndLogRequest("DELETE VF MODULE INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: " - + vnfInstanceId + " vfModuleInstanceId: " + vfModuleInstanceId, request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - // POST - /** - * Creates the volume group instance. - * - * @param serviceInstanceId the service instance id - * @param vnfInstanceId the vnf instance id - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - // /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/volumeGroups - @RequestMapping(value = "/mso_create_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}", method = RequestMethod.POST) - public ResponseEntity createVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, - @PathVariable("vnfInstanceId") String vnfInstanceId, HttpServletRequest request) throws Exception { - readAndLogRequest("CREATE VOLUME GROUP INSTANCE: seviceInstanceId: " + serviceInstanceId + " vnfInstanceId: " - + vnfInstanceId, request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - /** - * Delete volume group instance. - * - * @param serviceInstanceId the service instance id - * @param vnfInstanceId the vnf instance id - * @param volumeGroupInstanceId the volume group instance id - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - // /serviceInstances/v2/ff305d54-75b4-431b-adb2-eb6b9e5ff000/volumeGroups/ff305d54-75b4-ff1b-cdb2-eb6b9e5460ff - @RequestMapping(value = "/mso_delete_volumegroup_instance/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}", method = RequestMethod.POST) - public ResponseEntity deleteVolumeGroupInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, - @PathVariable("vnfInstanceId") String vnfInstanceId, - @PathVariable("volumeGroupInstanceId") String volumeGroupInstanceId, HttpServletRequest request) - throws Exception { - readAndLogRequest("DELETE NW INSTANCE: serviceInstanceId: " + serviceInstanceId + " vnfInstanceId: " - + vnfInstanceId + " volumeGroupInstanceId: " + volumeGroupInstanceId, request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - /** - * Creates the nw instance. - * - * @param serviceInstanceId the service instance id - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - @RequestMapping(value = "/mso_create_nw_instance/{serviceInstanceId}", method = RequestMethod.POST) - public ResponseEntity createNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, - HttpServletRequest request) throws Exception { - readAndLogRequest("CREATE NW INSTANCE: serviceInstanceId: " + serviceInstanceId, request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - /** - * Delete nw instance. - * - * @param serviceInstanceId the service instance id - * @param networkInstanceId the network instance id - * @param request the request - * @return the response entity - * @throws Exception the exception - */ - @RequestMapping(value = "/mso_delete_nw_instance/{serviceInstanceId}/networks/{networkInstanceId}", method = RequestMethod.POST) - public ResponseEntity deleteNwInstance(@PathVariable("serviceInstanceId") String serviceInstanceId, - @PathVariable("networkInstanceId") String networkInstanceId, HttpServletRequest request) throws Exception { - readAndLogRequest("DELETE NW INSTANCE: serviceInstanceId: " + serviceInstanceId + " networkInstanceId: " - + networkInstanceId, request); - Thread.sleep(TEST_DELAY_SHORT_MSEC); - maximumPolls = MAXIMUM_POLLS_DEFAULT; // Simulates MSO polling behavior - attemptCount = 0; - return new ResponseEntity(acceptResponse, HttpStatus.OK); - } - - /** - * Gets the orchestration request. - * - * @param requestId the request id - * @param request the request - * @return the orchestration request - * @throws Exception the exception - */ - @RequestMapping(value = "/mso_get_orch_req/{requestId}", method = RequestMethod.GET) - public ResponseEntity getOrchestrationRequest(@PathVariable("requestId") String requestId, - HttpServletRequest request) throws Exception { - - System.err.println("GET ORCHESTRATION REQUEST: requestId: " + requestId); - - /* - * This block of code simulates various errors and would NOT be expected - * in a non-test method - */ - - if (simulatedError.equals(ERROR_INVALID_FIELD_POLL)) { - /* - * Force invalid response field name. Return "XXXXXrequestStatus" - * instead of "requestStatus" - */ - return new ResponseEntity(inProgressResponse.replace("requestStatus", "XXXXXrequestStatus"), - HttpStatus.OK); - } - - if (simulatedError.equals(ERROR_POLL_FAILURE)) { - /* - * Force status field with "Failure" - */ - return new ResponseEntity(inProgressResponse.replace("InProgress", "Failure"), HttpStatus.OK); - } - - if (simulatedError.equals(ERROR_SERVER_TIMEOUT_POLL)) { - Thread.sleep(TEST_DELAY_LONG_MSEC); - } - - /* - * End of block of simulated error code. - */ - - /* - * This logic simulates how MSO might behave ... i.e. return different - * results depending on the value of 'maximumPolls'. - * - */ - int percentProgress = (++attemptCount * 100) / maximumPolls; - - System.err.println("attempts: " + attemptCount + " max: " + maximumPolls + " percent: " + percentProgress); - - String response = inProgressResponse.replace("\"50\"", "\"" + Integer.toString(percentProgress) + "\""); - - if (attemptCount < maximumPolls) { - if (attemptCount > 1) { - response = response.replace("vLan setup", "setup step " + Integer.toString(attemptCount)); - } - return new ResponseEntity(response, HttpStatus.OK); - } else { - return new ResponseEntity( - response.replace("InProgress", "Complete").replace("vLan setup complete", ""), HttpStatus.OK); - } - } - - /** - * Gets the orchestration requests. - * - * @param filterString the filter string - * @param request the request - * @return the orchestration requests - * @throws Exception the exception - */ - @RequestMapping(value = "/mso_get_orch_reqs/{filterString}", method = RequestMethod.GET) - public ResponseEntity getOrchestrationRequests(@PathVariable("filterString") String filterString, - HttpServletRequest request) throws Exception { - - System.err.println("GET ORCHESTRATION REQUESTS: filterString: " + filterString); - - return new ResponseEntity(getOrchestrationRequestsResponse, HttpStatus.OK); - - } - - /* - * General purpose exception handler that could be used in application code. - * - * The method returns exceptions as error code 500. Both the exception type - * and message are written as a JSON object. - * - * See the following references: - * - * 1) The ExceptionResponse POJO. - * - * 2) The "getHttpErrorMessage" function in "utilityService.js" - an example - * of how the browser JavaScript code can interpret this response. - */ - - /** - * Exception. - * - * @param e the e - * @param response the response - * @throws IOException Signals that an I/O exception has occurred. - */ - @ExceptionHandler(Exception.class) - private void exception(Exception e, HttpServletResponse response) throws IOException { - - /* - * This logging step should preferably be replaced with an appropriate - * logging method consistent whatever logging mechanism the rest of the - * application code uses. - */ - - e.printStackTrace(System.err); - - response.setContentType("application/json; charset=UTF-8"); - response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); - - ExceptionResponse exceptionResponse = new ExceptionResponse(); - exceptionResponse.setException(e.getClass().toString().replaceFirst("^.*\\.", "")); - exceptionResponse.setMessage(e.getMessage()); - - response.getWriter().write(new ObjectMapper().writeValueAsString(exceptionResponse)); - - response.flushBuffer(); - - } - - /* - * 'readAndLogRequest' only intended to be used for testing. - * - * The method reads JSON from the input stream and thus prevents other - * mechanisms from reading the input. - */ - - /** - * Read and log request. - * - * @param label the label - * @param request the request - * @throws Exception the exception - */ - private void readAndLogRequest(String label, HttpServletRequest request) throws Exception { - String input = request.getReader().lines().collect(Collectors.joining(System.lineSeparator())); - - ObjectMapper mapper = new ObjectMapper(); - Object json = mapper.readValue(input, Object.class); - - System.err.println(label + "\n" + mapper.writerWithDefaultPrettyPrinter().writeValueAsString(json)); - - /* - * Only needed for error simulation ... - */ - if (input.matches("^.*modelName.*$")) { - simulatedError = input.replaceAll("^.*\"modelName\":\"", "").replaceAll("\".*$", ""); - } - } - - /* - * Various test responses: - */ - - // @formatter:off - - /** The accept response. */ - /* - * Sample responses to initial create / delete transaction - */ - private String acceptResponse = - "{" + - " \"status\": 202," + - " \"entity\": {" + - " \"requestReferences\": {" + - " \"instanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"," + - " \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e331\"" + - " }" + - " }" + - "}"; - - /** The policy exception response. */ - private String policyExceptionResponse = - "{" + - " \"status\": 400," + - " \"entity\": { " + - " \"requestError\": {" + - " \"policyException\": {" + - " \"messageId\": \"POL9003\"," + - " \"text\": \"Message content size exceeds the allowable limit\"" + - " }" + - " }" + - " }" + - "}"; - - /** The service exception response. */ - private String serviceExceptionResponse = - "{" + - " \"status\": 400," + - " \"entity\": { " + - " \"requestError\": {" + - " \"serviceException\": {" + - " \"messageId\": \"SVC2000\"," + - " \"text\": \"Missing Parameter: %1. Error code is %2\"," + - " \"variables\": [" + - " \"severity\"," + - " \"400\"" + - " ]" + - " }" + - " }" + - " }" + - "}" + - ""; - - /** The in progress response. */ - /* - * Sample response to subsequent getOrchestrationRequest - */ - private String inProgressResponse = - "{" + - " \"status\": 200," + - " \"entity\": {" + - " \"request\": {" + - " \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e333\"," + - " \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\"," + - " \"instanceIds\": {" + - " \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"" + - " }," + - " \"requestScope\": \"service\"," + - " \"requestType\": \"createInstance\"," + - " \"requestDetails\": {" + - " \"modelInfo\": {" + - " \"modelType\": \"service\"," + - " \"modelId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\"," + - " \"modelNameVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\"," + - " \"modelName\": \"WanBonding\"," + - " \"modelVersion\": \"1\"" + - " }," + - " \"subscriberInfo\": {" + - " \"globalSubscriberId\": \"C12345\"," + - " \"subscriberName\": \"General Electric Division 12\"" + - " }," + - " \"requestParameters\": {" + - " \"vpnId\": \"1a2b3c4d5e6f\"," + - " \"productName\": \"Trinity\"," + - " \"customerId\": \"icore9883749\"" + - " }" + - " }," + - " \"requestStatus\": {" + - " \"timestamp\": \"Thu, 04 Jun 2009 02:53:39 GMT\"," + - " \"requestState\": \"InProgress\"," + - " \"statusMessage\": \"vLan setup complete\"," + - " \"percentProgress\": \"50\"" + - " }" + - " }" + - " }" + - "}"; - - /* - * Sample response to subsequent getOrchestrationRequests - */ - - /** The get orchestration requests response. */ - private String getOrchestrationRequestsResponse = - "{" + - " \"status\": 200," + - " \"entity\": {" + - " \"requestList\": [" + - " {" + - " \"request\": {" + - " \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e333\"," + - " \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\"," + - " \"finishTime\": \"Thu, 04 Jun 2009 02:55:59 GMT\"," + - " \"instanceReferences\": {" + - " \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"" + - " }," + - " \"requestScope\": \"service\"," + - " \"requestType\": \"createInstance\"," + - " \"requestDetails\": {" + - " \"modelInfo\": {" + - " \"modelType\": \"service\"," + - " \"modelId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\"," + - " \"modelNameVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\"," + - " \"modelName\": \"WanBonding\"," + - " \"modelVersion\": \"1\"" + - " }," + - " \"subscriberInfo\": {" + - " \"globalSubscriberId\": \"C12345\"," + - " \"subscriberName\": \"General Electric Division 12\"" + - " }," + - " \"requestParameters\": {" + - " \"vpnId\": \"1a2b3c4d5e6f\"," + - " \"productName\": \"Trinity\"," + - " \"customerId\": \"icore9883749\"" + - " }" + - " }," + - " \"requestStatus\": {" + - " \"timestamp\": \"Thu, 04 Jun 2009 02:54:49 GMT\"," + - " \"requestState\": \"complete\"," + - " \"statusMessage\": \"Resource Created\"," + - " \"percentProgress\": \"100\"" + - " }" + - " }" + - " }," + - " {" + - " \"request\": {" + - " \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e334\"," + - " \"startTime\": \"Thu, 04 Jun 2009 03:52:59 GMT\"," + - " \"instanceReferences\": {" + - " \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\"" + - " }," + - " \"requestScope\": \"service\"," + - " \"requestType\": \"updateInstance\"," + - " \"requestDetails\": {" + - " \"modelInfo\": {" + - " \"modelType\": \"service\"," + - " \"modelId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\"," + - " \"modelNameVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\"," + - " \"modelName\": \"WanBonding\"," + - " \"modelVersion\": \"1\"" + - " }," + - " \"subscriberInfo\": {" + - " \"globalSubscriberId\": \"C12345\"," + - " \"subscriberName\": \"General Electric Division 12\"" + - " }," + - " \"requestParameters\": {" + - " \"vpnId\": \"1a2b3c4d5e70\"," + - " \"productName\": \"Trinity\"," + - " \"customerId\": \"icore9883749\"" + - " }" + - " }," + - " \"requestStatus\": {" + - " \"timestamp\": \"Thu, 04 Jun 2009 03:53:39 GMT\"," + - " \"requestState\": \"InProgress\"," + - " \"statusMessage\": \"vLan setup complete\"," + - " \"percentProgress\": \"50\"" + - " }" + - " }" + - " }" + - " ]" + - " }" + - "}"; -} diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/test/TestPageController.java b/vid-app-common/src/main/java/org/onap/vid/controller/test/TestPageController.java deleted file mode 100644 index d4c65f851..000000000 --- a/vid-app-common/src/main/java/org/onap/vid/controller/test/TestPageController.java +++ /dev/null @@ -1,55 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * VID - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.vid.controller.test; - -import org.onap.portalsdk.core.controller.RestrictedBaseController; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.servlet.ModelAndView; - -/** - * The Class TestPageController. - */ -@Controller -public class TestPageController extends RestrictedBaseController { - - /** - * Test mso page. - * - * @return the model and view - */ - @RequestMapping(value = { "testMso.htm" }, method = RequestMethod.GET) - public ModelAndView testMsoPage() { - return new ModelAndView(getViewName()); - } - - /** - * Test view edit page. - * - * @return the model and view - */ - @RequestMapping(value = { "testViewEdit" }, method = RequestMethod.GET) - public ModelAndView testViewEditPage() { - return new ModelAndView(getViewName()); - } - -} diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/test/TestAaiControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/test/TestAaiControllerTest.java deleted file mode 100644 index c05db9b95..000000000 --- a/vid-app-common/src/test/java/org/onap/vid/controller/test/TestAaiControllerTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.onap.vid.controller.test; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.junit.Test; - -public class TestAaiControllerTest { - - private TestAaiController createTestSubject() { - return new TestAaiController(); - } - - @Test - public void testGetSubscriptionServiceTypeList() throws Exception { - TestAaiController testSubject; - String globalCustomerId = ""; - HttpServletRequest request = null; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getSubscriptionServiceTypeList(globalCustomerId, request); - } - - -} \ No newline at end of file diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/test/TestAsdcControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/test/TestAsdcControllerTest.java deleted file mode 100644 index 0e7a6033f..000000000 --- a/vid-app-common/src/test/java/org/onap/vid/controller/test/TestAsdcControllerTest.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.onap.vid.controller.test; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.junit.Test; - -public class TestAsdcControllerTest { - - private TestAsdcController createTestSubject() { - return new TestAsdcController(); - } - - @Test - public void testGetModel() throws Exception { - TestAsdcController testSubject; - String modelId = ""; - HttpServletRequest request = null; - String result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getModel(modelId, request); - } - -} \ No newline at end of file diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/test/TestMsoControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/test/TestMsoControllerTest.java deleted file mode 100644 index e5d62c7d0..000000000 --- a/vid-app-common/src/test/java/org/onap/vid/controller/test/TestMsoControllerTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.onap.vid.controller.test; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.junit.Test; -import org.springframework.http.ResponseEntity; - -public class TestMsoControllerTest { - - private TestMsoController createTestSubject() { - return new TestMsoController(); - } - - - @Test - public void testGetOrchestrationRequests() throws Exception { - TestMsoController testSubject; - String filterString = ""; - HttpServletRequest request = null; - ResponseEntity result; - - // default test - testSubject = createTestSubject(); - result = testSubject.getOrchestrationRequests(filterString, request); - } - - -} \ No newline at end of file diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/test/TestPageControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/test/TestPageControllerTest.java deleted file mode 100644 index f47eb4079..000000000 --- a/vid-app-common/src/test/java/org/onap/vid/controller/test/TestPageControllerTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.onap.vid.controller.test; - -import org.junit.Test; -import org.springframework.web.servlet.ModelAndView; - -public class TestPageControllerTest { - - private TestPageController createTestSubject() { - return new TestPageController(); - } - - @Test - public void testTestMsoPage() throws Exception { - TestPageController testSubject; - ModelAndView result; - - // default test - testSubject = createTestSubject(); - result = testSubject.testMsoPage(); - } - - @Test - public void testTestViewEditPage() throws Exception { - TestPageController testSubject; - ModelAndView result; - - // default test - testSubject = createTestSubject(); - result = testSubject.testViewEditPage(); - } -} \ No newline at end of file -- cgit 1.2.3-korg