From: Marcus Williams <marcus.williams@intel.com>
Date: Mon, 17 Sep 2018 19:01:22 +0000 (+0000)
Subject: Merge "more stability fixes"
X-Git-Tag: 1.3.1~94
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d4c05d98beb4b8db51d876d34e3e0fae086647ea;p=so.git

Merge "more stability fixes"
---

d4c05d98beb4b8db51d876d34e3e0fae086647ea
diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java
index 66e571cc93,bc4831c804..2b58b7bdd7
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterVfModuleObjectMapper.java
@@@ -160,14 -157,11 +160,14 @@@ public class VnfAdapterVfModuleObjectMa
  	private Map<String,String> buildVfModuleParamsMap(RequestContext requestContext, ServiceInstance serviceInstance, GenericVnf genericVnf, 
  				VfModule vfModule, String sdncVnfQueryResponse, String sdncVfModuleQueryResponse) throws JsonParseException, JsonMappingException, IOException {
  		
 -		GenericResourceApiVnftopologyVnfTopology vnfTopology = mapper.readValue(sdncVnfQueryResponse, GenericResourceApiVnftopologyVnfTopology.class);
 -		GenericResourceApiVfmoduletopologyVfModuleTopology vfModuleTopology = mapper.readValue(sdncVfModuleQueryResponse, GenericResourceApiVfmoduletopologyVfModuleTopology.class);
 +		
 +		GenericResourceApiVnfTopology vnfTop= mapper.readValue(sdncVnfQueryResponse, GenericResourceApiVnfTopology.class);
 +		GenericResourceApiVfModuleTopology vfModuleTop = mapper.readValue(sdncVfModuleQueryResponse, GenericResourceApiVfModuleTopology.class);
 +		GenericResourceApiVnftopologyVnfTopology vnfTopology = vnfTop.getVnfTopology();
 +		GenericResourceApiVfmoduletopologyVfModuleTopology vfModuleTopology = vfModuleTop.getVfModuleTopology();
  		Map<String,String> paramsMap = new HashMap<>();
  
- 		if(vnfTopology.getSdncGeneratedCloudResources() && vfModuleTopology.getSdncGeneratedCloudResources()) {
+ 		if( vfModuleTopology.getSdncGeneratedCloudResources()) {
  			buildParamsMapFromVfModuleSdncResponse(paramsMap, vfModuleTopology, true);
  			buildParamsMapFromVnfSdncResponse(paramsMap, vnfTopology, null, true);
  		}