Containerization feature of SO

Change-Id: I95381232eeefcd247a66a5cec370a8ce1c288e18
Issue-ID: SO-670
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

4 files changed, 0 insertions, 790 deletions

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/AdapterBeansTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/AdapterBeansTest.java
deleted file mode 100644
index 250211845f..0000000000
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/AdapterBeansTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP - SO

- * ================================================================================

- * Copyright (C) 2017 Huawei Technologies Co., Ltd. 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.openecomp.mso.adapter_utils.tests;

-

-import static org.junit.Assert.assertTrue;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import org.junit.Test;

-import org.openecomp.mso.entity.MsoRequest;

-import org.openecomp.mso.openstack.beans.MsoTenant;

-import org.openecomp.mso.openstack.beans.NetworkRollback;

-import org.openecomp.mso.openstack.beans.Pool;

-import org.openecomp.mso.openstack.beans.Subnet;

-import org.openecomp.mso.openstack.beans.VnfRollback;

-

-public class AdapterBeansTest {

-	@Test

-	public final void msoTenantTest() {

-		MsoTenant tenant = new MsoTenant();

-		tenant.setTenantId("1");

-		assertTrue(tenant.getTenantId().equalsIgnoreCase("1"));

-		tenant.setTenantName("TenantName");

-		assertTrue(tenant.getTenantName().equalsIgnoreCase("TenantName"));

-		Map<String, String> hm = new HashMap<>();

-		hm.put("Key1", "value1");

-		tenant.setMetadata(hm);

-		assertTrue(tenant.getMetadata() != null);

-		new MsoTenant("1", "TenantName", hm);

-		// assertTrue(tenant.toString() != null);

-	}

-

-	@Test

-	public final void networkRollbackTest() {

-		NetworkRollback networkRollback = new NetworkRollback();

-		networkRollback.setCloudId("cloudId");

-		assertTrue(networkRollback.getCloudId().equalsIgnoreCase("cloudId"));

-		networkRollback.setModelCustomizationUuid("modelCustomizationUuid");

-		assertTrue(networkRollback.getModelCustomizationUuid().equalsIgnoreCase("modelCustomizationUuid"));

-		MsoRequest msoRequest = new MsoRequest();

-		networkRollback.setMsoRequest(msoRequest);

-		networkRollback.getMsoRequest();

-		// assertTrue(networkRollback.getMsoRequest() == null);

-		networkRollback.setNetworkCreated(Boolean.TRUE);

-		assertTrue(networkRollback.getNetworkCreated());

-		networkRollback.setNetworkId("networkId");

-		assertTrue(networkRollback.getNetworkId().equalsIgnoreCase("networkId"));

-		networkRollback.setNetworkName("networkName");

-		assertTrue(networkRollback.getNetworkName().equalsIgnoreCase("networkName"));

-		networkRollback.setNetworkStackId("networkStackId");

-		assertTrue(networkRollback.getNetworkStackId().equalsIgnoreCase("networkStackId"));

-		networkRollback.setNetworkType("networkType");

-		assertTrue(networkRollback.getNetworkType().equalsIgnoreCase("networkType"));

-		networkRollback.setNeutronNetworkId("neutronNetworkId");

-		assertTrue(networkRollback.getNeutronNetworkId().equalsIgnoreCase("neutronNetworkId"));

-		networkRollback.setPhysicalNetwork("physicalNetwork");

-		assertTrue(networkRollback.getPhysicalNetwork().equalsIgnoreCase("physicalNetwork"));

-		networkRollback.setTenantId("tenantId");

-		assertTrue(networkRollback.getTenantId().equalsIgnoreCase("tenantId"));

-		List<Integer> al = new ArrayList<>();

-		al.add(1);

-		al.add(2);

-		networkRollback.setVlans(al);

-		assertTrue(networkRollback.getVlans() != null);

-		assertTrue(networkRollback.toString() != null);

-	}

-

-	@Test

-	public final void poolTest() {

-		Pool p = new Pool();

-		p.setStart("start");

-		p.getStart();

-		p.setEnd("end");

-		p.getEnd();

-		p.toString();

-	}

-

-	@Test

-	public final void subnetTest() {

-		Subnet subnet = new Subnet();

-		subnet.setAllocationPools(new ArrayList<>());

-		subnet.getAllocationPools();

-		subnet.setCidr("cidr");

-		subnet.getCidr();

-		subnet.setDnsNameServers(new ArrayList<>());

-		subnet.getDnsNameServers();

-		subnet.setEnableDHCP(true);

-		subnet.getEnableDHCP();

-		subnet.setGatewayIp("gatewayIp");

-		subnet.getGatewayIp();

-		subnet.setHostRoutes(new ArrayList<>());

-		subnet.getHostRoutes();

-		subnet.setIpVersion("ipVersion");

-		subnet.getIpVersion();

-		subnet.setNeutronId("neutronId");

-		subnet.getNeutronId();

-		subnet.setSubnetId("subnetId");

-		subnet.getSubnetId();

-		subnet.setSubnetName("subnetName");

-		subnet.getSubnetName();

-		subnet.toString();

-	}

-

-	@Test

-	public final void vnfRollbackTest() {

-		VnfRollback vnfRollback = new VnfRollback();

-		new VnfRollback("vnfId", "tenantId", "cloudSiteId", true, true, new MsoRequest(), "volumeGroupName",

-				"volumeGroupId", "requestType", "modelCustomizationUuid");

-		vnfRollback.setBaseGroupHeatStackId("baseGroupHeatStackId");

-		vnfRollback.getBaseGroupHeatStackId();

-		vnfRollback.setCloudSiteId("cloudId");

-		vnfRollback.getCloudSiteId();

-		vnfRollback.setIsBase(false);

-		vnfRollback.isBase();

-		vnfRollback.setModelCustomizationUuid("modelCustomizationUuid");

-		vnfRollback.getModelCustomizationUuid();

-		vnfRollback.setMsoRequest(new MsoRequest());

-		vnfRollback.getMsoRequest();

-		vnfRollback.setRequestType("requestType");

-		vnfRollback.getRequestType();

-		vnfRollback.setTenantCreated(true);

-		vnfRollback.getTenantCreated();

-		vnfRollback.setTenantId("tenantId");

-		vnfRollback.getTenantId();

-		vnfRollback.setVfModuleStackId("vfModuleStackId");

-		vnfRollback.getVfModuleStackId();

-		vnfRollback.setVnfCreated(true);

-		vnfRollback.getVnfCreated();

-		vnfRollback.setVnfId("vnfId");

-		vnfRollback.getVnfId();

-		vnfRollback.setVolumeGroupHeatStackId("volumeGroupHeatStackId");

-		vnfRollback.getVolumeGroupHeatStackId();

-		vnfRollback.setVolumeGroupId("volumeGroupId");

-		vnfRollback.getVolumeGroupId();

-		vnfRollback.setVolumeGroupName("volumeGroupName");

-		vnfRollback.getVolumeGroupName();

-		vnfRollback.toString();

-	}

-}

diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoCommonUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoCommonUtilsTest.java
deleted file mode 100644
index 73bd67723d..0000000000
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoCommonUtilsTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.openecomp.mso.adapter_utils.tests;
-
-
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-import org.openecomp.mso.logger.MsoAlarmLogger;
-import org.openecomp.mso.openstack.exceptions.MsoAdapterException;
-import org.openecomp.mso.openstack.exceptions.MsoException;
-import org.openecomp.mso.openstack.exceptions.MsoExceptionCategory;
-import org.openecomp.mso.openstack.exceptions.MsoIOException;
-import org.openecomp.mso.openstack.exceptions.MsoOpenstackException;
-import org.openecomp.mso.openstack.utils.MsoCommonUtils;
-import org.openecomp.mso.properties.MsoJavaProperties;
-import org.openecomp.mso.properties.MsoPropertiesException;
-import org.openecomp.mso.properties.MsoPropertiesFactory;
-import com.woorea.openstack.base.client.OpenStackBaseException;
-import com.woorea.openstack.base.client.OpenStackConnectException;
-import com.woorea.openstack.base.client.OpenStackRequest;
-import com.woorea.openstack.base.client.OpenStackResponseException;
-
-
-/**
- * This class implements test methods of the MsoCommonUtils
- *
- *
- */
-public class MsoCommonUtilsTest extends MsoCommonUtils {
-
-	public static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
-	
-	@Test
-    public final void testExecuteAndRecordOpenstackRequest () {
-		OpenStackRequest openstackRequest = Mockito.mock(OpenStackRequest.class);
-		Mockito.when(openstackRequest.endpoint()).thenReturn("localhost");
-		Mockito.when(openstackRequest.path()).thenReturn("/test");
-		//TODO:Must try a real connection
-		assertNull(super.executeAndRecordOpenstackRequest (openstackRequest));
-
-	}
-
-	@Test
-    public final void testKeystoneErrorToMsoException () {
-		OpenStackBaseException openStackConnectException = new OpenStackConnectException("connect");
-
-		OpenStackBaseException openStackResponseException = new OpenStackResponseException("response",1);
-
-		MsoException me = super.keystoneErrorToMsoException (openStackConnectException,"ContextError");
-
-		assertTrue(me instanceof MsoIOException);
-		assertTrue("connect".equals(me.getMessage()));
-
-
-		MsoException me2 = super.keystoneErrorToMsoException (openStackResponseException,"ContextError");
-		assertTrue(me2 instanceof MsoOpenstackException);
-		assertTrue("ContextError".equals(me2.getContext()));
-		assertTrue(MsoExceptionCategory.OPENSTACK.equals(me2.getCategory()));
-
-	}
-
-	@Test
-	public final void testHeatExceptionToMsoException () {
-		OpenStackBaseException openStackConnectException = new OpenStackConnectException("connect");
-
-		OpenStackBaseException openStackResponseException = new OpenStackResponseException("response",1);
-
-		MsoException me = super.heatExceptionToMsoException (openStackConnectException,"ContextError");
-
-		assertTrue(me instanceof MsoIOException);
-		assertTrue("connect".equals(me.getMessage()));
-
-
-		MsoException me2 = super.heatExceptionToMsoException (openStackResponseException,"ContextError");
-		assertTrue(me2 instanceof MsoOpenstackException);
-		assertTrue("ContextError".equals(me2.getContext()));
-		assertTrue(MsoExceptionCategory.OPENSTACK.equals(me2.getCategory()));
-	}
-
-	@Test
-	public final void testNeutronExceptionToMsoException () {
-		OpenStackBaseException openStackConnectException = new OpenStackConnectException("connect");
-
-		OpenStackBaseException openStackResponseException = new OpenStackResponseException("response",1);
-
-		MsoException me = super.neutronExceptionToMsoException (openStackConnectException,"ContextError");
-
-		assertTrue(me instanceof MsoIOException);
-		assertTrue("connect".equals(me.getMessage()));
-
-		MsoException me2 = super.neutronExceptionToMsoException (openStackResponseException,"ContextError");
-		assertTrue(me2 instanceof MsoOpenstackException);
-		assertTrue("ContextError".equals(me2.getContext()));
-		assertTrue(MsoExceptionCategory.OPENSTACK.equals(me2.getCategory()));
-	}
-
-	@Test
-	public final void testRuntimeExceptionToMsoException () {
-	    RuntimeException re = new RuntimeException ("runtime");
-	    MsoException me = super.runtimeExceptionToMsoException (re, "ContextError");
-
-	    assertTrue (me instanceof MsoAdapterException);
-	    assertTrue("ContextError".equals(me.getContext()));
-        assertTrue(MsoExceptionCategory.INTERNAL.equals(me.getCategory()));
-	}
-}
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java
deleted file mode 100644
index 93afbcccaf..0000000000
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.openecomp.mso.adapter_utils.tests;
-
-import java.io.IOException;
-import java.util.*;
-
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.TextNode;
-import com.woorea.openstack.base.client.HttpMethod;
-import com.woorea.openstack.base.client.OpenStackRequest;
-import com.woorea.openstack.heat.model.Stack;
-import com.woorea.openstack.keystone.model.Access;
-import com.woorea.openstack.keystone.utils.KeystoneUtils;
-import mockit.Deencapsulation;
-import mockit.Invocation;
-import mockit.Mock;
-import mockit.MockUp;
-import mockit.integration.junit4.JMockit;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.openecomp.mso.cloud.CloudConfigFactory;
-import org.openecomp.mso.cloud.CloudConfigTest;
-import org.openecomp.mso.openstack.beans.StackInfo;
-import org.openecomp.mso.openstack.exceptions.MsoCloudIdentityNotFound;
-import org.openecomp.mso.openstack.exceptions.MsoCloudSiteNotFound;
-import org.openecomp.mso.openstack.exceptions.MsoException;
-import org.openecomp.mso.openstack.exceptions.MsoIOException;
-import org.openecomp.mso.openstack.exceptions.MsoStackAlreadyExists;
-import org.openecomp.mso.openstack.exceptions.MsoTenantNotFound;
-import org.openecomp.mso.openstack.utils.MsoCommonUtils;
-import org.openecomp.mso.openstack.utils.MsoHeatUtils;
-import org.openecomp.mso.properties.MsoPropertiesException;
-import org.openecomp.mso.properties.MsoPropertiesFactory;
-
-import com.woorea.openstack.heat.model.CreateStackParam;
-
-/**
- * This class implements test methods of the MsoHeatUtils
- *
- *
- */
-public class MsoHeatUtilsTest extends MsoCommonUtils {
-	public static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
-	public static CloudConfigFactory cloudConfigFactory = new CloudConfigFactory();
-	public static MsoHeatUtils msoHeatUtils;
-
-	@BeforeClass
-	public static final void loadClasses() throws MsoCloudIdentityNotFound, MsoPropertiesException {
-		ClassLoader classLoader = MsoHeatUtilsTest.class.getClassLoader();
-		String cloudConfigJson = classLoader.getResource("cloud_config.json").getPath();
-		cloudConfigFactory.initializeCloudConfig(cloudConfigJson, 1);
-		msoPropertiesFactory.initializeMsoProperties("NO_PROP", classLoader.getResource("mso.properties").getPath());
-		msoHeatUtils = new MsoHeatUtils("NO_PROP", msoPropertiesFactory, cloudConfigFactory);
-	}
-
-	@Test
-	public final void testCreateStackBadCloudConfig()
-			throws MsoStackAlreadyExists, MsoTenantNotFound, MsoException, MsoCloudSiteNotFound {
-		try {
-			msoHeatUtils.createStack("DOESNOTEXIST", "test", "stackName", "test", new HashMap<>(),
-					Boolean.TRUE, 10);
-		} catch (MsoCloudSiteNotFound e) {
-
-		} catch (java.lang.NullPointerException npe) {
-
-		}
-
-	}
-
-	@Test
-	public final void testCreateStackFailedConnectionHeatClient()
-			throws MsoStackAlreadyExists, MsoTenantNotFound, MsoException, MsoCloudSiteNotFound {
-		try {
-			msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE,
-					10);
-		} catch (MsoIOException e) {
-
-		}
-
-	}
-
-	@Test
-	public final void testCreateStackFailedConnection()
-			throws MsoStackAlreadyExists, MsoTenantNotFound, MsoException, MsoCloudSiteNotFound {
-		try {
-			msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE,
-					10);
-		} catch (MsoIOException e) {
-
-		}
-
-	}
-
-	@Test
-	public final void createStackSuccessWithEnvironment() throws MsoException {
-		final MockUp<OpenStackRequest<Access>> mockRequest = new MockUp<OpenStackRequest<Access>>() {
-			@Mock
-			public Object execute(Invocation invocation) {
-				final OpenStackRequest invokedInstance = invocation.getInvokedInstance();
-				final Class<?> returnType = Deencapsulation.getField(invokedInstance, "returnType");
-
-				try {
-					if (returnType == Access.class) {
-						ObjectMapper mapper = new ObjectMapper();
-						String json = "{\"token\":{\"id\":\"tokenId\",\"tenant\":{\"id\":\"tenantId\",\"name\":\"tenantName\"}},\"serviceCatalog\":[{\"type\":\"orchestration\",\"name\":\"orchestration\",\"endpoints\":[{\"region\":\"region1\",\"publicURL\":\"http://localhost:5000\",\"internalURL\":\"http://localhost:5000\",\"adminURL\":\"http://localhost:5000\"}]}]}";
-						return mapper.readValue(json, Access.class);
-					} else if (returnType == Stack.class) {
-						final Stack stack = new Stack();
-						stack.setId("stackId");
-						stack.setStackName("stackName");
-						stack.setStackStatus("CREATE_COMPLETE");
-						return stack;
-					}
-					return null;
-				} catch (Exception e) {
-					throw new RuntimeException(e);
-				}
-			}
-		};
-
-		final MockUp<KeystoneUtils> mockKeystone = new MockUp<KeystoneUtils>() {
-			@Mock
-			String findEndpointURL(List<Access.Service> serviceCatalog, String type, String region, String facing) {
-				return "http://localhost:5000";
-			}
-		};
-
-		msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE, 10,
-				"environment");
-
-		mockRequest.tearDown();
-		mockKeystone.tearDown();
-	}
-
-	@Test
-	public final void createStackSuccessWithFiles() throws MsoException {
-		final MockUp<OpenStackRequest<Access>> mockRequest = new MockUp<OpenStackRequest<Access>>() {
-			@Mock
-			public Object execute(Invocation invocation) {
-				final OpenStackRequest invokedInstance = invocation.getInvokedInstance();
-				final Class<?> returnType = Deencapsulation.getField(invokedInstance, "returnType");
-
-				try {
-					if (returnType == Access.class) {
-						ObjectMapper mapper = new ObjectMapper();
-						String json = "{\"token\":{\"id\":\"tokenId\",\"tenant\":{\"id\":\"tenantId\",\"name\":\"tenantName\"}},\"serviceCatalog\":[{\"type\":\"orchestration\",\"name\":\"orchestration\",\"endpoints\":[{\"region\":\"region1\",\"publicURL\":\"http://localhost:5000\",\"internalURL\":\"http://localhost:5000\",\"adminURL\":\"http://localhost:5000\"}]}]}";
-						return mapper.readValue(json, Access.class);
-					} else if (returnType == Stack.class) {
-						final Stack stack = new Stack();
-						stack.setId("stackId");
-						stack.setStackName("stackName");
-						stack.setStackStatus("CREATE_COMPLETE");
-						return stack;
-					}
-					return null;
-				} catch (Exception e) {
-					throw new RuntimeException(e);
-				}
-			}
-		};
-
-		final MockUp<KeystoneUtils> mockKeystone = new MockUp<KeystoneUtils>() {
-			@Mock
-			String findEndpointURL(List<Access.Service> serviceCatalog, String type, String region, String facing) {
-				return "http://localhost:5000";
-			}
-		};
-
-		msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE, 10,
-				"environment", new HashMap<>());
-
-		mockRequest.tearDown();
-		mockKeystone.tearDown();
-	}
-
-	@Test
-	public final void createStackSuccessWithHeatFiles() throws MsoException {
-
-		final MockUp<OpenStackRequest<Access>> mockRequest = new MockUp<OpenStackRequest<Access>>() {
-			@Mock
-			public Object execute(Invocation invocation) {
-				final OpenStackRequest invokedInstance = invocation.getInvokedInstance();
-				final Class<?> returnType = Deencapsulation.getField(invokedInstance, "returnType");
-
-				try {
-					if (returnType == Access.class) {
-						ObjectMapper mapper = new ObjectMapper();
-						String json = "{\"token\":{\"id\":\"tokenId\",\"tenant\":{\"id\":\"tenantId\",\"name\":\"tenantName\"}},\"serviceCatalog\":[{\"type\":\"orchestration\",\"name\":\"orchestration\",\"endpoints\":[{\"region\":\"region1\",\"publicURL\":\"http://localhost:5000\",\"internalURL\":\"http://localhost:5000\",\"adminURL\":\"http://localhost:5000\"}]}]}";
-						return mapper.readValue(json, Access.class);
-					} else if (returnType == Stack.class) {
-						final Stack stack = new Stack();
-						stack.setId("stackId");
-						stack.setStackName("stackName");
-						stack.setStackStatus("CREATE_COMPLETE");
-						return stack;
-					}
-					return null;
-				} catch (Exception e) {
-					throw new RuntimeException(e);
-				}
-			}
-		};
-
-		final MockUp<KeystoneUtils> mockKeystone = new MockUp<KeystoneUtils>() {
-			@Mock
-			String findEndpointURL(List<Access.Service> serviceCatalog, String type, String region, String facing) {
-				return "http://localhost:5000";
-			}
-		};
-
-		msoHeatUtils.createStack("MT", "test", "stackName", "test", new HashMap<>(), Boolean.TRUE, 10,
-				"environment", new HashMap<>(), new HashMap<>());
-
-		mockRequest.tearDown();
-		mockKeystone.tearDown();
-	}
-
-	@Test
-	public final void requestToStringBuilderTest() {
-		CreateStackParam param = new CreateStackParam();
-		param.setDisableRollback(false);
-		param.setEnvironment("environment");
-		param.setFiles(new HashMap<>());
-		param.setParameters(new HashMap<>());
-		param.setStackName("stackName");
-		param.setTemplate("template");
-		param.setTemplateUrl("http://templateUrl");
-		param.setTimeoutMinutes(1);
-
-		msoHeatUtils.requestToStringBuilder(param);
-	}
-
-	@Test
-	public final void heatCacheResetTest() {
-		msoHeatUtils.heatCacheReset();
-	}
-
-	@Test
-	public final void expireHeatClientTest() {
-		msoHeatUtils.expireHeatClient("tenantId", "cloudId");
-	}
-
-	@Test
-	public final void heatCacheCleanupTest() {
-		msoHeatUtils.heatCacheCleanup();
-	}
-
-	@Test
-	public void queryStackTest() throws MsoException {
-		final MockUp<OpenStackRequest<Access>> mockRequest = new MockUp<OpenStackRequest<Access>>() {
-			@Mock
-			public Object execute(Invocation invocation) {
-				final OpenStackRequest invokedInstance = invocation.getInvokedInstance();
-				final Class<?> returnType = Deencapsulation.getField(invokedInstance, "returnType");
-
-				try {
-					if (returnType == Access.class) {
-						ObjectMapper mapper = new ObjectMapper();
-						String json = "{\"token\":{\"id\":\"tokenId\",\"tenant\":{\"id\":\"tenantId\",\"name\":\"tenantName\"}},\"serviceCatalog\":[{\"type\":\"orchestration\",\"name\":\"orchestration\",\"endpoints\":[{\"region\":\"region1\",\"publicURL\":\"http://localhost:5000\",\"internalURL\":\"http://localhost:5000\",\"adminURL\":\"http://localhost:5000\"}]}]}";
-						return mapper.readValue(json, Access.class);
-					} else if (returnType == Stack.class) {
-						final Stack stack = new Stack();
-						stack.setId("stackId");
-						stack.setStackName("stackName");
-						stack.setStackStatus("CREATE_COMPLETE");
-						return stack;
-					}
-					return null;
-				} catch (Exception e) {
-					throw new RuntimeException(e);
-				}
-			}
-		};
-
-		final MockUp<KeystoneUtils> mockKeystone = new MockUp<KeystoneUtils>() {
-			@Mock
-			String findEndpointURL(List<Access.Service> serviceCatalog, String type, String region, String facing) {
-				return "http://localhost:5000";
-			}
-		};
-
-		final StackInfo stackInfo = msoHeatUtils.queryStack("MT", "test", "stackName");
-
-		mockRequest.tearDown();
-		mockKeystone.tearDown();
-	}
-
-	@Test
-	public void deleteStack() throws MsoException {
-		final MockUp<OpenStackRequest<Access>> mockRequest = new MockUp<OpenStackRequest<Access>>() {
-			@Mock
-			public Object execute(Invocation invocation) {
-				final OpenStackRequest invokedInstance = invocation.getInvokedInstance();
-				final Class<?> returnType = Deencapsulation.getField(invokedInstance, "returnType");
-				final String path = Deencapsulation.getField(invokedInstance, "endpoint");
-//				final String stackName = path.substring(path.lastIndexOf("/"));
-
-				try {
-					if (returnType == Access.class) {
-						ObjectMapper mapper = new ObjectMapper();
-						String json = "{\"token\":{\"id\":\"tokenId\",\"tenant\":{\"id\":\"tenantId\",\"name\":\"tenantName\"}},\"serviceCatalog\":[{\"type\":\"orchestration\",\"name\":\"orchestration\",\"endpoints\":[{\"region\":\"region1\",\"publicURL\":\"http://localhost:5000\",\"internalURL\":\"http://localhost:5000\",\"adminURL\":\"http://localhost:5000\"}]}]}";
-						return mapper.readValue(json, Access.class);
-					} else if (returnType == Stack.class) {
-						final Stack stack = new Stack();
-						stack.setId("stackId");
-						stack.setStackName("stackName");
-						final String status = "DELETE_COMPLETE";
-						stack.setStackStatus(status);
-						return stack;
-					}
-					return null;
-				} catch (Exception e) {
-					throw new RuntimeException(e);
-				}
-			}
-		};
-
-		final MockUp<KeystoneUtils> mockKeystone = new MockUp<KeystoneUtils>() {
-			@Mock
-			String findEndpointURL(List<Access.Service> serviceCatalog, String type, String region, String facing) {
-				return "http://localhost:5000";
-			}
-		};
-
-		final StackInfo stackInfo = msoHeatUtils.deleteStack("test", "MT", "stackName", true);
-
-		mockRequest.tearDown();
-		mockKeystone.tearDown();
-	}
-
-	@Test
-	public void copyStringOutputsToInputsTest() {
-		Map<String, String> inputs = new HashMap<String, String>(){{put("key41", "value41");}};
-		Map<String, Object> outputs = new HashMap<String, Object>(){{
-			put("key2", "val2");
-			put("key3", new TextNode("val3"));
-			put("key4", new LinkedHashMap<String, String>(){{put("key41", "value41");}});
-		}};
-		msoHeatUtils.copyStringOutputsToInputs(inputs, outputs, true);
-	}
-}
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsWithUpdateTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsWithUpdateTest.java
deleted file mode 100644
index 62043e83b8..0000000000
--- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsWithUpdateTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * 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.openecomp.mso.adapter_utils.tests;
-
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.when;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import java.util.Optional;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.openecomp.mso.cloud.CloudConfig;
-import org.openecomp.mso.cloud.CloudConfigFactory;
-import org.openecomp.mso.cloud.CloudIdentity;
-import org.openecomp.mso.cloud.CloudIdentity.IdentityServerType;
-import org.openecomp.mso.cloud.CloudSite;
-import org.openecomp.mso.openstack.exceptions.MsoCloudSiteNotFound;
-import org.openecomp.mso.openstack.exceptions.MsoException;
-import org.openecomp.mso.openstack.exceptions.MsoIOException;
-import org.openecomp.mso.openstack.utils.MsoHeatUtilsWithUpdate;
-import org.openecomp.mso.properties.MsoPropertiesFactory;
-
-import com.woorea.openstack.base.client.OpenStackConnectException;
-
-@RunWith(MockitoJUnitRunner.class)
-public class MsoHeatUtilsWithUpdateTest {
-
-	public static MsoPropertiesFactory msoPropertiesFactory = new MsoPropertiesFactory();
-	public static CloudConfigFactory cloudConfigFactory = new CloudConfigFactory();
-	
-    @Mock
-    CloudConfig cloudConfig;
-    @InjectMocks
-    MsoHeatUtilsWithUpdate util=new MsoHeatUtilsWithUpdate("NO_PROP",msoPropertiesFactory,cloudConfigFactory);
-
-    private CloudSite cloudSite;
-
-    @Before
-    public void init () {
-        cloudSite = new CloudSite ();
-        cloudSite.setId ("cloud");
-        CloudIdentity cloudIdentity = new CloudIdentity ();
-        cloudIdentity.setIdentityServerType(IdentityServerType.KEYSTONE);
-        cloudIdentity.setKeystoneUrl ("toto");
-        cloudIdentity.setMsoPass (CloudIdentity.encryptPassword ("mockId"));
-        cloudSite.setIdentityService (cloudIdentity);
-        when(cloudConfig.getCloudSite("cloud")).thenReturn (Optional.of(cloudSite));
-        when(cloudConfig.getCloudSite("none")).thenReturn (Optional.empty());
-    }
-
-    @Test
-    @Ignore
-    public void testUpdateStack () {
-        // Heat heat = Mockito.mock (Heat.class);
-        Map <String, Object> stackInputs = new HashMap <> ();
-        try {
-            util.updateStack ("none", "tenantId", "stackName", "heatTemplate", stackInputs, false, 1);
-        } catch (MsoException e) {
-            if (e instanceof MsoCloudSiteNotFound) {
-                // Ok
-            } else {
-                e.printStackTrace ();
-                fail ("Exception caught");
-            }
-        }
-        try {
-            util.updateStack ("cloud", "tenantId", "stackName", "heatTemplate", stackInputs, false, 1);
-        } catch (MsoException e) {
-            if (e instanceof MsoIOException && e.getCause () != null
-                && e.getCause () instanceof OpenStackConnectException) {
-                // Ok, we were able to go up to the connection to OpenStack
-            } else {
-                e.printStackTrace ();
-                fail ("Exception caught");
-            }
-        }
-        try {
-            util.updateStack ("cloud", "tenantId", "stackName", "heatTemplate", stackInputs, false, 1, "environment");
-        } catch (MsoException e) {
-            if (e instanceof MsoIOException && e.getCause () != null
-                && e.getCause () instanceof OpenStackConnectException) {
-                // Ok, we were able to go up to the connection to OpenStack
-            } else {
-                e.printStackTrace ();
-                fail ("Exception caught");
-            }
-        }
-        try {
-            util.updateStack ("cloud", "tenantId", "stackName", "heatTemplate", stackInputs, false, 1, "environment", null);
-        } catch (MsoException e) {
-            if (e instanceof MsoIOException && e.getCause () != null
-                && e.getCause () instanceof OpenStackConnectException) {
-                // Ok, we were able to go up to the connection to OpenStack
-            } else {
-                e.printStackTrace ();
-                fail ("Exception caught");
-            }
-        }
-        try {
-            util.updateStack ("cloud", "tenantId", "stackName", "heatTemplate", stackInputs, false, 1, "environment", null, null);
-        } catch (MsoException e) {
-            if (e instanceof MsoIOException && e.getCause () != null
-                && e.getCause () instanceof OpenStackConnectException) {
-                // Ok, we were able to go up to the connection to OpenStack
-            } else {
-                e.printStackTrace ();
-                fail ("Exception caught");
-            }
-        }
-    }
-}