From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 31 Dec 2018 17:21:27 +0200 Subject: Merge from ECOMP's repository Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern --- .../onap/vid/controller/MsoControllerNewTest.java | 394 +++++++++++++++++++++ 1 file changed, 394 insertions(+) create mode 100644 vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerNewTest.java (limited to 'vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerNewTest.java') diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerNewTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerNewTest.java new file mode 100644 index 000000000..747783d52 --- /dev/null +++ b/vid-app-common/src/test/java/org/onap/vid/controller/MsoControllerNewTest.java @@ -0,0 +1,394 @@ +package org.onap.vid.controller; + +import org.junit.Test; +import org.onap.vid.mso.MsoBusinessLogicImpl; +import org.onap.vid.mso.MsoInterface; +import org.onap.vid.mso.rest.RequestDetails; +import org.onap.vid.mso.rest.RequestDetailsWrapper; +import org.onap.vid.services.CloudOwnerServiceImpl; +import org.springframework.http.ResponseEntity; +import org.togglz.core.manager.FeatureManager; + +import javax.servlet.http.HttpServletRequest; + +import static org.mockito.Mockito.mock; + +public class MsoControllerNewTest { + + private MsoController createTestSubject() { + try { + return new MsoController(new MsoBusinessLogicImpl(mock(MsoInterface.class),mock(FeatureManager.class)), new CloudOwnerServiceImpl(null, null)); + } catch (Exception e) { + return null; + } + } + + @Test + public void testCreateSvcInstance() throws Exception { + MsoController testSubject; + HttpServletRequest request = null; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.createSvcInstance(request, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testCreateVnf() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + HttpServletRequest request = null; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.createVnf(serviceInstanceId, request, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testCreateNwInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + HttpServletRequest request = null; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.createNwInstance(serviceInstanceId, request, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testCreateVolumeGroupInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String vnfInstanceId = ""; + HttpServletRequest request = null; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.createVolumeGroupInstance(serviceInstanceId, vnfInstanceId, request, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testCreateVfModuleInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String vnfInstanceId = ""; + HttpServletRequest request = null; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.createVfModuleInstance(serviceInstanceId, vnfInstanceId, request, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testCreateConfigurationInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + HttpServletRequest request = null; + RequestDetailsWrapper mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.createConfigurationInstance(serviceInstanceId, request, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testDeleteSvcInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + HttpServletRequest request = null; + RequestDetails mso_request = null; + String result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.deleteSvcInstance(serviceInstanceId, request, mso_request, ""); + } catch (Exception e) { + } + } + + @Test + public void testDeleteVnf() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String vnfInstanceId = ""; + HttpServletRequest request = null; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.deleteVnf(serviceInstanceId, vnfInstanceId, request, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testDeleteConfiguration() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String configurationId = ""; + RequestDetailsWrapper mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.deleteConfiguration(serviceInstanceId, configurationId, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testActivateConfiguration() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String configurationId = ""; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.activateConfiguration(serviceInstanceId, configurationId, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testDeactivateConfiguration() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String configurationId = ""; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.deactivateConfiguration(serviceInstanceId, configurationId, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testDisablePortOnConfiguration() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String configurationId = ""; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.disablePortOnConfiguration(serviceInstanceId, configurationId, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testEnablePortOnConfiguration() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String configurationId = ""; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.enablePortOnConfiguration(serviceInstanceId, configurationId, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testDeleteVfModule() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String vnfInstanceId = ""; + String vfModuleId = ""; + HttpServletRequest request = null; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.deleteVfModule(serviceInstanceId, vnfInstanceId, vfModuleId, request, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testDeleteVolumeGroupInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String vnfInstanceId = ""; + String volumeGroupId = ""; + HttpServletRequest request = null; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.deleteVolumeGroupInstance(serviceInstanceId, vnfInstanceId, volumeGroupId, request, + mso_request); + } catch (Exception e) { + } + } + + @Test + public void testDeleteNwInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + String networkInstanceId = ""; + HttpServletRequest request = null; + RequestDetails mso_request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.deleteNwInstance(serviceInstanceId, networkInstanceId, request, mso_request); + } catch (Exception e) { + } + } + + @Test + public void testGetOrchestrationRequest() throws Exception { + MsoController testSubject; + String requestId = ""; + HttpServletRequest request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.getOrchestrationRequest(requestId, request); + } catch (Exception e) { + } + } + + @Test + public void testGetOrchestrationRequests() throws Exception { + MsoController testSubject; + String filterString = ""; + HttpServletRequest request = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.getOrchestrationRequests(filterString, request); + } catch (Exception e) { + } + } + + @Test + public void testActivateServiceInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + RequestDetails requestDetails = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.activateServiceInstance(serviceInstanceId, requestDetails); + } catch (Exception e) { + } + } + + @Test + public void testDeactivateServiceInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + RequestDetails requestDetails = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.deactivateServiceInstance(serviceInstanceId, requestDetails); + } catch (Exception e) { + } + } + + @Test + public void testManualTaskComplete() throws Exception { + MsoController testSubject; + String taskId = ""; + RequestDetails requestDetails = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.manualTaskComplete(taskId, requestDetails); + } catch (Exception e) { + } + } + + @Test + public void testRemoveRelationshipFromServiceInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + RequestDetails requestDetails = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.removeRelationshipFromServiceInstance(serviceInstanceId, requestDetails); + } catch (Exception e) { + } + } + + @Test + public void testAddRelationshipToServiceInstance() throws Exception { + MsoController testSubject; + String serviceInstanceId = ""; + RequestDetails requestDetails = null; + ResponseEntity result; + + // default test + try { + testSubject = createTestSubject(); + result = testSubject.addRelationshipToServiceInstance(serviceInstanceId, requestDetails); + } catch (Exception e) { + } + } +} -- cgit 1.2.3-korg