cloud owner support for SDNC interface

added cloudOwner to SDNC gr api payloads

Change-Id: If8351ab9078bd0c0f503acdf21622d615eb5a5ab
Issue-ID: SO-1137
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

4 files changed, 4 insertions, 1 deletions

diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml
index d9b3ee57d8..d46f13434f 100644
--- a/bpmn/so-bpmn-tasks/pom.xml
+++ b/bpmn/so-bpmn-tasks/pom.xml
@@ -29,7 +29,7 @@
 		<dependency>
 			<groupId>org.onap.sdnc.northbound</groupId>
 			<artifactId>generic-resource-api-client</artifactId>
-			<version>1.4.0</version>
+			<version>1.4.1</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.ws.rs</groupId>
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapper.java
index a9f695b5be..2b4834af42 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/NetworkTopologyOperationRequestMapper.java
@@ -87,6 +87,7 @@ public class NetworkTopologyOperationRequestMapper {
 	private GenericResourceApiNetworkrequestinputNetworkRequestInput buildNetworkRequestInput(L3Network network, ServiceInstance serviceInstance, CloudRegion cloudRegion){
 		GenericResourceApiNetworkrequestinputNetworkRequestInput networkRequestInput = new GenericResourceApiNetworkrequestinputNetworkRequestInput();
 		networkRequestInput.setTenant(cloudRegion.getTenantId());
+		networkRequestInput.setCloudOwner(cloudRegion.getCloudOwner());
 		networkRequestInput.setAicCloudRegion(cloudRegion.getLcpCloudRegionId());
 		if (network.getNetworkName() != null && !network.getNetworkName().equals("")) {
 			networkRequestInput.setNetworkName(network.getNetworkName());
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java
index 7013a50dcf..a6ef02bd4d 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java
@@ -114,6 +114,7 @@ public class VfModuleTopologyOperationRequestMapper {
 		if (cloudRegion != null) {
 			vfModuleRequestInput.setTenant(cloudRegion.getTenantId());
 			vfModuleRequestInput.setAicCloudRegion(cloudRegion.getLcpCloudRegionId());
+			vfModuleRequestInput.setCloudOwner(cloudRegion.getCloudOwner());
 		}
 		if (vfModule.getVfModuleName() != null && !vfModule.getVfModuleName().equals("")) {
 			vfModuleRequestInput.setVfModuleName(vfModule.getVfModuleName());
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
index 1355151919..bf128a4838 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/mapper/VnfTopologyOperationRequestMapper.java
@@ -71,6 +71,7 @@ public class VnfTopologyOperationRequestMapper {
 
 		vnfRequestInput.setTenant(cloudRegion.getTenantId());
 		vnfRequestInput.setAicCloudRegion(cloudRegion.getLcpCloudRegionId());
+		vnfRequestInput.setCloudOwner(cloudRegion.getCloudOwner());
 		
 		if (StringUtils.isNotBlank(vnf.getVnfName())) {
 			vnfRequestInput.setVnfName(vnf.getVnfName());