Containerization feature of SO

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

35 files changed, 819 insertions, 1837 deletions

diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/BeansTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/BeansTest.java
new file mode 100644
index 0000000000..e3474009c9
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/BeansTest.java
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 Huawei Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.adapters;
+
+import org.junit.Test;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterNonConcrete;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.SetterMustExistRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+
+public class BeansTest {
+	private PojoClassFilter filterTestClasses = new FilterTestClasses();
+
+	@Test
+	public void pojoStructure() {
+		test("org.onap.so.adapters.nwrest");
+		test("org.onap.so.adapters.sdncrest");
+		test("org.onap.so.adapters.tenantrest");
+		test("org.onap.so.adapters.vnfrest");
+		test("org.onap.so.adapters.network.beans");
+		test("org.onap.so.openstack.beans");
+	}
+	
+	private void test(String pojoPackage) {
+		Validator validator = ValidatorBuilder.create()
+				.with(new GetterMustExistRule())
+				.with(new SetterMustExistRule())
+				.with(new SetterTester())
+				.with(new GetterTester())
+				.build();
+		validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses, new FilterNonConcrete());
+	}
+	
+	private static class FilterTestClasses implements PojoClassFilter {
+		public boolean include(PojoClass pojoClass) {
+			return !pojoClass.getSourcePath().contains("/test-classes/");
+		}
+	}
+}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/network/mappers/ContrailSubnetMappersTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/network/mappers/ContrailSubnetMappersTest.java
new file mode 100644
index 0000000000..240074bca7
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/network/mappers/ContrailSubnetMappersTest.java
@@ -0,0 +1,236 @@
+/*-
+ * ============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.onap.so.adapters.network.mappers;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.junit.Test;
+import org.onap.so.adapters.network.beans.ContrailSubnet;
+import org.onap.so.adapters.network.beans.ContrailSubnetHostRoute;
+import org.onap.so.adapters.network.beans.ContrailSubnetHostRoutes;
+import org.onap.so.adapters.network.beans.ContrailSubnetIp;
+import org.onap.so.adapters.network.beans.ContrailSubnetPool;
+import org.onap.so.openstack.beans.HostRoute;
+import org.onap.so.openstack.beans.Pool;
+import org.onap.so.openstack.beans.Subnet;
+
+public class ContrailSubnetMappersTest {
+
+	
+	
+	@Test
+	public void contrailSubnetHostRouteMapperTest() {
+		HostRoute hostRoute = new HostRoute();
+		hostRoute.setNextHop("hop");
+		hostRoute.setPrefix("prefix");
+		ContrailSubnetHostRouteMapper mapper = new ContrailSubnetHostRouteMapper(hostRoute);
+		ContrailSubnetHostRoute cshr = mapper.map();
+		assertEquals("hop", cshr.getNextHop());
+		assertEquals("prefix", cshr.getPrefix());
+	}
+	
+	@Test
+	public void contrailSubnetPoolMapperTest() {
+		Pool pool = new Pool();
+		pool.setStart("start");
+		pool.setEnd("end");
+		ContrailSubnetPoolMapper mapper = new ContrailSubnetPoolMapper(pool);
+		ContrailSubnetPool csPool = mapper.map();
+		assertEquals("start", csPool.getStart());
+		assertEquals("end", csPool.getEnd());
+	}
+	
+	@Test
+	public void checkIsNullOrEmpty() {
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(null);
+		assertEquals(true, mapper.isNullOrEmpty(""));
+		assertEquals(true, mapper.isNullOrEmpty(null));
+		assertEquals(false, mapper.isNullOrEmpty("hello"));
+	}
+	
+	@Test
+	public void createSubnetTestValidCidr() {
+		Subnet subnet = new Subnet();
+		subnet.setCidr("test/value");
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		
+		assertEquals("test",result.getSubnet().getIpPrefix());
+		assertEquals("value", result.getSubnet().getIpPrefixLen());
+	}
+	
+	@Test
+	public void createSubnetTestInvalidCidr() {
+		Subnet subnet = new Subnet();
+		subnet.setCidr("test");
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		assertEquals(null, result.getSubnet().getIpPrefix());
+		assertEquals(null, result.getSubnet().getIpPrefixLen());
+
+	}
+	
+	@Test
+	public void createSubnetTestNullCidr() {
+		Subnet subnet = new Subnet();
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		assertEquals(null, result.getSubnet().getIpPrefix());
+		assertEquals(null, result.getSubnet().getIpPrefixLen());
+	}
+	
+	@Test
+	public void createContrailSubnetPoolTest() {
+		List<Pool> pools = new ArrayList<>();
+		Pool pool1 = new Pool();
+		pool1.setStart("start1");
+		pool1.setEnd("end1");
+		Pool pool2 = new Pool();
+		pool2.setStart("start2");
+		pool2.setEnd("end2");
+		pools.add(pool1);
+		pools.add(pool2);
+		
+		Subnet subnet = new Subnet();
+		subnet.setAllocationPools(pools);
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		List<ContrailSubnetPool> cspools = result.getAllocationPools();
+		assertEquals(2, cspools.size());
+		assertEquals("start2", cspools.get(1).getStart());
+		assertEquals("end2", cspools.get(1).getEnd());
+	}
+	
+	@Test
+	public void createContrailSubnetPoolInvalidTest() {
+		List<Pool> pools = new ArrayList<>();
+		Pool pool1 = new Pool();
+		pool1.setStart("start1");
+		pool1.setEnd("end1");
+		Pool pool2 = new Pool();
+		pool2.setStart("start2");
+		pools.add(pool1);
+		pools.add(pool2);
+		
+		Subnet subnet = new Subnet();
+		subnet.setAllocationPools(pools);
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		List<ContrailSubnetPool> cspools = result.getAllocationPools();
+		assertEquals(1, cspools.size());
+		assertEquals("start1", cspools.get(0).getStart());
+		assertEquals("end1", cspools.get(0).getEnd());
+	}
+	
+	@Test
+	public void createContrailSubnetPoolEmptyTest() {
+
+		Subnet subnet = new Subnet();
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		List<ContrailSubnetPool> cspools = result.getAllocationPools();
+		assertEquals(true, cspools.isEmpty());
+
+	}
+	
+	@Test
+	public void createContrailSubnetHostRoutesTest() {
+		List<HostRoute> hostRoutes = new ArrayList<>();
+		HostRoute hostRoute1 = new HostRoute();
+		hostRoute1.setNextHop("next-hop1");
+		hostRoute1.setPrefix("prefix1");
+		HostRoute hostRoute2 = new HostRoute();
+		hostRoute2.setNextHop("next-hop2");
+		hostRoute2.setPrefix("prefix2");
+		hostRoutes.add(hostRoute1);
+		hostRoutes.add(hostRoute2);
+		
+		Subnet subnet = new Subnet();
+		subnet.setHostRoutes(hostRoutes);
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		ContrailSubnetHostRoutes routes = result.getHostRoutes();
+		assertEquals(2, routes.getHostRoutes().size());
+		assertEquals("next-hop2", routes.getHostRoutes().get(1).getNextHop());
+		assertEquals("prefix2", routes.getHostRoutes().get(1).getPrefix());
+	}
+	
+	@Test
+	public void createContrailSubnetHostRoutesMissingFieldTest() {
+		List<HostRoute> hostRoutes = new ArrayList<>();
+		HostRoute hostRoute1 = new HostRoute();
+		hostRoute1.setNextHop("next-hop1");
+		HostRoute hostRoute2 = new HostRoute();
+		hostRoute2.setNextHop("next-hop2");
+		hostRoute2.setPrefix("prefix2");
+		hostRoutes.add(hostRoute1);
+		hostRoutes.add(hostRoute2);
+		
+		Subnet subnet = new Subnet();
+		subnet.setHostRoutes(hostRoutes);
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		ContrailSubnetHostRoutes routes = result.getHostRoutes();
+		assertEquals(2, routes.getHostRoutes().size());
+		assertEquals("next-hop1", routes.getHostRoutes().get(0).getNextHop());
+		assertEquals("prefix2", routes.getHostRoutes().get(1).getPrefix());
+	}
+	
+	@Test
+	public void createContrailSubnetHostRoutesEmptyTest() {
+		List<HostRoute> hostRoutes = new ArrayList<>();
+		Subnet subnet = new Subnet();
+		subnet.setHostRoutes(hostRoutes);
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		ContrailSubnetHostRoutes routes = result.getHostRoutes();
+		assertEquals(true, routes.getHostRoutes().isEmpty());
+	}
+	
+	@Test
+	public void getSubnetNameTest() {
+		Subnet subnet = new Subnet();
+		subnet.setSubnetName("name");
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		assertEquals("if subnetName is populated map", "name", mapper.getSubnetName(subnet));
+		subnet = new Subnet(); 
+		subnet.setSubnetId("id");
+		mapper = new ContrailSubnetMapper(subnet);
+		assertEquals("choose id when name is null", "id", mapper.getSubnetName(subnet));
+		subnet = new Subnet();
+		mapper = new ContrailSubnetMapper(subnet);
+		assertEquals("expect null", null, mapper.getSubnetName(subnet));
+	}
+	@Test
+	public void mapRemainingFields() {
+		Subnet subnet = new Subnet();
+		subnet.setEnableDHCP(true);
+		subnet.setGatewayIp("gateway-ip");
+		ContrailSubnetMapper mapper = new ContrailSubnetMapper(subnet);
+		ContrailSubnet result = mapper.map();
+		assertEquals(true, result.isEnableDhcp());
+		assertEquals("gateway-ip", result.getDefaultGateway());
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/nwrest/NetworkRequestTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/nwrest/NetworkRequestTest.java
new file mode 100644
index 0000000000..08851c2ce9
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/nwrest/NetworkRequestTest.java
@@ -0,0 +1,50 @@
+/*-
+ * ============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.onap.so.adapters.nwrest;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class NetworkRequestTest {
+
+	
+	@Test
+	public void isSynchronousTrue() {
+		CreateNetworkRequest networkResponse = new CreateNetworkRequest();
+		assertEquals(true, networkResponse.isSynchronous());
+		//flip synchronous to false in the background
+		networkResponse.setNotificationUrl("testtest");
+		assertEquals(false, networkResponse.isSynchronous());
+		networkResponse.setNotificationUrl("");
+		assertEquals(true, networkResponse.isSynchronous());
+	}
+	
+	@Test
+	public void isContrailRequest() {
+		CreateNetworkRequest networkResponse = new CreateNetworkRequest();
+		assertEquals(false, networkResponse.isContrailRequest());
+		networkResponse.setNetworkTechnology(NetworkTechnology.CONTRAIL);
+		assertEquals(false, networkResponse.isContrailRequest());
+		networkResponse.setContrailNetwork(new ContrailNetwork());
+		assertEquals(true, networkResponse.isContrailRequest());
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/vdu/BeansTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/vdu/BeansTest.java
new file mode 100644
index 0000000000..e681d43256
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/adapters/vdu/BeansTest.java
@@ -0,0 +1,56 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.so.adapters.vdu;
+
+import org.junit.Test;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+public class BeansTest {
+
+	private PojoClassFilter filterTestClasses = new FilterTestClasses();
+
+	@Test
+	public void pojoStructure() {
+		test("org.onap.so.adapters.vdu");
+	}
+
+	private void test(String pojoPackage) {
+		Validator validator = ValidatorBuilder.create()
+				.with(new GetterMustExistRule())
+				.with(new SetterTester())
+				.with(new GetterTester())
+				.build();
+		validator.validate(pojoPackage, new FilterPackageInfo(), filterTestClasses);
+	}
+	private static class FilterTestClasses implements PojoClassFilter {
+		public boolean include(PojoClass pojoClass) {
+			return !pojoClass.getSourcePath().contains("/test-classes/");
+		}
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoAdapterExceptionTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoAdapterExceptionTest.java
index 738fe9e4d9..28a4a8302f 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoAdapterExceptionTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoAdapterExceptionTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,9 +18,26 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Test;
+import org.junit.Assert;
 
 public class MsoAdapterExceptionTest {
-    MsoAdapterException msoAdapterException = new MsoAdapterException("test");
-    MsoAdapterException msoAdapterExceptionThr = new MsoAdapterException("test" , new Throwable());
+
+    @Test
+    public void testConstructor() {
+        MsoAdapterException msoAdapterException = new MsoAdapterException("test");
+        Assert.assertEquals("test",msoAdapterException.getMessage());
+        Assert.assertEquals(MsoExceptionCategory.INTERNAL, msoAdapterException.category);
+    }
+
+    @Test
+    public void testOverloadedConstructor() {
+        MsoAdapterException msoAdapterException = new MsoAdapterException("test" , new Throwable());
+        Assert.assertEquals("test",msoAdapterException.getMessage());
+        Assert.assertEquals(MsoExceptionCategory.INTERNAL, msoAdapterException.category);
+        Assert.assertNotNull(msoAdapterException.getCause());
+    }
+
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoCloudIdentityNotFoundTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoCloudIdentityNotFoundTest.java
index 4027aa6342..e7befed71a 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoCloudIdentityNotFoundTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoCloudIdentityNotFoundTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,10 +17,27 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Test;
+import org.junit.Assert;
 
 public class MsoCloudIdentityNotFoundTest {
-    MsoCloudIdentityNotFound msoCloudIdentityNotFound = new MsoCloudIdentityNotFound();
-    MsoCloudIdentityNotFound msoCloudIdentityNotFoundStr = new MsoCloudIdentityNotFound("test");
-    public String str = msoCloudIdentityNotFound.toString();
+
+    @Test
+    public void testConstructor() {
+        MsoCloudIdentityNotFound msoCloudIdentityNotFound = new MsoCloudIdentityNotFound();
+        Assert.assertEquals("Cloud Identity not found",msoCloudIdentityNotFound.getMessage());
+        Assert.assertEquals("Cloud Identity not found",msoCloudIdentityNotFound.toString());
+        Assert.assertEquals(MsoExceptionCategory.USERDATA, msoCloudIdentityNotFound.category);
+    }
+
+    @Test
+    public void testOverloadedConstructor() {
+        MsoCloudIdentityNotFound msoCloudIdentityNotFound = new MsoCloudIdentityNotFound("test");
+        Assert.assertEquals("Cloud Identity [test] not found",msoCloudIdentityNotFound.getMessage());
+        Assert.assertEquals("Cloud Identity [test] not found",msoCloudIdentityNotFound.toString());
+        Assert.assertEquals(MsoExceptionCategory.USERDATA, msoCloudIdentityNotFound.category);
+    }
+
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoCloudSiteNotFoundTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoCloudSiteNotFoundTest.java
index cac02152e0..c75a66e100 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoCloudSiteNotFoundTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoCloudSiteNotFoundTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,11 +17,27 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Test;
+import org.junit.Assert;
 
 public class MsoCloudSiteNotFoundTest {
-    MsoCloudSiteNotFound msoCloudSiteNotFound = new MsoCloudSiteNotFound();
-    MsoCloudSiteNotFound msoCloudSiteNotFoundStr = new MsoCloudSiteNotFound("test");
-    public String str = msoCloudSiteNotFoundStr.toString();
+
+    @Test
+    public void testConstructor() {
+        MsoCloudSiteNotFound msoCloudSiteNotFound = new MsoCloudSiteNotFound();
+        Assert.assertEquals("Cloud site not found",msoCloudSiteNotFound.getMessage());
+        Assert.assertEquals("Cloud site not found",msoCloudSiteNotFound.toString());
+        Assert.assertEquals(MsoExceptionCategory.USERDATA, msoCloudSiteNotFound.category);
+    }
+
+    @Test
+    public void testOverloadedConstructor() {
+        MsoCloudSiteNotFound msoCloudSiteNotFound = new MsoCloudSiteNotFound("test");
+        Assert.assertEquals("Cloud Site [test] not found",msoCloudSiteNotFound.getMessage());
+        Assert.assertEquals("Cloud Site [test] not found",msoCloudSiteNotFound.toString());
+        Assert.assertEquals(MsoExceptionCategory.USERDATA, msoCloudSiteNotFound.category);
+    }
 
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoIOExceptionTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoIOExceptionTest.java
index d1f4db778e..e257e52cd4 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoIOExceptionTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoIOExceptionTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,10 +17,26 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Test;
+import org.junit.Assert;
 
 public class MsoIOExceptionTest {
-    MsoIOException msoIOException = new MsoIOException("test");
-    MsoIOException msoIOExceptionTh = new MsoIOException("test" , new Throwable());
-    public String str = msoIOException.toString();
+
+    @Test
+    public void testConstructor() {
+        MsoIOException msoIOException = new MsoIOException("test");
+        Assert.assertEquals("test",msoIOException.getMessage());
+        Assert.assertEquals(MsoExceptionCategory.IO, msoIOException.category);
+    }
+
+    @Test
+    public void testOverloadedConstructor() {
+        MsoIOException msoIOException = new MsoIOException("test", new Throwable());
+        Assert.assertEquals("test",msoIOException.getMessage());
+        Assert.assertEquals(MsoExceptionCategory.IO, msoIOException.category);
+        Assert.assertNotNull(msoIOException.getCause());
+    }
+
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoNetworkAlreadyExistsTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoNetworkAlreadyExistsTest.java
index c5217e4933..96ff89c094 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoNetworkAlreadyExistsTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoNetworkAlreadyExistsTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,8 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Test;
+import org.junit.Assert;
 
 public class MsoNetworkAlreadyExistsTest {
-    MsoNetworkAlreadyExists msoNetworkAlreadyExists = new MsoNetworkAlreadyExists("test","test","test");
+
+    @Test
+    public void testConstructor() {
+        MsoNetworkAlreadyExists msoNetworkAlreadyExists = new MsoNetworkAlreadyExists("test","test","test");
+        Assert.assertEquals("Stack test already exists in Tenant test in Cloud test",msoNetworkAlreadyExists.getMessage());
+        Assert.assertEquals("409 Conflict: Stack test already exists in Tenant test in Cloud test",msoNetworkAlreadyExists.toString());
+    }
+
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoNetworkNotFoundTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoNetworkNotFoundTest.java
index ea74efcf42..5991e55915 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoNetworkNotFoundTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoNetworkNotFoundTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,8 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Test;
+import org.junit.Assert;
 
 public class MsoNetworkNotFoundTest {
-    MsoNetworkNotFound msoNetworkNotFound =new MsoNetworkNotFound("test","test","test");
+
+    @Test
+    public void testConstructor() {
+        MsoNetworkNotFound msoNetworkNotFound =new MsoNetworkNotFound("test","test","test");
+        Assert.assertEquals("Network test does not exist in Cloud/Tenant test/test",msoNetworkNotFound.getMessage());
+        Assert.assertEquals("404 Not Found: Network test does not exist in Cloud/Tenant test/test",msoNetworkNotFound.toString());
+    }
+
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoOpenstackExceptionTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoOpenstackExceptionTest.java
index 58cea958df..7bdb2283e8 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoOpenstackExceptionTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoOpenstackExceptionTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,11 +18,29 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Test;
+import org.junit.Assert;
 
 public class MsoOpenstackExceptionTest {
-    MsoOpenstackException msoOpenstackException= new MsoOpenstackException(404,"test","test");
-    MsoOpenstackException msoOpenstackExceptionEx= new MsoOpenstackException(404,"test","test",new Exception());
-    public String str = msoOpenstackException.toString();
+
+    @Test
+    public void testConstructor() {
+        MsoOpenstackException msoOpenstackException= new MsoOpenstackException(404,"test","test");
+        Assert.assertEquals("test",msoOpenstackException.getMessage());
+        Assert.assertEquals("404 test: test",msoOpenstackException.toString());
+        Assert.assertEquals(MsoExceptionCategory.OPENSTACK, msoOpenstackException.category);
+    }
+
+    @Test
+    public void testOverloadedConstructor() {
+        MsoOpenstackException msoOpenstackExceptionEx= new MsoOpenstackException(404,"test","test",new Exception());
+        Assert.assertEquals("test",msoOpenstackExceptionEx.getMessage());
+        Assert.assertEquals("404 test: test",msoOpenstackExceptionEx.toString());
+        Assert.assertEquals(MsoExceptionCategory.OPENSTACK, msoOpenstackExceptionEx.category);
+        Assert.assertNotNull(msoOpenstackExceptionEx.getCause());
+
+    }
 
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoStackAlreadyExistsTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoStackAlreadyExistsTest.java
index f36ddfe7a1..4b44f0db93 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoStackAlreadyExistsTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoStackAlreadyExistsTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,8 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Assert;
+import org.junit.Test;
 
 public class MsoStackAlreadyExistsTest {
-    MsoStackAlreadyExists msoStackAlreadyExists = new MsoStackAlreadyExists("test","test","test");
+
+    @Test
+    public void testConstructor() {
+        MsoStackAlreadyExists msoStackAlreadyExists = new MsoStackAlreadyExists("test", "test", "test");
+        Assert.assertEquals("Stack test already exists in Tenant test in Cloud test",msoStackAlreadyExists.getMessage());
+        Assert.assertEquals("409 Conflict: Stack test already exists in Tenant test in Cloud test",msoStackAlreadyExists.toString());
+    }
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoStackNotFoundTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoStackNotFoundTest.java
index e422c04fcc..8ce5a33cc4 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoStackNotFoundTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoStackNotFoundTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,8 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Assert;
+import org.junit.Test;
 
 public class MsoStackNotFoundTest {
-    MsoStackNotFound msoStackNotFound = new MsoStackNotFound("test","test","test");
+
+    @Test
+    public void testConstructor() {
+        MsoStackNotFound msoStackNotFound = new MsoStackNotFound("test", "test", "test");
+        Assert.assertEquals("Stack test does not exist in Cloud/Tenant test/test",msoStackNotFound.getMessage());
+        Assert.assertEquals("404 Not Found: Stack test does not exist in Cloud/Tenant test/test",msoStackNotFound.toString());
+    }
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoTenantAlreadyExistsTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoTenantAlreadyExistsTest.java
index d9e83063d1..5999a587a5 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoTenantAlreadyExistsTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoTenantAlreadyExistsTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,8 +18,17 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Assert;
+import org.junit.Test;
 
 public class MsoTenantAlreadyExistsTest {
-    MsoTenantAlreadyExists msoTenantAlreadyExists = new MsoTenantAlreadyExists("test","test");
+
+    @Test
+    public void testConstructor() {
+        MsoTenantAlreadyExists msoTenantAlreadyExists = new MsoTenantAlreadyExists("test","test");
+        Assert.assertEquals("Tenant test already exists in Cloud test",msoTenantAlreadyExists.getMessage());
+        Assert.assertEquals("409 Conflict: Tenant test already exists in Cloud test",msoTenantAlreadyExists.toString());
+    }
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoTenantNotFoundTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoTenantNotFoundTest.java
index a8dd6c6afb..23df616573 100644
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/exceptions/MsoTenantNotFoundTest.java
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/exceptions/MsoTenantNotFoundTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -18,8 +18,18 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.openstack.exceptions;
+package org.onap.so.openstack.exceptions;
+
+import org.junit.Assert;
+import org.junit.Test;
 
 public class MsoTenantNotFoundTest {
-    MsoTenantNotFound msoTenantNotFound = new MsoTenantNotFound("test","test");
+
+    @Test
+    public void testConstructor() {
+        MsoTenantNotFound msoTenantNotFound = new MsoTenantNotFound("test","test");
+        Assert.assertEquals("Tenant test does not exist in Cloud test",msoTenantNotFound.getMessage());
+        Assert.assertEquals("404 Not Found: Tenant test does not exist in Cloud test",msoTenantNotFound.toString());
+    }
+
 }
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/mappers/NetworkInfoMapperTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/mappers/NetworkInfoMapperTest.java
new file mode 100644
index 0000000000..90e15f8ba5
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/mappers/NetworkInfoMapperTest.java
@@ -0,0 +1,124 @@
+/*-
+ * ============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.onap.so.openstack.mappers;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+import org.javatuples.Pair;
+import org.junit.Test;
+import org.onap.so.openstack.beans.NetworkInfo;
+import org.onap.so.openstack.beans.NetworkStatus;
+
+import com.woorea.openstack.quantum.model.Network;
+import com.woorea.openstack.quantum.model.Segment;
+
+public class NetworkInfoMapperTest {
+
+	@Test
+	public void checkNetworkStatusMap() {
+		NetworkInfoMapper mapper = new NetworkInfoMapper(new Network());
+		assertEquals(NetworkStatus.ACTIVE, mapper.mapStatus("ACTIVE"));
+		assertEquals(NetworkStatus.BUILD, mapper.mapStatus("BUILD"));
+		assertEquals(NetworkStatus.ERROR, mapper.mapStatus("ERROR"));
+		assertEquals(NetworkStatus.DOWN, mapper.mapStatus("DOWN"));
+		assertEquals(NetworkStatus.UNKNOWN, mapper.mapStatus("NOT IN MAP"));
+		assertEquals(NetworkStatus.UNKNOWN, mapper.mapStatus(null));
+	}
+	
+	@Test
+	public void checkLocateVlanInformationNoSegments() {
+		Network network = new Network();
+		network.setProviderPhysicalNetwork("test-physical-network");
+		network.setProviderNetworkType("vlan");
+		network.setProviderSegmentationId(2);
+		NetworkInfoMapper mapper = new NetworkInfoMapper(network);
+		NetworkInfo result = mapper.map();
+		assertEquals("test-physical-network", result.getProvider());
+		assertEquals(1, result.getVlans().size());
+		assertEquals(2, result.getVlans().get(0).intValue());
+	}
+	
+	@Test
+	public void checkLocateVlanInformationSegments() {
+		Network network = new Network();
+		addSegments(network);
+
+		NetworkInfoMapper mapper = new NetworkInfoMapper(network);
+		NetworkInfo result = mapper.map();
+		assertEquals("type1", result.getProvider());
+		assertEquals(2, result.getVlans().size());
+		assertEquals(Arrays.asList(1, 2).toString(), result.getVlans().toString());
+	}
+	
+	@Test
+	public void checkLocateVlanInformationSegmentsAndPhysical() {
+		Network network = new Network();
+		addSegments(network);
+		network.setProviderPhysicalNetwork("test-physical-network");
+		network.setProviderNetworkType("vlan");
+		network.setProviderSegmentationId(2);
+		NetworkInfoMapper mapper = new NetworkInfoMapper(network);
+		NetworkInfo result = mapper.map();
+		assertEquals("test-physical-network", result.getProvider());
+		assertEquals(1, result.getVlans().size());
+		assertEquals(2, result.getVlans().get(0).intValue());
+	}
+	
+	@Test
+	public void nullNetwork() {
+		NetworkInfoMapper mapper = new NetworkInfoMapper(null);
+		assertEquals(NetworkStatus.NOTFOUND, mapper.map().getStatus());
+	}
+	
+	@Test
+	public void mapFields() {
+		Network network = new Network();
+		network.setId("id");
+		network.setName("name");
+		network.setSubnets(Arrays.asList("string1", "string2"));
+		NetworkInfoMapper mapper = new NetworkInfoMapper(network);
+		NetworkInfo mapped = mapper.map();
+		assertEquals("name", mapped.getName());
+		assertEquals("id", mapped.getId());
+		assertEquals(network.getSubnets(), mapped.getSubnets());
+	}
+	
+	private Network addSegments(Network network) {
+		List<Segment> segments = new ArrayList<>();
+		Segment segment1 = new Segment();
+		segment1.setProviderPhysicalNetwork("type1");
+		segment1.setProviderNetworkType("vlan");
+		segment1.setProviderSegmentationId(1);
+		segments.add(segment1);
+		Segment segment2 = new Segment();
+		segment2.setProviderPhysicalNetwork("type2");
+		segment2.setProviderNetworkType("vlan");
+		segment2.setProviderSegmentationId(2);
+		segments.add(segment2);
+		network.setSegments(segments);
+		return network;
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/mappers/StackInfoMapperTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/mappers/StackInfoMapperTest.java
new file mode 100644
index 0000000000..f01745f8c1
--- /dev/null
+++ b/adapters/mso-adapters-rest-interface/src/test/java/org/onap/so/openstack/mappers/StackInfoMapperTest.java
@@ -0,0 +1,94 @@
+/*-
+ * ============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.onap.so.openstack.mappers;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.onap.so.openstack.beans.HeatStatus;
+import org.onap.so.openstack.beans.StackInfo;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.woorea.openstack.heat.model.Stack;
+
+public class StackInfoMapperTest {
+
+	private static final String PATH = "src/test/resources/";
+	@Test
+	public void nullStack() {
+		StackInfoMapper mapper = new StackInfoMapper(null);
+		assertEquals(HeatStatus.NOTFOUND, mapper.map().getStatus());
+	}
+	
+	@Test
+	public void checkHeatStatusMap() {
+		StackInfoMapper mapper = new StackInfoMapper(null);
+		assertEquals(HeatStatus.BUILDING, mapper.mapStatus("CREATE_IN_PROGRESS"));
+		assertEquals(HeatStatus.CREATED, mapper.mapStatus("CREATE_COMPLETE"));
+		assertEquals(HeatStatus.FAILED, mapper.mapStatus("CREATE_FAILED"));
+		assertEquals(HeatStatus.DELETING, mapper.mapStatus("DELETE_IN_PROGRESS"));
+		assertEquals(HeatStatus.NOTFOUND, mapper.mapStatus("DELETE_COMPLETE"));
+		assertEquals(HeatStatus.FAILED, mapper.mapStatus("DELETE_FAILED"));
+		assertEquals(HeatStatus.UPDATING, mapper.mapStatus("UPDATE_IN_PROGRESS"));
+		assertEquals(HeatStatus.FAILED, mapper.mapStatus("UPDATE_FAILED"));
+		assertEquals(HeatStatus.UPDATED, mapper.mapStatus("UPDATE_COMPLETE"));
+		assertEquals(HeatStatus.INIT, mapper.mapStatus(null));
+		assertEquals(HeatStatus.UNKNOWN, mapper.mapStatus("status-not-there"));
+	}
+	
+	@Test
+	public void checkOutputToMap() throws JsonParseException, JsonMappingException, IOException {
+		ObjectMapper jacksonMapper = new ObjectMapper();
+		Stack sample = jacksonMapper.readValue(this.getJson("stack-example.json"), Stack.class);
+		StackInfoMapper mapper = new StackInfoMapper(sample);
+		StackInfo result = mapper.map();
+		Map<String, Object> map = result.getOutputs();
+		assertEquals(true, map.containsKey("key2"));
+		assertEquals("value1", map.get("key1"));
+	}
+	
+	@Test
+	public void mapRemainingFields() {
+		Stack stack = new Stack();
+		stack.setStackName("name");
+		stack.setId("id");
+		stack.setStackStatusReason("message");
+		stack.setParameters(new HashMap<String, Object>());
+		StackInfoMapper mapper = new StackInfoMapper(stack);
+		StackInfo info = mapper.map();
+		assertEquals("name", info.getName());
+		assertEquals("name/id", info.getCanonicalName());
+		assertEquals("message", info.getStatusMessage());
+		assertEquals(stack.getParameters(), info.getParameters());
+	}
+	
+	private String getJson(String filename) throws IOException {
+		 return new String(Files.readAllBytes(Paths.get(PATH + filename)));
+	}
+}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/BeanTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/BeanTest.java
deleted file mode 100644
index 9efaee921f..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/BeanTest.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2017 Huawei 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.adapters;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.HashMap;
-import org.junit.Test;
-import org.openecomp.mso.adapters.nwrest.ContrailNetwork;
-import org.openecomp.mso.adapters.nwrest.CreateNetworkError;
-import org.openecomp.mso.adapters.nwrest.CreateNetworkRequest;
-import org.openecomp.mso.adapters.nwrest.CreateNetworkResponse;
-import org.openecomp.mso.adapters.nwrest.DeleteNetworkError;
-import org.openecomp.mso.adapters.nwrest.DeleteNetworkRequest;
-import org.openecomp.mso.adapters.nwrest.DeleteNetworkResponse;
-import org.openecomp.mso.adapters.nwrest.NetworkExceptionResponse;
-import org.openecomp.mso.adapters.nwrest.NetworkTechnology;
-import org.openecomp.mso.adapters.nwrest.ProviderVlanNetwork;
-import org.openecomp.mso.adapters.nwrest.QueryNetworkResponse;
-import org.openecomp.mso.adapters.nwrest.RollbackNetworkError;
-import org.openecomp.mso.adapters.nwrest.RollbackNetworkRequest;
-import org.openecomp.mso.adapters.nwrest.RollbackNetworkResponse;
-import org.openecomp.mso.adapters.nwrest.UpdateNetworkError;
-import org.openecomp.mso.adapters.nwrest.UpdateNetworkRequest;
-import org.openecomp.mso.adapters.tenantrest.CreateTenantError;
-import org.openecomp.mso.adapters.tenantrest.CreateTenantRequest;
-import org.openecomp.mso.adapters.tenantrest.CreateTenantResponse;
-import org.openecomp.mso.adapters.tenantrest.DeleteTenantError;
-import org.openecomp.mso.adapters.tenantrest.DeleteTenantRequest;
-import org.openecomp.mso.adapters.tenantrest.DeleteTenantResponse;
-import org.openecomp.mso.adapters.tenantrest.HealthCheckHandler;
-import org.openecomp.mso.adapters.tenantrest.QueryTenantError;
-import org.openecomp.mso.adapters.tenantrest.QueryTenantResponse;
-import org.openecomp.mso.adapters.tenantrest.RollbackTenantError;
-import org.openecomp.mso.adapters.tenantrest.RollbackTenantRequest;
-import org.openecomp.mso.adapters.tenantrest.RollbackTenantResponse;
-import org.openecomp.mso.adapters.tenantrest.TenantExceptionResponse;
-import org.openecomp.mso.adapters.tenantrest.TenantRollback;
-import org.openecomp.mso.adapters.vnfrest.CreateVfModuleRequest;
-import org.openecomp.mso.adapters.vnfrest.CreateVfModuleResponse;
-import org.openecomp.mso.adapters.vnfrest.CreateVolumeGroupRequest;
-import org.openecomp.mso.adapters.vnfrest.CreateVolumeGroupResponse;
-import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleRequest;
-import org.openecomp.mso.adapters.vnfrest.DeleteVfModuleResponse;
-import org.openecomp.mso.adapters.vnfrest.DeleteVolumeGroupRequest;
-import org.openecomp.mso.adapters.vnfrest.DeleteVolumeGroupResponse;
-import org.openecomp.mso.adapters.vnfrest.QueryVfModuleResponse;
-import org.openecomp.mso.adapters.vnfrest.QueryVolumeGroupResponse;
-import org.openecomp.mso.adapters.vnfrest.RollbackVolumeGroupResponse;
-import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleRequest;
-import org.openecomp.mso.adapters.vnfrest.UpdateVfModuleResponse;
-import org.openecomp.mso.adapters.vnfrest.UpdateVolumeGroupRequest;
-import org.openecomp.mso.adapters.vnfrest.UpdateVolumeGroupResponse;
-import org.openecomp.mso.adapters.vnfrest.VfModuleExceptionResponse;
-import org.openecomp.mso.adapters.vnfrest.VfModuleRollback;
-import org.openecomp.mso.adapters.vnfrest.VolumeGroupRollback;
-import org.openecomp.mso.entity.MsoRequest;
-
-public class BeanTest {
-
-	// Test cases for code coverage
-	@Test
-	public void testCreateNetworkRequest() {
-		CreateNetworkRequest n = new CreateNetworkRequest();
-		n.setBackout(true);
-		n.setCloudSiteId("test");
-		ContrailNetwork contrailNetwork = new ContrailNetwork("shared", "external", new ArrayList<>(),
-				new ArrayList<>(), new ArrayList<>());
-		contrailNetwork.setExternal("dgddb");
-		contrailNetwork.setPolicyFqdns(new ArrayList<>());
-		contrailNetwork.setRouteTableFqdns(new ArrayList<>());
-		contrailNetwork.setRouteTargets(new ArrayList<>());
-		contrailNetwork.setShared("test");
-		n.setContrailNetwork(contrailNetwork);
-		n.setFailIfExists(true);
-		n.setMessageId("38829");
-		n.setModelCustomizationUuid("4u838282");
-		MsoRequest req = new MsoRequest();
-		req.setRequestId("38849");
-		req.setServiceInstanceId("3884839");
-		n.setMsoRequest(req);
-		n.setNetworkId("478383");
-		n.setNetworkName("tetet");
-		n.setNetworkParams(new HashMap<>());
-		n.setNetworkTechnology("VMWARE");
-		n.setNetworkType("tete");
-		n.setNetworkTypeVersion("v1");
-		n.setNotificationUrl("test");
-		ProviderVlanNetwork providerVlanNetwork = new ProviderVlanNetwork("test", new ArrayList<>());
-		providerVlanNetwork.setPhysicalNetworkName("physicalNetworkName");
-		providerVlanNetwork.setVlans(new ArrayList<>());
-		n.setProviderVlanNetwork(providerVlanNetwork);
-		n.setSkipAAI(false);
-		n.setSubnets(new ArrayList<>());
-		n.setTenantId("tenantId");
-		n.getBackout();
-		n.getCloudSiteId();
-		ContrailNetwork cn = n.getContrailNetwork();
-		cn.getExternal();
-		cn.getPolicyFqdns();
-		cn.getRouteTableFqdns();
-		cn.getRouteTargets();
-		cn.getShared();
-		n.getFailIfExists();
-		n.getMessageId();
-		n.getModelCustomizationUuid();
-		n.getMsoRequest();
-		n.getNetworkId();
-		n.getNetworkName();
-		n.getNetworkParams();
-		n.getNetworkTechnology();
-		n.getNetworkType();
-		n.getNetworkTypeVersion();
-		n.getNotificationUrl();
-		n.getProviderVlanNetwork();
-		n.getSkipAAI();
-		n.getSubnets();
-		n.getTenantId();
-		n.isContrailRequest();
-		n.isSynchronous();
-		n.toJsonString();
-		n.toXmlString();
-	}
-
-	@Test
-	public void testDeleteNetworkRequest() {
-		DeleteNetworkRequest r = new DeleteNetworkRequest();
-		r.setCloudSiteId("test");
-		r.setMessageId("messageId");
-		r.setModelCustomizationUuid("modelCustomizationUuid");
-		r.setMsoRequest(null);
-		r.setNetworkId("networkId");
-		r.setNetworkStackId("networkStackId");
-		r.setNetworkType("networkType");
-		r.setNotificationUrl("notificationUrl");
-		r.setSkipAAI(true);
-		r.setTenantId("tenantId");
-		r.getCloudSiteId();
-		r.getMessageId();
-		r.getModelCustomizationUuid();
-		r.getMsoRequest();
-		r.getNetworkId();
-		r.getNetworkStackId();
-		r.getNetworkType();
-		r.getNotificationUrl();
-		r.getSkipAAI();
-		r.getTenantId();
-	}
-
-	@Test
-	public void testCreateNetworkError() {
-		CreateNetworkError e = new CreateNetworkError("message");
-		e = new CreateNetworkError("message", null, true, "messageid");
-		DeleteNetworkError d = new DeleteNetworkError("message");
-		d = new DeleteNetworkError("message", null, false, "29102");
-	}
-
-	@Test
-	public void testCreatenetworkResponse() {
-		CreateNetworkResponse cnr = new CreateNetworkResponse("networkId", "neutronNetworkId", "networkStackId",
-				"networkFqdn", false, null, null, "messageId");
-		cnr.setMessageId("messageId");
-		cnr.setNetworkCreated(true);
-		cnr.setNetworkFqdn(null);
-		cnr.setNetworkStackId(null);
-		cnr.setNeutronNetworkId(null);
-		cnr.setRollback(null);
-		cnr.setNetworkStackId(null);
-		cnr.setSubnetMap(null);
-		cnr.getMessageId();
-		cnr.getNetworkCreated();
-		cnr.getNetworkFqdn();
-		cnr.getNetworkId();
-		cnr.getNetworkStackId();
-		cnr.getNeutronNetworkId();
-		cnr.getRollback();
-		cnr.getSubnetMap();
-
-		DeleteNetworkResponse dr = new DeleteNetworkResponse("networkId", true, "messageId");
-		dr.setMessageId(null);
-		dr.setNetworkDeleted(null);
-		dr.setNetworkId(null);
-		dr.getMessageId();
-		dr.getNetworkDeleted();
-		dr.getNetworkId();
-
-		NetworkExceptionResponse ner = new NetworkExceptionResponse("message");
-		ner = new NetworkExceptionResponse(null, null, false, null);
-		ner.setCategory(null);
-		ner.setMessage(null);
-		ner.setRolledBack(null);
-		ner.setMessageId(null);
-		ner.getCategory();
-		ner.getMessage();
-		ner.getMessageId();
-		ner.getRolledBack();
-
-		ner.toJsonString();
-		ner.toXmlString();
-		NetworkTechnology nt = NetworkTechnology.NEUTRON;
-		ProviderVlanNetwork pvn = new ProviderVlanNetwork(null, null);
-		pvn.setPhysicalNetworkName(null);
-		pvn.setVlans(null);
-		pvn.getPhysicalNetworkName();
-		pvn.getVlans();
-
-		QueryNetworkResponse qnr = new QueryNetworkResponse(null, null, null, null, null);
-		qnr.setNetworkExists(null);
-		qnr.setNetworkId(null);
-		qnr.setNetworkOutputs(null);
-		qnr.setNetworkStackId(null);
-		qnr.setNetworkStatus(null);
-		qnr.setNeutronNetworkId(null);
-		qnr.setRouteTargets(null);
-		qnr.setSubnetIdMap(null);
-		qnr.setVlans(null);
-		qnr.getNetworkExists();
-		qnr.getNetworkId();
-		qnr.getNetworkOutputs();
-		qnr.getNetworkStatus();
-		qnr.getNeutronNetworkId();
-		qnr.getRouteTargets();
-		qnr.getSubnetIdMap();
-		qnr.getVlans();
-		qnr.toJsonString();
-
-		UpdateNetworkRequest unr = new UpdateNetworkRequest();
-		unr.setBackout(null);
-		unr.setCloudSiteId(null);
-		unr.setContrailNetwork(null);
-		unr.setMessageId(null);
-		unr.setModelCustomizationUuid(null);
-		unr.setMsoRequest(null);
-		unr.setNetworkId(null);
-		unr.setNetworkName(null);
-		unr.setNetworkParams(null);
-		unr.setNetworkStackId(null);
-		unr.setNetworkTechnology("VMWARE");
-		unr.setNetworkType(null);
-		unr.setNetworkTypeVersion(null);
-		unr.setNotificationUrl(null);
-		unr.setProviderVlanNetwork(null);
-		unr.setSkipAAI(null);
-		unr.setSubnets(null);
-		unr.setTenantId(null);
-		unr.getBackout();
-		unr.getCloudSiteId();
-		unr.getContrailNetwork();
-		unr.getMessageId();
-		unr.getModelCustomizationUuid();
-		unr.getMsoRequest();
-		unr.getNetworkId();
-		unr.getNetworkName();
-		unr.getNetworkParams();
-		unr.getNetworkStackId();
-		unr.getNetworkTechnology();
-		unr.getNetworkType();
-		unr.getNetworkTypeVersion();
-		unr.getNotificationUrl();
-		unr.getProviderVlanNetwork();
-		unr.getSkipAAI();
-		unr.getSubnets();
-		unr.getTenantId();
-		unr.isContrailRequest();
-
-		RollbackNetworkError err = new RollbackNetworkError("message");
-		err = new RollbackNetworkError(null, null, false, null);
-		RollbackNetworkRequest req = new RollbackNetworkRequest();
-		req.setNetworkRollback(null);
-		req.getNetworkRollback();
-		req.setMessageId(null);
-		req.getMessageId();
-		req.setNotificationUrl(null);
-		req.getNotificationUrl();
-		req.setSkipAAI(null);
-		req.getSkipAAI();
-
-		RollbackNetworkResponse rnr = new RollbackNetworkResponse(true, null);
-		rnr.setMessageId(null);
-		rnr.getMessageId();
-		rnr.setNetworkRolledBack(null);
-		rnr.getNetworkRolledBack();
-
-		UpdateNetworkError error = new UpdateNetworkError(null);
-		error = new UpdateNetworkError("test", null, false, null);
-
-		UpdateVfModuleRequest uvmr = new UpdateVfModuleRequest();
-		uvmr.setBackout(null);
-		uvmr.setBaseVfModuleId(null);
-		uvmr.setBaseVfModuleStackId(null);
-		uvmr.setFailIfExists(null);
-		uvmr.setMessageId(null);
-		uvmr.setModelCustomizationUuid(null);
-		uvmr.setMsoRequest(null);
-		uvmr.setNotificationUrl(null);
-		uvmr.setRequestType(null);
-		uvmr.setSkipAAI(true);
-		uvmr.setTenantId(null);
-		uvmr.setVfModuleId(null);
-		uvmr.setVfModuleName(null);
-		uvmr.setVfModuleParams(null);
-		uvmr.setVfModuleStackId(null);
-		uvmr.setVfModuleType(null);
-		uvmr.setVnfId(null);
-		uvmr.setVnfType(null);
-		uvmr.setVnfVersion(null);
-		uvmr.setVolumeGroupId(null);
-		uvmr.setVolumeGroupStackId(null);
-		uvmr.getBackout();
-		uvmr.getBaseVfModuleId();
-		uvmr.getBaseVfModuleStackId();
-		uvmr.getCloudSiteId();
-		uvmr.getFailIfExists();
-		uvmr.getMessageId();
-		uvmr.getModelCustomizationUuid();
-		uvmr.getMsoRequest();
-		uvmr.getNotificationUrl();
-		uvmr.getRequestType();
-		uvmr.getSkipAAI();
-		uvmr.getTenantId();
-		uvmr.getVfModuleId();
-		uvmr.getVfModuleName();
-		uvmr.getVfModuleParams();
-		uvmr.getVfModuleStackId();
-		uvmr.getVfModuleType();
-		uvmr.getVnfId();
-		uvmr.getVnfType();
-		uvmr.getVnfVersion();
-		uvmr.getVolumeGroupId();
-		uvmr.getVolumeGroupStackId();
-		uvmr.setCloudSiteId(null);
-
-		CreateVfModuleRequest cvmr = new CreateVfModuleRequest();
-		cvmr.setBackout(null);
-		cvmr.setBaseVfModuleId(null);
-		cvmr.setBaseVfModuleStackId(null);
-		cvmr.setCloudSiteId(null);
-		cvmr.setFailIfExists(null);
-
-		coverCode(CreateVfModuleRequest.class);
-		CreateVfModuleResponse resp = new CreateVfModuleResponse(null, null, null, true, null, null, null);
-		resp.toJsonString();
-		resp.toXmlString();
-		coverCode(CreateVfModuleResponse.class);
-
-		coverCode(CreateVolumeGroupRequest.class);
-
-		CreateVolumeGroupResponse cvgr = new CreateVolumeGroupResponse(null, null, true, null, null, null);
-		coverCode(CreateVolumeGroupResponse.class);
-		coverCode(DeleteVfModuleRequest.class);
-		coverCode(DeleteVfModuleResponse.class);
-		coverCode(DeleteVolumeGroupRequest.class);
-		coverCode(DeleteVolumeGroupResponse.class);
-		QueryVfModuleResponse vfmr = new QueryVfModuleResponse(null, null, null, null, null);
-		coverCode(QueryVfModuleResponse.class);
-		QueryVolumeGroupResponse qvgr = new QueryVolumeGroupResponse(null, null, null, null);
-		coverCode(QueryVolumeGroupResponse.class);
-		UpdateVfModuleResponse uvfmr = new UpdateVfModuleResponse(null, null, null, null, null);
-		coverCode(UpdateVfModuleResponse.class);
-		coverCode(UpdateVolumeGroupRequest.class);
-		UpdateVolumeGroupResponse uvgr = new UpdateVolumeGroupResponse(null, null, null, null);
-		coverCode(UpdateVolumeGroupResponse.class);
-		VfModuleExceptionResponse vfmer = new VfModuleExceptionResponse(null, null, false, null);
-		coverCode(VfModuleExceptionResponse.class);
-		//VfModuleRollback vfmrb = new VfModuleRollback(null, null, null, null);
-		VfModuleRollback vfmrb = new VfModuleRollback(null, null, null, false, null, null, null, null);
-		coverCode(VfModuleRollback.class);
-		//VolumeGroupRollback vgrback = new VolumeGroupRollback(null, null, null);
-		VolumeGroupRollback vgrback = new VolumeGroupRollback(null, null, false, null, null, null, null);
-		coverCode(VolumeGroupRollback.class);
-		RollbackVolumeGroupResponse rvgresp = new RollbackVolumeGroupResponse(null, null);
-		coverCode(RollbackVolumeGroupResponse.class);
-	}
-	
-	@Test
-	public void testTenantRestPackage(){
-		CreateTenantError cte = new CreateTenantError(null, null, false);
-		coverCode(CreateTenantError.class);
-		CreateTenantRequest ctreq = new CreateTenantRequest();
-		ctreq.toJsonString();
-		ctreq.toXmlString();
-		ctreq.toString();
-		coverCode(CreateTenantRequest.class);
-		CreateTenantResponse ctresp = new CreateTenantResponse(null, null, null, new TenantRollback());
-		ctresp.toString();
-		coverCode(CreateTenantResponse.class);
-		DeleteTenantError dterr = new DeleteTenantError(null, null, false);
-		coverCode(DeleteTenantError.class);
-		coverCode(DeleteTenantRequest.class);
-		coverCode(DeleteTenantResponse.class);
-		coverCode(HealthCheckHandler.class);
-		QueryTenantError qnerr = new QueryTenantError(null, null);
-		coverCode(QueryTenantError.class);
-		QueryTenantResponse qtresp = new QueryTenantResponse(null, null, null);
-		coverCode(QueryTenantResponse.class);
-		coverCode(RollbackTenantError.class);
-		RollbackTenantError rollTer = new RollbackTenantError(null, null, false);
-		coverCode(RollbackTenantRequest.class);
-		coverCode(RollbackTenantResponse.class);
-		TenantExceptionResponse resp = new TenantExceptionResponse(null, null, false);
-		coverCode(TenantExceptionResponse.class);
-		coverCode(TenantRollback.class);
-	}
-
-	private void coverCode(Class cls) {
-		try {
-			Object obj = cls.newInstance();
-			Method[] methods = cls.getDeclaredMethods();
-			for (Method m : methods) {
-				try {
-					m.setAccessible(true);
-					Type[] types = m.getGenericParameterTypes();
-					Object[] objs = { new Object(), new Object(), new Object(), new Object() };
-					if (types.length < 1) {
-						m.invoke(obj);
-					} else if (types.length == 1) {
-						String type = types[0].getTypeName();
-						if (type.contains("<")) {
-							type = type.substring(0, type.indexOf("<"));
-						}
-						Class paramCls = Class.forName(type);
-						Object paramobj = paramCls.newInstance();
-						m.invoke(obj, paramobj);
-					} else if (types.length == 2) {
-						// m.invoke(obj,null,null);
-					}
-				} catch (Exception ex) {
-				}
-			}
-		} catch (Exception ex) {
-			ex.printStackTrace();
-		}
-	}
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/json/MapDeserializerTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/json/MapDeserializerTest.java
deleted file mode 100644
index fd0855e221..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/json/MapDeserializerTest.java
+++ /dev/null
@@ -1,57 +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.adapters.json;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-
-import java.util.Map;
-import org.codehaus.jackson.JsonParser;
-import org.codehaus.jackson.map.DeserializationContext;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-
-public class MapDeserializerTest {
-
-    private static final String MAP_KEY = "keyTest";
-    private static final String MAP_VALUE = "valueTest";
-
-    @Test
-    public void mapWithProperValuesIsReturned() throws Exception {
-        JsonParser parser = new ObjectMapper().getJsonFactory().createJsonParser(getJsonAsString());
-        MapDeserializer testedObject = new MapDeserializer();
-        Map<String, String> params = testedObject.deserialize(parser, mock(DeserializationContext.class));
-        assertThat(params).hasSize(1).containsEntry(MAP_KEY, MAP_VALUE);
-    }
-
-    private String getJsonAsString() throws JSONException {
-        JSONObject child2 = new JSONObject();
-        child2.put("key", MAP_KEY);
-        child2.put("value", MAP_VALUE);
-        JSONObject child1 = new JSONObject();
-        child1.put("child2", child2);
-        JSONObject parent = new JSONObject();
-        parent.put("child1", child1);
-        return parent.toString();
-    }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/json/MapSerializerTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/json/MapSerializerTest.java
deleted file mode 100644
index f903f21441..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/json/MapSerializerTest.java
+++ /dev/null
@@ -1,56 +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.adapters.json;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import java.util.HashMap;
-import java.util.Map;
-import org.codehaus.jackson.JsonGenerator;
-import org.codehaus.jackson.map.SerializerProvider;
-import org.junit.Test;
-
-public class MapSerializerTest {
-
-    private static final String JSON_FIELD_NAME_1 = "testKey1";
-    private static final String JSON_VALUE_1 = "testValue1";
-    private static final String JSON_FIELD_NAME_2 = "testKey2";
-    private static final String JSON_VALUE_2 = "testValue2";
-
-    @Test
-    public void serializationWritesTheProperFieldsToJson() throws Exception {
-        JsonGenerator jsonGeneratorMock = mock(JsonGenerator.class);
-        MapSerializer testedObject = new MapSerializer();
-        testedObject.serialize(prepareMap(), jsonGeneratorMock, mock(SerializerProvider.class));
-        verify(jsonGeneratorMock).writeStringField("key", JSON_FIELD_NAME_1);
-        verify(jsonGeneratorMock).writeStringField("value", JSON_VALUE_1);
-        verify(jsonGeneratorMock).writeStringField("key", JSON_FIELD_NAME_2);
-        verify(jsonGeneratorMock).writeStringField("value", JSON_VALUE_2);
-    }
-
-    private Map<String, String> prepareMap() {
-        Map<String, String> map = new HashMap<>();
-        map.put(JSON_FIELD_NAME_1, JSON_VALUE_1);
-        map.put(JSON_FIELD_NAME_2, JSON_VALUE_2);
-        return map;
-    }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/RequestInformationTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/RequestInformationTest.java
deleted file mode 100644
index c6d815a960..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/RequestInformationTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 TechMahindra
- * ================================================================================
- * 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.adapters.sdncrest;
-
-import org.junit.Assert;
-
-import org.junit.Before;
-import org.junit.Test;
-
-public class RequestInformationTest {
-
-    private RequestInformation requestInformation;
-
-    @Before
-    public void setUp() {
-        requestInformation = new RequestInformation();
-    }
-
-    @Test
-    public void testGetRequestId() {
-        requestInformation.setRequestId("requestId");
-        Assert.assertNotNull(requestInformation.getRequestId());
-        Assert.assertEquals(requestInformation.getRequestId(), "requestId");
-    }
-
-    @Test
-    public void testGetSource() {
-        requestInformation.setSource("source");
-        Assert.assertNotNull(requestInformation.getSource());
-        Assert.assertEquals(requestInformation.getSource(), "source");
-    }
-
-    @Test
-    public void testGetNotificationUrl() {
-        requestInformation.setNotificationUrl("notificationUrl");
-        Assert.assertNotNull(requestInformation.getNotificationUrl());
-        Assert.assertEquals(requestInformation.getNotificationUrl(), "notificationUrl");
-    }
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCEventTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCEventTest.java
deleted file mode 100644
index 81d888bf70..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCEventTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 TechMahindra
- * ================================================================================
- * 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.adapters.sdncrest;
-
-import static org.junit.Assert.*;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class SDNCEventTest {
-
-    private SDNCEvent sdncEvent;
-    private Map<String, String> param;
-    private String name = "name";
-    private String value = "value";
-
-    @Before
-    public void setUp() {
-        sdncEvent = new SDNCEvent();
-    }
-
-    @Test
-    public void testGetEventType() {
-        sdncEvent.setEventType("eventType");
-        Assert.assertNotNull(sdncEvent.getEventType());
-        Assert.assertEquals(sdncEvent.getEventType(), "eventType");
-    }
-
-    @Test
-    public void testGetEventCorrelatorType() {
-        sdncEvent.setEventCorrelatorType("eventCorrelatorType");
-        Assert.assertNotNull(sdncEvent.getEventCorrelatorType());
-        Assert.assertEquals(sdncEvent.getEventCorrelatorType(), "eventCorrelatorType");
-    }
-
-    @Test
-    public void testGetEventCorrelator() {
-        sdncEvent.setEventCorrelator("eventCorrelator");
-        Assert.assertNotNull(sdncEvent.getEventCorrelator());
-        Assert.assertEquals(sdncEvent.getEventCorrelator(), "eventCorrelator");
-    }
-
-    @Test
-    public void testGetParams() {
-        param = new HashMap<>();
-        param.put("paramKey", "paramValue");
-        sdncEvent.setParams(param);
-        Assert.assertNotNull(sdncEvent.getParams());
-        Assert.assertTrue(sdncEvent.getParams().containsKey("paramKey"));
-        Assert.assertTrue(sdncEvent.getParams().containsValue("paramValue"));
-    }
-
-    @Test
-    public void testAddParam() {
-        sdncEvent.addParam("name", "value");
-
-    }
-
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceErrorTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceErrorTest.java
deleted file mode 100644
index df69b377ca..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceErrorTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.adapters.sdncrest;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.openecomp.mso.adapters.sdncrest.SDNCErrorCommon;
-import org.openecomp.mso.adapters.sdncrest.SDNCServiceError;
-
-public class SDNCServiceErrorTest {
-
-	@Mock
-	SDNCErrorCommon sec;
-	
-	@InjectMocks
-	SDNCServiceError ssc;
-	
-	@Before
-	public void init(){
-	    MockitoAnnotations.initMocks(this);
-	 }
-	
-	@Test
-	public void testSDNCServiceError() {
-		
-		ssc= new SDNCServiceError("id", "200",
-				"msg", "indicator");
-		assert(ssc!=null);		
-	}
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequestTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequestTest.java
deleted file mode 100644
index c63f1b8f82..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceRequestTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.adapters.sdncrest;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.openecomp.mso.adapters.sdncrest.SDNCRequestCommon;
-import org.openecomp.mso.adapters.sdncrest.ServiceInformation;
-import org.openecomp.mso.adapters.sdncrest.RequestInformation;
-
-public class SDNCServiceRequestTest {
-
-	@Mock
-	SDNCRequestCommon src;
-	
-	@Mock
-	ServiceInformation si;
-	
-	@Mock
-	RequestInformation ri;
-	
-	@InjectMocks
-	SDNCServiceRequest ssr;
-	
-	@Before
-	public void init(){
-	    MockitoAnnotations.initMocks(this);
-	 }
-	
-	@Test
-	public void test() {
-		ssr= new SDNCServiceRequest("url", "timeout",
-				"sdncRequestId", "sdncService", "sdncOperation",
-				ri,
-				si, "sdncServiceDataType",
-				"sndcServiceData");
-		
-	ssr.setSDNCService("sdncService");
-	ssr.setSDNCServiceData("sndcServiceData");
-	ssr.setSDNCServiceDataType("sdncServiceDataType");
-	ssr.setBPTimeout("timeout");
-	ssr.setBPNotificationUrl("url");
-	ssr.setRequestInformation(ri);
-	ssr.setServiceInformation(si);
-	ssr.setSDNCOperation("sdncOperation");
-	ssr.setSDNCRequestId("sdncRequestId");
-	assert(ssr.getSDNCService().equals("sdncService"));
-	assert(ssr.getSDNCServiceData().equals("sndcServiceData"));
-	assert(ssr.getSDNCServiceDataType().equals("sdncServiceDataType"));
-	assert(ssr.getBPTimeout().equals("timeout"));
-	assert(ssr.getBPNotificationUrl().equals("url"));
-	assert(ssr.getRequestInformation().equals(ri));
-	assert(ssr.getServiceInformation().equals(si));
-	assert(ssr.getSDNCOperation().equals("sdncOperation"));
-	assert(ssr.getSDNCRequestId().equals("sdncRequestId"));	
-	}
-
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponseTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponseTest.java
deleted file mode 100644
index 9c4e98a02b..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/SDNCServiceResponseTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.adapters.sdncrest;
-
-import static org.junit.Assert.*;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.openecomp.mso.adapters.sdncrest.SDNCResponseCommon;
-
-public class SDNCServiceResponseTest {
-
-	@Mock
-	SDNCResponseCommon src;
-	
-	@InjectMocks
-	SDNCServiceResponse ssr;
-	
-	@Before
-	public void init(){
-	    MockitoAnnotations.initMocks(this);
-	 }
-	
-	@Test
-	public void test() {
-		ssr=new SDNCServiceResponse("sdncRequestId", "200",
-				"msg", "indicator");
-		Map<String, String> mp = new HashMap<>();
-		mp.put("name", "value");
-		ssr.setParams(mp);
-		assert(ssr.getParams().equals(mp));
-		assertNotNull(ssr);
-	}
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/ServiceInformationTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/ServiceInformationTest.java
deleted file mode 100644
index 2b87bbf101..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/adapters/sdncrest/ServiceInformationTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-* ============LICENSE_START=======================================================
-* ONAP : SO
-* ================================================================================
-* Copyright 2018 TechMahindra
-*=================================================================================
-* 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.adapters.sdncrest;
-
-import org.junit.Test;
-
-public class ServiceInformationTest {
-
-	
-	
-	@Test
-	public void test() {
-		ServiceInformation si= new ServiceInformation("id","service","GlobalId","name");
-		
-		si.setServiceInstanceId("id");
-		si.setServiceType("service");
-		si.setSubscriberGlobalId("GlobalId");
-		si.setSubscriberName("name");
-		assert(si.getServiceInstanceId().equals("id"));
-		assert(si.getServiceType().equals("service"));
-		assert(si.getSubscriberGlobalId().equals("GlobalId"));
-		assert(si.getSubscriberName().equals("name"));
-	}
-}
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/HostRouteTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/HostRouteTest.java
deleted file mode 100644
index 14f0485ba1..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/HostRouteTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 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.openstack.beans;
-
-import org.junit.Test;
-
-public class HostRouteTest {
-
-    HostRoute hostRoute = new HostRoute();
-
-    @Test
-    public void getPrefix() throws Exception {
-        hostRoute.getPrefix();
-    }
-
-    @Test
-    public void setPrefix() throws Exception {
-        hostRoute.setPrefix("192.168.21/0");
-    }
-
-    @Test
-    public void getNextHop() throws Exception {
-        hostRoute.setNextHop("127.0.0.1");
-    }
-
-    @Test
-    public void setNextHop() throws Exception {
-        hostRoute.setNextHop("127.0.0.1");
-    }
-
-}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/MsoTenantTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/MsoTenantTest.java
deleted file mode 100644
index 6e1f392c80..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/MsoTenantTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 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.openstack.beans;
-
-import org.junit.Test;
-
-import java.util.HashMap;
-
-public class MsoTenantTest {
-
-    MsoTenant msoTenant = new MsoTenant();
-
-    @Test
-    public void getTenantId() throws Exception {
-        msoTenant.getTenantId();
-    }
-
-    @Test
-    public void setTenantId() throws Exception {
-        msoTenant.setTenantId("id-123");
-    }
-
-    @Test
-    public void getTenantName() throws Exception {
-        msoTenant.getTenantName();
-    }
-
-    @Test
-    public void setTenantName() throws Exception {
-        msoTenant.setTenantName("test");
-    }
-
-    @Test
-    public void getMetadata() throws Exception {
-        msoTenant.getMetadata();
-    }
-
-    @Test
-    public void setMetadata() throws Exception {
-        msoTenant.setMetadata(new HashMap<>());
-    }
-
-}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/NetworkInfoTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/NetworkInfoTest.java
deleted file mode 100644
index ec0b917a3d..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/NetworkInfoTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 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.openstack.beans;
-
-import com.woorea.openstack.quantum.model.Network;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-public class NetworkInfoTest {
-
-    NetworkInfo networkInfo = new NetworkInfo(new Network());
-
-    @Test
-    public void getName() throws Exception {
-        networkInfo.getName();
-    }
-
-    @Test
-    public void setName() throws Exception {
-        networkInfo.setName("test");
-    }
-
-    @Test
-    public void getId() throws Exception {
-        networkInfo.getId();
-    }
-
-    @Test
-    public void setId() throws Exception {
-        networkInfo.setId("test");
-    }
-
-    @Test
-    public void getStatus() throws Exception {
-        networkInfo.getStatus();
-    }
-
-    @Test
-    public void setStatus() throws Exception {
-        networkInfo.setStatus(null);
-    }
-
-    @Test
-    public void getProvider() throws Exception {
-        networkInfo.getProvider();
-    }
-
-    @Test
-    public void setProvider() throws Exception {
-        networkInfo.setProvider("provider");
-    }
-
-    @Test
-    public void getVlans() throws Exception {
-        networkInfo.getVlans();
-    }
-
-    @Test
-    public void setVlans() throws Exception {
-        networkInfo.setVlans(Arrays.asList(10, 20, 30));
-    }
-
-    @Test
-    public void getSubnets() throws Exception {
-        networkInfo.getSubnets();
-    }
-
-}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/NetworkRollbackTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/NetworkRollbackTest.java
deleted file mode 100644
index b6245f642f..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/NetworkRollbackTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 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.openstack.beans;
-
-import org.junit.Test;
-import org.openecomp.mso.entity.MsoRequest;
-
-import java.util.Arrays;
-
-public class NetworkRollbackTest {
-
-    NetworkRollback networkRollback = new NetworkRollback();
-
-    @Test
-    public void getNetworkId() throws Exception {
-        networkRollback.getNetworkId();
-    }
-
-    @Test
-    public void setNetworkId() throws Exception {
-        networkRollback.setNetworkId("255.255.255.0");
-    }
-
-    @Test
-    public void getNeutronNetworkId() throws Exception {
-        networkRollback.getNeutronNetworkId();
-    }
-
-    @Test
-    public void setNeutronNetworkId() throws Exception {
-        networkRollback.setNeutronNetworkId("192.168.0.0");
-    }
-
-    @Test
-    public void getNetworkStackId() throws Exception {
-        networkRollback.getNetworkStackId();
-    }
-
-    @Test
-    public void setNetworkStackId() throws Exception {
-        networkRollback.setNetworkStackId("id-123");
-    }
-
-    @Test
-    public void getTenantId() throws Exception {
-        networkRollback.getTenantId();
-    }
-
-    @Test
-    public void setTenantId() throws Exception {
-        networkRollback.setTenantId("id-123");
-    }
-
-    @Test
-    public void getCloudId() throws Exception {
-        networkRollback.getCloudId();
-    }
-
-    @Test
-    public void setCloudId() throws Exception {
-        networkRollback.setCloudId("id-123");
-    }
-
-    @Test
-    public void getNetworkType() throws Exception {
-        networkRollback.getNetworkType();
-    }
-
-    @Test
-    public void setNetworkType() throws Exception {
-        networkRollback.setNetworkType("type");
-    }
-
-    @Test
-    public void getModelCustomizationUuid() throws Exception {
-        networkRollback.getModelCustomizationUuid();
-    }
-
-    @Test
-    public void setModelCustomizationUuid() throws Exception {
-        networkRollback.setModelCustomizationUuid("id-123");
-    }
-
-    @Test
-    public void getNetworkCreated() throws Exception {
-        networkRollback.getNetworkCreated();
-    }
-
-    @Test
-    public void setNetworkCreated() throws Exception {
-        networkRollback.setNetworkCreated(true);
-    }
-
-    @Test
-    public void getNetworkName() throws Exception {
-        networkRollback.getNetworkName();
-    }
-
-    @Test
-    public void setNetworkName() throws Exception {
-        networkRollback.setNetworkName("test");
-    }
-
-    @Test
-    public void getPhysicalNetwork() throws Exception {
-        networkRollback.getPhysicalNetwork();
-    }
-
-    @Test
-    public void setPhysicalNetwork() throws Exception {
-        networkRollback.setPhysicalNetwork("test");
-    }
-
-    @Test
-    public void getVlans() throws Exception {
-        networkRollback.getVlans();
-    }
-
-    @Test
-    public void setVlans() throws Exception {
-        networkRollback.setVlans(Arrays.asList(10, 20));
-    }
-
-    @Test
-    public void getMsoRequest() throws Exception {
-        networkRollback.getMsoRequest();
-    }
-
-    @Test
-    public void setMsoRequest() throws Exception {
-        networkRollback.setMsoRequest(new MsoRequest());
-    }
-
-}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/PoolTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/PoolTest.java
deleted file mode 100644
index 9795c18197..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/PoolTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 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.openstack.beans;
-
-import org.junit.Test;
-
-public class PoolTest {
-
-    Pool pool = new Pool();
-
-    @Test
-    public void getStart() throws Exception {
-        pool.getStart();
-    }
-
-    @Test
-    public void setStart() throws Exception {
-        pool.setStart("test");
-    }
-
-    @Test
-    public void getEnd() throws Exception {
-        pool.getEnd();
-    }
-
-    @Test
-    public void setEnd() throws Exception {
-        pool.setEnd("test");
-    }
-
-}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/RouteTargetTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/RouteTargetTest.java
deleted file mode 100644
index fd34f48276..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/RouteTargetTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 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.openstack.beans;
-
-import org.junit.Test;
-
-public class RouteTargetTest {
-
-    RouteTarget routeTarget = new RouteTarget();
-
-    @Test
-    public void getRouteTarget() throws Exception {
-        routeTarget.getRouteTarget();
-    }
-
-    @Test
-    public void setRouteTarget() throws Exception {
-        routeTarget.setRouteTarget("1.1.1.1");
-    }
-
-    @Test
-    public void getRouteTargetRole() throws Exception {
-        routeTarget.getRouteTargetRole();
-    }
-
-    @Test
-    public void setRole() throws Exception {
-        routeTarget.setRole("test");
-    }
-
-}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/StackInfoTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/StackInfoTest.java
deleted file mode 100644
index b549b5f853..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/StackInfoTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 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.openstack.beans;
-
-import org.junit.Test;
-
-import java.util.HashMap;
-
-public class StackInfoTest {
-
-    StackInfo stackInfo = new StackInfo();
-
-    @Test
-    public void getName() throws Exception {
-        stackInfo.getName();
-    }
-
-    @Test
-    public void setName() throws Exception {
-        stackInfo.setName("test");
-    }
-
-    @Test
-    public void getCanonicalName() throws Exception {
-        stackInfo.getCanonicalName();
-    }
-
-    @Test
-    public void setCanonicalName() throws Exception {
-        stackInfo.setCanonicalName("test");
-    }
-
-    @Test
-    public void getStatus() throws Exception {
-        stackInfo.getStatus();
-    }
-
-    @Test
-    public void setStatus() throws Exception {
-        stackInfo.setStatus(HeatStatus.BUILDING);
-    }
-
-    @Test
-    public void getStatusMessage() throws Exception {
-        stackInfo.getStatusMessage();
-    }
-
-    @Test
-    public void setStatusMessage() throws Exception {
-        stackInfo.setStatusMessage("test");
-    }
-
-    @Test
-    public void getOutputs() throws Exception {
-        stackInfo.getOutputs();
-    }
-
-    @Test
-    public void setOutputs() throws Exception {
-        stackInfo.setOutputs(new HashMap<>());
-    }
-
-    @Test
-    public void getParameters() throws Exception {
-        stackInfo.getParameters();
-    }
-
-    @Test
-    public void setParameters() throws Exception {
-        stackInfo.setParameters(new HashMap<>());
-    }
-
-}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/SubnetTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/SubnetTest.java
deleted file mode 100644
index 42781c04d1..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/SubnetTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 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.openstack.beans;
-
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-
-public class SubnetTest {
-
-    Subnet subnet = new Subnet();
-
-    @Test
-    public void getSubnetName() throws Exception {
-        subnet.getSubnetName();
-    }
-
-    @Test
-    public void setSubnetName() throws Exception {
-        subnet.setSubnetName("test");
-    }
-
-    @Test
-    public void getAllocationPools() throws Exception {
-        subnet.getAllocationPools();
-    }
-
-    @Test
-    public void getCidr() throws Exception {
-        subnet.getCidr();
-    }
-
-    @Test
-    public void getDnsNameServers() throws Exception {
-        subnet.getDnsNameServers();
-    }
-
-    @Test
-    public void getEnableDHCP() throws Exception {
-        subnet.getEnableDHCP();
-    }
-
-    @Test
-    public void getAddrFromStart() throws Exception {
-        subnet.getAddrFromStart();
-    }
-
-    @Test
-    public void setAddrFromStart() throws Exception {
-        subnet.setAddrFromStart(true);
-    }
-
-    @Test
-    public void getGatewayIp() throws Exception {
-        subnet.getGatewayIp();
-    }
-
-    @Test
-    public void getHostRoutes() throws Exception {
-        subnet.getHostRoutes();
-    }
-
-    @Test
-    public void getNeutronId() throws Exception {
-        subnet.getNeutronId();
-    }
-
-    @Test
-    public void getIpVersion() throws Exception {
-        subnet.getIpVersion();
-    }
-
-    @Test
-    public void getSubnetId() throws Exception {
-        subnet.getSubnetId();
-    }
-
-    @Test
-    public void setAllocationPools() throws Exception {
-        subnet.setAllocationPools(Arrays.asList());
-    }
-
-    @Test
-    public void setCidr() throws Exception {
-        subnet.setCidr("255.255.255.0");
-    }
-
-    @Test
-    public void setDnsNameServers() throws Exception {
-        subnet.setDnsNameServers(Arrays.asList());
-    }
-
-    @Test
-    public void setEnableDHCP() throws Exception {
-        subnet.setEnableDHCP(true);
-    }
-
-    @Test
-    public void setGatewayIp() throws Exception {
-        subnet.setGatewayIp("192.168.0.1");
-    }
-
-    @Test
-    public void setHostRoutes() throws Exception {
-        subnet.setHostRoutes(Collections.emptyList());
-    }
-
-    @Test
-    public void setNeutronId() throws Exception {
-        subnet.setNeutronId("test");
-    }
-
-    @Test
-    public void setIpVersion() throws Exception {
-        subnet.setIpVersion("ipv4");
-    }
-
-    @Test
-    public void setSubnetId() throws Exception {
-        subnet.setSubnetId("1.0.0.0");
-    }
-
-}
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/VnfRollbackTest.java b/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/VnfRollbackTest.java
deleted file mode 100644
index 9891811b86..0000000000
--- a/adapters/mso-adapters-rest-interface/src/test/java/org/openecomp/mso/openstack/beans/VnfRollbackTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP - SO
- * ================================================================================
- * Copyright (C) 2018 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.openstack.beans;
-
-import org.junit.Test;
-import org.openecomp.mso.entity.MsoRequest;
-
-public class VnfRollbackTest {
-
-    VnfRollback vnfRollback = new VnfRollback();
-
-    @Test
-    public void getVnfId() throws Exception {
-        vnfRollback.getVnfId();
-    }
-
-    @Test
-    public void setVnfId() throws Exception {
-        vnfRollback.setVnfId("test");
-    }
-
-    @Test
-    public void getTenantId() throws Exception {
-        vnfRollback.getTenantId();
-    }
-
-    @Test
-    public void setTenantId() throws Exception {
-        vnfRollback.setTenantId("test");
-    }
-
-    @Test
-    public void getCloudSiteId() throws Exception {
-        vnfRollback.getCloudSiteId();
-    }
-
-    @Test
-    public void setCloudSiteId() throws Exception {
-        vnfRollback.setCloudSiteId("test");
-    }
-
-    @Test
-    public void getTenantCreated() throws Exception {
-        vnfRollback.getTenantCreated();
-    }
-
-    @Test
-    public void setTenantCreated() throws Exception {
-        vnfRollback.setTenantCreated(true);
-    }
-
-    @Test
-    public void getVnfCreated() throws Exception {
-        vnfRollback.getVnfCreated();
-    }
-
-    @Test
-    public void setVnfCreated() throws Exception {
-        vnfRollback.setVnfCreated(true);
-    }
-
-    @Test
-    public void getMsoRequest() throws Exception {
-        vnfRollback.getMsoRequest();
-    }
-
-    @Test
-    public void setMsoRequest() throws Exception {
-        vnfRollback.setMsoRequest(new MsoRequest());
-    }
-
-    @Test
-    public void getVolumeGroupName() throws Exception {
-        vnfRollback.getVolumeGroupName();
-    }
-
-    @Test
-    public void setVolumeGroupName() throws Exception {
-        vnfRollback.setVolumeGroupName("test");
-    }
-
-    @Test
-    public void getVolumeGroupId() throws Exception {
-        vnfRollback.getVolumeGroupId();
-    }
-
-    @Test
-    public void setVolumeGroupId() throws Exception {
-        vnfRollback.setVolumeGroupId("test");
-    }
-
-    @Test
-    public void getRequestType() throws Exception {
-        vnfRollback.getRequestType();
-    }
-
-    @Test
-    public void setRequestType() throws Exception {
-        vnfRollback.setRequestType("test");
-    }
-
-    @Test
-    public void getVolumeGroupHeatStackId() throws Exception {
-        vnfRollback.getVolumeGroupHeatStackId();
-    }
-
-    @Test
-    public void setVolumeGroupHeatStackId() throws Exception {
-        vnfRollback.setVolumeGroupHeatStackId("test");
-    }
-
-    @Test
-    public void getBaseGroupHeatStackId() throws Exception {
-        vnfRollback.getBaseGroupHeatStackId();
-    }
-
-    @Test
-    public void setBaseGroupHeatStackId() throws Exception {
-        vnfRollback.setBaseGroupHeatStackId("test");
-    }
-
-    @Test
-    public void isBase() throws Exception {
-        vnfRollback.isBase();
-    }
-
-    @Test
-    public void setIsBase() throws Exception {
-        vnfRollback.setIsBase(true);
-    }
-
-    @Test
-    public void getVfModuleStackId() throws Exception {
-        vnfRollback.getVfModuleStackId();
-    }
-
-    @Test
-    public void setVfModuleStackId() throws Exception {
-        vnfRollback.setVfModuleStackId("test");
-    }
-
-    @Test
-    public void getModelCustomizationUuid() throws Exception {
-        vnfRollback.getModelCustomizationUuid();
-    }
-
-    @Test
-    public void setModelCustomizationUuid() throws Exception {
-        vnfRollback.setModelCustomizationUuid("test");
-    }
-
-    @Test
-    public void getMode() throws Exception {
-        vnfRollback.getMode();
-    }
-
-    @Test
-    public void setMode() throws Exception {
-        vnfRollback.setMode("test");
-    }
-
-}
\ No newline at end of file