From: Seshu Kumar M <seshu.kumar.m@huawei.com>
Date: Wed, 14 Nov 2018 09:54:14 +0000 (+0000)
Subject: Merge "Get Csar file bug fix" into casablanca
X-Git-Tag: 1.3.2~32
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=91109d4e4805a69b20f9dbb1329347038149f0d7;p=so.git

Merge "Get Csar file bug fix" into casablanca
---

91109d4e4805a69b20f9dbb1329347038149f0d7
diff --cc bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ActivateSDNCNetworkResource.groovy
index ba5cba893b,30e6c452e0..64de29eaa9
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ActivateSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/ActivateSDNCNetworkResource.groovy
@@@ -29,9 -29,9 +29,10 @@@ import org.onap.so.bpmn.common.recipe.R
  import org.onap.so.bpmn.common.resource.ResourceRequestBuilder
  import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
  import org.onap.so.bpmn.common.scripts.ExceptionUtil
 +import org.onap.so.bpmn.common.scripts.MsoUtils
  import org.onap.so.bpmn.common.scripts.SDNCAdapterUtils
  import org.onap.so.bpmn.core.json.JsonUtils
+ import org.onap.so.bpmn.core.UrnPropertiesReader
  import org.onap.so.logger.MsoLogger
  
  /**
diff --cc bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
index 1509119683,f8c2ced2c7..d0a3dddba9
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/CreateSDNCNetworkResource.groovy
@@@ -30,10 -32,13 +32,14 @@@ import org.onap.so.bpmn.common.resource
  import org.onap.so.bpmn.common.scripts.AaiUtil
  import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
  import org.onap.so.bpmn.common.scripts.ExceptionUtil
 +import org.onap.so.bpmn.common.scripts.MsoUtils
  import org.onap.so.bpmn.core.json.JsonUtils
+ import org.onap.so.bpmn.core.UrnPropertiesReader
+ import org.onap.so.client.aai.AAIObjectPlurals
+ import org.onap.so.client.aai.AAIResourcesClient
+ import org.onap.so.client.aai.entities.uri.AAIResourceUri
+ import org.onap.so.client.aai.entities.uri.AAIUriFactory
  import org.onap.so.logger.MsoLogger
- import org.onap.so.rest.APIResponse
  
  import static org.apache.commons.lang3.StringUtils.*
  
@@@ -50,10 -55,8 +56,10 @@@ public class CreateSDNCNetworkResource 
  
      JsonUtils jsonUtil = new JsonUtils()
  
 +    MsoUtils msoUtils = new MsoUtils()
 +
      public void preProcessRequest(DelegateExecution execution){
-         
+ 
          msoLogger.info(" ***** Started preProcessRequest *****")
          try {
  
diff --cc bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
index a5e0e3f080,ed8b3b4e0a..6ab03b9769
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
@@@ -27,9 -27,9 +27,10 @@@ import org.onap.so.bpmn.common.recipe.R
  import org.onap.so.bpmn.common.resource.ResourceRequestBuilder
  import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
  import org.onap.so.bpmn.common.scripts.ExceptionUtil
 +import org.onap.so.bpmn.common.scripts.MsoUtils
  import org.onap.so.bpmn.common.scripts.SDNCAdapterUtils
  import org.onap.so.bpmn.core.json.JsonUtils
+ import org.onap.so.bpmn.core.UrnPropertiesReader
  import org.onap.so.logger.MsoLogger
  
  /**
diff --cc bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
index be348095fd,b5c9f8cda6..6456fc3a5d
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
@@@ -27,9 -27,9 +27,10 @@@ import org.onap.so.bpmn.common.recipe.R
  import org.onap.so.bpmn.common.resource.ResourceRequestBuilder
  import org.onap.so.bpmn.common.scripts.AbstractServiceTaskProcessor
  import org.onap.so.bpmn.common.scripts.ExceptionUtil
 +import org.onap.so.bpmn.common.scripts.MsoUtils
  import org.onap.so.bpmn.common.scripts.SDNCAdapterUtils
  import org.onap.so.bpmn.core.json.JsonUtils
+ import org.onap.so.bpmn.core.UrnPropertiesReader
  import org.onap.so.logger.MsoLogger
  
  import static org.apache.commons.lang3.StringUtils.*