Bug fixes November 10th

use network name on delete when heat id not present
compare mod count index as Integers

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

1 files changed, 7 insertions, 1 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java
index 57c760b01f..79a75c532a 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java
@@ -27,6 +27,7 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 
+import org.apache.commons.lang3.StringUtils;
 import org.modelmapper.ModelMapper;
 import org.modelmapper.PropertyMap;
 import org.onap.so.adapters.nwrest.ContrailNetwork;
@@ -129,7 +130,12 @@ public class NetworkAdapterObjectMapper {
 		
 		deleteNetworkRequest.setMsoRequest(createMsoRequest(requestContext, serviceInstance));
 		deleteNetworkRequest.setNetworkId(l3Network.getNetworkId());
-		deleteNetworkRequest.setNetworkStackId(l3Network.getHeatStackId());
+		if (!StringUtils.isEmpty(l3Network.getHeatStackId())){
+			deleteNetworkRequest.setNetworkStackId(l3Network.getHeatStackId());
+		}
+		else {
+			deleteNetworkRequest.setNetworkStackId(l3Network.getNetworkName());
+		}
 		deleteNetworkRequest.setNetworkType(l3Network.getNetworkType());
 		deleteNetworkRequest.setSkipAAI(true);
 		deleteNetworkRequest.setTenantId(cloudRegion.getTenantId());