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>

diff --git a/bpmn/so-bpmn-tasks/pom.xml b/bpmn/so-bpmn-tasks/pom.xml
index d9b3ee5..d46f134 100644 (file)
--- 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 a9f695b..2b4834a 100644 (file)
--- 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 7013a50..a6ef02b 100644 (file)
--- 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 1355151..bf128a4 100644 (file)
--- 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());