Add cloudOwner to VNF adapter call

The BPMN layer has the CloudRegion which includes the CloudOwner
attribute, but this is not passed to the VNF adapter layer.
Calls to the Multicloud infrastructure workload need the
CloudOwner as well.

This patch adds CloudOwner to the VNF adapter API.  While
the intended usage is primarily for the multicloud adapter,
it touches a log of other files - though those do not
make use of it at this point.

Change-Id: I88028096fbd84fc3fe5d53786c70b3c8806bb711
Issue-ID: SO-1447
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>

11 files changed, 128 insertions, 34 deletions

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/CloudInfo.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/CloudInfo.java
index a56a6929a9..f7db785deb 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/CloudInfo.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/CloudInfo.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,36 +22,44 @@ package org.onap.so.adapters.vdu;
 
 /**
  * Cloud information structure for deploying/managing a VDU.  Includes the cloud site
- * as well as tenant information within the site.  Currently this is defined as a 
+ * as well as tenant information within the site.  Currently this is defined as a
  * cloud site ID. which would map to a CloudConfig entry.
  * Perhaps the CloudConfig entry itself should be provided, instead of requiring each
  * plug-in to query it.
- * 
+ *
  * The meaning of 'tenant' may differ by cloud provider, but every cloud supports some
  * sort of tenant partitioning.
- * 
+ *
  */
 public class CloudInfo {
-	
+
 	private String cloudSiteId;
-	private String tenantId;  	
+	private String cloudOwner;
+	private String tenantId;
 	private String tenantName;//bpmn query and pass
-	
+
 	public CloudInfo() {
 	}
-	
-	public CloudInfo (String cloudSiteId, String tenantId, String tenantName) {
+
+	public CloudInfo (String cloudSiteId, String cloudOwner, String tenantId, String tenantName) {
 		this.cloudSiteId = cloudSiteId;
+		this.cloudOwner = cloudOwner;
 		this.tenantId = tenantId;
 		this.tenantName = tenantName;
 	}
-	
+
 	public String getCloudSiteId() {
 		return cloudSiteId;
 	}
 	public void setCloudSiteId(String cloudSiteId) {
 		this.cloudSiteId = cloudSiteId;
 	}
+    public String getCloudOwner() {
+        return cloudOwner;
+    }
+    public void setCloudOwner(String cloudOwner) {
+        this.cloudOwner = cloudOwner;
+    }
 	public String getTenantId() {
 		return tenantId;
 	}
@@ -64,6 +72,6 @@ public class CloudInfo {
 	public void setTenantName(String tenantName) {
 		this.tenantName = tenantName;
 	}
-	
-	
+
+
 }
\ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVfModuleRequest.java
index a136ff778d..80e0a95b27 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVfModuleRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVfModuleRequest.java
@@ -43,6 +43,7 @@ import com.fasterxml.jackson.annotation.JsonRootName;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CreateVfModuleRequest extends VfRequestCommon {
 	private String cloudSiteId;
+	private String cloudOwner;
 	private String tenantId;
 
 	private String vnfId;
@@ -75,6 +76,14 @@ public class CreateVfModuleRequest extends VfRequestCommon {
 		this.cloudSiteId = cloudSiteId;
 	}
 
+	public String getCloudOwner() {
+		return cloudOwner;
+	}
+
+	public void setCloudOwner(String cloudOwner) {
+		this.cloudOwner = cloudOwner;
+	}
+
 	public String getTenantId() {
 		return tenantId;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVolumeGroupRequest.java
index d402004d57..a1443f569a 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVolumeGroupRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/CreateVolumeGroupRequest.java
@@ -39,6 +39,7 @@ import com.fasterxml.jackson.annotation.JsonRootName;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CreateVolumeGroupRequest extends VfRequestCommon {
 	private String cloudSiteId;
+	private String cloudOwner;
 	private String tenantId;
 	private String volumeGroupName;
 	private String volumeGroupId;
@@ -65,6 +66,14 @@ public class CreateVolumeGroupRequest extends VfRequestCommon {
 		this.cloudSiteId = cloudSiteId;
 	}
 
+	public String getCloudOwner() {
+		return cloudOwner;
+	}
+
+	public void setCloudOwner(String cloudOwner) {
+		this.cloudOwner = cloudOwner;
+	}
+
 	public String getTenantId() {
 		return tenantId;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVfModuleRequest.java
index 6ce9b2fa4c..d9825ddca2 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVfModuleRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVfModuleRequest.java
@@ -37,6 +37,7 @@ public class DeleteVfModuleRequest extends VfRequestCommon implements Serializab
 	 */
 	private static final long serialVersionUID = -8504083539107392561L;
 	private String cloudSiteId;
+	private String cloudOwner;
 	private String tenantId;
 	private String vnfId;
 	private String vfModuleId;
@@ -56,6 +57,14 @@ public class DeleteVfModuleRequest extends VfRequestCommon implements Serializab
 		this.cloudSiteId = cloudSiteId;
 	}
 
+	public String getCloudOwner() {
+		return cloudOwner;
+	}
+
+	public void setCloudOwner(String cloudOwner) {
+		this.cloudOwner = cloudOwner;
+	}
+
 	public String getTenantId() {
 		return tenantId;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVolumeGroupRequest.java
index d17c5dd0de..aba53a4dd3 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVolumeGroupRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/DeleteVolumeGroupRequest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,6 +32,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 @XmlRootElement(name = "deleteVolumeGroupRequest")
 public class DeleteVolumeGroupRequest extends VfRequestCommon {
 	private String cloudSiteId;
+	private String cloudOwner;
 	private String tenantId;
 	private String volumeGroupId;
 	private String volumeGroupStackId;
@@ -49,6 +50,14 @@ public class DeleteVolumeGroupRequest extends VfRequestCommon {
 		this.cloudSiteId = cloudSiteId;
 	}
 
+    public String getCloudOwner() {
+        return cloudOwner;
+    }
+
+    public void setCloudOwner(String cloudOwner) {
+        this.cloudOwner = cloudOwner;
+    }
+
 	public String getTenantId() {
 		return tenantId;
 	}
@@ -80,7 +89,7 @@ public class DeleteVolumeGroupRequest extends VfRequestCommon {
 	public void setMsoRequest(MsoRequest msoRequest) {
 		this.msoRequest = msoRequest;
 	}
-	
+
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this).appendSuper(super.toString()).append("cloudSiteId", cloudSiteId)
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVfModuleRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVfModuleRequest.java
index bac9eae2c5..a02dc1f94e 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVfModuleRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVfModuleRequest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,6 +40,7 @@ import com.fasterxml.jackson.annotation.JsonRootName;
 public class UpdateVfModuleRequest extends VfRequestCommon {
 
 	private String cloudSiteId;
+	private String cloudOwner;
 	private String tenantId;
 
 	private String vnfId;
@@ -62,7 +63,7 @@ public class UpdateVfModuleRequest extends VfRequestCommon {
 	private String requestType;
 	private Boolean failIfExists;
 	private Boolean backout;
-	
+
 	@XmlJavaTypeAdapter(MapAdapter.class)
 	private Map<String,Object> vfModuleParams = new HashMap<>();
 	private MsoRequest msoRequest = new MsoRequest();
@@ -75,6 +76,14 @@ public class UpdateVfModuleRequest extends VfRequestCommon {
 		this.cloudSiteId = cloudSiteId;
 	}
 
+    public String getCloudOwner() {
+        return cloudOwner;
+    }
+
+    public void setCloudOwner(String cloudOwner) {
+        this.cloudOwner = cloudOwner;
+    }
+
 	public String getTenantId() {
 		return tenantId;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVolumeGroupRequest.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVolumeGroupRequest.java
index d3b685a1d0..e7c8171d6c 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVolumeGroupRequest.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/UpdateVolumeGroupRequest.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,6 +39,7 @@ import com.fasterxml.jackson.annotation.JsonRootName;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class UpdateVolumeGroupRequest extends VfRequestCommon {
 	private String cloudSiteId;
+	private String cloudOwner;
 	private String tenantId;
 	private String volumeGroupId;
 	private String volumeGroupStackId;
@@ -62,6 +63,14 @@ public class UpdateVolumeGroupRequest extends VfRequestCommon {
 		this.cloudSiteId = cloudSiteId;
 	}
 
+    public String getCloudOwner() {
+        return cloudOwner;
+    }
+
+    public void setCloudOwner(String cloudOwner) {
+        this.cloudOwner = cloudOwner;
+    }
+
 	public String getTenantId() {
 		return tenantId;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VfModuleRollback.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VfModuleRollback.java
index 0e716e5924..a6a988690c 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VfModuleRollback.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VfModuleRollback.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -36,6 +36,7 @@ public class VfModuleRollback {
 	private String vfModuleStackId;
 	private boolean vfModuleCreated = false;
 	private String tenantId;
+	private String cloudOwner;
 	private String cloudSiteId;
 	private MsoRequest msoRequest;
 	private String messageId;
@@ -51,6 +52,7 @@ public class VfModuleRollback {
 		this.vfModuleStackId = vfModuleStackId;
 		this.vfModuleCreated = vrb.getVnfCreated();
 		this.tenantId = vrb.getTenantId();
+		this.cloudOwner = vrb.getCloudOwner();
 		this.cloudSiteId = vrb.getCloudSiteId();
 		this.msoRequest = vrb.getMsoRequest();
 		this.messageId = messageId;
@@ -59,6 +61,7 @@ public class VfModuleRollback {
 
 	public VfModuleRollback(String vnfId, String vfModuleId,
 			String vfModuleStackId, boolean vfModuleCreated, String tenantId,
+			String cloudOwner,
 			String cloudSiteId,
 			MsoRequest msoRequest,
 			String messageId) {
@@ -68,6 +71,7 @@ public class VfModuleRollback {
 		this.vfModuleStackId = vfModuleStackId;
 		this.vfModuleCreated = vfModuleCreated;
 		this.tenantId = tenantId;
+		this.cloudOwner = cloudOwner;
 		this.cloudSiteId = cloudSiteId;
 		this.msoRequest = msoRequest;
 		this.messageId = messageId;
@@ -109,6 +113,12 @@ public class VfModuleRollback {
 	public void setCloudSiteId(String cloudSiteId) {
 		this.cloudSiteId = cloudSiteId;
 	}
+    public String getCloudOwner() {
+        return cloudOwner;
+    }
+    public void setCloudOwner(String cloudOwner) {
+        this.cloudOwner = cloudOwner;
+    }
 	public MsoRequest getMsoRequest() {
 		return msoRequest;
 	}
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VolumeGroupRollback.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VolumeGroupRollback.java
index 2795ba0de3..ea7ce582ad 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VolumeGroupRollback.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vnfrest/VolumeGroupRollback.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -34,6 +34,7 @@ public class VolumeGroupRollback {
 //	“volumeGroupId”: “<A&AI_ VOLUME_GROUP_ID>”,
 //	“volumeGroupStackId”: “<VOLUME_GROUP _STACK_ID>”,
 //	 “tenantId”: “<TENANT_ID>”,
+//  "cloudOwnerId"" "<CLOUD_OWNER>",
 //	“cloudSiteId”: “<CLOUD_CLLI>”,
 //	“volumeGroupCreated”: TRUE|FALSE,
 //	“msoRequest”: {
@@ -45,6 +46,7 @@ public class VolumeGroupRollback {
 	private String volumeGroupId;
 	private String volumeGroupStackId;
 	private String tenantId;
+	private String cloudOwnerId;
 	private String cloudSiteId;
 	private boolean volumeGroupCreated = false;
 	private MsoRequest msoRequest;
@@ -58,6 +60,7 @@ public class VolumeGroupRollback {
 		this.volumeGroupId      = vrb.getVolumeGroupId();
 		this.volumeGroupStackId = volumeGroupStackId;
 		this.tenantId           = vrb.getTenantId();
+		this.cloudOwnerId       = vrb.getCloudOwnerId();
 		this.cloudSiteId        = vrb.getCloudSiteId();
 		this.volumeGroupCreated = vrb.isVolumeGroupCreated();
 		this.msoRequest         = vrb.getMsoRequest();
@@ -69,6 +72,7 @@ public class VolumeGroupRollback {
 			String volumeGroupStackId,
 			boolean volumeGroupCreated,
 			String tenantId,
+			String cloudOwnerId,
 			String cloudSiteId,
 			MsoRequest msoRequest,
 			String messageId)
@@ -78,6 +82,7 @@ public class VolumeGroupRollback {
 		this.volumeGroupStackId = volumeGroupStackId;
 		this.volumeGroupCreated = volumeGroupCreated;
 		this.tenantId = tenantId;
+		this.cloudOwnerId = cloudOwnerId;
 		this.cloudSiteId = cloudSiteId;
 		this.msoRequest = msoRequest;
 		this.messageId = messageId;
@@ -107,7 +112,12 @@ public class VolumeGroupRollback {
 	public void setCloudSiteId(String cloudSiteId) {
 		this.cloudSiteId = cloudSiteId;
 	}
-	public boolean isVolumeGroupCreated() {
+	public String getCloudOwnerId() {
+	    return cloudOwnerId;
+	}
+	public void setCloudOwnerId(String cloudOwnerId) {
+	    this.cloudOwnerId = cloudOwnerId;
+	}public boolean isVolumeGroupCreated() {
 		return volumeGroupCreated;
 	}
 	public void setVolumeGroupCreated(boolean volumeGroupCreated) {
diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/openstack/beans/VnfRollback.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/openstack/beans/VnfRollback.java
index ba7f6532e1..1c7164a0a0 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/openstack/beans/VnfRollback.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/openstack/beans/VnfRollback.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,6 +31,7 @@ import org.onap.so.entity.MsoRequest;
 public class VnfRollback {
 	private String vnfId;
 	private String tenantId;
+	private String cloudOwner;
 	private String cloudSiteId;
 	private boolean tenantCreated = false;
 	private boolean vnfCreated = false;
@@ -49,9 +50,10 @@ public class VnfRollback {
 
 	/**
 	 * For backwards compatibility... orchestration mode defaults to HEAT
-	 * 
+	 *
 	 * @param vnfId
 	 * @param tenantId
+	 * @param cloudOwner
 	 * @param cloudSiteId
 	 * @param tenantCreated
 	 * @param vnfCreated
@@ -61,13 +63,14 @@ public class VnfRollback {
 	 * @param requestType
 	 * @param modelCustomizationUuid
 	 */
-	public VnfRollback(String vnfId, String tenantId, String cloudSiteId,
+	public VnfRollback(String vnfId, String tenantId, String cloudOwner, String cloudSiteId,
 			boolean tenantCreated, boolean vnfCreated,
 			MsoRequest msoRequest,
 			String volumeGroupName, String volumeGroupId, String requestType, String modelCustomizationUuid) {
 		super();
 		this.vnfId = vnfId;
 		this.tenantId = tenantId;
+		this.cloudOwner = cloudOwner;
 		this.cloudSiteId = cloudSiteId;
 		this.tenantCreated = tenantCreated;
 		this.vnfCreated = vnfCreated;
@@ -79,9 +82,10 @@ public class VnfRollback {
 	}
 
 	/**
-	 * 
+	 *
 	 * @param vnfId
 	 * @param tenantId
+	 * @param cloudOwner
 	 * @param cloudSiteId
 	 * @param tenantCreated
 	 * @param vnfCreated
@@ -91,13 +95,14 @@ public class VnfRollback {
 	 * @param requestType
 	 * @param modelCustomizationUuid
 	 */
-	public VnfRollback(String vnfId, String tenantId, String cloudSiteId,
+	public VnfRollback(String vnfId, String tenantId, String cloudOwner, String cloudSiteId,
 			boolean tenantCreated, boolean vnfCreated,
 			MsoRequest msoRequest, String volumeGroupName, String volumeGroupId,
 			String requestType, String modelCustomizationUuid, String orchestrationMode) {
 		super();
 		this.vnfId = vnfId;
 		this.tenantId = tenantId;
+		this.cloudOwner = cloudOwner;
 		this.cloudSiteId = cloudSiteId;
 		this.tenantCreated = tenantCreated;
 		this.vnfCreated = vnfCreated;
@@ -128,6 +133,12 @@ public class VnfRollback {
 	public void setCloudSiteId(String cloudId) {
 		this.cloudSiteId = cloudId;
 	}
+    public String getCloudOwner() {
+        return cloudOwner;
+    }
+    public void setCloudOwner(String cloudOwner) {
+        this.cloudOwner = cloudOwner;
+    }
 	public boolean getTenantCreated() {
 		return tenantCreated;
 	}
@@ -204,7 +215,7 @@ public class VnfRollback {
 	}
 	@Override
     public String toString() {
-		return "VnfRollback: cloud=" + cloudSiteId + ", tenant=" + tenantId +
+		return "VnfRollback: owner=" + cloudOwner + ", cloud=" + cloudSiteId + ", tenant=" + tenantId +
 				", vnf=" + vnfId + ", tenantCreated=" + tenantCreated +
 				", vnfCreated=" + vnfCreated + ", requestType = " + requestType
 				+ ", modelCustomizationUuid=" + this.modelCustomizationUuid
diff --git a/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml b/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml
index 76ba3695f2..1ff24a50f6 100644
--- a/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml
+++ b/adapters/mso-adapters-rest-interface/src/test/resources/createVfModuleRequest-with-params.xml
@@ -1,5 +1,6 @@
 <createVfModuleRequest>
 	<cloudSiteId>RegionOne</cloudSiteId>
+	<cloudOwner>CloudOwner</cloudOwner>
 	<tenantId>09d8566ea45e43aa974cf447ed591d77</tenantId>
 	<vnfId>8daea639-82b9-4da6-aec9-5054f006a82d</vnfId>
 	<vnfName>vcpe_vnf_vcpe_infra_201903101808</vnfName>
@@ -203,4 +204,4 @@
 	</msoRequest>
 	<messageId>11c8ec20-a1f8-4aa2-926f-e55d67a30f8b-1552241542248</messageId>
 	<notificationUrl>http://so-bpmn-infra.onap:8081/mso/WorkflowMessage/VNFAResponse/11c8ec20-a1f8-4aa2-926f-e55d67a30f8b-1552241542248</notificationUrl>
-</createVfModuleRequest>
\ No newline at end of file
+</createVfModuleRequest>