Merge "Add cloudOwner to VNF adapter call"

3 files changed, 41 insertions, 0 deletions

diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/adapter/vnf/VnfRollback.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/adapter/vnf/VnfRollback.java
index 194ce58fe9..9fd3bc596f 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/adapter/vnf/VnfRollback.java
+++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/common/adapter/vnf/VnfRollback.java
@@ -36,6 +36,7 @@ import javax.xml.bind.annotation.XmlType;
  *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
  *       <sequence>
  *         <element name="cloudSiteId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         <element name="cloudOwner" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
  *         <element name="msoRequest" type="{http://org.onap.so/vnfNotify}msoRequest" minOccurs="0"/>
  *         <element name="tenantCreated" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
  *         <element name="tenantId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
@@ -52,6 +53,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "vnfRollback", propOrder = {
     "cloudSiteId",
+    "cloudOwner",
     "msoRequest",
     "tenantCreated",
     "tenantId",
@@ -61,6 +63,7 @@ import javax.xml.bind.annotation.XmlType;
 public class VnfRollback {
 
     protected String cloudSiteId;
+    protected String cloudOwner;
     protected MsoRequest msoRequest;
     protected boolean tenantCreated;
     protected String tenantId;
@@ -92,6 +95,30 @@ public class VnfRollback {
     }
 
     /**
+     * Gets the value of the cloudOwner property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getCloudOwner() {
+        return cloudOwner;
+    }
+
+    /**
+     * Sets the value of the cloudOwner property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCloudOwner(String value) {
+        this.cloudOwner = value;
+    }
+
+    /**
      * Gets the value of the msoRequest property.
      * 
      * @return
@@ -201,6 +228,7 @@ public class VnfRollback {
 
         	return
         		"<cloudSiteId>"+cloudSiteId+"</cloudSiteId>" + '\n' +
+        		"<cloudOwner>"+cloudOwner+"</cloudOwner>" + '\n' +
         		msoRequestElement +
         		"<tenantCreated>"+tenantCreated+"</tenantCreated>" + '\n' +
         		"<tenantId>"+tenantId+"</tenantId>" + '\n' +
diff --git a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/VnfAdapterRestV1IT.java b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/VnfAdapterRestV1IT.java
index ad08f8b2bb..1ef864b543 100644
--- a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/VnfAdapterRestV1IT.java
+++ b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/VnfAdapterRestV1IT.java
@@ -59,6 +59,7 @@ public class VnfAdapterRestV1IT extends BaseIntegrationTest {
 	private final String CREATE_VF_MODULE_REQUEST =
 		"<createVfModuleRequest>" + EOL +
 		"  <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
+		"  <cloudOwner>cloudOwner</cloudOwner>" + EOL +
 		"  <tenantId>tenantId</tenantId>" + EOL +
 		"  <vnfId>vnfId</vnfId>" + EOL +
 		"  <vfModuleName>vfModuleName</vfModuleName>" + EOL +
@@ -94,6 +95,7 @@ public class VnfAdapterRestV1IT extends BaseIntegrationTest {
 	private final String UPDATE_VF_MODULE_REQUEST =
 		"<updateVfModuleRequest>" + EOL +
 		"  <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
+		"  <cloudOwner>cloudOwner</cloudOwner>" + EOL +
 		"  <tenantId>tenantId</tenantId>" + EOL +
 		"  <vnfId>vnfId</vnfId>" + EOL +
 		"  <vfModuleName>vfModuleName</vfModuleName>" + EOL +
@@ -130,6 +132,7 @@ public class VnfAdapterRestV1IT extends BaseIntegrationTest {
 	private final String DELETE_VF_MODULE_REQUEST =
 		"<deleteVfModuleRequest>" + EOL +
 		"  <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
+		"  <cloudOwner>cloudOwner</cloudOwner>" + EOL +
 		"  <tenantId>tenantId</tenantId>" + EOL +
 		"  <vnfId>vnfId</vnfId>" + EOL +
 		"  <vfModuleId>vfModuleId</vfModuleId>" + EOL +
@@ -150,6 +153,7 @@ public class VnfAdapterRestV1IT extends BaseIntegrationTest {
 			"  <skipAAI>true</skipAAI>" + EOL +
 			"  <vfModuleRollback>" + EOL +
 			"    <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
+		    "    <cloudOwner>cloudOwner</cloudOwner>" + EOL +
 			"    <tenantId>tenantId</tenantId>" + EOL +
 			"    <vnfId>vnfId</vnfId>" + EOL +
 			"    <vfModuleId>vfModuleId</vfModuleId>" + EOL +
@@ -186,6 +190,7 @@ public class VnfAdapterRestV1IT extends BaseIntegrationTest {
 			"    <vfModuleStackId>vfModuleStackId</vfModuleStackId>" + EOL +
 			"    <vfModuleCreated>true</vfModuleCreated>" + EOL +
 			"    <tenantId>tenantId</tenantId>" + EOL +
+		    "    <cloudOwner>cloudOwner</cloudOwner>" + EOL +
 			"    <cloudSiteId>cloudSiteId</cloudSiteId>" + EOL +
 			"    <msoRequest>" + EOL +
 			"      <requestId>requestId</requestId>" + EOL +
diff --git a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/WorkflowTest.java b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/WorkflowTest.java
index 117d3b213a..eed2978bc7 100644
--- a/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/WorkflowTest.java
+++ b/bpmn/mso-infrastructure-bpmn/src/test/java/org/onap/so/bpmn/common/WorkflowTest.java
@@ -1100,6 +1100,10 @@ public abstract class WorkflowTest {
 				"/tns:createVnfNotification/tns:rollback/tns:cloudSiteId/text()");
 			rollback.setCloudSiteId(cloudSiteId);
 
+			String cloudOwner = xpathTool.evaluate(
+				"/tns:createVnfNotification/tns:rollback/tns:cloudOwner/text()");
+			rollback.setCloudOwner(cloudOwner);
+
 			String requestId = xpathTool.evaluate(
 				"/tns:createVnfNotification/tns:rollback/tns:msoRequest/tns:requestId/text()");
 			String serviceInstanceId = xpathTool.evaluate(
@@ -1276,6 +1280,10 @@ public abstract class WorkflowTest {
 				"/tns:updateVnfNotification/tns:rollback/tns:cloudSiteId/text()");
 			rollback.setCloudSiteId(cloudSiteId);
 
+			String cloudOwner = xpathTool.evaluate(
+				"/tns:updateVnfNotification/tns:rollback/tns:cloudOwner/text()");
+			rollback.setCloudOwner(cloudOwner);
+
 			String requestId = xpathTool.evaluate(
 				"/tns:updateVnfNotification/tns:rollback/tns:msoRequest/tns:requestId/text()");
 			String serviceInstanceId = xpathTool.evaluate(