Add correlationId to ServiceInstancesRequest

Change-Id: Ia38fa1234f7b89c0574c74efe62d7b270c8ff987
Issue-ID: SO-596
Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>

2 files changed, 40 insertions, 140 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
index f8caa54846..5c4ddfb56e 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
@@ -40,12 +40,12 @@ import org.junit.Test;
 import org.openecomp.mso.apihandler.common.CamundaClient;
 import org.openecomp.mso.apihandler.common.RequestClient;
 import org.openecomp.mso.apihandler.common.RequestClientFactory;
+import org.openecomp.mso.apihandler.common.RequestClientParamater;
 import org.openecomp.mso.apihandler.common.ValidationException;
 import org.openecomp.mso.db.AbstractSessionFactoryManager;
 import org.openecomp.mso.db.catalog.CatalogDatabase;
 import org.openecomp.mso.db.catalog.beans.Service;
 import org.openecomp.mso.db.catalog.beans.ServiceRecipe;
-import org.openecomp.mso.properties.MsoDatabaseException;
 import org.openecomp.mso.properties.MsoJavaProperties;
 import org.openecomp.mso.properties.MsoPropertiesFactory;
 import org.openecomp.mso.requestsdb.OperationStatus;
@@ -194,12 +194,7 @@ public class E2EServiceInstancesTest {
 
 		new MockUp<CamundaClient>() {
 			@Mock
-			public HttpResponse post(String requestId, boolean isBaseVfModule,
-					int recipeTimeout, String requestAction,
-					String serviceInstanceId, String vnfId, String vfModuleId,
-					String volumeGroupId, String networkId, String configurationId, String serviceType,
-					String vnfType, String vfModuleType, String networkType,
-					String requestDetails, String recipeParamXsd) {
+			public HttpResponse post(RequestClientParamater requestClientParamater) {
 				ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
 				HttpResponse resp = new BasicHttpResponse(pv, 202,
 						"test response");
@@ -258,12 +253,7 @@ public class E2EServiceInstancesTest {
 
 		new MockUp<CamundaClient>() {
 			@Mock
-			public HttpResponse post(String requestId, boolean isBaseVfModule,
-					int recipeTimeout, String requestAction,
-					String serviceInstanceId, String vnfId, String vfModuleId,
-					String volumeGroupId, String networkId, String configurationId, String serviceType,
-					String vnfType, String vfModuleType, String networkType,
-					String requestDetails, String recipeParamXsd) {
+			public HttpResponse post(RequestClientParamater requestClientParamater) {
 				ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
 				HttpResponse resp = new BasicHttpResponse(pv, 500,
 						"test response");
@@ -323,12 +313,7 @@ public class E2EServiceInstancesTest {
 
 		new MockUp<CamundaClient>() {
 			@Mock
-			public HttpResponse post(String requestId, boolean isBaseVfModule,
-					int recipeTimeout, String requestAction,
-					String serviceInstanceId, String vnfId, String vfModuleId,
-					String volumeGroupId, String networkId, String configurationId, String serviceType,
-					String vnfType, String vfModuleType, String networkType,
-					String requestDetails, String recipeParamXsd) {
+			public HttpResponse post(RequestClientParamater requestClientParamater) {
 				ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
 				HttpResponse resp = new BasicHttpResponse(pv, 500,
 						"test response");
@@ -388,12 +373,7 @@ public class E2EServiceInstancesTest {
 
 		new MockUp<CamundaClient>() {
 			@Mock
-			public HttpResponse post(String requestId, boolean isBaseVfModule,
-					int recipeTimeout, String requestAction,
-					String serviceInstanceId, String vnfId, String vfModuleId,
-					String volumeGroupId, String networkId, String configurationId, String serviceType,
-					String vnfType, String vfModuleType, String networkType,
-					String requestDetails, String recipeParamXsd) {
+			public HttpResponse post(RequestClientParamater requestClientParamater) {
 				HttpResponse resp = null;
 				return resp;
 			}
@@ -625,12 +605,7 @@ public class E2EServiceInstancesTest {
 
         final MockUp<CamundaClient> mockCmaundaClient = new MockUp<CamundaClient>() {
             @Mock
-            public HttpResponse post(String requestId, boolean isBaseVfModule,
-                                     int recipeTimeout, String requestAction, String serviceInstanceId,
-                                     String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,
-                                     String serviceType, String vnfType, String vfModuleType, String networkType,
-                                     String requestDetails, String recipeParamXsd)
-                    throws ClientProtocolException, IOException {
+            public HttpResponse post(RequestClientParamater requestClientParamater) {
                 ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
                 HttpResponse resp = new BasicHttpResponse(pv, 200, "test response");
                 BasicHttpEntity entity = new BasicHttpEntity();
@@ -822,12 +797,7 @@ public class E2EServiceInstancesTest {
 
 		new MockUp<CamundaClient>() {
 			@Mock
-			public HttpResponse post(String requestId, boolean isBaseVfModule,
-					int recipeTimeout, String requestAction,
-					String serviceInstanceId, String vnfId, String vfModuleId,
-					String volumeGroupId, String networkId, String configurationId, String serviceType,
-					String vnfType, String vfModuleType, String networkType,
-					String requestDetails, String recipeParamXsd) {
+			public HttpResponse post(RequestClientParamater requestClientParamater) {
 				ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
 				HttpResponse resp = new BasicHttpResponse(pv, 202,
 						"test response");
@@ -888,12 +858,7 @@ public class E2EServiceInstancesTest {
 
 		new MockUp<CamundaClient>() {
 			@Mock
-			public HttpResponse post(String requestId, boolean isBaseVfModule,
-					int recipeTimeout, String requestAction,
-					String serviceInstanceId, String vnfId, String vfModuleId,
-					String volumeGroupId, String networkId, String configurationId, String serviceType,
-					String vnfType, String vfModuleType, String networkType,
-					String requestDetails, String recipeParamXsd) {
+			public HttpResponse post(RequestClientParamater requestClientParamater) {
 				ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
 				HttpResponse resp = new BasicHttpResponse(pv, 202,
 						"test response");
@@ -955,12 +920,7 @@ public class E2EServiceInstancesTest {
 
         new MockUp<CamundaClient>() {
             @Mock
-            public HttpResponse post(String requestId, boolean isBaseVfModule,
-                                     int recipeTimeout, String requestAction,
-                                     String serviceInstanceId, String vnfId, String vfModuleId,
-                                     String volumeGroupId, String networkId, String configurationId, String serviceType,
-                                     String vnfType, String vfModuleType, String networkType,
-                                     String requestDetails, String recipeParamXsd) {
+            public HttpResponse post(RequestClientParamater requestClientParamater) {
                 ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "test response");
@@ -1027,12 +987,7 @@ public class E2EServiceInstancesTest {
 
         new MockUp<CamundaClient>() {
             @Mock
-            public HttpResponse post(String requestId, boolean isBaseVfModule,
-                                     int recipeTimeout, String requestAction,
-                                     String serviceInstanceId, String vnfId, String vfModuleId,
-                                     String volumeGroupId, String networkId, String configurationId, String serviceType,
-                                     String vnfType, String vfModuleType, String networkType,
-                                     String requestDetails, String recipeParamXsd) {
+            public HttpResponse post(RequestClientParamater requestClientParamater) {
                 ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "test response");
@@ -1093,12 +1048,7 @@ public class E2EServiceInstancesTest {
 
         new MockUp<CamundaClient>() {
             @Mock
-            public HttpResponse post(String requestId, boolean isBaseVfModule,
-                                     int recipeTimeout, String requestAction,
-                                     String serviceInstanceId, String vnfId, String vfModuleId,
-                                     String volumeGroupId, String networkId, String configurationId, String serviceType,
-                                     String vnfType, String vfModuleType, String networkType,
-                                     String requestDetails, String recipeParamXsd) {
+            public HttpResponse post(RequestClientParamater requestClientParamater) {
                 ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "test response");
@@ -1160,12 +1110,7 @@ public class E2EServiceInstancesTest {
 
         MockUp<CamundaClient> client = new MockUp<CamundaClient>() {
             @Mock
-            public HttpResponse post(String requestId, boolean isBaseVfModule,
-                                     int recipeTimeout, String requestAction,
-                                     String serviceInstanceId, String vnfId, String vfModuleId,
-                                     String volumeGroupId, String networkId, String configurationId, String serviceType,
-                                     String vnfType, String vfModuleType, String networkType,
-                                     String requestDetails, String recipeParamXsd) throws Exception {
+            public HttpResponse post(RequestClientParamater requestClientParamater) throws Exception {
                 throw new Exception();
             }
         };
@@ -1192,13 +1137,7 @@ public class E2EServiceInstancesTest {
 
         new MockUp<CamundaClient>() {
             @Mock
-            public HttpResponse post(String requestId, boolean isBaseVfModule,
-                 int recipeTimeout, String requestAction, String serviceInstanceId,
-                 String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,
-                 String serviceType, String vnfType, String vfModuleType, String networkType,
-                 String requestDetails, String recipeParamXsd)
-                    throws ClientProtocolException, IOException {
-
+            public HttpResponse post(RequestClientParamater requestClientParamater) throws IOException {
                 throw new ClientProtocolException();
             }
         };
@@ -1216,13 +1155,7 @@ public class E2EServiceInstancesTest {
 
         new MockUp<CamundaClient>() {
             @Mock
-            public HttpResponse post(String requestId, boolean isBaseVfModule,
-                                     int recipeTimeout, String requestAction, String serviceInstanceId,
-                                     String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,
-                                     String serviceType, String vnfType, String vfModuleType, String networkType,
-                                     String requestDetails, String recipeParamXsd)
-                    throws ClientProtocolException, IOException {
-
+            public HttpResponse post(RequestClientParamater requestClientParamater) {
                 ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "compareModelwithTargetVersion, test response");
@@ -1291,12 +1224,7 @@ public class E2EServiceInstancesTest {
 
         final MockUp<CamundaClient> mockCamundaClient = new MockUp<CamundaClient>() {
             @Mock
-            public HttpResponse post(String requestId, boolean isBaseVfModule,
-                                     int recipeTimeout, String requestAction,
-                                     String serviceInstanceId, String vnfId, String vfModuleId,
-                                     String volumeGroupId, String networkId, String configurationId, String serviceType,
-                                     String vnfType, String vfModuleType, String networkType,
-                                     String requestDetails, String recipeParamXsd) {
+            public HttpResponse post(RequestClientParamater requestClientParamater) {
                 ProtocolVersion pv = new ProtocolVersion("HTTP", 1, 1);
                 HttpResponse resp = new BasicHttpResponse(pv, 202,
                         "test response");
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java
index 28cb51aa70..a86a993fa6 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/ServiceInstanceTest.java
@@ -21,6 +21,16 @@
 package org.openecomp.mso.apihandlerinfra;

 

 

+import static org.junit.Assert.assertTrue;

+

+import java.io.ByteArrayInputStream;

+import java.io.InputStream;

+import java.util.Collections;

+import java.util.HashMap;

+import java.util.List;

+import javax.ws.rs.core.Response;

+import mockit.Mock;

+import mockit.MockUp;

 import org.apache.http.HttpResponse;

 import org.apache.http.ProtocolVersion;

 import org.apache.http.entity.BasicHttpEntity;

@@ -30,33 +40,23 @@ import org.hibernate.criterion.Order;
 import org.junit.BeforeClass;

 import org.junit.Ignore;

 import org.junit.Test;

-

-import javax.ws.rs.core.Response;

-

-import static org.junit.Assert.assertFalse;

-import static org.junit.Assert.assertTrue;

-import static org.junit.Assert.fail;

-

-import java.io.ByteArrayInputStream;

-import java.io.InputStream;

-import java.util.Collections;

-import java.util.HashMap;

-import java.util.List;

-

 import org.openecomp.mso.apihandler.common.CamundaClient;

 import org.openecomp.mso.apihandler.common.RequestClient;

 import org.openecomp.mso.apihandler.common.RequestClientFactory;

+import org.openecomp.mso.apihandler.common.RequestClientParamater;

 import org.openecomp.mso.db.catalog.CatalogDatabase;

-import org.openecomp.mso.db.catalog.beans.*;

+import org.openecomp.mso.db.catalog.beans.Service;

+import org.openecomp.mso.db.catalog.beans.ServiceRecipe;

+import org.openecomp.mso.db.catalog.beans.VfModule;

+import org.openecomp.mso.db.catalog.beans.VfModuleCustomization;

+import org.openecomp.mso.db.catalog.beans.VnfComponentsRecipe;

+import org.openecomp.mso.db.catalog.beans.VnfRecipe;

+import org.openecomp.mso.db.catalog.beans.VnfResource;

 import org.openecomp.mso.properties.MsoJavaProperties;

-import org.openecomp.mso.properties.MsoPropertiesException;

 import org.openecomp.mso.properties.MsoPropertiesFactory;

 import org.openecomp.mso.requestsdb.InfraActiveRequests;

 import org.openecomp.mso.requestsdb.RequestsDatabase;

 

-import mockit.Mock;

-import mockit.MockUp;

-

 public class ServiceInstanceTest {

 

 	/*** Create Service Instance Test Cases ***/

@@ -225,11 +225,7 @@ public class ServiceInstanceTest {
         

         new MockUp<CamundaClient>() {

             @Mock

-            public HttpResponse post(String requestId, boolean isBaseVfModule,

-        			int recipeTimeout, String requestAction, String serviceInstanceId,

-        			String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,

-        			String serviceType, String vnfType, String vfModuleType, String networkType,

-        			String requestDetails, String recipeParamXsd){ 

+            public HttpResponse post(RequestClientParamater requestClientParamater) {

             	ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);

             	HttpResponse resp = new BasicHttpResponse(pv,200, "test response");

             	BasicHttpEntity entity = new BasicHttpEntity();

@@ -295,11 +291,7 @@ public class ServiceInstanceTest {
         

         new MockUp<CamundaClient>() {

             @Mock

-            public HttpResponse post(String requestId, boolean isBaseVfModule,

-        			int recipeTimeout, String requestAction, String serviceInstanceId,

-        			String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,

-        			String serviceType, String vnfType, String vfModuleType, String networkType,

-        			String requestDetails, String recipeParamXsd){ 

+            public HttpResponse post(RequestClientParamater requestClientParamater) {

             	ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);

             	HttpResponse resp = new BasicHttpResponse(pv,500, "test response");

             	BasicHttpEntity entity = new BasicHttpEntity();

@@ -366,11 +358,7 @@ public class ServiceInstanceTest {
         

         new MockUp<CamundaClient>() {

             @Mock

-            public HttpResponse post(String requestId, boolean isBaseVfModule,

-        			int recipeTimeout, String requestAction, String serviceInstanceId,

-        			String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,

-        			String serviceType, String vnfType, String vfModuleType, String networkType,

-        			String requestDetails, String recipeParamXsd){ 

+            public HttpResponse post(RequestClientParamater requestClientParamater) {

             	ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);

             	HttpResponse resp = new BasicHttpResponse(pv,500, "test response");

             	BasicHttpEntity entity = new BasicHttpEntity();

@@ -437,11 +425,7 @@ public class ServiceInstanceTest {
         

         new MockUp<CamundaClient>() {

             @Mock

-            public HttpResponse post(String requestId, boolean isBaseVfModule,

-        			int recipeTimeout, String requestAction, String serviceInstanceId,

-        			String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,

-        			String serviceType, String vnfType, String vfModuleType, String networkType,

-        			String requestDetails, String recipeParamXsd){ 

+            public HttpResponse post(RequestClientParamater requestClientParamater){

             	return null;

             }

         };

@@ -923,11 +907,7 @@ public class ServiceInstanceTest {
 

 		new MockUp<CamundaClient>() {

 			@Mock

-			public HttpResponse post(String requestId, boolean isBaseVfModule,

-									 int recipeTimeout, String requestAction, String serviceInstanceId,

-									 String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,

-									 String serviceType, String vnfType, String vfModuleType, String networkType,

-									 String requestDetails, String recipeParamXsd){

+			public HttpResponse post(RequestClientParamater requestClientParamater) {

 				ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);

 				HttpResponse resp = new BasicHttpResponse(pv,200, "test response");

 				BasicHttpEntity entity = new BasicHttpEntity();

@@ -1092,11 +1072,7 @@ public class ServiceInstanceTest {
 

 		new MockUp<CamundaClient>() {

 			@Mock

-			public HttpResponse post(String requestId, boolean isBaseVfModule,

-									 int recipeTimeout, String requestAction, String serviceInstanceId,

-									 String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,

-									 String serviceType, String vnfType, String vfModuleType, String networkType,

-									 String requestDetails, String recipeParamXsd){

+			public HttpResponse post(RequestClientParamater requestClientParamater){

 				ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);

 				HttpResponse resp = new BasicHttpResponse(pv,200, "test response");

 				BasicHttpEntity entity = new BasicHttpEntity();

@@ -1143,11 +1119,7 @@ public class ServiceInstanceTest {
 

 		new MockUp<CamundaClient>() {

 			@Mock

-			public HttpResponse post(String requestId, boolean isBaseVfModule,

-									 int recipeTimeout, String requestAction, String serviceInstanceId,

-									 String vnfId, String vfModuleId, String volumeGroupId, String networkId, String configurationId,

-									 String serviceType, String vnfType, String vfModuleType, String networkType,

-									 String requestDetails, String recipeParamXsd){

+			public HttpResponse post(RequestClientParamater requestClientParamater) {

 				ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);

 				HttpResponse resp = new BasicHttpResponse(pv,200, "test response");

 				BasicHttpEntity entity = new BasicHttpEntity();