Adding UT for ApiHandlers

IsuueId: SO-191

Change-Id: Iac92a61eb2692f3793a21097715735501d9954bd
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

13 files changed, 972 insertions, 0 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/BeanTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/BeanTest.java
new file mode 100644
index 0000000000..9028109735
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/BeanTest.java
@@ -0,0 +1,59 @@
+/*-
+ * ============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.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.openecomp.mso.apihandlerinfra.vnfbeans.VnfInputs;
+
+public class BeanTest {
+
+	@Test
+	public void testVnfInputs(){
+		VnfInputs bean = new VnfInputs();
+		bean.setAicCloudRegion("south");
+		bean.setAicNodeClli("38982");
+		bean.setAsdcServiceModelVersion("v2");
+		bean.setBackoutOnFailure(false);
+		bean.setIsBaseVfModule(true);
+		bean.setPersonaModelId("2017");
+		bean.setPersonaModelVersion("v3");
+		bean.setProvStatus("active");
+		bean.setServiceId("123456");
+		bean.setServiceInstanceId("aaa1234");
+		bean.setServiceType("vnf");
+		bean.setTenantId("89903042");
+		bean.setVfModuleId("4993022");
+		bean.setVfModuleModelName("m1");
+		bean.setVnfId("34");
+		bean.setVnfName("test");
+		bean.setVnfPersonaModelId("1002");
+		bean.setVnfPersonaModelVersion("v3");
+		bean.setVnfType("fddf");
+		bean.setVolumeGroupId("7889");
+		bean.setVolumeGroupName("test");
+		
+		String str = bean.toString();
+		assertTrue(str != null);
+		
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ManualTasksTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ManualTasksTest.java
new file mode 100644
index 0000000000..e18bc5e911
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ManualTasksTest.java
@@ -0,0 +1,38 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import javax.ws.rs.core.Response;
+
+public class ManualTasksTest {
+
+	ManualTasks task = new ManualTasks();
+	
+	@Test
+	public void completeTaskTest(){
+		Response resp = task.completeTask("test", "v2", "1882993");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkInfoHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkInfoHandlerTest.java
new file mode 100644
index 0000000000..445fab329f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkInfoHandlerTest.java
@@ -0,0 +1,65 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.openecomp.mso.apihandlerinfra.networkbeans.NetworkRequest;
+import org.openecomp.mso.requestsdb.InfraRequests;
+
+public class NetworkInfoHandlerTest {
+
+	NetworkInfoHandler handler = new NetworkInfoHandler();
+	
+	@Test
+	public void fillVnfRequestTest(){
+		NetworkRequest qr = new NetworkRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("2990102");
+		ar.setVnfParams("test");
+		handler.fillNetworkRequest(qr, ar, "v3");
+		String vnfid = (String)qr.getNetworkParams();
+		assertTrue(vnfid.equals("test"));
+	}
+	
+	@Test
+	public void fillVnfRequestTestV2(){
+		NetworkRequest qr = new NetworkRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("2990102");
+		ar.setVnfParams("test");
+		handler.fillNetworkRequest(qr, ar, "v2");
+		String vnfid = (String)qr.getNetworkParams();
+		assertTrue(vnfid.equals("test"));
+	}
+	
+	@Test
+	public void fillVnfRequestTestV1(){
+		NetworkRequest qr = new NetworkRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("2990102");
+		ar.setVnfParams("test");
+		handler.fillNetworkRequest(qr, ar, "v1");
+		String vnfid = (String)qr.getNetworkParams();
+		assertTrue(vnfid.equals("test"));
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
new file mode 100644
index 0000000000..3feb168f51
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
@@ -0,0 +1,153 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Field;
+import java.net.URI;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import mockit.Mock;
+import mockit.MockUp;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.mso.apihandlerinfra.networkbeans.NetworkRequest;
+import org.openecomp.mso.requestsdb.InfraRequests;
+
+public class NetworkRequestHandlerTest {
+
+	NetworkRequestHandler handler = null;
+	
+UriInfo uriInfo = null;
+	
+	@Before
+	public void setup() throws Exception{
+		
+		uriInfo = Mockito.mock(UriInfo.class);
+		Class<?> clazz = NetworkRequestHandler.class;
+		handler = (NetworkRequestHandler)clazz.newInstance();
+		
+		Field f1 = handler.getClass().getDeclaredField("uriInfo");
+		
+		f1.setAccessible(true);
+        f1.set(handler, uriInfo);
+	}
+	
+	@Test
+	public void manageVnfRequestTest(){
+		Response resp = handler.manageNetworkRequest("<name>Test</name>", "v2");
+		assertTrue(null != resp);
+	}
+	
+	@Test
+	public void manageVnfRequest2Test(){
+		Mockito.when(uriInfo.getRequestUri())
+        .thenReturn(URI.create("http://localhost:8080/test"));
+		
+		new MockUp<MsoPropertiesUtils>() {
+			@Mock
+			public synchronized final boolean getNoPropertiesState() {
+				return false;
+			}
+		};
+		Response resp = handler.manageNetworkRequest("<name>Test</name>", "v2");
+		assertTrue(null != resp);
+	}
+	
+	@Test
+	public void fillNetworkRequestTestV1(){
+		NetworkRequest qr = new NetworkRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("1003");
+		ar.setVnfName("vnf");
+		ar.setVnfType("vnt");
+		ar.setTenantId("48889690");
+		ar.setProvStatus("uuu");
+		ar.setVolumeGroupName("volume");
+		ar.setVolumeGroupId("38838");
+		ar.setServiceType("vnf");
+		ar.setAicNodeClli("djerfe");
+		ar.setAaiServiceId("599499");
+		ar.setAicCloudRegion("south");
+		ar.setVfModuleName("m1");
+		ar.setVfModuleId("39949");
+		ar.setVfModuleModelName("test");
+		ar.setAaiServiceId("37728");
+		ar.setVnfParams("test");
+		handler.fillNetworkRequest(qr, ar, "v1");
+		String param = (String)qr.getNetworkParams();
+		assertTrue(param.equals("test"));
+	}
+	@Test
+	public void fillNetworkRequestTestV2(){
+		NetworkRequest qr = new NetworkRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("1003");
+		ar.setVnfName("vnf");
+		ar.setVnfType("vnt");
+		ar.setTenantId("48889690");
+		ar.setProvStatus("uuu");
+		ar.setVolumeGroupName("volume");
+		ar.setVolumeGroupId("38838");
+		ar.setServiceType("vnf");
+		ar.setAicNodeClli("djerfe");
+		ar.setAaiServiceId("599499");
+		ar.setAicCloudRegion("south");
+		ar.setVfModuleName("m1");
+		ar.setVfModuleId("39949");
+		ar.setVfModuleModelName("test");
+		ar.setAaiServiceId("37728");
+		ar.setVnfParams("test");
+		handler.fillNetworkRequest(qr, ar, "v2");
+		String param = (String)qr.getNetworkParams();
+		assertTrue(param.equals("test"));
+	}
+	@Test
+	public void fillNetworkRequestTestV3(){
+		NetworkRequest qr = new NetworkRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("1003");
+		ar.setVnfName("vnf");
+		ar.setVnfType("vnt");
+		ar.setTenantId("48889690");
+		ar.setProvStatus("uuu");
+		ar.setVolumeGroupName("volume");
+		ar.setVolumeGroupId("38838");
+		ar.setServiceType("vnf");
+		ar.setAicNodeClli("djerfe");
+		ar.setAaiServiceId("599499");
+		ar.setAicCloudRegion("south");
+		ar.setVfModuleName("m1");
+		ar.setVfModuleId("39949");
+		ar.setVfModuleModelName("test");
+		ar.setAaiServiceId("37728");
+		ar.setVnfParams("test");
+		handler.fillNetworkRequest(qr, ar, "v3");
+		String param = (String)qr.getNetworkParams();
+		assertTrue(param.equals("test"));
+	}
+	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkTypesHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkTypesHandlerTest.java
new file mode 100644
index 0000000000..3738e2f94a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkTypesHandlerTest.java
@@ -0,0 +1,73 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.ws.rs.core.Response;
+
+import mockit.Mock;
+import mockit.MockUp;
+
+import org.junit.Test;
+import org.openecomp.mso.db.catalog.CatalogDatabase;
+import org.openecomp.mso.db.catalog.beans.NetworkResource;
+
+public class NetworkTypesHandlerTest {
+
+	NetworkTypesHandler handler = new NetworkTypesHandler();
+	
+	@Test
+	public void getNetworkTypesTest(){
+		Response resp = handler.getNetworkTypes("v2");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+	
+	@Test
+	public void getNetworkTypesTest2(){
+		new MockUp<CatalogDatabase>() {
+			@Mock
+			public  List <NetworkResource>  getAllNetworkResources(){
+				return null;
+			}	
+		};
+		Response resp = handler.getNetworkTypes("v2");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+	
+	@Test
+	public void getNetworkTypesTest3(){
+		List <NetworkResource> netList = new ArrayList<>();
+		new MockUp<CatalogDatabase>() {
+			@Mock
+			public  List <NetworkResource>  getAllNetworkResources(){
+				NetworkResource ns = new NetworkResource();
+				netList.add(ns);
+				return netList;
+			}	
+		};
+		Response resp = handler.getNetworkTypes("v2");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/OrchestrationRequestsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/OrchestrationRequestsTest.java
new file mode 100644
index 0000000000..82eb8d4a60
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/OrchestrationRequestsTest.java
@@ -0,0 +1,59 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class OrchestrationRequestsTest {
+
+	OrchestrationRequests req = new OrchestrationRequests();
+	
+	@Test
+	public void getOrchestrationRequestTest(){
+		Response resp = req.getOrchestrationRequest("1001", "v3");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+	
+	@Test
+	public void getE2EServiceInstancesTest(){
+		Response resp = req.getE2EServiceInstances("1001", "v3","599934");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+	
+	@Test
+	public void getOrchestrationRequest2Test(){
+		UriInfo uriInfo = Mockito.mock(UriInfo.class);
+		Response resp = req.getOrchestrationRequest(uriInfo, "v3");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+	
+	@Test
+	public void unlockOrchestrationRequestTest(){
+		Response resp = req.unlockOrchestrationRequest("{\"result\":\"success\"}","1001", "v3");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/TasksHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/TasksHandlerTest.java
new file mode 100644
index 0000000000..4926da77b1
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/TasksHandlerTest.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import javax.ws.rs.core.Response;
+
+import org.junit.Test;
+
+public class TasksHandlerTest {
+	
+	TasksHandler handler = new TasksHandler();
+	
+	@Test
+	public void queryFiltersTest(){
+		Response resp = handler.queryFilters("10020", "399495", "test", "nfRole", "buildingBlockName", "originalRequestDate", "originalRequestorId", "v2");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VfModuleModelNamesHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VfModuleModelNamesHandlerTest.java
new file mode 100644
index 0000000000..4305db3e72
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VfModuleModelNamesHandlerTest.java
@@ -0,0 +1,74 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import mockit.Mock;
+import mockit.MockUp;
+
+import org.junit.Test;
+import org.openecomp.mso.db.catalog.CatalogDatabase;
+import org.openecomp.mso.db.catalog.beans.VfModule;
+import org.openecomp.mso.db.catalog.beans.VnfResource;
+
+import javax.ws.rs.core.Response;
+public class VfModuleModelNamesHandlerTest {
+
+	VfModuleModelNamesHandler handler = new VfModuleModelNamesHandler();
+	
+	@Test
+	public void getVfModuleModelNamesTest(){
+		Response resp = handler.getVfModuleModelNames("v2");
+		assertTrue(resp.getEntity().toString()!= null);
+	}
+	
+	@Test
+	public void getVfModuleModelNamesTest2(){
+		new MockUp<CatalogDatabase>() {
+			@Mock
+			public  List <VfModule>  getAllVfModules(){
+				List <VfModule> list = new ArrayList<VfModule>();
+				VfModule resource = new VfModule();
+				list.add(resource);
+				return list;
+			}	
+		};
+		Response resp = handler.getVfModuleModelNames("v2");
+		assertTrue(resp.getEntity().toString()!= null);
+	}
+	
+	
+	@Test
+	public void getVfModuleModelNamesTest3(){
+		new MockUp<CatalogDatabase>() {
+			@Mock
+			public  List <VfModule>  getAllVfModules(){
+				return null;
+			}	
+		};
+		Response resp = handler.getVfModuleModelNames("v2");
+		assertTrue(resp.getEntity().toString()!= null);
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfInfoHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfInfoHandlerTest.java
new file mode 100644
index 0000000000..fd22af012f
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfInfoHandlerTest.java
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.openecomp.mso.apihandlerinfra.vnfbeans.VnfRequest;
+import org.openecomp.mso.requestsdb.InfraRequests;
+
+public class VnfInfoHandlerTest {
+
+	VnfInfoHandler handler = new VnfInfoHandler();
+	
+	@Test
+	public void fillVnfRequestTest(){
+		VnfRequest qr = new VnfRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("2990102");
+		ar.setVnfParams("test");
+		handler.fillVnfRequest(qr, ar, "v3");
+		String vnfid = (String)qr.getVnfParams();
+		assertTrue(vnfid.equals("test"));
+	}
+	
+	@Test
+	public void fillVnfRequestTestV2(){
+		VnfRequest qr = new VnfRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("2990102");
+		ar.setVnfParams("test");
+		handler.fillVnfRequest(qr, ar, "v2");
+		String vnfid = (String)qr.getVnfParams();
+		assertTrue(vnfid.equals("test"));
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
new file mode 100644
index 0000000000..8d06b40074
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
@@ -0,0 +1,153 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Field;
+import java.net.URI;
+
+import mockit.Mock;
+import mockit.MockUp;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.openecomp.mso.apihandlerinfra.vnfbeans.VnfRequest;
+import org.openecomp.mso.requestsdb.InfraRequests;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+public class VnfRequestHandlerTest {
+	VnfRequestHandler handler = null;
+	UriInfo uriInfo = null;
+	
+	@Before
+	public void setup() throws Exception{
+		
+		uriInfo = Mockito.mock(UriInfo.class);
+		Class<?> clazz = VnfRequestHandler.class;
+		handler = (VnfRequestHandler)clazz.newInstance();
+		
+		Field f1 = handler.getClass().getDeclaredField("uriInfo");
+		
+		f1.setAccessible(true);
+        f1.set(handler, uriInfo);
+	}
+	
+	@Test
+	public void manageVnfRequestTest(){
+		Response resp = handler.manageVnfRequest("<name>Test</name>", "v2");
+		assertTrue(null != resp);
+	}
+	
+	@Test
+	public void manageVnfRequest2Test(){
+		Mockito.when(uriInfo.getRequestUri())
+        .thenReturn(URI.create("http://localhost:8080/test"));
+		
+		new MockUp<MsoPropertiesUtils>() {
+			@Mock
+			public synchronized final boolean getNoPropertiesState() {
+				return false;
+			}
+		};
+		Response resp = handler.manageVnfRequest("<name>Test</name>", "v2");
+		assertTrue(null != resp);
+	}
+	
+	@Test
+	public void fillVnfRequestTest(){
+		VnfRequest qr = new VnfRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("1003");
+		ar.setVnfName("vnf");
+		ar.setVnfType("vnt");
+		ar.setTenantId("48889690");
+		ar.setProvStatus("uuu");
+		ar.setVolumeGroupName("volume");
+		ar.setVolumeGroupId("38838");
+		ar.setServiceType("vnf");
+		ar.setAicNodeClli("djerfe");
+		ar.setAaiServiceId("599499");
+		ar.setAicCloudRegion("south");
+		ar.setVfModuleName("m1");
+		ar.setVfModuleId("39949");
+		ar.setVfModuleModelName("test");
+		ar.setAaiServiceId("37728");
+		ar.setVnfParams("test");
+		handler.fillVnfRequest(qr, ar, "v1");
+		String param = (String)qr.getVnfParams();
+		assertTrue(param.equals("test"));
+	}
+	
+	@Test
+	public void fillVnfRequestTestV2(){
+		VnfRequest qr = new VnfRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("1003");
+		ar.setVnfName("vnf");
+		ar.setVnfType("vnt");
+		ar.setTenantId("48889690");
+		ar.setProvStatus("uuu");
+		ar.setVolumeGroupName("volume");
+		ar.setVolumeGroupId("38838");
+		ar.setServiceType("vnf");
+		ar.setAicNodeClli("djerfe");
+		ar.setAaiServiceId("599499");
+		ar.setAicCloudRegion("south");
+		ar.setVfModuleName("m1");
+		ar.setVfModuleId("39949");
+		ar.setVfModuleModelName("test");
+		ar.setAaiServiceId("37728");
+		ar.setVnfParams("test");
+		handler.fillVnfRequest(qr, ar, "v2");
+		String param = (String)qr.getVnfParams();
+		assertTrue(param.equals("test"));
+	}
+	@Test
+	public void fillVnfRequestTestV3(){
+		VnfRequest qr = new VnfRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("1003");
+		ar.setVnfName("vnf");
+		ar.setVnfType("vnt");
+		ar.setTenantId("48889690");
+		ar.setProvStatus("uuu");
+		ar.setVolumeGroupName("volume");
+		ar.setVolumeGroupId("38838");
+		ar.setServiceType("vnf");
+		ar.setAicNodeClli("djerfe");
+		ar.setAaiServiceId("599499");
+		ar.setAicCloudRegion("south");
+		ar.setVfModuleName("m1");
+		ar.setVfModuleId("39949");
+		ar.setVfModuleModelName("test");
+		ar.setAaiServiceId("37728");
+		ar.setVnfParams("test");
+		ar.setServiceInstanceId("38829");
+		handler.fillVnfRequest(qr, ar, "v3");
+		String param = (String)qr.getVnfParams();
+		assertTrue(param.equals("test"));
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfTypesHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfTypesHandlerTest.java
new file mode 100644
index 0000000000..7eabc1ac2a
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfTypesHandlerTest.java
@@ -0,0 +1,75 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import mockit.Mock;
+import mockit.MockUp;
+
+import org.junit.Test;
+import org.openecomp.mso.db.catalog.CatalogDatabase;
+import org.openecomp.mso.db.catalog.beans.NetworkResource;
+import org.openecomp.mso.db.catalog.beans.VnfResource;
+
+import javax.ws.rs.core.Response;
+
+public class VnfTypesHandlerTest {
+	
+	VnfTypesHandler handler = new VnfTypesHandler();
+	
+	@Test
+	public void getVnfTypesTest(){
+		Response resp = handler.getVnfTypes(null, "v2");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+	
+	@Test
+	public void getVnfTypesTest2(){
+		new MockUp<CatalogDatabase>() {
+			@Mock
+			public  List <VnfResource>  getAllVnfResources(){
+				return null;
+			}	
+		};
+		Response resp = handler.getVnfTypes(null, "v2");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+	
+	@Test
+	public void getVnfTypesTest3(){
+		new MockUp<CatalogDatabase>() {
+			@Mock
+			public  List <VnfResource>  getAllVnfResources(){
+				List <VnfResource> list = new ArrayList<VnfResource>();
+				VnfResource resource = new VnfResource();
+				list.add(resource);
+				return list;
+			}	
+		};
+		Response resp = handler.getVnfTypes(null, "v2");
+		assertTrue(resp.getEntity().toString() != null);
+	}
+
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeInfoHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeInfoHandlerTest.java
new file mode 100644
index 0000000000..78ed076b55
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeInfoHandlerTest.java
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.openecomp.mso.apihandlerinfra.volumebeans.VolumeRequest;
+import org.openecomp.mso.requestsdb.InfraRequests;
+
+public class VolumeInfoHandlerTest {
+
+	VolumeInfoHandler handler = new VolumeInfoHandler();
+	
+	@Test
+	public void fillVnfRequestTestV3(){
+		VolumeRequest qr = new VolumeRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("2990102");
+		ar.setVnfParams("test");
+		handler.fillVolumeRequest(qr, ar, "v3");
+		String vnfid = (String)qr.getVolumeParams();
+		assertTrue(vnfid.equals("test"));
+	}
+	
+	@Test
+	public void fillVnfRequestTestV2(){
+		VolumeRequest qr = new VolumeRequest();
+		InfraRequests ar = new InfraRequests();
+		ar.setVnfId("2990102");
+		ar.setVnfParams("test");
+		handler.fillVolumeRequest(qr, ar, "v2");
+		String vnfid = (String)qr.getVolumeParams();
+		assertTrue(vnfid.equals("test"));
+	}
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
new file mode 100644
index 0000000000..be41944b31
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
@@ -0,0 +1,76 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.apihandlerinfra;
+
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Field;
+import java.net.URI;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriInfo;
+
+import mockit.Mock;
+import mockit.MockUp;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class VolumeRequestHandlerTest {
+	VolumeRequestHandler handler = null;
+	
+    UriInfo uriInfo = null;
+	
+	@Before
+	public void setup() throws Exception{
+		
+		uriInfo = Mockito.mock(UriInfo.class);
+		Class<?> clazz = VolumeRequestHandler.class;
+		handler = (VolumeRequestHandler)clazz.newInstance();
+		
+		Field f1 = handler.getClass().getDeclaredField("uriInfo");
+		
+		f1.setAccessible(true);
+        f1.set(handler, uriInfo);
+	}
+	
+	@Test
+	public void manageVnfRequestTest(){
+		Response resp = handler.manageVolumeRequest("<name>Test</name>", "v2");
+		assertTrue(null != resp);
+	}
+	
+	@Test
+	public void manageVnfRequest2Test(){
+		Mockito.when(uriInfo.getRequestUri())
+        .thenReturn(URI.create("http://localhost:8080/test"));
+		
+		new MockUp<MsoPropertiesUtils>() {
+			@Mock
+			public synchronized final boolean getNoPropertiesState() {
+				return false;
+			}
+		};
+		Response resp = handler.manageVolumeRequest("<name>Test</name>", "v2");
+		assertTrue(null != resp);
+	}
+}