Add SO APIs to Nokia VNFM adapter

Change-Id: I7dfc5677144be3df553edb4141e89e543e1b977d
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Issue-ID: VFC-950

9 files changed, 14 insertions, 869 deletions

diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/FullUnitTestSuite.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/FullUnitTestSuite.java
index b37d95ff..61919e0d 100644
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/FullUnitTestSuite.java
+++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/FullUnitTestSuite.java
@@ -26,7 +26,6 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.TestAAIRestApiProvi
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.TestGrantlessGrantManager;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.TestSdcPackageProvider;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.notification.*;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.so.TestSoLifecycleManager;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.vfc.*;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.packagetransformer.*;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.restapi.*;
@@ -58,8 +57,6 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.notification.TestReportedA
         TestGrantlessGrantManager.class,
         TestSdcPackageProvider.class,
 
-        TestSoLifecycleManager.class,
-
         TestVfcExternalSystemInfoProvider.class,
         TestVfcGrantManager.class,
         TestVfcPackageProvider.class,
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/ct/CTDirectReal.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/ct/CTDirectReal.java
index a284f28f..457d4688 100644
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/ct/CTDirectReal.java
+++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/ct/CTDirectReal.java
@@ -52,50 +52,6 @@ public class CTDirectReal {
     public void testBasicWorkflow() throws Exception {
         SystemFunctions.systemFunctions().sleep(10000000 * 1000L);
 
-        VimInfo nokia_regionOne = externalSystemInfoProvider.getVimInfo("Nokia_RegionOne");
-
-        VnfLifecycleChangeNotification recievedNot = new VnfLifecycleChangeNotification();
-        recievedNot.setVnfInstanceId("CBAM-d8deb02a7a51449dba576ac9eabb55b8");
-        ReportedAffectedConnectionPoints affectedConnectionPoints = new ReportedAffectedConnectionPoints();
-        recievedNot.setAffectedVirtualLinks(new ArrayList<>());
-        AffectedVirtualLink link = new AffectedVirtualLink();
-        recievedNot.getAffectedVirtualLinks().add(link);
-        link.setId("vlid1");
-        link.setChangeType(ChangeType.REMOVED);
-        link.setVirtualLinkDescId("vldId1");
-        link.setResource(new ResourceHandle());
-        link.getResource().setResourceId("netProviderId1");
-        link.getResource().setAdditionalData(additionalData("name", "networkName"));
-        recievedNot.setAffectedVnfcs(new ArrayList<>());
-        AffectedVnfc vnfc = new AffectedVnfc();
-        vnfc.setId("myVnfcId1");
-        vnfc.setChangeType(ChangeType.ADDED);
-        vnfc.setVduId("myVduId");
-        vnfc.setStorageResourceIds(new ArrayList<>());
-        vnfc.setComputeResource(new ResourceHandle());
-        vnfc.getComputeResource().setResourceId("serverProvId1");
-        JsonObject additionalData = additionalData("name", "serverName");
-        additionalData.addProperty("tenantId", "de8fd0d1d5874503a47b920c10f4322a");
-        vnfc.getComputeResource().setAdditionalData(additionalData);
-        recievedNot.getAffectedVnfcs().add(vnfc);
-        ReportedAffectedCp addedCp = new ReportedAffectedCp();
-        addedCp.setCpId("cpId");
-        addedCp.setIpAddress("1.2.3.4");
-        addedCp.setMacAddress("a:b:c:d:e:f");
-        addedCp.setNetworkProviderId("netProviderId1");
-        addedCp.setServerProviderId("serverProvId1");
-        addedCp.setProviderId("portId");
-        addedCp.setTenantId("de8fd0d1d5874503a47b920c10f4322a");
-        addedCp.setCpdId("cpdId");
-        affectedConnectionPoints.getPost().add(addedCp);
-        notificationProcessor.processNotification(recievedNot, null, of(affectedConnectionPoints), "Nokia_RegionOne", "vnfmId");
-    }
-
-    JsonObject additionalData(String key, String value) {
-        JsonObject jsonObject = new JsonObject();
-        jsonObject.addProperty(key, value);
-        return jsonObject;
     }
 
-
 }
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/so/TestSoLifecycleManager.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/so/TestSoLifecycleManager.java
deleted file mode 100644
index 582b41df..00000000
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/so/TestSoLifecycleManager.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * Copyright 2016-2017, Nokia Corporation
- *
- * 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.
- */
-package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.so;
-
-import com.google.gson.JsonObject;
-import com.nokia.cbam.lcm.v32.model.ExtVirtualLinkData;
-import com.nokia.cbam.lcm.v32.model.VimSoftwareImage;
-import com.nokia.cbam.lcm.v32.model.VnfInfo;
-import com.nokia.cbam.lcm.v32.model.VnfProperty;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.AAIExternalSystemInfoProvider;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.direct.notification.GenericVnfManager;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.*;
-import org.onap.vnfmadapter.so.model.*;
-import org.onap.vnfmdriver.model.*;
-
-import static com.nokia.cbam.lcm.v32.model.VimInfo.VimInfoTypeEnum.*;
-import static junit.framework.TestCase.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.CbamRestApiProvider.NOKIA_LCM_API_VERSION;
-
-public class TestSoLifecycleManager extends TestBase {
-
-    private static final String VNFD_ID = "cbamVnfdId";
-    @Mock
-    private LifecycleManagerForSo lifecycleManager;
-    @Mock
-    private AAIExternalSystemInfoProvider vimInfoProvider;
-    @Mock
-    private JobManagerForSo jobManager;
-    @Mock
-    private GenericVnfManager genericVnfManager;
-    private SoLifecycleManager soLifecycleManager;
-
-    @Before
-    public void init() {
-        soLifecycleManager = new SoLifecycleManager(lifecycleManager, vimInfoProvider, cbamRestApiProviderForSo, jobManager, genericVnfManager);
-    }
-
-    /**
-     * test VNF creation
-     */
-    @Test
-    public void testVnfCreation() throws Exception {
-        SoVnfCreationRequest onapRequest = new SoVnfCreationRequest();
-        Object additionalParams = new JsonObject();
-        onapRequest.setAdditionalParams(additionalParams);
-        onapRequest.setCsarId("csarId");
-        onapRequest.setDescription("description");
-        onapRequest.setName("name");
-        VnfInfo vnfInfo = new VnfInfo();
-        vnfInfo.setId(VNF_ID);
-        LifecycleManager.VnfCreationResult genericResponse = new LifecycleManager.VnfCreationResult(vnfInfo, VNFD_ID);
-        when(lifecycleManager.create(VNFM_ID, "csarId", "name", "description")).thenReturn(genericResponse);
-        //when
-        SoVnfCreationResponse response = soLifecycleManager.create(VNFM_ID, onapRequest);
-        //verify
-        assertEquals(VNF_ID, response.getVnfId());
-    }
-
-    /**
-     * test VNF activation without parameters
-     */
-    @Test
-    public void testVnfActivation() throws Exception {
-        SoVnfActivationRequest soRequest = new SoVnfActivationRequest();
-        soRequest.setVimId(VIM_ID);
-
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        org.onap.vnfmdriver.model.VnfInfo vnfInfo = new org.onap.vnfmdriver.model.VnfInfo();
-        vnfInfo.setVnfdId(VNFD_ID);
-        when(lifecycleManager.queryVnf(VNFM_ID, VNF_ID)).thenReturn(vnfInfo);
-        ArgumentCaptor<List<ExtVirtualLinkInfo>> extLinks = ArgumentCaptor.forClass(List.class);
-        ArgumentCaptor<AdditionalParameters> additionalParameters = ArgumentCaptor.forClass(AdditionalParameters.class);
-        VnfInstantiateResponse instantiationResponse = new VnfInstantiateResponse();
-        instantiationResponse.setJobId(JOB_ID);
-        when(lifecycleManager.instantiate(eq(VNFM_ID), extLinks.capture(), eq(httpResponse), eq(additionalParams), additionalParameters.capture(), eq(VNF_ID), eq("csarId"), eq(VNFD_ID))).thenReturn(instantiationResponse);
-        org.onap.vnfmdriver.model.VimInfo esrInfo = new org.onap.vnfmdriver.model.VimInfo();
-        esrInfo.setUrl("http://localhost:123/v3");
-        esrInfo.setDomain("domain");
-        when(vimInfoProvider.getVimInfo(VIM_ID)).thenReturn(esrInfo);
-        VnfInfo cbamVnfInfo = new VnfInfo();
-        cbamVnfInfo.setExtensions(new ArrayList<>());
-        VnfProperty onapVnfdId = new VnfProperty();
-        cbamVnfInfo.getExtensions().add(onapVnfdId);
-        onapVnfdId.setName(LifecycleManager.ONAP_CSAR_ID);
-        onapVnfdId.setValue("csarId");
-        when(vnfApi.vnfsVnfInstanceIdGet(VNF_ID, NOKIA_LCM_API_VERSION)).thenReturn(buildObservable(cbamVnfInfo));
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.activate(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        AdditionalParameters actualAdditionalParameters = additionalParameters.getValue();
-        assertEquals(0, actualAdditionalParameters.getComputeResourceFlavours().size());
-        assertEquals(additionalParams, actualAdditionalParameters.getAdditionalParams());
-        assertEquals(0, actualAdditionalParameters.getExternalConnectionPointAddresses().size());
-        assertEquals(0, actualAdditionalParameters.getExtManagedVirtualLinks().size());
-        assertEquals(0, actualAdditionalParameters.getExtVirtualLinks().size());
-        assertEquals("default", actualAdditionalParameters.getInstantiationLevel());
-        assertEquals(0, actualAdditionalParameters.getSoftwareImages().size());
-        assertEquals(OPENSTACK_V3_INFO, actualAdditionalParameters.getVimType());
-        assertEquals(0, actualAdditionalParameters.getZones().size());
-        assertEquals(0, extLinks.getValue().size());
-    }
-
-
-    /**
-     * test VNF activation without parameters for V2 based API
-     */
-    @Test
-    public void testVnfActivationForV2() throws Exception {
-        SoVnfActivationRequest soRequest = new SoVnfActivationRequest();
-        soRequest.setVimId(VIM_ID);
-
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        org.onap.vnfmdriver.model.VnfInfo vnfInfo = new org.onap.vnfmdriver.model.VnfInfo();
-        vnfInfo.setVnfdId(VNFD_ID);
-        when(lifecycleManager.queryVnf(VNFM_ID, VNF_ID)).thenReturn(vnfInfo);
-        ArgumentCaptor<List<ExtVirtualLinkInfo>> extLinks = ArgumentCaptor.forClass(List.class);
-        ArgumentCaptor<AdditionalParameters> additionalParameters = ArgumentCaptor.forClass(AdditionalParameters.class);
-        VnfInstantiateResponse instantiationResponse = new VnfInstantiateResponse();
-        instantiationResponse.setJobId(JOB_ID);
-        when(lifecycleManager.instantiate(eq(VNFM_ID), extLinks.capture(), eq(httpResponse), eq(additionalParams), additionalParameters.capture(), eq(VNF_ID), eq("csarId"), eq(VNFD_ID))).thenReturn(instantiationResponse);
-        org.onap.vnfmdriver.model.VimInfo esrInfo = new org.onap.vnfmdriver.model.VimInfo();
-        esrInfo.setUrl("http://localhost:123/v2");
-        when(vimInfoProvider.getVimInfo(VIM_ID)).thenReturn(esrInfo);
-        VnfInfo cbamVnfInfo = new VnfInfo();
-        cbamVnfInfo.setExtensions(new ArrayList<>());
-        VnfProperty onapVnfdId = new VnfProperty();
-        cbamVnfInfo.getExtensions().add(onapVnfdId);
-        onapVnfdId.setName(LifecycleManager.ONAP_CSAR_ID);
-        onapVnfdId.setValue("csarId");
-        when(vnfApi.vnfsVnfInstanceIdGet(VNF_ID, NOKIA_LCM_API_VERSION)).thenReturn(buildObservable(cbamVnfInfo));
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.activate(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        AdditionalParameters actualAdditionalParameters = additionalParameters.getValue();
-        assertEquals(OPENSTACK_V2_INFO, actualAdditionalParameters.getVimType());
-    }
-
-    /**
-     * test VNF activation without parameters for vCloud based API
-     */
-    @Test
-    public void testVnfActivationForVcloud() throws Exception {
-        SoVnfActivationRequest soRequest = new SoVnfActivationRequest();
-        soRequest.setVimId(VIM_ID);
-
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        org.onap.vnfmdriver.model.VnfInfo vnfInfo = new org.onap.vnfmdriver.model.VnfInfo();
-        vnfInfo.setVnfdId(VNFD_ID);
-        when(lifecycleManager.queryVnf(VNFM_ID, VNF_ID)).thenReturn(vnfInfo);
-        ArgumentCaptor<List<ExtVirtualLinkInfo>> extLinks = ArgumentCaptor.forClass(List.class);
-        ArgumentCaptor<AdditionalParameters> additionalParameters = ArgumentCaptor.forClass(AdditionalParameters.class);
-        VnfInstantiateResponse instantiationResponse = new VnfInstantiateResponse();
-        instantiationResponse.setJobId(JOB_ID);
-        when(lifecycleManager.instantiate(eq(VNFM_ID), extLinks.capture(), eq(httpResponse), eq(additionalParams), additionalParameters.capture(), eq(VNF_ID), eq("csarId"), eq(VNFD_ID))).thenReturn(instantiationResponse);
-        org.onap.vnfmdriver.model.VimInfo esrInfo = new org.onap.vnfmdriver.model.VimInfo();
-        esrInfo.setUrl("http://localhost:123/");
-        esrInfo.setDomain("domain");
-        when(vimInfoProvider.getVimInfo(VIM_ID)).thenReturn(esrInfo);
-        VnfInfo cbamVnfInfo = new VnfInfo();
-        cbamVnfInfo.setExtensions(new ArrayList<>());
-        VnfProperty onapVnfdId = new VnfProperty();
-        cbamVnfInfo.getExtensions().add(onapVnfdId);
-        onapVnfdId.setName(LifecycleManager.ONAP_CSAR_ID);
-        onapVnfdId.setValue("csarId");
-        when(vnfApi.vnfsVnfInstanceIdGet(VNF_ID, NOKIA_LCM_API_VERSION)).thenReturn(buildObservable(cbamVnfInfo));
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.activate(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        AdditionalParameters actualAdditionalParameters = additionalParameters.getValue();
-        assertEquals(VMWARE_VCLOUD_INFO, actualAdditionalParameters.getVimType());
-    }
-
-    /**
-     * test VNF activation with VDU mappings
-     */
-    @Test
-    public void testVnfActivationWithVdu() throws Exception {
-        SoVnfActivationRequest soRequest = new SoVnfActivationRequest();
-        soRequest.setVimId(VIM_ID);
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        org.onap.vnfmdriver.model.VnfInfo vnfInfo = new org.onap.vnfmdriver.model.VnfInfo();
-        vnfInfo.setVnfdId(VNFD_ID);
-        when(lifecycleManager.queryVnf(VNFM_ID, VNF_ID)).thenReturn(vnfInfo);
-        ArgumentCaptor<List<ExtVirtualLinkInfo>> extLinks = ArgumentCaptor.forClass(List.class);
-        ArgumentCaptor<AdditionalParameters> additionalParameters = ArgumentCaptor.forClass(AdditionalParameters.class);
-        VnfInstantiateResponse instantiationResponse = new VnfInstantiateResponse();
-        instantiationResponse.setJobId(JOB_ID);
-        when(lifecycleManager.instantiate(eq(VNFM_ID), extLinks.capture(), eq(httpResponse), eq(additionalParams), additionalParameters.capture(), eq(VNF_ID), eq("csarId"), eq(VNFD_ID))).thenReturn(instantiationResponse);
-        org.onap.vnfmdriver.model.VimInfo esrInfo = new org.onap.vnfmdriver.model.VimInfo();
-        esrInfo.setUrl("http://localhost:123/v3");
-        esrInfo.setDomain("domain");
-        when(vimInfoProvider.getVimInfo(VIM_ID)).thenReturn(esrInfo);
-        VnfInfo cbamVnfInfo = new VnfInfo();
-        cbamVnfInfo.setExtensions(new ArrayList<>());
-        VnfProperty onapVnfdId = new VnfProperty();
-        cbamVnfInfo.getExtensions().add(onapVnfdId);
-        onapVnfdId.setName(LifecycleManager.ONAP_CSAR_ID);
-        onapVnfdId.setValue("csarId");
-        when(vnfApi.vnfsVnfInstanceIdGet(VNF_ID, NOKIA_LCM_API_VERSION)).thenReturn(buildObservable(cbamVnfInfo));
-        soRequest.setVduMappings(new ArrayList<>());
-        SoVduMapping vduMapping = new SoVduMapping();
-        soRequest.getVduMappings().add(vduMapping);
-        vduMapping.setFlavourId("flavorId");
-        vduMapping.setImageId("imageId");
-        vduMapping.setVduId("vduId");
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.activate(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        AdditionalParameters actualAdditionalParameters = additionalParameters.getValue();
-        assertEquals(1, actualAdditionalParameters.getComputeResourceFlavours().size());
-        assertEquals(1, actualAdditionalParameters.getSoftwareImages().size());
-        VimSoftwareImage image = actualAdditionalParameters.getSoftwareImages().get(0);
-        assertEquals(VIM_ID, image.getVimId());
-        assertEquals("vduId_image", image.getVnfdSoftwareImageId());
-        assertEquals("imageId", image.getResourceId());
-        assertEquals(VIM_ID, actualAdditionalParameters.getComputeResourceFlavours().get(0).getVimId());
-        assertEquals("flavorId", actualAdditionalParameters.getComputeResourceFlavours().get(0).getResourceId());
-        assertEquals("vduId", actualAdditionalParameters.getComputeResourceFlavours().get(0).getVnfdVirtualComputeDescId());
-        assertEquals(OPENSTACK_V3_INFO, actualAdditionalParameters.getVimType());
-    }
-
-    /**
-     * test VNF activation with network mappings
-     */
-    @Test
-    public void testVnfActivationWithNetworkMapping() throws Exception {
-        SoVnfActivationRequest soRequest = new SoVnfActivationRequest();
-        soRequest.setVimId(VIM_ID);
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        org.onap.vnfmdriver.model.VnfInfo vnfInfo = new org.onap.vnfmdriver.model.VnfInfo();
-        vnfInfo.setVnfdId(VNFD_ID);
-        when(lifecycleManager.queryVnf(VNFM_ID, VNF_ID)).thenReturn(vnfInfo);
-        ArgumentCaptor<List<ExtVirtualLinkInfo>> extLinks = ArgumentCaptor.forClass(List.class);
-        ArgumentCaptor<AdditionalParameters> additionalParameters = ArgumentCaptor.forClass(AdditionalParameters.class);
-        VnfInstantiateResponse instantiationResponse = new VnfInstantiateResponse();
-        instantiationResponse.setJobId(JOB_ID);
-        when(lifecycleManager.instantiate(eq(VNFM_ID), extLinks.capture(), eq(httpResponse), eq(additionalParams), additionalParameters.capture(), eq(VNF_ID), eq("csarId"), eq(VNFD_ID))).thenReturn(instantiationResponse);
-        org.onap.vnfmdriver.model.VimInfo esrInfo = new org.onap.vnfmdriver.model.VimInfo();
-        esrInfo.setUrl("http://localhost:123/v3");
-        esrInfo.setDomain("domain");
-        when(vimInfoProvider.getVimInfo(VIM_ID)).thenReturn(esrInfo);
-        VnfInfo cbamVnfInfo = new VnfInfo();
-        cbamVnfInfo.setExtensions(new ArrayList<>());
-        VnfProperty onapVnfdId = new VnfProperty();
-        cbamVnfInfo.getExtensions().add(onapVnfdId);
-        onapVnfdId.setName(LifecycleManager.ONAP_CSAR_ID);
-        onapVnfdId.setValue("csarId");
-        when(vnfApi.vnfsVnfInstanceIdGet(VNF_ID, NOKIA_LCM_API_VERSION)).thenReturn(buildObservable(cbamVnfInfo));
-        soRequest.setNetworkMappings(new ArrayList<>());
-        SoNetworkMapping networkMapping = new SoNetworkMapping();
-        networkMapping.setVldId("myVldId");
-        networkMapping.setNetworkProviderId("providerId");
-        networkMapping.setAssignedAddresses(new ArrayList<>());
-        SoAssignedAddresses e1 = new SoAssignedAddresses();
-        e1.setIpAddress("1.2.3.4");
-        e1.setCpdId("cpdId");
-        SoAssignedAddresses e2 = new SoAssignedAddresses();
-        e2.setIpAddress("1.2.3.5");
-        e2.setCpdId("cpdId2");
-        SoAssignedAddresses e3 = new SoAssignedAddresses();
-        e3.setIpAddress("1.2.3.6");
-        e3.setCpdId("cpdId2");
-        SoAssignedAddresses e4 = new SoAssignedAddresses();
-        e4.setIpAddress("1.2.3.6");
-        e4.setCpdId("cpdId2");
-        networkMapping.getAssignedAddresses().add(e1);
-        networkMapping.getAssignedAddresses().add(e2);
-        networkMapping.getAssignedAddresses().add(e3);
-        networkMapping.getAssignedAddresses().add(e4);
-        SoNetworkMapping networkMapping2 = new SoNetworkMapping();
-        soRequest.getNetworkMappings().add(networkMapping);
-        soRequest.getNetworkMappings().add(networkMapping2);
-        networkMapping2.setVldId("myVldId2");
-        networkMapping2.setNetworkProviderId("providerId2");
-
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.activate(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        AdditionalParameters actualAdditionalParameters = additionalParameters.getValue();
-        assertEquals(2, actualAdditionalParameters.getExtVirtualLinks().size());
-        ExtVirtualLinkData actualVl = actualAdditionalParameters.getExtVirtualLinks().get(0);
-        assertEquals(VIM_ID, actualVl.getVimId());
-        assertEquals("providerId", actualVl.getResourceId());
-        assertEquals("myVldId", actualVl.getExtVirtualLinkId());
-        assertEquals(2, actualVl.getExtCps().size());
-        assertEquals("cpdId", actualVl.getExtCps().get(0).getCpdId());
-        assertEquals("1.2.3.4", actualVl.getExtCps().get(0).getAddresses().get(0).getIp());
-        assertEquals("cpdId2", actualVl.getExtCps().get(1).getCpdId());
-        assertEquals("1.2.3.5", actualVl.getExtCps().get(1).getAddresses().get(0).getIp());
-        assertEquals("1.2.3.6", actualVl.getExtCps().get(1).getAddresses().get(1).getIp());
-    }
-
-    /**
-     * test VNF activation with server mappings
-     */
-    @Test
-    public void testVnfActivationWithServerMappings() throws Exception {
-        SoVnfActivationRequest soRequest = new SoVnfActivationRequest();
-        soRequest.setVimId(VIM_ID);
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        org.onap.vnfmdriver.model.VnfInfo vnfInfo = new org.onap.vnfmdriver.model.VnfInfo();
-        vnfInfo.setVnfdId(VNFD_ID);
-        when(lifecycleManager.queryVnf(VNFM_ID, VNF_ID)).thenReturn(vnfInfo);
-        ArgumentCaptor<List<ExtVirtualLinkInfo>> extLinks = ArgumentCaptor.forClass(List.class);
-        ArgumentCaptor<AdditionalParameters> additionalParameters = ArgumentCaptor.forClass(AdditionalParameters.class);
-        VnfInstantiateResponse instantiationResponse = new VnfInstantiateResponse();
-        instantiationResponse.setJobId(JOB_ID);
-        when(lifecycleManager.instantiate(eq(VNFM_ID), extLinks.capture(), eq(httpResponse), eq(additionalParams), additionalParameters.capture(), eq(VNF_ID), eq("csarId"), eq(VNFD_ID))).thenReturn(instantiationResponse);
-        org.onap.vnfmdriver.model.VimInfo esrInfo = new org.onap.vnfmdriver.model.VimInfo();
-        esrInfo.setUrl("http://localhost:123/v3");
-        esrInfo.setDomain("domain");
-        when(vimInfoProvider.getVimInfo(VIM_ID)).thenReturn(esrInfo);
-        VnfInfo cbamVnfInfo = new VnfInfo();
-        cbamVnfInfo.setExtensions(new ArrayList<>());
-        VnfProperty onapVnfdId = new VnfProperty();
-        cbamVnfInfo.getExtensions().add(onapVnfdId);
-        onapVnfdId.setName(LifecycleManager.ONAP_CSAR_ID);
-        onapVnfdId.setValue("csarId");
-        when(vnfApi.vnfsVnfInstanceIdGet(VNF_ID, NOKIA_LCM_API_VERSION)).thenReturn(buildObservable(cbamVnfInfo));
-        soRequest.setServerMappings(new ArrayList<>());
-        SoServerMapping s1 = new SoServerMapping();
-        soRequest.getServerMappings().add(s1);
-        s1.setVduId("vduId1");
-        s1.setAvailabilityZoneId("azId1");
-        SoServerMapping s2 = new SoServerMapping();
-        soRequest.getServerMappings().add(s2);
-        s2.setVduId("vduId1");
-        s2.setAvailabilityZoneId("azId1");
-        SoServerMapping s3 = new SoServerMapping();
-        soRequest.getServerMappings().add(s3);
-        s3.setVduId("vduId2");
-        s3.setAvailabilityZoneId("azId1");
-
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.activate(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        AdditionalParameters actualAdditionalParameters = additionalParameters.getValue();
-        assertEquals(2, actualAdditionalParameters.getZones().size());
-        assertEquals(VIM_ID, actualAdditionalParameters.getZones().get(0).getVimId());
-        assertEquals("azId1", actualAdditionalParameters.getZones().get(0).getResourceId());
-        assertEquals("vduId1", actualAdditionalParameters.getZones().get(0).getId());
-        assertEquals(VIM_ID, actualAdditionalParameters.getZones().get(1).getVimId());
-        assertEquals("azId1", actualAdditionalParameters.getZones().get(1).getResourceId());
-        assertEquals("vduId2", actualAdditionalParameters.getZones().get(1).getId());
-    }
-
-    /**
-     * test VNF scale in
-     */
-    @Test
-    public void testScaleIn() throws Exception {
-        SoVnfScaleRequest soRequest = new SoVnfScaleRequest();
-        ArgumentCaptor<org.onap.vnfmdriver.model.VnfScaleRequest> driverRequest = ArgumentCaptor.forClass(org.onap.vnfmdriver.model.VnfScaleRequest.class);
-        JobInfo jobInfo = new JobInfo();
-        jobInfo.setJobId(JOB_ID);
-
-        soRequest.setAspectId("aspectId");
-        soRequest.setDirection(SoScaleDirection.IN);
-        soRequest.setSteps(2);
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        when(lifecycleManager.scaleVnf(eq(VNFM_ID), eq(VNF_ID), driverRequest.capture(), eq(httpResponse))).thenReturn(jobInfo);
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.scale(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        assertEquals(2, Integer.parseInt(driverRequest.getValue().getNumberOfSteps()));
-        assertEquals("aspectId", driverRequest.getValue().getAspectId());
-        assertEquals(org.onap.vnfmdriver.model.ScaleDirection.IN, driverRequest.getValue().getType());
-        assertEquals(additionalParams, driverRequest.getValue().getAdditionalParam());
-    }
-
-    /**
-     * test VNF scale out
-     */
-    @Test
-    public void testScaleOut() throws Exception {
-        SoVnfScaleRequest soRequest = new SoVnfScaleRequest();
-        ArgumentCaptor<org.onap.vnfmdriver.model.VnfScaleRequest> driverRequest = ArgumentCaptor.forClass(org.onap.vnfmdriver.model.VnfScaleRequest.class);
-        JobInfo jobInfo = new JobInfo();
-        jobInfo.setJobId(JOB_ID);
-
-        soRequest.setAspectId("aspectId");
-        soRequest.setDirection(SoScaleDirection.OUT);
-        soRequest.setSteps(2);
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        when(lifecycleManager.scaleVnf(eq(VNFM_ID), eq(VNF_ID), driverRequest.capture(), eq(httpResponse))).thenReturn(jobInfo);
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.scale(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        assertEquals(2, Integer.parseInt(driverRequest.getValue().getNumberOfSteps()));
-        assertEquals("aspectId", driverRequest.getValue().getAspectId());
-        assertEquals(org.onap.vnfmdriver.model.ScaleDirection.OUT, driverRequest.getValue().getType());
-        assertEquals(additionalParams, driverRequest.getValue().getAdditionalParam());
-    }
-
-    /**
-     * test VNF heal
-     */
-    @Test
-    public void testHeal() throws Exception {
-        SoVnfHealRequest soRequest = new SoVnfHealRequest();
-        ArgumentCaptor<org.onap.vnfmdriver.model.VnfHealRequest> driverRequest = ArgumentCaptor.forClass(org.onap.vnfmdriver.model.VnfHealRequest.class);
-        JobInfo jobInfo = new JobInfo();
-        jobInfo.setJobId(JOB_ID);
-
-        soRequest.setVnfcId(VNF_ID + "_vnfcId");
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        when(lifecycleManager.healVnf(eq(VNFM_ID), eq(VNF_ID), driverRequest.capture(), eq(Optional.of("vnfcId")), eq(httpResponse))).thenReturn(jobInfo);
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.heal(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        assertEquals("notUsedByDriver", driverRequest.getValue().getAffectedvm().getVduid());
-        assertEquals("notUsedByDriver", driverRequest.getValue().getAffectedvm().getVimid());
-        assertEquals("unknown", driverRequest.getValue().getAffectedvm().getVmname());
-        assertEquals("heal", driverRequest.getValue().getAction());
-    }
-
-    /**
-     * test VNF deactivation
-     */
-    @Test
-    public void testDeactivation() throws Exception {
-        SoVnfTerminationRequest soRequest = new SoVnfTerminationRequest();
-        ArgumentCaptor<org.onap.vnfmdriver.model.VnfTerminateRequest> driverRequest = ArgumentCaptor.forClass(org.onap.vnfmdriver.model.VnfTerminateRequest.class);
-        JobInfo jobInfo = new JobInfo();
-        jobInfo.setJobId(JOB_ID);
-        soRequest.setGracefulTerminationTimeoutInMs(1234);
-        soRequest.setMode(SoTerminationMode.GRACEFUL);
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        when(lifecycleManager.terminateAndDelete(eq(VNFM_ID), eq(VNF_ID), driverRequest.capture(), eq(httpResponse))).thenReturn(jobInfo);
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.deactivate(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        assertEquals(VnfTerminationType.GRACEFUL, driverRequest.getValue().getTerminationType());
-        assertEquals("1234", driverRequest.getValue().getGracefulTerminationTimeout());
-    }
-
-    /**
-     * test VNF deactivation
-     */
-    @Test
-    public void testDeactivationForceFull() throws Exception {
-        SoVnfTerminationRequest soRequest = new SoVnfTerminationRequest();
-        ArgumentCaptor<org.onap.vnfmdriver.model.VnfTerminateRequest> driverRequest = ArgumentCaptor.forClass(org.onap.vnfmdriver.model.VnfTerminateRequest.class);
-        JobInfo jobInfo = new JobInfo();
-        jobInfo.setJobId(JOB_ID);
-        soRequest.setMode(SoTerminationMode.FORCEFUL);
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        when(lifecycleManager.terminateAndDelete(eq(VNFM_ID), eq(VNF_ID), driverRequest.capture(), eq(httpResponse))).thenReturn(jobInfo);
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.deactivate(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-        assertEquals(VnfTerminationType.FORCEFUL, driverRequest.getValue().getTerminationType());
-        assertEquals(null, driverRequest.getValue().getGracefulTerminationTimeout());
-    }
-
-    /**
-     * test VNF deletion
-     */
-    @Test
-    public void testDelete() throws Exception {
-        //when
-        soLifecycleManager.delete(VNFM_ID, VNF_ID);
-        //verify
-        verify(lifecycleManager).deleteVnf(VNFM_ID, VNF_ID);
-    }
-
-    /**
-     * test VNF custom operation
-     */
-    @Test
-    public void testCustomOperation() throws Exception {
-        SoVnfCustomOperation soRequest = new SoVnfCustomOperation();
-        JobInfo jobInfo = new JobInfo();
-        jobInfo.setJobId(JOB_ID);
-        soRequest.setOperationId("operationId");
-        JsonObject additionalParams = new JsonObject();
-        soRequest.setAdditionalParams(additionalParams);
-        when(lifecycleManager.customOperation(VNFM_ID, VNF_ID, "operationId", additionalParams, httpResponse)).thenReturn(jobInfo);
-        //when
-        SoJobHandler jobHandler = soLifecycleManager.customOperation(VNFM_ID, VNF_ID, soRequest, httpResponse);
-        //verify
-        assertEquals(JOB_ID, jobHandler.getJobId());
-    }
-
-
-    /**
-     * test VNF custom operation
-     */
-    @Test
-    public void testJobDetails() throws Exception {
-        JobDetailInfo currentJobDetails = new JobDetailInfo();
-        currentJobDetails.setJobId(JOB_ID);
-        when(jobManager.getJob(VNFM_ID, JOB_ID)).thenReturn(currentJobDetails);
-        currentJobDetails.setResponseDescriptor(new JobDetailInfoResponseDescriptor());
-
-        assertJob(currentJobDetails, SoJobStatus.FINISHED, JobStatus.FINISHED);
-        assertJob(currentJobDetails, SoJobStatus.FAILED, JobStatus.ERROR);
-        assertJob(currentJobDetails, SoJobStatus.FAILED, JobStatus.TIMEOUT);
-        assertJob(currentJobDetails, SoJobStatus.STARTED, JobStatus.STARTED);
-        assertJob(currentJobDetails, SoJobStatus.STARTED, JobStatus.PROCESSING);
-
-    }
-
-    private void assertJob(JobDetailInfo currentJobDetails, SoJobStatus expectedState, JobStatus started) {
-        currentJobDetails.getResponseDescriptor().setStatus(started);
-        //when
-        SoJobDetail jobDetail = soLifecycleManager.getJobDetails(VNFM_ID, JOB_ID);
-        //verify
-        assertEquals(JOB_ID, jobDetail.getJobId());
-        assertEquals(expectedState, jobDetail.getStatus());
-    }
-
-
-}
\ No newline at end of file
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestCbamVnfdBuilder.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestCbamVnfdBuilder.java
index 5840ef4e..10a5a38c 100644
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestCbamVnfdBuilder.java
+++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestCbamVnfdBuilder.java
@@ -26,7 +26,7 @@ public class TestCbamVnfdBuilder extends TestBase {
     private CbamVnfdBuilder packageTransformer = new CbamVnfdBuilder();
 
     /**
-     * test package conversion on the most mininal VNFD possible
+     * test package conversion on the most minimal VNFD possible
      */
     @Test
     public void testEmpty() throws Exception {
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestOnapVnfPackageBuilder.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestOnapVnfPackageBuilder.java
index d2a92556..78a8a725 100644
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestOnapVnfPackageBuilder.java
+++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/packagetransformer/TestOnapVnfPackageBuilder.java
@@ -60,7 +60,7 @@ public class TestOnapVnfPackageBuilder extends TestBase {
     }
 
     /**
-     * Test conversion for V1 package
+     * Test conversion for V1TOSCA package
      */
     @Test
     public void testConversionViaV1() throws Exception {
@@ -73,7 +73,7 @@ public class TestOnapVnfPackageBuilder extends TestBase {
         String cbamVnfd = new String(TestUtil.loadFile("unittests/packageconverter/cbam.package.zip.vnfd"));
         String expectedOnapVnfd = new OnapR1VnfdBuilder().toOnapVnfd(cbamVnfd);
         //when
-        byte[] convertedPackage = new OnapVnfPackageBuilder().covert(new ByteArrayInputStream(TestUtil.loadFile("unittests/packageconverter/cbam.package.zip")), SupportedOnapPackageVersions.V1);
+        byte[] convertedPackage = new OnapVnfPackageBuilder().covert(new ByteArrayInputStream(TestUtil.loadFile("unittests/packageconverter/cbam.package.zip")), SupportedOnapPackageVersions.V1TOSCA);
         //verify
         assertFileInZip(convertedPackage, "TOSCA-Metadata/TOSCA.meta", TestUtil.loadFile("TOSCA.meta"));
         assertFileInZip(convertedPackage, "MainServiceTemplate.yaml", expectedOnapVnfd.getBytes());
@@ -84,7 +84,7 @@ public class TestOnapVnfPackageBuilder extends TestBase {
     }
 
     /**
-     * Test conversion for V2 package
+     * Test conversion for V2TOSCA package
      */
     @Test
     public void testConversionViaV2() throws Exception {
@@ -97,7 +97,7 @@ public class TestOnapVnfPackageBuilder extends TestBase {
         String cbamVnfd = new String(TestUtil.loadFile("unittests/packageconverter/cbam.package.zip.vnfd"));
         String expectedOnapVnfd = new OnapR2VnfdBuilder().toOnapVnfd(cbamVnfd);
         //when
-        byte[] convertedPackage = new OnapVnfPackageBuilder().covert(new ByteArrayInputStream(TestUtil.loadFile("unittests/packageconverter/cbam.package.zip")), SupportedOnapPackageVersions.V2);
+        byte[] convertedPackage = new OnapVnfPackageBuilder().covert(new ByteArrayInputStream(TestUtil.loadFile("unittests/packageconverter/cbam.package.zip")), SupportedOnapPackageVersions.V2TOSCA);
         //verify
         assertFileInZip(convertedPackage, "TOSCA-Metadata/TOSCA.meta", TestUtil.loadFile("TOSCA.meta"));
         assertFileInZip(convertedPackage, "MainServiceTemplate.yaml", expectedOnapVnfd.getBytes());
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestConverterApi.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestConverterApi.java
index 99fd203a..ba64b924 100644
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestConverterApi.java
+++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestConverterApi.java
@@ -75,7 +75,7 @@ public class TestConverterApi extends TestBase {
         when(httpRequest.getPart("fileToUpload")).thenReturn(part);
         Part part2 = Mockito.mock(Part.class);
         when(httpRequest.getPart("version")).thenReturn(part2);
-        when(part2.getInputStream()).thenReturn(new ByteArrayInputStream("V1".getBytes()));
+        when(part2.getInputStream()).thenReturn(new ByteArrayInputStream("V1TOSCA".getBytes()));
         //when
         converterApi.convert(httpResponse, httpRequest);
         //verify
@@ -122,7 +122,7 @@ public class TestConverterApi extends TestBase {
         when(httpRequest.getPart("fileToUpload")).thenThrow(expectedException);
         Part part = Mockito.mock(Part.class);
         when(httpRequest.getPart("version")).thenReturn(part);
-        when(part.getInputStream()).thenReturn(new ByteArrayInputStream("V1".getBytes()));
+        when(part.getInputStream()).thenReturn(new ByteArrayInputStream("V1TOSCA".getBytes()));
         try {
             converterApi.convert(httpResponse, httpRequest);
             fail();
@@ -143,7 +143,7 @@ public class TestConverterApi extends TestBase {
         when(part.getInputStream()).thenReturn(new ByteArrayInputStream(TestUtil.loadFile("unittests/packageconverter/cbam.package.zip")));
         when(httpRequest.getPart("fileToUpload")).thenReturn(part);
         when(httpRequest.getPart("version")).thenThrow(expectedException);
-        when(part.getInputStream()).thenReturn(new ByteArrayInputStream("V1".getBytes()));
+        when(part.getInputStream()).thenReturn(new ByteArrayInputStream("V1TOSCA".getBytes()));
         try {
             converterApi.convert(httpResponse, httpRequest);
             fail();
@@ -165,7 +165,7 @@ public class TestConverterApi extends TestBase {
 
         Part part2 = Mockito.mock(Part.class);
         when(httpRequest.getPart("version")).thenReturn(part2);
-        when(part2.getInputStream()).thenReturn(new ByteArrayInputStream("V1".getBytes()));
+        when(part2.getInputStream()).thenReturn(new ByteArrayInputStream("V1TOSCA".getBytes()));
         try {
             converterApi.convert(httpResponse, httpRequest);
             fail();
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestSoApi.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestSoApi.java
deleted file mode 100644
index be1ee5a7..00000000
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestSoApi.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2016-2017, Nokia Corporation
- *
- * 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.
- */
-
-package org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.restapi;
-
-import junit.framework.TestCase;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.onap.so.SoLifecycleManager;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.vnfm.TestBase;
-import org.onap.vnfmadapter.so.model.*;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.springframework.test.util.ReflectionTestUtils.setField;
-
-
-public class TestSoApi extends TestBase {
-
-    @Mock
-    private SoLifecycleManager soLifecycleManager;
-    @InjectMocks
-    private SoApi soApi;
-    @Mock
-    private SoJobHandler jobHandler;
-
-    @Before
-    public void initMocks() throws Exception {
-        setField(SoApi.class, "logger", logger);
-    }
-
-    /**
-     * test create
-     */
-    @Test
-    public void testCreate() {
-        SoVnfCreationRequest soRequest = Mockito.mock(SoVnfCreationRequest.class);
-        SoVnfCreationResponse vnf = new SoVnfCreationResponse();
-        when(soLifecycleManager.create(VNFM_ID, soRequest)).thenReturn(vnf);
-        //when
-        SoVnfCreationResponse actual = soApi.createVnf(soRequest, VNFM_ID, httpResponse);
-        //verify
-        verify(logger).info("REST: Create the VNF");
-        TestCase.assertEquals(vnf, actual);
-    }
-
-    /**
-     * test activation
-     */
-    @Test
-    public void testActivate() {
-        SoVnfActivationRequest soRequest = Mockito.mock(SoVnfActivationRequest.class);
-        when(soLifecycleManager.activate(VNFM_ID, VNF_ID, soRequest, httpResponse)).thenReturn(jobHandler);
-        //when
-        SoJobHandler soJobHandler = soApi.activateVnf(soRequest, VNFM_ID, VNF_ID, httpResponse);
-        //verify
-        verify(logger).info("REST: Activate the VNF");
-        TestCase.assertEquals(jobHandler, soJobHandler);
-    }
-
-    /**
-     * test scale
-     */
-    @Test
-    public void testScale() {
-        SoVnfScaleRequest soRequest = Mockito.mock(SoVnfScaleRequest.class);
-        when(soLifecycleManager.scale(VNFM_ID, VNF_ID, soRequest, httpResponse)).thenReturn(jobHandler);
-        //when
-        SoJobHandler soJobHandler = soApi.scaleVnf(soRequest, VNFM_ID, VNF_ID, httpResponse);
-        //verify
-        verify(logger).info("REST: Scale the VNF");
-        TestCase.assertEquals(jobHandler, soJobHandler);
-    }
-
-    /**
-     * test heal
-     */
-    @Test
-    public void testHeal() {
-        SoVnfHealRequest soRequest = Mockito.mock(SoVnfHealRequest.class);
-        when(soLifecycleManager.heal(VNFM_ID, VNF_ID, soRequest, httpResponse)).thenReturn(jobHandler);
-        //when
-        SoJobHandler soJobHandler = soApi.healVnf(soRequest, VNFM_ID, VNF_ID, httpResponse);
-        //verify
-        verify(logger).info("REST: Heal the VNF");
-        TestCase.assertEquals(jobHandler, soJobHandler);
-    }
-
-
-    /**
-     * test custom
-     */
-    @Test
-    public void testCustom() {
-        SoVnfCustomOperation soRequest = Mockito.mock(SoVnfCustomOperation.class);
-        when(soLifecycleManager.customOperation(VNFM_ID, VNF_ID, soRequest, httpResponse)).thenReturn(jobHandler);
-        //when
-        SoJobHandler soJobHandler = soApi.executeCustomOperation(soRequest, VNFM_ID, VNF_ID, httpResponse);
-        //verify
-        verify(logger).info("REST: Execute custom operation on the VNF");
-        TestCase.assertEquals(jobHandler, soJobHandler);
-    }
-
-    /**
-     * test deactivation
-     */
-    @Test
-    public void testDeactivation() {
-        SoVnfTerminationRequest soRequest = Mockito.mock(SoVnfTerminationRequest.class);
-        when(soLifecycleManager.deactivate(VNFM_ID, VNF_ID, soRequest, httpResponse)).thenReturn(jobHandler);
-        //when
-        SoJobHandler soJobHandler = soApi.deactivateVnf(soRequest, VNFM_ID, VNF_ID, httpResponse);
-        //verify
-        verify(logger).info("REST: Deactivate the VNF");
-        TestCase.assertEquals(jobHandler, soJobHandler);
-    }
-
-    /**
-     * test delete
-     */
-    @Test
-    public void testDelete() {
-        //when
-        soApi.deleteVnf(VNFM_ID, VNF_ID, httpResponse);
-        //verify
-        verify(logger).info("REST: Delete the VNF");
-        verify(soLifecycleManager).delete(VNFM_ID, VNF_ID);
-    }
-
-    /**
-     * test deactivation
-     */
-    @Test
-    public void testGetJob() {
-        SoJobDetail jobDetail = new SoJobDetail();
-        when(soLifecycleManager.getJobDetails(VNFM_ID, JOB_ID)).thenReturn(jobDetail);
-        //when
-        SoJobDetail actial = soApi.getJob(VNFM_ID, JOB_ID, httpResponse);
-        //verify
-        verify(logger).trace("REST: Query the job");
-        TestCase.assertEquals(jobDetail, actial);
-    }
-
-}
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestSwaggerDefinitionConsistency.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestSwaggerDefinitionConsistency.java
index d39a1445..77406c24 100644
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestSwaggerDefinitionConsistency.java
+++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/restapi/TestSwaggerDefinitionConsistency.java
@@ -37,7 +37,7 @@ import static org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.util.TestUtil.loadFile;
 
 public class TestSwaggerDefinitionConsistency extends TestBase {
 
-    public static final HashSet<Class<?>> CLASSES = Sets.newHashSet(LcmApi.class, LcnApi.class, SwaggerApi.class, ConverterApi.class, SoApi.class);
+    public static final HashSet<Class<?>> CLASSES = Sets.newHashSet(LcmApi.class, LcnApi.class, SwaggerApi.class, ConverterApi.class, SoV2Api.class);
 
     @Test
     public void test() throws Exception {
diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/TestLifecycleManager.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/TestLifecycleManager.java
index ea379e67..0ece0080 100644
--- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/TestLifecycleManager.java
+++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/TestLifecycleManager.java
@@ -288,30 +288,7 @@ public class TestLifecycleManager extends TestBase {
     }
 
     /**
-     * invalid VIM type results in failure
-     */
-    @Test
-    public void testInstantiationWithInvalidVimType() throws Exception {
-        //given
-        VnfInstantiateRequest instantiationRequest = prepareInstantiationRequest(VimInfo.VimInfoTypeEnum.OTHER_VIM_INFO, false);
-        when(vnfApi.vnfsPost(createRequest.capture(), eq(NOKIA_LCM_API_VERSION))).thenReturn(buildObservable(vnfInfo));
-        when(logger.isInfoEnabled()).thenReturn(false);
-        //when
-        try {
-            lifecycleManager.createAndInstantiate(VNFM_ID, instantiationRequest, restResponse);
-            //verify
-            fail();
-        } catch (Exception e) {
-            assertEquals("Only OPENSTACK_V2_INFO, OPENSTACK_V3_INFO and VMWARE_VCLOUD_INFO is the supported VIM types", e.getMessage());
-        }
-        verify(vnfApi, never()).vnfsPost(Mockito.any(), Mockito.any());
-        verify(logger, never()).info(eq("Starting {} operation on VNF with {} identifier with {} parameter"), eq("creation"), eq("not yet specified"), anyString());
-        verify(logger, never()).info(eq("Starting {} operation on VNF with {} identifier with {} parameter"), eq("instantiation"), eq(VNF_ID), anyString());
-        verify(logger).error("Only OPENSTACK_V2_INFO, OPENSTACK_V3_INFO and VMWARE_VCLOUD_INFO is the supported VIM types");
-    }
-
-    /**
-     * test instantiation with KeyStone V2 based with SSL
+     * test instantiation with KeyStone V2TOSCA based with SSL
      */
     @Test
     public void testInstantiationV2WithSsl() throws Exception {
@@ -579,70 +556,6 @@ public class TestLifecycleManager extends TestBase {
     }
 
     /**
-     * verify backward compatibility with Amsterdam release
-     */
-    @Test
-    public void testInstantiationV3WithNoDomain() throws Exception {
-        additionalParam.setInstantiationLevel(INSTANTIATION_LEVEL);
-        additionalParam.setDomain("myDomain");
-        VnfInstantiateRequest instantiationRequest = prepareInstantiationRequest(VimInfo.VimInfoTypeEnum.OPENSTACK_V3_INFO, false);
-        vimInfo.setDomain(null);
-        when(vnfApi.vnfsPost(createRequest.capture(), eq(NOKIA_LCM_API_VERSION))).thenReturn(buildObservable(vnfInfo));
-        when(vfcGrantManager.requestGrantForInstantiate(VNFM_ID, VNF_ID, VIM_ID, ONAP_CSAR_ID, INSTANTIATION_LEVEL, cbamVnfdContent, JOB_ID)).thenReturn(grantResponse);
-        grantResponse.setVimId(VIM_ID);
-        GrantVNFResponseVimAccessInfo accessInfo = new GrantVNFResponseVimAccessInfo();
-        accessInfo.setTenant(TENANT);
-        vimInfo.setSslInsecure(null);
-        grantResponse.setAccessInfo(accessInfo);
-        ArgumentCaptor<InstantiateVnfRequest> actualInstantiationRequest = ArgumentCaptor.forClass(InstantiateVnfRequest.class);
-        when(vnfApi.vnfsVnfInstanceIdInstantiatePost(eq(VNF_ID), actualInstantiationRequest.capture(), eq(NOKIA_LCM_API_VERSION))).thenReturn(buildObservable(instantiationOperationExecution));
-        //when
-        VnfInstantiateResponse response = lifecycleManager.createAndInstantiate(VNFM_ID, instantiationRequest, restResponse);
-        waitForJobToFinishInJobManager(finished);
-        assertEquals(1, actualInstantiationRequest.getValue().getVims().size());
-        //verify
-        OPENSTACKV3INFO actualVim = (OPENSTACKV3INFO) actualInstantiationRequest.getValue().getVims().get(0);
-        assertEquals(VIM_ID, actualVim.getId());
-        assertEquals(VimInfo.VimInfoTypeEnum.OPENSTACK_V3_INFO, actualVim.getVimInfoType());
-        assertEquals("cloudUrl", actualVim.getInterfaceInfo().getEndpoint());
-        //FIXME assertEquals();actualVim.getInterfaceInfo().getTrustedCertificates());
-        assertEquals("vimPassword", actualVim.getAccessInfo().getPassword());
-        assertEquals("regionId", actualVim.getAccessInfo().getRegion());
-        assertEquals("myTenant", actualVim.getAccessInfo().getProject());
-        assertEquals("myDomain", actualVim.getAccessInfo().getDomain());
-        assertEquals("vimUsername", actualVim.getAccessInfo().getUsername());
-        assertTrue(actualVim.getInterfaceInfo().isSkipCertificateVerification());
-        assertTrue(actualVim.getInterfaceInfo().isSkipCertificateHostnameCheck());
-        verify(logger).warn("Setting domain from additional parameters");
-    }
-
-    /**
-     * verify backward compatibility with Amsterdam release
-     * if no domain is specified error is propagated
-     */
-    @Test
-    public void testInstantiationV3WithNoDomainFail() throws Exception {
-        VnfInstantiateRequest instantiationRequest = prepareInstantiationRequest(VimInfo.VimInfoTypeEnum.OPENSTACK_V3_INFO, false);
-        vimInfo.setDomain(null);
-        when(vnfApi.vnfsPost(createRequest.capture(), eq(NOKIA_LCM_API_VERSION))).thenReturn(buildObservable(vnfInfo));
-        additionalParam.setInstantiationLevel(INSTANTIATION_LEVEL);
-        when(vfcGrantManager.requestGrantForInstantiate(VNFM_ID, VNF_ID, VIM_ID, ONAP_CSAR_ID, INSTANTIATION_LEVEL, cbamVnfdContent, JOB_ID)).thenReturn(grantResponse);
-        grantResponse.setVimId(VIM_ID);
-        GrantVNFResponseVimAccessInfo accessInfo = new GrantVNFResponseVimAccessInfo();
-        accessInfo.setTenant(TENANT);
-        vimInfo.setSslInsecure(null);
-        grantResponse.setAccessInfo(accessInfo);
-        ArgumentCaptor<InstantiateVnfRequest> actualInstantiationRequest = ArgumentCaptor.forClass(InstantiateVnfRequest.class);
-        when(vnfApi.vnfsVnfInstanceIdInstantiatePost(eq(VNF_ID), actualInstantiationRequest.capture(), eq(NOKIA_LCM_API_VERSION))).thenReturn(buildObservable(instantiationOperationExecution));
-        //when
-        VnfInstantiateResponse response = lifecycleManager.createAndInstantiate(VNFM_ID, instantiationRequest, restResponse);
-        waitForJobToFinishInJobManager(finished);
-        assertEquals(0, actualInstantiationRequest.getAllValues().size());
-        //verify
-        verify(logger).error("The cloud did not supply the cloud domain (Amsterdam release) and was not supplied as additional data");
-    }
-
-    /**
      * test instantiation with vcloud
      */
     @Test
@@ -1709,17 +1622,15 @@ public class TestLifecycleManager extends TestBase {
         additionalParam.setInstantiationLevel("level1");
         switch (cloudType) {
             case OPENSTACK_V2_INFO:
-                additionalParam.setVimType(VimInfo.VimInfoTypeEnum.OPENSTACK_V2_INFO);
+                vimInfo.setType("openstack");
                 break;
             case OPENSTACK_V3_INFO:
-                additionalParam.setVimType(VimInfo.VimInfoTypeEnum.OPENSTACK_V3_INFO);
+                vimInfo.setType("openstack");
                 vimInfo.setDomain("myDomain");
                 break;
             case VMWARE_VCLOUD_INFO:
-                additionalParam.setVimType(VimInfo.VimInfoTypeEnum.VMWARE_VCLOUD_INFO);
+                vimInfo.setType("vmware");
                 break;
-            default:
-                additionalParam.setVimType(VimInfo.VimInfoTypeEnum.OTHER_VIM_INFO);
         }
 
         Map<String, List<NetworkAddress>> exteranalConnectionPointAddresses = new HashMap<>();