[MSO-8] Second step of the rebase for MSO

Second rebase containing additional features for MSO + total reworking
of the BPMN structure + Notification flow can now be added at the end of
some BPMN flows

Change-Id: I7e937c7a0ba1593ca85e164a093f79c7e38b6ce0
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

8 files changed, 680 insertions, 672 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/Constants.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/Constants.java
index 12cfdb0ee8..b3c8a9539e 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/Constants.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/Constants.java
@@ -1,50 +1,50 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * 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;
-
-
-public class Constants {
-
-	public static final String VNF_TYPES_PATH = "/{version: v1|v2|v3}/vnf-types";
-	public static final String NETWORK_TYPES_PATH = "/{version: v1|v2|v3}/network-types";
-	public static final String VF_MODULE_MODEL_NAMES_PATH = "/{version: v2|v3}/vf-module-model-names";
-	public static final String REQUEST_ID_PATH = "/{request-id}";
-
-	public static final String STATUS_SUCCESS = "SUCCESS";
-
-	public static final String MODIFIED_BY_APIHANDLER = "APIH";
-
-	public static final String SCHEMA_VERSION_V1 = "v1";
-	public static final String SCHEMA_VERSION_V2 = "v2";
-	public static final String SCHEMA_VERSION_V3 = "v3";
-
-	public static final long PROGRESS_REQUEST_COMPLETED = 100L;
-	public static final long PROGRESS_REQUEST_RECEIVED = 0L;
-	public static final long PROGRESS_REQUEST_IN_PROGRESS = 20L;
-
-	public static final String VNF_TYPE_WILDCARD = "*";
-
-	public static final String VOLUME_GROUP_COMPONENT_TYPE = "VOLUME_GROUP";
-
-	public static final String VALID_INSTANCE_NAME_FORMAT = "^[a-zA-Z][a-zA-Z0-9._-]*$";
-
-	public static final String A_LA_CARTE = "aLaCarte";
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * 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;

+

+

+public class Constants {

+

+	public static final String VNF_TYPES_PATH = "/{version: v1|v2|v3}/vnf-types";

+	public static final String NETWORK_TYPES_PATH = "/{version: v1|v2|v3}/network-types";

+	public static final String VF_MODULE_MODEL_NAMES_PATH = "/{version: v2|v3}/vf-module-model-names";

+	public static final String REQUEST_ID_PATH = "/{request-id}";

+

+	public static final String STATUS_SUCCESS = "SUCCESS";

+

+	public static final String MODIFIED_BY_APIHANDLER = "APIH";

+

+	public static final String SCHEMA_VERSION_V1 = "v1";

+	public static final String SCHEMA_VERSION_V2 = "v2";

+	public static final String SCHEMA_VERSION_V3 = "v3";

+

+	public static final long PROGRESS_REQUEST_COMPLETED = 100L;

+	public static final long PROGRESS_REQUEST_RECEIVED = 0L;

+	public static final long PROGRESS_REQUEST_IN_PROGRESS = 20L;

+

+	public static final String VNF_TYPE_WILDCARD = "*";

+

+	public static final String VOLUME_GROUP_COMPONENT_TYPE = "VOLUME_GROUP";

+

+	public static final String VALID_INSTANCE_NAME_FORMAT = "^[a-zA-Z][a-zA-Z0-9._-]*$";

+

+	public static final String A_LA_CARTE = "aLaCarte";

 }
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
index 3410cf4b76..317859da0e 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java
@@ -85,7 +85,7 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response deleteServiceInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId, @PathParam("version") String version) {
+	public Response deleteServiceInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId) {
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		Response response = serviceInstances(request, Action.deleteInstance, instanceIdMap, version);
@@ -96,8 +96,8 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/vnfs")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response createVnfInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId, @PathParam("version") String version) {
-
+	public Response createVnfInstance(String request,  @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId) {
+        msoLogger.debug ("version is: " + version);
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		Response response = serviceInstances(request, Action.createInstance, instanceIdMap, version);
 
@@ -108,9 +108,8 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/vnfs/{vnfInstanceId}")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response deleteVnfInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId,
-													  @PathParam("vnfInstanceId") String vnfInstanceId,
-                                                      @PathParam("version") String version) {
+	public Response deleteVnfInstance(String request,  @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
+													  @PathParam("vnfInstanceId") String vnfInstanceId) {
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
@@ -123,10 +122,9 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response createVfModuleInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId,
-														   @PathParam("vnfInstanceId") String vnfInstanceId,
-                                                           @PathParam("version") String version) {
-
+	public Response createVfModuleInstance(String request,  @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
+														   @PathParam("vnfInstanceId") String vnfInstanceId) {
+        msoLogger.debug ("version is: " + version);
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
 		Response response = serviceInstances(request, Action.createInstance, instanceIdMap, version);
@@ -138,10 +136,9 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response updateVfModuleInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId,
+	public Response updateVfModuleInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 														   @PathParam("vnfInstanceId") String vnfInstanceId,
-														   @PathParam("vfmoduleInstanceId") String vfmoduleInstanceId,
-                                                           @PathParam("version") String version) {
+														   @PathParam("vfmoduleInstanceId") String vfmoduleInstanceId) {
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
@@ -155,10 +152,9 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/vnfs/{vnfInstanceId}/vfModules/{vfmoduleInstanceId}")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response deleteVfModuleInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId,
+	public Response deleteVfModuleInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 																		@PathParam("vnfInstanceId") String vnfInstanceId,
-																		@PathParam("vfmoduleInstanceId") String vfmoduleInstanceId,
-                                                                        @PathParam("version") String version) {
+																		@PathParam("vfmoduleInstanceId") String vfmoduleInstanceId) {
 
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
@@ -174,9 +170,8 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response createVolumeGroupInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId,
-			                                                               @PathParam("vnfInstanceId") String vnfInstanceId,
-                                                                           @PathParam("version") String version) {
+	public Response createVolumeGroupInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
+			                                                               @PathParam("vnfInstanceId") String vnfInstanceId) {
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("vnfInstanceId", vnfInstanceId);
@@ -189,10 +184,9 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response updateVolumeGroupInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId,
+	public Response updateVolumeGroupInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 																		   @PathParam("vnfInstanceId") String vnfInstanceId,
-																		   @PathParam("volumeGroupInstanceId") String volumeGroupInstanceId,
-                                                                           @PathParam("version") String version) {
+																		   @PathParam("volumeGroupInstanceId") String volumeGroupInstanceId) {
 
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
@@ -207,10 +201,9 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/vnfs/{vnfInstanceId}/volumeGroups/{volumeGroupInstanceId}")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response deleteVolumeGroupInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId,
+	public Response deleteVolumeGroupInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
 																		   @PathParam("vnfInstanceId") String vnfInstanceId,
-																		   @PathParam("volumeGroupInstanceId") String volumeGroupInstanceId,
-                                                                           @PathParam("version") String version) {
+																		   @PathParam("volumeGroupInstanceId") String volumeGroupInstanceId) {
 
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
@@ -225,7 +218,7 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/networks")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response createNetworkInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId, @PathParam("version") String version) {
+	public Response createNetworkInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId) {
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		Response response = serviceInstances(request, Action.createInstance, instanceIdMap, version);
@@ -237,9 +230,8 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/networks/{networkInstanceId}")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response updateNetworkInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId,
-																	   @PathParam("networkInstanceId") String networkInstanceId,
-                                                                       @PathParam("version") String version) {
+	public Response updateNetworkInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
+																	   @PathParam("networkInstanceId") String networkInstanceId) {
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("networkInstanceId", networkInstanceId);
@@ -252,9 +244,8 @@ public class ServiceInstances {
 	@Path("/{serviceInstanceId}/networks/{networkInstanceId}")
 	@Consumes(MediaType.APPLICATION_JSON)
 	@Produces(MediaType.APPLICATION_JSON)
-	public Response deleteNetworkInstance(String request, @PathParam("serviceInstanceId") String serviceInstanceId,
-																	   @PathParam("networkInstanceId") String networkInstanceId,
-                                                                       @PathParam("version") String version) {
+	public Response deleteNetworkInstance(String request, @PathParam("version") String version, @PathParam("serviceInstanceId") String serviceInstanceId,
+																	   @PathParam("networkInstanceId") String networkInstanceId) {
 
 		instanceIdMap.put("serviceInstanceId", serviceInstanceId);
 		instanceIdMap.put("networkInstanceId", networkInstanceId);
@@ -367,11 +358,44 @@ public class ServiceInstances {
 
 	   serviceResponse.setRequestReferences(referencesResponse);
 
-       try (CatalogDatabase db = new CatalogDatabase()){
+        CatalogDatabase db = null;
+        try {
+            db = new CatalogDatabase ();
+        } catch (Exception e) {
+            msoLogger.error (MessageEnum.APIH_DB_ACCESS_EXC, MSO_PROP_APIHANDLER_INFRA, "", "", MsoLogger.ErrorCode.AvailabilityError, "Exception while communciate with Catalog DB", e);
+            msoRequest.setStatus (org.openecomp.mso.apihandlerinfra.vnfbeans.RequestStatusType.FAILED);
+            Response response = msoRequest.buildServiceErrorResponse (HttpStatus.SC_NOT_FOUND,
+                    MsoException.ServiceException,
+                    "No communication to catalog DB " + e.getMessage (),
+                    ErrorNumbers.SVC_NO_SERVER_RESOURCES,
+                    null);
+            alarmLogger.sendAlarm ("MsoDatabaseAccessError",
+                    MsoAlarmLogger.CRITICAL,
+                    Messages.errors.get (ErrorNumbers.NO_COMMUNICATION_TO_CATALOG_DB));
+            msoRequest.createRequestRecord (Status.FAILED,action);
+            msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.DBAccessError, "Exception while communciate with DB");
+            msoLogger.debug ("End of the transaction, the final response is: " + (String) response.getEntity ());
+            return response;
+        }
+
+
 
            RecipeLookupResult recipeLookupResult = null;
            try {
                recipeLookupResult = getServiceInstanceOrchestrationURI (db, msoRequest, action);
+           } catch (ValidationException e) {
+               msoLogger.debug ("Validation failed: ", e);
+               Response response = msoRequest.buildServiceErrorResponse(HttpStatus.SC_BAD_REQUEST, MsoException.ServiceException,
+                       "Error validating request.  " + e.getMessage(),
+                       ErrorNumbers.SVC_BAD_PARAMETER, null);
+               if (msoRequest.getRequestId () != null) {
+                   msoLogger.debug ("Logging failed message to the database");
+                   msoRequest.createRequestRecord (Status.FAILED, action);
+               }
+               msoLogger.error (MessageEnum.APIH_REQUEST_VALIDATION_ERROR, MSO_PROP_APIHANDLER_INFRA, "", "", MsoLogger.ErrorCode.SchemaError, requestJSON, e);
+               msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.SchemaError, "Validation of the input request failed");
+               msoLogger.debug ("End of the transaction, the final response is: " + (String) response.getEntity ());
+               return response;
            } catch (Exception e) {
                msoLogger.error (MessageEnum.APIH_DB_ACCESS_EXC, MSO_PROP_APIHANDLER_INFRA, "", "", MsoLogger.ErrorCode.DataError, "Exception while querying Catalog DB", e);
                msoRequest.setStatus (org.openecomp.mso.apihandlerinfra.vnfbeans.RequestStatusType.FAILED);
@@ -594,22 +618,6 @@ public class ServiceInstances {
 
            //return Response.status (HttpStatus.SC_ACCEPTED).entity (serviceResponse).build ();
            // return serviceResponse;
-       } catch (Exception e) {
-           msoLogger.error (MessageEnum.APIH_DB_ACCESS_EXC, MSO_PROP_APIHANDLER_INFRA, "", "", MsoLogger.ErrorCode.AvailabilityError, "Exception while communciate with Catalog DB", e);
-           msoRequest.setStatus (org.openecomp.mso.apihandlerinfra.vnfbeans.RequestStatusType.FAILED);
-           Response response = msoRequest.buildServiceErrorResponse (HttpStatus.SC_NOT_FOUND,
-					  											  MsoException.ServiceException,
-					                                              "No communication to catalog DB " + e.getMessage (),
-                                                                  ErrorNumbers.SVC_NO_SERVER_RESOURCES,
-                                                                  null);
-           alarmLogger.sendAlarm ("MsoDatabaseAccessError",
-                                  MsoAlarmLogger.CRITICAL,
-                                  Messages.errors.get (ErrorNumbers.NO_COMMUNICATION_TO_CATALOG_DB));
-           msoRequest.createRequestRecord (Status.FAILED,action);
-           msoLogger.recordAuditEvent (startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.DBAccessError, "Exception while communciate with DB");
-           msoLogger.debug ("End of the transaction, the final response is: " + (String) response.getEntity ());
-           return response;
-       }
 	}
 
     private RecipeLookupResult getServiceInstanceOrchestrationURI (CatalogDatabase db, MsoRequest msoRequest, Action action) throws Exception {
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/CloudConfiguration.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/CloudConfiguration.java
index 777c945e82..c877751205 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/CloudConfiguration.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/CloudConfiguration.java
@@ -1,96 +1,96 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * 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.serviceinstancebeans;
-
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)
-public class CloudConfiguration {
-
-    protected String aicNodeClli;
-    protected String tenantId;
-    protected String lcpCloudRegionId;
-
-    /**
-     * Gets the value of the aicNodeClli property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getAicNodeClli() {
-        return aicNodeClli;
-    }
-
-    /**
-     * Sets the value of the aicNodeClli property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setAicNodeClli(String value) {
-        this.aicNodeClli = value;
-    }
-
-    /**
-     * Gets the value of the tenantId property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getTenantId() {
-        return tenantId;
-    }
-
-    /**
-     * Sets the value of the tenantId property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setTenantId(String value) {
-        this.tenantId = value;
-    }
-
-
-	public String getLcpCloudRegionId() {
-		return lcpCloudRegionId;
-	}
-
-	public void setLcpCloudRegionId(String lcpCloudRegionId) {
-		this.lcpCloudRegionId = lcpCloudRegionId;
-	}
-
-	@Override
-	public String toString() {
-		return "CloudConfiguration [aicNodeClli=" + aicNodeClli + ", tenantId="
-				+ tenantId + ", lcpCloudRegionId=" + lcpCloudRegionId + "]";
-	}
-
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * 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.serviceinstancebeans;

+

+import org.codehaus.jackson.map.annotate.JsonSerialize;

+

+@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)

+public class CloudConfiguration {

+

+    protected String aicNodeClli;

+    protected String tenantId;

+    protected String lcpCloudRegionId;

+

+    /**

+     * Gets the value of the aicNodeClli property.

+     *

+     * @return

+     *     possible object is

+     *     {@link String }

+     *

+     */

+    public String getAicNodeClli() {

+        return aicNodeClli;

+    }

+

+    /**

+     * Sets the value of the aicNodeClli property.

+     *

+     * @param value

+     *     allowed object is

+     *     {@link String }

+     *

+     */

+    public void setAicNodeClli(String value) {

+        this.aicNodeClli = value;

+    }

+

+    /**

+     * Gets the value of the tenantId property.

+     *

+     * @return

+     *     possible object is

+     *     {@link String }

+     *

+     */

+    public String getTenantId() {

+        return tenantId;

+    }

+

+    /**

+     * Sets the value of the tenantId property.

+     *

+     * @param value

+     *     allowed object is

+     *     {@link String }

+     *

+     */

+    public void setTenantId(String value) {

+        this.tenantId = value;

+    }

+

+

+	public String getLcpCloudRegionId() {

+		return lcpCloudRegionId;

+	}

+

+	public void setLcpCloudRegionId(String lcpCloudRegionId) {

+		this.lcpCloudRegionId = lcpCloudRegionId;

+	}

+

+	@Override

+	public String toString() {

+		return "CloudConfiguration [aicNodeClli=" + aicNodeClli + ", tenantId="

+				+ tenantId + ", lcpCloudRegionId=" + lcpCloudRegionId + "]";

+	}

+

+

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ModelInfo.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ModelInfo.java
index f542d63da9..5f1ea28308 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ModelInfo.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/ModelInfo.java
@@ -1,117 +1,117 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * 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=========================================================
- */
-
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2016.03.30 at 02:48:23 PM CDT
-//
-
-
-package org.openecomp.mso.apihandlerinfra.serviceinstancebeans;
-
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-import org.openecomp.mso.apihandlerinfra.ModelType;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)
-public class ModelInfo {
-
-    protected String modelCustomizationName;
-    protected String modelInvariantId;
-	protected ModelType modelType;
-	//v2
-    protected String modelNameVersionId;
-    protected String modelName;
-    protected String modelVersion;
-    protected String modelCustomizationUuid;
-    //v3
-    protected String modelVersionId;
-    protected String modelCustomizationId;
-
-
-	public String getModelCustomizationName() {
-		return modelCustomizationName;
-	}
-	public void setModelCustomizationName(String modelCustomizationName) {
-		this.modelCustomizationName = modelCustomizationName;
-	}
-	public String getModelNameVersionId() {
-		return modelNameVersionId;
-	}
-	public void setModelNameVersionId(String modelNameVersionId) {
-		this.modelNameVersionId = modelNameVersionId;
-	}
-	public String getModelName() {
-		return modelName;
-	}
-	public void setModelName(String modelName) {
-		this.modelName = modelName;
-	}
-	public String getModelVersion() {
-		return modelVersion;
-	}
-	public void setModelVersion(String modelVersion) {
-		this.modelVersion = modelVersion;
-	}
-	public ModelType getModelType() {
-		return modelType;
-	}
-	public void setModelType(ModelType modelType) {
-		this.modelType = modelType;
-	}
-	public String getModelInvariantId() {
-		return modelInvariantId;
-	}
-	public void setModelInvariantId(String modelInvariantId) {
-		this.modelInvariantId = modelInvariantId;
-	}
-	public String getModelCustomizationUuid() {
-		return modelCustomizationUuid;
-	}
-	public void setModelCustomizationUuid(String modelCustomizationUuid) {
-		this.modelCustomizationUuid = modelCustomizationUuid;
-	}
-	public String getModelVersionId() {
-		return modelVersionId;
-	}
-	public void setModelVersionId(String modelVersionId) {
-		this.modelVersionId = modelVersionId;
-	}
-	public String getModelCustomizationId() {
-		return modelCustomizationId;
-	}
-	public void setModelCustomizationId(String modelCustomizationId) {
-		this.modelCustomizationId = modelCustomizationId;
-	}
-	@Override
-	public String toString() {
-		return "ModelInfo [modelCustomizationName=" + modelCustomizationName
-				+ ", modelInvariantId=" + modelInvariantId + ", modelType="
-				+ modelType + ", modelNameVersionId=" + modelNameVersionId
-				+ ", modelName=" + modelName + ", modelVersion=" + modelVersion
-				+ ", modelCustomizationUuid=" + modelCustomizationUuid
-				+ ", modelVersionId=" + modelVersionId
-				+ ", modelCustomizationId=" + modelCustomizationId + "]";
-	}
-
-
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * 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=========================================================

+ */

+

+//

+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.7

+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>

+// Any modifications to this file will be lost upon recompilation of the source schema.

+// Generated on: 2016.03.30 at 02:48:23 PM CDT

+//

+

+

+package org.openecomp.mso.apihandlerinfra.serviceinstancebeans;

+

+import org.codehaus.jackson.map.annotate.JsonSerialize;

+

+import org.openecomp.mso.apihandlerinfra.ModelType;

+

+@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)

+public class ModelInfo {

+

+    protected String modelCustomizationName;

+    protected String modelInvariantId;

+	protected ModelType modelType;

+	//v2

+    protected String modelNameVersionId;

+    protected String modelName;

+    protected String modelVersion;

+    protected String modelCustomizationUuid;

+    //v3

+    protected String modelVersionId;

+    protected String modelCustomizationId;

+

+

+	public String getModelCustomizationName() {

+		return modelCustomizationName;

+	}

+	public void setModelCustomizationName(String modelCustomizationName) {

+		this.modelCustomizationName = modelCustomizationName;

+	}

+	public String getModelNameVersionId() {

+		return modelNameVersionId;

+	}

+	public void setModelNameVersionId(String modelNameVersionId) {

+		this.modelNameVersionId = modelNameVersionId;

+	}

+	public String getModelName() {

+		return modelName;

+	}

+	public void setModelName(String modelName) {

+		this.modelName = modelName;

+	}

+	public String getModelVersion() {

+		return modelVersion;

+	}

+	public void setModelVersion(String modelVersion) {

+		this.modelVersion = modelVersion;

+	}

+	public ModelType getModelType() {

+		return modelType;

+	}

+	public void setModelType(ModelType modelType) {

+		this.modelType = modelType;

+	}

+	public String getModelInvariantId() {

+		return modelInvariantId;

+	}

+	public void setModelInvariantId(String modelInvariantId) {

+		this.modelInvariantId = modelInvariantId;

+	}

+	public String getModelCustomizationUuid() {

+		return modelCustomizationUuid;

+	}

+	public void setModelCustomizationUuid(String modelCustomizationUuid) {

+		this.modelCustomizationUuid = modelCustomizationUuid;

+	}

+	public String getModelVersionId() {

+		return modelVersionId;

+	}

+	public void setModelVersionId(String modelVersionId) {

+		this.modelVersionId = modelVersionId;

+	}

+	public String getModelCustomizationId() {

+		return modelCustomizationId;

+	}

+	public void setModelCustomizationId(String modelCustomizationId) {

+		this.modelCustomizationId = modelCustomizationId;

+	}

+	@Override

+	public String toString() {

+		return "ModelInfo [modelCustomizationName=" + modelCustomizationName

+				+ ", modelInvariantId=" + modelInvariantId + ", modelType="

+				+ modelType + ", modelNameVersionId=" + modelNameVersionId

+				+ ", modelName=" + modelName + ", modelVersion=" + modelVersion

+				+ ", modelCustomizationUuid=" + modelCustomizationUuid

+				+ ", modelVersionId=" + modelVersionId

+				+ ", modelCustomizationId=" + modelCustomizationId + "]";

+	}

+

+

 }
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstanceList.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstanceList.java
index b60d4b6fdb..2ae5dc8989 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstanceList.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstanceList.java
@@ -1,42 +1,42 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * 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.serviceinstancebeans;
-
-public class RelatedInstanceList {
-
-	protected RelatedInstance relatedInstance;
-
-	public RelatedInstance getRelatedInstance() {
-		return relatedInstance;
-	}
-
-	public void setRelatedInstance(RelatedInstance relatedInstance) {
-		this.relatedInstance = relatedInstance;
-	}
-
-	@Override
-	public String toString() {
-		return "RelatedInstanceList [relatedInstance=" + relatedInstance + "]";
-	}
-
-
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * 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.serviceinstancebeans;

+

+public class RelatedInstanceList {

+

+	protected RelatedInstance relatedInstance;

+

+	public RelatedInstance getRelatedInstance() {

+		return relatedInstance;

+	}

+

+	public void setRelatedInstance(RelatedInstance relatedInstance) {

+		this.relatedInstance = relatedInstance;

+	}

+

+	@Override

+	public String toString() {

+		return "RelatedInstanceList [relatedInstance=" + relatedInstance + "]";

+	}

+

+

+

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestDetails.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestDetails.java
index bb1fa3b8a5..512b061c59 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestDetails.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestDetails.java
@@ -1,176 +1,176 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * 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.serviceinstancebeans;
-
-import java.util.Arrays;
-
-import org.codehaus.jackson.map.annotate.JsonRootName;
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonRootName(value = "requestDetails")
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)
-public class RequestDetails {
-
-    protected ModelInfo modelInfo;
-    protected RequestInfo requestInfo;
-    protected RelatedInstanceList[] relatedInstanceList;
-    protected SubscriberInfo subscriberInfo;
-    protected CloudConfiguration cloudConfiguration;
-    protected RequestParameters requestParameters;
-
-    /**
-     * Gets the value of the serviceInfo property.
-     *
-     * @return
-     *     possible object is
-     *     {@link ModelInfo }
-     *
-     */
-    public ModelInfo getModelInfo() {
-        return modelInfo;
-    }
-
-    /**
-     * Sets the value of the serviceInfo property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link ModelInfo }
-     *
-     */
-    public void setModelInfo(ModelInfo value) {
-        this.modelInfo = value;
-    }
-
-    /**
-     * Gets the value of the requestInfo property.
-     *
-     * @return
-     *     possible object is
-     *     {@link RequestInfo }
-     *
-     */
-    public RequestInfo getRequestInfo() {
-        return requestInfo;
-    }
-
-    /**
-     * Sets the value of the requestInfo property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link RequestInfo }
-     *
-     */
-    public void setRequestInfo(RequestInfo value) {
-        this.requestInfo = value;
-    }
-
-    /**
-     * Gets the value of the subscriberInfo property.
-     *
-     * @return
-     *     possible object is
-     *     {@link SubscriberInfo }
-     *
-     */
-    public SubscriberInfo getSubscriberInfo() {
-        return subscriberInfo;
-    }
-
-    /**
-     * Sets the value of the subscriberInfo property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link SubscriberInfo }
-     *
-     */
-    public void setSubscriberInfo(SubscriberInfo value) {
-        this.subscriberInfo = value;
-    }
-
-    /**
-     * Gets the value of the cloudConfiguration property.
-     *
-     * @return
-     *     possible object is
-     *     {@link CloudConfiguration }
-     *
-     */
-    public CloudConfiguration getCloudConfiguration() {
-        return cloudConfiguration;
-    }
-
-    /**
-     * Sets the value of the cloudConfiguration property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link CloudConfiguration }
-     *
-     */
-    public void setCloudConfiguration(CloudConfiguration value) {
-        this.cloudConfiguration = value;
-    }
-
-    /**
-     * Gets the value of the requestParameters property.
-     *
-     * @return
-     *     possible object is
-     *     {@link RequestParameters }
-     *
-     */
-    public RequestParameters getRequestParameters() {
-        return requestParameters;
-    }
-
-    /**
-     * Sets the value of the requestParameters property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link RequestParameters }
-     *
-     */
-    public void setRequestParameters(RequestParameters value) {
-        this.requestParameters = value;
-    }
-
-	public RelatedInstanceList[] getRelatedInstanceList() {
-		return relatedInstanceList;
-	}
-
-	public void setRelatedInstanceList(RelatedInstanceList[] relatedInstanceList) {
-		this.relatedInstanceList = relatedInstanceList;
-	}
-
-	@Override
-	public String toString() {
-		return "RequestDetails [modelInfo=" + modelInfo + ", requestInfo="
-				+ requestInfo + ", relatedInstanceList="
-				+ Arrays.toString(relatedInstanceList) + ", subscriberInfo="
-				+ subscriberInfo + ", cloudConfiguration=" + cloudConfiguration
-				+ ", requestParameters=" + requestParameters + "]";
-	}
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * 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.serviceinstancebeans;

+

+import java.util.Arrays;

+

+import org.codehaus.jackson.map.annotate.JsonRootName;

+import org.codehaus.jackson.map.annotate.JsonSerialize;

+

+@JsonRootName(value = "requestDetails")

+@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)

+public class RequestDetails {

+

+    protected ModelInfo modelInfo;

+    protected RequestInfo requestInfo;

+    protected RelatedInstanceList[] relatedInstanceList;

+    protected SubscriberInfo subscriberInfo;

+    protected CloudConfiguration cloudConfiguration;

+    protected RequestParameters requestParameters;

+

+    /**

+     * Gets the value of the serviceInfo property.

+     *

+     * @return

+     *     possible object is

+     *     {@link ModelInfo }

+     *

+     */

+    public ModelInfo getModelInfo() {

+        return modelInfo;

+    }

+

+    /**

+     * Sets the value of the serviceInfo property.

+     *

+     * @param value

+     *     allowed object is

+     *     {@link ModelInfo }

+     *

+     */

+    public void setModelInfo(ModelInfo value) {

+        this.modelInfo = value;

+    }

+

+    /**

+     * Gets the value of the requestInfo property.

+     *

+     * @return

+     *     possible object is

+     *     {@link RequestInfo }

+     *

+     */

+    public RequestInfo getRequestInfo() {

+        return requestInfo;

+    }

+

+    /**

+     * Sets the value of the requestInfo property.

+     *

+     * @param value

+     *     allowed object is

+     *     {@link RequestInfo }

+     *

+     */

+    public void setRequestInfo(RequestInfo value) {

+        this.requestInfo = value;

+    }

+

+    /**

+     * Gets the value of the subscriberInfo property.

+     *

+     * @return

+     *     possible object is

+     *     {@link SubscriberInfo }

+     *

+     */

+    public SubscriberInfo getSubscriberInfo() {

+        return subscriberInfo;

+    }

+

+    /**

+     * Sets the value of the subscriberInfo property.

+     *

+     * @param value

+     *     allowed object is

+     *     {@link SubscriberInfo }

+     *

+     */

+    public void setSubscriberInfo(SubscriberInfo value) {

+        this.subscriberInfo = value;

+    }

+

+    /**

+     * Gets the value of the cloudConfiguration property.

+     *

+     * @return

+     *     possible object is

+     *     {@link CloudConfiguration }

+     *

+     */

+    public CloudConfiguration getCloudConfiguration() {

+        return cloudConfiguration;

+    }

+

+    /**

+     * Sets the value of the cloudConfiguration property.

+     *

+     * @param value

+     *     allowed object is

+     *     {@link CloudConfiguration }

+     *

+     */

+    public void setCloudConfiguration(CloudConfiguration value) {

+        this.cloudConfiguration = value;

+    }

+

+    /**

+     * Gets the value of the requestParameters property.

+     *

+     * @return

+     *     possible object is

+     *     {@link RequestParameters }

+     *

+     */

+    public RequestParameters getRequestParameters() {

+        return requestParameters;

+    }

+

+    /**

+     * Sets the value of the requestParameters property.

+     *

+     * @param value

+     *     allowed object is

+     *     {@link RequestParameters }

+     *

+     */

+    public void setRequestParameters(RequestParameters value) {

+        this.requestParameters = value;

+    }

+

+	public RelatedInstanceList[] getRelatedInstanceList() {

+		return relatedInstanceList;

+	}

+

+	public void setRelatedInstanceList(RelatedInstanceList[] relatedInstanceList) {

+		this.relatedInstanceList = relatedInstanceList;

+	}

+

+	@Override

+	public String toString() {

+		return "RequestDetails [modelInfo=" + modelInfo + ", requestInfo="

+				+ requestInfo + ", relatedInstanceList="

+				+ Arrays.toString(relatedInstanceList) + ", subscriberInfo="

+				+ subscriberInfo + ", cloudConfiguration=" + cloudConfiguration

+				+ ", requestParameters=" + requestParameters + "]";

+	}

+

+}

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestStatus.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestStatus.java
index 89e8075836..02ad6e20ce 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestStatus.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestStatus.java
@@ -1,60 +1,60 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * 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.serviceinstancebeans;
-
-import java.util.Date;
-
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)
-public class RequestStatus {
-
-    protected String requestState;
-    protected String statusMessage;
-    protected Integer percentProgress;
-    protected String finishTime;
-
-
-	public String getRequestState() {
-		return requestState;
-	}
-	public void setRequestState(String requestState) {
-		this.requestState = requestState;
-	}
-	public String getStatusMessage() {
-		return statusMessage;
-	}
-	public void setStatusMessage(String statusMessage) {
-		this.statusMessage = statusMessage;
-	}
-	public Integer getPercentProgress() {
-		return percentProgress;
-	}
-	public void setPercentProgress(Integer percentProgress) {
-		this.percentProgress = percentProgress;
-	}
-	public String getFinishTime() {
-		return finishTime;
-	}
-	public void setFinishTime(String finishTime) {
-		this.finishTime = finishTime;
-	}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * 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.serviceinstancebeans;

+

+import java.util.Date;

+

+import org.codehaus.jackson.map.annotate.JsonSerialize;

+

+@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)

+public class RequestStatus {

+

+    protected String requestState;

+    protected String statusMessage;

+    protected Integer percentProgress;

+    protected String finishTime;

+

+

+	public String getRequestState() {

+		return requestState;

+	}

+	public void setRequestState(String requestState) {

+		this.requestState = requestState;

+	}

+	public String getStatusMessage() {

+		return statusMessage;

+	}

+	public void setStatusMessage(String statusMessage) {

+		this.statusMessage = statusMessage;

+	}

+	public Integer getPercentProgress() {

+		return percentProgress;

+	}

+	public void setPercentProgress(Integer percentProgress) {

+		this.percentProgress = percentProgress;

+	}

+	public String getFinishTime() {

+		return finishTime;

+	}

+	public void setFinishTime(String finishTime) {

+		this.finishTime = finishTime;

+	}

 }
\ No newline at end of file
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/SubscriberInfo.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/SubscriberInfo.java
index 97fc4968bb..e81f1028fb 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/SubscriberInfo.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/SubscriberInfo.java
@@ -1,85 +1,85 @@
-/*-
- * ============LICENSE_START=======================================================
- * OPENECOMP - MSO
- * ================================================================================
- * 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.serviceinstancebeans;
-
-import org.codehaus.jackson.map.annotate.JsonSerialize;
-
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)
-public class SubscriberInfo {
-
-    protected String globalSubscriberId;
-    protected String subscriberName;
-
-    /**
-     * Gets the value of the globalSubscriberId property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getGlobalSubscriberId() {
-        return globalSubscriberId;
-    }
-
-    /**
-     * Sets the value of the globalSubscriberId property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setGlobalSubscriberId(String value) {
-        this.globalSubscriberId = value;
-    }
-
-    /**
-     * Gets the value of the subscriberName property.
-     *
-     * @return
-     *     possible object is
-     *     {@link String }
-     *
-     */
-    public String getSubscriberName() {
-        return subscriberName;
-    }
-
-    /**
-     * Sets the value of the subscriberName property.
-     *
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *
-     */
-    public void setSubscriberName(String value) {
-        this.subscriberName = value;
-    }
-
-	@Override
-	public String toString() {
-		return "SubscriberInfo [globalSubscriberId=" + globalSubscriberId
-				+ ", subscriberName=" + subscriberName + "]";
-	}
-
-}
+/*-

+ * ============LICENSE_START=======================================================

+ * OPENECOMP - MSO

+ * ================================================================================

+ * 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.serviceinstancebeans;

+

+import org.codehaus.jackson.map.annotate.JsonSerialize;

+

+@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)

+public class SubscriberInfo {

+

+    protected String globalSubscriberId;

+    protected String subscriberName;

+

+    /**

+     * Gets the value of the globalSubscriberId property.

+     *

+     * @return

+     *     possible object is

+     *     {@link String }

+     *

+     */

+    public String getGlobalSubscriberId() {

+        return globalSubscriberId;

+    }

+

+    /**

+     * Sets the value of the globalSubscriberId property.

+     *

+     * @param value

+     *     allowed object is

+     *     {@link String }

+     *

+     */

+    public void setGlobalSubscriberId(String value) {

+        this.globalSubscriberId = value;

+    }

+

+    /**

+     * Gets the value of the subscriberName property.

+     *

+     * @return

+     *     possible object is

+     *     {@link String }

+     *

+     */

+    public String getSubscriberName() {

+        return subscriberName;

+    }

+

+    /**

+     * Sets the value of the subscriberName property.

+     *

+     * @param value

+     *     allowed object is

+     *     {@link String }

+     *

+     */

+    public void setSubscriberName(String value) {

+        this.subscriberName = value;

+    }

+

+	@Override

+	public String toString() {

+		return "SubscriberInfo [globalSubscriberId=" + globalSubscriberId

+				+ ", subscriberName=" + subscriberName + "]";

+	}

+

+}