From 48d70110d7f29f77f4612962d920bd2ddbb5ad56 Mon Sep 17 00:00:00 2001 From: Eric Multanen Date: Mon, 25 Mar 2019 20:22:21 -0700 Subject: Prepare the x_directives inputs for multicloud API Prepare the sdnc_directives from the list of parameters provided by SDNC. Prepare the user_directives from the User input parameters. Add these two directives strings to the parameter map to be passed to Multicloud API by the multicloud adapter. Change-Id: I15c5737596e89b7ff147ae71fec0b143abeffdeb Issue-ID: SO-1442 Signed-off-by: Eric Multanen --- .../adapter/vnf/mapper/AttributeNameValue.java | 60 ++++ .../vnf/mapper/VnfAdapterVfModuleObjectMapper.java | 338 +++++++++++---------- 2 files changed, 241 insertions(+), 157 deletions(-) create mode 100644 bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/AttributeNameValue.java (limited to 'bpmn/so-bpmn-tasks/src/main/java') diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/AttributeNameValue.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/AttributeNameValue.java new file mode 100644 index 0000000000..e93e216ea3 --- /dev/null +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/AttributeNameValue.java @@ -0,0 +1,60 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2019 Intel Corp. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.so.client.adapter.vnf.mapper; + +import java.io.Serializable; + +public class AttributeNameValue implements Serializable { + private final static long serialVersionUID = -5215028275587848311L; + + private String attributeName; + private Object attributeValue; + + public AttributeNameValue(String attributeName, Object attributeValue) { + this.attributeName = attributeName; + this.attributeValue = attributeValue; + } + + public String getAttributeName() { + return attributeName; + } + + public void setAttributeName(String attributeName) { + this.attributeName = attributeName; + } + + public Object getAttributeValue() { + return attributeValue; + } + + public void setAttributeValue(Object attributeValue) { + this.attributeValue = attributeValue; + } + + @Override + public String toString() { + return new StringBuilder().append("{\"attribute_name\": \"") + .append(attributeName.toString()) + .append("\", \"attribute_value\": \"") + .append(attributeValue.toString()) + .append("\"}").toString(); + } +} diff --git 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 index 258bea9a01..dc113e5abc 100644 --- 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 @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,6 +36,7 @@ import java.util.Optional; import javax.annotation.PostConstruct; +import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang3.StringUtils; import org.onap.sdnc.northbound.client.model.GenericResourceApiParam; import org.onap.sdnc.northbound.client.model.GenericResourceApiParamParam; @@ -78,6 +79,7 @@ import org.onap.so.bpmn.servicedecomposition.generalobjects.OrchestrationContext import org.onap.so.bpmn.servicedecomposition.generalobjects.RequestContext; import org.onap.so.entity.MsoRequest; import org.onap.so.jsonpath.JsonPathUtil; +import org.onap.so.openstack.utils.MsoMulticloudUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -94,7 +96,7 @@ public class VnfAdapterVfModuleObjectMapper { @Autowired protected VnfAdapterObjectMapperUtils vnfAdapterObjectMapperUtils; private static List sdncResponseParamsToSkip = asList("vnf_id", "vf_module_id", "vnf_name", "vf_module_name"); - + private ObjectMapper mapper = new ObjectMapper(); private static final JsonPathUtil jsonPath = JsonPathUtil.getInstance(); private static final String SUB_INT = "subint"; @@ -110,23 +112,23 @@ public class VnfAdapterVfModuleObjectMapper { private static final String FLOATING_IP = "_floating_ip"; private static final String FLOATING_V6_IP = "_floating_v6_ip"; private static final String UNDERSCORE = "_"; - + @PostConstruct public void init () { mapper.enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY); } - - public CreateVfModuleRequest createVfModuleRequestMapper(RequestContext requestContext, CloudRegion cloudRegion, OrchestrationContext orchestrationContext, ServiceInstance serviceInstance, GenericVnf genericVnf, + + public CreateVfModuleRequest createVfModuleRequestMapper(RequestContext requestContext, CloudRegion cloudRegion, OrchestrationContext orchestrationContext, ServiceInstance serviceInstance, GenericVnf genericVnf, VfModule vfModule, VolumeGroup volumeGroup, String sdncVnfQueryResponse, String sdncVfModuleQueryResponse) throws JsonParseException, JsonMappingException, IOException { CreateVfModuleRequest createVfModuleRequest = new CreateVfModuleRequest(); - + createVfModuleRequest.setCloudSiteId(cloudRegion.getLcpCloudRegionId()); createVfModuleRequest.setCloudOwner(cloudRegion.getCloudOwner()); createVfModuleRequest.setTenantId(cloudRegion.getTenantId()); createVfModuleRequest.setVfModuleId(vfModule.getVfModuleId()); createVfModuleRequest.setVfModuleName(vfModule.getVfModuleName()); createVfModuleRequest.setVnfId(genericVnf.getVnfId()); - createVfModuleRequest.setVnfType(genericVnf.getVnfType()); + createVfModuleRequest.setVnfType(genericVnf.getVnfType()); createVfModuleRequest.setVnfVersion(serviceInstance.getModelInfoServiceInstance().getModelVersion()); createVfModuleRequest.setVfModuleType(vfModule.getModelInfoVfModule().getModelName()); createVfModuleRequest.setModelCustomizationUuid(vfModule.getModelInfoVfModule().getModelCustomizationUUID()); @@ -134,38 +136,38 @@ public class VnfAdapterVfModuleObjectMapper { createVfModuleRequest.setVolumeGroupId(volumeGroup.getVolumeGroupId()); createVfModuleRequest.setVolumeGroupStackId(volumeGroup.getHeatStackId()); } - VfModule baseVfModule = getBaseVfModule(genericVnf); + VfModule baseVfModule = getBaseVfModule(genericVnf); if (baseVfModule != null) { createVfModuleRequest.setBaseVfModuleId(baseVfModule.getVfModuleId()); createVfModuleRequest.setBaseVfModuleStackId(baseVfModule.getHeatStackId()); } createVfModuleRequest.setVfModuleParams(buildVfModuleParamsMap(requestContext, serviceInstance, genericVnf, vfModule, sdncVnfQueryResponse, sdncVfModuleQueryResponse)); - - createVfModuleRequest.setSkipAAI(true); + + createVfModuleRequest.setSkipAAI(true); createVfModuleRequest.setBackout(Boolean.TRUE.equals(orchestrationContext.getIsRollbackEnabled())); createVfModuleRequest.setFailIfExists(true); - - MsoRequest msoRequest = buildMsoRequest(requestContext, serviceInstance); + + MsoRequest msoRequest = buildMsoRequest(requestContext, serviceInstance); createVfModuleRequest.setMsoRequest(msoRequest); - + String messageId = vnfAdapterObjectMapperUtils.getRandomUuid(); createVfModuleRequest.setMessageId(messageId); createVfModuleRequest.setNotificationUrl(vnfAdapterObjectMapperUtils.createCallbackUrl("VNFAResponse", messageId)); - + return createVfModuleRequest; } - + private MsoRequest buildMsoRequest(RequestContext requestContext,ServiceInstance serviceInstance) { MsoRequest msoRequest = new MsoRequest(); msoRequest.setRequestId(requestContext.getMsoRequestId()); msoRequest.setServiceInstanceId(serviceInstance.getServiceInstanceId()); - return msoRequest; + return msoRequest; } - - private Map buildVfModuleParamsMap(RequestContext requestContext, ServiceInstance serviceInstance, GenericVnf genericVnf, + + private Map buildVfModuleParamsMap(RequestContext requestContext, ServiceInstance serviceInstance, GenericVnf genericVnf, VfModule vfModule, String sdncVnfQueryResponse, String sdncVfModuleQueryResponse) throws JsonParseException, JsonMappingException, IOException { - - + + GenericResourceApiVnfTopology vnfTop= mapper.readValue(sdncVnfQueryResponse, GenericResourceApiVnfTopology.class); GenericResourceApiVfModuleTopology vfModuleTop = mapper.readValue(sdncVfModuleQueryResponse, GenericResourceApiVfModuleTopology.class); GenericResourceApiVnftopologyVnfTopology vnfTopology = vnfTop.getVnfTopology(); @@ -181,19 +183,41 @@ public class VnfAdapterVfModuleObjectMapper { buildParamsMapFromVfModuleSdncResponse(paramsMap, vfModuleTopology, false); buildParamsMapFromVnfSdncResponse(paramsMap, vnfTopology, networkRoleMap, false); } - + + // build the sdnc_directives from paramsMap + buildDirectivesParamFromMap(paramsMap, MsoMulticloudUtils.SDNC_DIRECTIVES, paramsMap); + buildDirectivesParamFromMap(paramsMap, MsoMulticloudUtils.USER_DIRECTIVES, requestContext.getUserParams()); + buildMandatoryParamsMap(paramsMap, serviceInstance, genericVnf, vfModule); - + // Parameters received from the request should overwrite any parameters received from SDNC paramsMap.putAll(requestContext.getUserParams()); - + if (vfModule.getCloudParams() != null) { paramsMap.putAll(vfModule.getCloudParams()); } return paramsMap; } - - private void buildMandatoryParamsMap(Map paramsMap, ServiceInstance serviceInstance, GenericVnf genericVnf, VfModule vfModule) { + + private void buildDirectivesParamFromMap(Map paramsMap, String directive, Map srcMap) { + StringBuilder directives = new StringBuilder(); + if (srcMap.size() > 0) { + directives.append("{ \"attributes\": [ "); + int i = 0; + for (String attributeName : srcMap.keySet()) { + directives.append(new AttributeNameValue(attributeName, srcMap.get(attributeName).toString())); + if (i < (srcMap.size()-1)) + directives.append(", "); + i++; + } + directives.append("] }"); + } else { + directives.append("{}"); + } + paramsMap.put(directive, directives.toString()); + } + + private void buildMandatoryParamsMap(Map paramsMap, ServiceInstance serviceInstance, GenericVnf genericVnf, VfModule vfModule) { paramsMap.put("vnf_id", genericVnf.getVnfId()); paramsMap.put("vnf_name", genericVnf.getVnfName()); paramsMap.put("vf_module_id", vfModule.getVfModuleId()); @@ -205,26 +229,26 @@ public class VnfAdapterVfModuleObjectMapper { Integer vfModuleIndex = vfModule.getModuleIndex(); if (vfModuleIndex != null) { paramsMap.put("vf_module_index", vfModuleIndex.toString()); - } + } } - - private void buildParamsMapFromVnfSdncResponse(Map paramsMap, GenericResourceApiVnftopologyVnfTopology vnfTopology, Map networkRoleMap, boolean skipVnfResourceAssignments) throws JsonParseException, JsonMappingException, IOException { + + private void buildParamsMapFromVnfSdncResponse(Map paramsMap, GenericResourceApiVnftopologyVnfTopology vnfTopology, Map networkRoleMap, boolean skipVnfResourceAssignments) throws JsonParseException, JsonMappingException, IOException { // Get VNF parameters from SDNC response GenericResourceApiParam vnfParametersData = vnfTopology.getVnfParametersData(); buildParamsMapFromSdncParams(paramsMap, vnfParametersData); - + if(!skipVnfResourceAssignments) { - GenericResourceApiVnfresourceassignmentsVnfResourceAssignments vnfResourceAssignments = vnfTopology.getVnfResourceAssignments(); + GenericResourceApiVnfresourceassignmentsVnfResourceAssignments vnfResourceAssignments = vnfTopology.getVnfResourceAssignments(); if (vnfResourceAssignments != null) { // Availability Zones buildAvailabilityZones(paramsMap, vnfResourceAssignments); // VNF Networks - buildVnfNetworks(paramsMap, vnfResourceAssignments, networkRoleMap); + buildVnfNetworks(paramsMap, vnfResourceAssignments, networkRoleMap); } } } - - private void buildAvailabilityZones (Map paramsMap, GenericResourceApiVnfresourceassignmentsVnfResourceAssignments vnfResourceAssignments) { + + private void buildAvailabilityZones (Map paramsMap, GenericResourceApiVnfresourceassignmentsVnfResourceAssignments vnfResourceAssignments) { GenericResourceApiVnfresourceassignmentsVnfresourceassignmentsAvailabilityZones availabilityZones = vnfResourceAssignments.getAvailabilityZones(); if (availabilityZones != null) { List availabilityZonesList = availabilityZones.getAvailabilityZone(); @@ -235,7 +259,7 @@ public class VnfAdapterVfModuleObjectMapper { } } } - + private void buildVnfNetworks (Map paramsMap, GenericResourceApiVnfresourceassignmentsVnfResourceAssignments vnfResourceAssignments, Map networkRoleMap) { GenericResourceApiVnfresourceassignmentsVnfresourceassignmentsVnfNetworks vnfNetworks = vnfResourceAssignments.getVnfNetworks(); if (vnfNetworks != null) { @@ -247,41 +271,41 @@ public class VnfAdapterVfModuleObjectMapper { String vnfNetworkKey = networkRoleMap.get(networkRole); if (vnfNetworkKey == null || vnfNetworkKey.isEmpty()) { vnfNetworkKey = networkRole; - } - + } + String vnfNetworkNeutronIdValue = vnfNetwork.getNeutronId(); paramsMap.put(vnfNetworkKey + "_net_id", vnfNetworkNeutronIdValue); String vnfNetworkNetNameValue = vnfNetwork.getNetworkName(); paramsMap.put(vnfNetworkKey + "_net_name", vnfNetworkNetNameValue); String vnfNetworkNetFqdnValue = vnfNetwork.getContrailNetworkFqdn(); paramsMap.put(vnfNetworkKey + "_net_fqdn", vnfNetworkNetFqdnValue); - + buildVnfNetworkSubnets(paramsMap, vnfNetwork, vnfNetworkKey); - + } } } } - + private void buildVnfNetworkSubnets(Map paramsMap, GenericResourceApiVnfNetworkData vnfNetwork, String vnfNetworkKey) { String vnfNetworkString = convertToString(vnfNetwork); Optional ipv4Ips = jsonPath.locateResult(vnfNetworkString, "$.subnets-data.subnet-data[*].[?(@.ip-version == 'ipv4' && @.dhcp-enabled == 'Y')].subnet-id"); if(ipv4Ips.isPresent()) addPairToMap(paramsMap, vnfNetworkKey, SUBNET_ID, ipv4Ips.get()); - + Optional ipv6Ips = jsonPath.locateResult(vnfNetworkString, "$.subnets-data.subnet-data[*].[?(@.ip-version == 'ipv6' && @.dhcp-enabled == 'Y')].subnet-id"); if(ipv6Ips.isPresent()) addPairToMap(paramsMap, vnfNetworkKey, V6_SUBNET_ID, ipv6Ips.get()); - } + } - private void buildParamsMapFromVfModuleSdncResponse(Map paramsMap, GenericResourceApiVfmoduletopologyVfModuleTopology vfModuleTopology, boolean skipVfModuleAssignments) throws JsonParseException, JsonMappingException, IOException { + private void buildParamsMapFromVfModuleSdncResponse(Map paramsMap, GenericResourceApiVfmoduletopologyVfModuleTopology vfModuleTopology, boolean skipVfModuleAssignments) throws JsonParseException, JsonMappingException, IOException { // Get VF Module parameters from SDNC response GenericResourceApiParam vfModuleParametersData = vfModuleTopology.getVfModuleParameters(); buildParamsMapFromSdncParams(paramsMap, vfModuleParametersData); - - if(!skipVfModuleAssignments) { + + if(!skipVfModuleAssignments) { GenericResourceApiVfmoduleassignmentsVfModuleAssignments vfModuleAssignments = vfModuleTopology.getVfModuleAssignments(); - if (vfModuleAssignments != null) { + if (vfModuleAssignments != null) { // VNF-VMS GenericResourceApiVfmoduleassignmentsVfmoduleassignmentsVms vms = vfModuleAssignments.getVms(); if (vms != null) { @@ -289,7 +313,7 @@ public class VnfAdapterVfModuleObjectMapper { if (vmsList != null) { for (GenericResourceApiVmTopologyData vm : vmsList){ String key = vm.getVmType(); - buildVfModuleVmNames(paramsMap, vm, key); + buildVfModuleVmNames(paramsMap, vm, key); GenericResourceApiVmtopologydataVmNetworks vmNetworks = vm.getVmNetworks(); if (vmNetworks != null) { List vmNetworksList = vmNetworks.getVmNetwork(); @@ -297,49 +321,49 @@ public class VnfAdapterVfModuleObjectMapper { for(int n = 0; n < vmNetworksList.size(); n++){ GenericResourceApiVmNetworkData network = vmNetworksList.get(n); network.getNetworkRoleTag(); - String networkKey = network.getNetworkRole(); + String networkKey = network.getNetworkRole(); // Floating IPs - buildVfModuleFloatingIps(paramsMap, network, key, networkKey); + buildVfModuleFloatingIps(paramsMap, network, key, networkKey); // Interface Route Prefixes - buildVfModuleInterfaceRoutePrefixes(paramsMap, network, key, networkKey); + buildVfModuleInterfaceRoutePrefixes(paramsMap, network, key, networkKey); // SRIOV Parameters - buildVfModuleSriovParameters(paramsMap, network, networkKey); + buildVfModuleSriovParameters(paramsMap, network, networkKey); // IPV4 and IPV6 Addresses buildVfModuleNetworkInformation(paramsMap, network, key, networkKey); - + buildVlanInformation(paramsMap, network, key, networkKey); - + } } } - + buildParamsMapFromVfModuleForHeatTemplate(paramsMap, vm); } - } - } + } + } } } } - + protected void buildVlanInformation(Map paramsMap, GenericResourceApiVmNetworkData network, String key, String networkKey) { - + String networkString = convertToString(network); String vlanFilterKey = key + UNDERSCORE + networkKey + UNDERSCORE + "vlan_filter"; String privateVlansKey = key + UNDERSCORE + networkKey + UNDERSCORE + "private_vlans"; String publicVlansKey = key + UNDERSCORE + networkKey + UNDERSCORE + "public_vlans"; String guestVlansKey = key + UNDERSCORE + networkKey + UNDERSCORE + "guest_vlans"; - + if (network.getSegmentationId() != null) { paramsMap.put(vlanFilterKey, network.getSegmentationId()); } - + List privateVlans = jsonPath.locateResultList(networkString, "$.related-networks.related-network[?(@.vlan-tags.is-private == true)].vlan-tags.upper-tag-id"); List publicVlans = jsonPath.locateResultList(networkString, "$.related-networks.related-network[?(@.vlan-tags.is-private == false)].vlan-tags.upper-tag-id"); List concat = new ArrayList<>(privateVlans); concat.addAll(publicVlans); Collection guestVlans = new HashSet<>(concat); - + if (!privateVlans.isEmpty()) { paramsMap.put(privateVlansKey, Joiner.on(",").join(privateVlans)); } @@ -358,7 +382,7 @@ public class VnfAdapterVfModuleObjectMapper { List valueList = vmNames.getVmName(); if (valueList != null) { for(int i = 0; i < valueList.size(); i++){ - String value = valueList.get(i); + String value = valueList.get(i); if (i != valueList.size() - 1) { values += value + ","; } @@ -371,7 +395,7 @@ public class VnfAdapterVfModuleObjectMapper { } } } - + private void buildVfModuleFloatingIps(Map paramsMap, GenericResourceApiVmNetworkData network, String key, String networkKey) { GenericResourceApiVmnetworkdataFloatingIps floatingIps = network.getFloatingIps(); if (floatingIps != null) { @@ -395,7 +419,7 @@ public class VnfAdapterVfModuleObjectMapper { } } } - + private void buildVfModuleInterfaceRoutePrefixes(Map paramsMap, GenericResourceApiVmNetworkData network, String key, String networkKey) { GenericResourceApiVmnetworkdataInterfaceRoutePrefixes interfaceRoutePrefixes = network.getInterfaceRoutePrefixes(); if (interfaceRoutePrefixes != null) { @@ -404,14 +428,14 @@ public class VnfAdapterVfModuleObjectMapper { sbInterfaceRoutePrefixes.append("["); if (interfaceRoutePrefixesList != null) { for(int a = 0; a < interfaceRoutePrefixesList.size(); a++){ - String interfaceRoutePrefixValue = interfaceRoutePrefixesList.get(a); + String interfaceRoutePrefixValue = interfaceRoutePrefixesList.get(a); if (a != interfaceRoutePrefixesList.size() - 1) { sbInterfaceRoutePrefixes.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}" + ","); } else { - sbInterfaceRoutePrefixes.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}"); + sbInterfaceRoutePrefixes.append("{\"interface_route_table_routes_route_prefix\": \"" + interfaceRoutePrefixValue + "\"}"); } - } + } sbInterfaceRoutePrefixes.append("]"); if (interfaceRoutePrefixesList.size() > 0) { paramsMap.put(key + UNDERSCORE + networkKey + "_route_prefixes", sbInterfaceRoutePrefixes.toString()); @@ -419,7 +443,7 @@ public class VnfAdapterVfModuleObjectMapper { } } } - + private void buildVfModuleSriovParameters(Map paramsMap, GenericResourceApiVmNetworkData network, String networkKey) { // SRIOV Parameters GenericResourceApiVmnetworkdataSriovParameters sriovParameters = network.getSriovParameters(); @@ -430,14 +454,14 @@ public class VnfAdapterVfModuleObjectMapper { StringBuilder sriovFilterBuf = new StringBuilder(); if (heatVlanFiltersList != null) { for(int a = 0; a < heatVlanFiltersList.size(); a++){ - String heatVlanFilterValue = heatVlanFiltersList.get(a); + String heatVlanFilterValue = heatVlanFiltersList.get(a); if (a != heatVlanFiltersList.size() - 1) { sriovFilterBuf.append(heatVlanFilterValue).append(","); } else { - sriovFilterBuf.append(heatVlanFilterValue); + sriovFilterBuf.append(heatVlanFilterValue); } - } + } if (heatVlanFiltersList.size() > 0) { paramsMap.put(networkKey + "_ATT_VF_VLAN_FILTER", sriovFilterBuf.toString()); } @@ -445,13 +469,13 @@ public class VnfAdapterVfModuleObjectMapper { } } } - + private void buildVfModuleNetworkInformation(Map paramsMap, GenericResourceApiVmNetworkData network, String key, String networkKey) { - + GenericResourceApiVmnetworkdataNetworkInformationItems networkInformationItems = network.getNetworkInformationItems(); StringBuilder sbIpv4Ips = new StringBuilder(); StringBuilder sbIpv6Ips = new StringBuilder(); - + if (networkInformationItems != null) { List networkInformationItemList = networkInformationItems.getNetworkInformationItem(); if (networkInformationItemList != null) { @@ -461,7 +485,7 @@ public class VnfAdapterVfModuleObjectMapper { GenericResourceApiVmnetworkdataNetworkinformationitemsNetworkinformationitemNetworkIps ips = ipAddress.getNetworkIps(); if (ips != null) { List ipsList = ips.getNetworkIp(); - if (ipsList != null) { + if (ipsList != null) { String ipVersion = ipAddress.getIpVersion(); for (int b = 0; b < ipsList.size(); b++) { String ipAddressValue = ipsList.get(b); @@ -472,7 +496,7 @@ public class VnfAdapterVfModuleObjectMapper { else { sbIpv4Ips.append(ipAddressValue); } - paramsMap.put(key + UNDERSCORE + networkKey + IP + UNDERSCORE + b, ipAddressValue); + paramsMap.put(key + UNDERSCORE + networkKey + IP + UNDERSCORE + b, ipAddressValue); } else if (ipVersion.equals("ipv6")) { if (b != ipsList.size() - 1) { @@ -481,11 +505,11 @@ public class VnfAdapterVfModuleObjectMapper { else { sbIpv6Ips.append(ipAddressValue); } - paramsMap.put(key + UNDERSCORE + networkKey + V6_IP + UNDERSCORE + b, ipAddressValue); - } + paramsMap.put(key + UNDERSCORE + networkKey + V6_IP + UNDERSCORE + b, ipAddressValue); + } } paramsMap.put(key + UNDERSCORE + networkKey + "_ips", sbIpv4Ips.toString()); - paramsMap.put(key + UNDERSCORE + networkKey + "_v6_ips", sbIpv6Ips.toString()); + paramsMap.put(key + UNDERSCORE + networkKey + "_v6_ips", sbIpv6Ips.toString()); } } } @@ -493,43 +517,43 @@ public class VnfAdapterVfModuleObjectMapper { } } } - + /* * Build Mapping from GenericResourceApi SDNC for Heat Template so that AIC - PO gets accurate requests for vf module assignments. * Build Count of SubInterfaces, VLAN Tag, network_name, network_id, * ip_address (V4 and V6) and Floating IPs Addresses (V4 and V6) for Heat Template - */ + */ private void buildParamsMapFromVfModuleForHeatTemplate(Map paramsMap, GenericResourceApiVmTopologyData vm) { GenericResourceApiVmtopologydataVmNames vmNames = vm.getVmNames(); - + if (vmNames != null) { - + List vnfcNamesList = vmNames.getVnfcNames(); if (vnfcNamesList != null) { - + for(int i = 0; i < vnfcNamesList.size(); i++){ - + GenericResourceApiVmtopologydataVmnamesVnfcNames vnfcNames = vnfcNamesList.get(i); parseVnfcNamesData(paramsMap, vnfcNames); } } } } - + /* * Parse vnfcNames data to build Mapping from GenericResourceApi SDNC for Heat Template. - */ + */ private void parseVnfcNamesData(Map paramsMap, GenericResourceApiVmtopologydataVmnamesVnfcNames vnfcNames) { - + if (vnfcNames != null) { GenericResourceApiVnfcNetworkData vnfcNetworks = vnfcNames.getVnfcNetworks(); if (vnfcNetworks != null) { List vnfcNetworkdataList = vnfcNetworks.getVnfcNetworkData(); - + if (vnfcNetworkdataList != null) { - + for(int networkDataIdx = 0; networkDataIdx < vnfcNetworkdataList.size(); networkDataIdx++){ - + GenericResourceApiVnfcnetworkdataVnfcNetworkData vnfcNetworkdata = vnfcNetworkdataList.get(networkDataIdx); parseVnfcNetworkData(paramsMap, vnfcNetworkdata, networkDataIdx); } @@ -537,72 +561,72 @@ public class VnfAdapterVfModuleObjectMapper { } } } - + /* * Parse VnfcNetworkData to build Mapping from GenericResourceApi SDNC for Heat Template. * Build Count of SubInterfaces, VLAN Tag, network_name, network_id, * ip_address (V4 and V6) and Floating IPs Addresses (V4 and V6) for Heat Template - */ + */ private void parseVnfcNetworkData(Map paramsMap, GenericResourceApiVnfcnetworkdataVnfcNetworkData vnfcNetworkdata, int networkDataIdx) { - + String vmTypeKey = vnfcNetworkdata.getVnfcType(); GenericResourceApiVnfcnetworkdataVnfcnetworkdataVnfcPorts vnfcPorts = vnfcNetworkdata.getVnfcPorts(); if (vnfcPorts != null) { - List vnfcPortList = vnfcPorts.getVnfcPort(); - if (vnfcPortList != null) { + List vnfcPortList = vnfcPorts.getVnfcPort(); + if (vnfcPortList != null) { for(int portIdx = 0; portIdx < vnfcPortList.size(); portIdx++){ - + GenericResourceApiVnfcnetworkdataVnfcnetworkdataVnfcportsVnfcPort vnfcPort = vnfcPortList.get(portIdx); GenericResourceApiSubInterfaceNetworkData vnicSubInterfaces = vnfcPort.getVnicSubInterfaces(); - + String vnicSubInterfacesString = convertToString(vnicSubInterfaces); - String networkRoleKey = vnfcPort.getCommonSubInterfaceRole(); + String networkRoleKey = vnfcPort.getCommonSubInterfaceRole(); String subInterfaceKey = createVnfcSubInterfaceKey(vmTypeKey, networkDataIdx, networkRoleKey, portIdx); String globalSubInterfaceKey = createGlobalVnfcSubInterfaceKey(vmTypeKey, networkRoleKey, portIdx); - + buildVfModuleSubInterfacesCount(paramsMap, globalSubInterfaceKey, vnicSubInterfaces); - + buildVfModuleVlanTag(paramsMap, subInterfaceKey, vnicSubInterfacesString); - + buildVfModuleNetworkName(paramsMap, subInterfaceKey, vnicSubInterfacesString); - + buildVfModuleNetworkId(paramsMap, subInterfaceKey, vnicSubInterfacesString); - + buildVfModuleIpV4AddressHeatTemplate(paramsMap, subInterfaceKey, vnicSubInterfacesString); - + buildVfModuleIpV6AddressHeatTemplate(paramsMap, subInterfaceKey, vnicSubInterfacesString); - + buildVfModuleFloatingIpV4HeatTemplate(paramsMap, globalSubInterfaceKey, vnicSubInterfacesString); - + buildVfModuleFloatingIpV6HeatTemplate(paramsMap, globalSubInterfaceKey, vnicSubInterfacesString); } } } } - + /* * Build "count" (calculating the total number of sub-interfaces) for Heat Template * Building Criteria : {vm-type}_subint_{network-role}_port_{index}_subintcount * vmTypeKey = vm-type, networkRoleKey = common-sub-interface-role * Example: fw_subint_ctrl_port_0_subintcount - * + * */ private void buildVfModuleSubInterfacesCount(Map paramsMap, String keyPrefix, GenericResourceApiSubInterfaceNetworkData vnicSubInterfaces) { List subInterfaceNetworkDataList = vnicSubInterfaces.getSubInterfaceNetworkData(); - + if ( (subInterfaceNetworkDataList != null) && !subInterfaceNetworkDataList.isEmpty() ) { addPairToMap(paramsMap, keyPrefix, SUB_INT_COUNT, String.valueOf(subInterfaceNetworkDataList.size())); } } - + protected String createVnfcSubInterfaceKey(String vmTypeKey, int networkDataIdx, String networkRoleKey, int portIdx) { - + return Joiner.on(UNDERSCORE).join(Arrays.asList(vmTypeKey, networkDataIdx, SUB_INT, networkRoleKey, PORT, portIdx)); } - + protected String createGlobalVnfcSubInterfaceKey(String vmTypeKey,String networkRoleKey, int portIdx) { - + return Joiner.on(UNDERSCORE).join(Arrays.asList(vmTypeKey, SUB_INT, networkRoleKey, PORT, portIdx)); } @@ -611,10 +635,10 @@ public class VnfAdapterVfModuleObjectMapper { * Building Criteria : {vm-type}_{index}_subint_{network-role}_port_{index}_vlan_ids * vmTypeKey = vm-type, networkRoleKey = common-sub-interface-role * Example: fw_0_subint_ctrl_port_0_vlan_ids - * + * */ protected void buildVfModuleVlanTag(Map paramsMap, String keyPrefix, String vnicSubInterfaces) { - + List vlanTagIds = jsonPath.locateResultList(vnicSubInterfaces, "$.sub-interface-network-data[*].vlan-tag-id"); addPairToMap(paramsMap, keyPrefix, VLAN_IDS, vlanTagIds); @@ -624,12 +648,12 @@ public class VnfAdapterVfModuleObjectMapper { * Building Criteria : {vm-type}_{index}_subint_{network-role}_port_{index}_net_names * vmTypeKey = vm-type, networkRoleKey = common-sub-interface-role * Example: fw_0_subint_ctrl_port_0_net_names - * + * */ protected void buildVfModuleNetworkName(Map paramsMap, String keyPrefix, String vnicSubInterfaces) { - + List neworkNames = jsonPath.locateResultList(vnicSubInterfaces, "$.sub-interface-network-data[*].network-name"); - + addPairToMap(paramsMap, keyPrefix, NET_NAMES, neworkNames); } @@ -638,25 +662,25 @@ public class VnfAdapterVfModuleObjectMapper { * Building Criteria : {vm-type}_{index}_subint_{network-role}_port_{index}_net_ids * vmTypeKey = vm-type, networkRoleKey = common-sub-interface-role * Example: fw_0_subint_ctrl_port_0_net_ids - * + * */ protected void buildVfModuleNetworkId(Map paramsMap, String keyPrefix, String vnicSubInterfaces) { - + List neworkIds = jsonPath.locateResultList(vnicSubInterfaces, "$.sub-interface-network-data[*].network-id"); - + addPairToMap(paramsMap, keyPrefix, NET_IDS, neworkIds); } - + /* * Build ip_address for V4 for Heat Template - * Building Criteria : + * Building Criteria : * {vm-type}_{index}_subint_{network-role}_port_{index}_ip_{index} -- for ipV4 * key = vm-type, networkRoleKey = NetWork-Role */ protected void buildVfModuleIpV4AddressHeatTemplate(Map paramsMap, String keyPrefix, String vnicSubInterfaces) { - + List ipv4Ips = jsonPath.locateResultList(vnicSubInterfaces, "$.sub-interface-network-data[*].network-information-items.network-information-item[?(@.ip-version == 'ipv4')].network-ips.network-ip[*]"); - + addPairToMap(paramsMap, keyPrefix, IP, ipv4Ips); for (int i = 0; i < ipv4Ips.size(); i++) { @@ -664,15 +688,15 @@ public class VnfAdapterVfModuleObjectMapper { } } - + /* * Build ip_address for Heat Template - * Building Criteria : + * Building Criteria : * {vm-type}_{index}_subint_{network-role}_port_{index}_v6_ip_{index} -- for ipV6 * key = vm-type, networkRoleKey = NetWork-Role */ protected void buildVfModuleIpV6AddressHeatTemplate(Map paramsMap, String keyPrefix, String vnicSubInterfaces) { - + List ipv6Ips = jsonPath.locateResultList(vnicSubInterfaces, "$.sub-interface-network-data[*].network-information-items.network-information-item[?(@.ip-version == 'ipv6')].network-ips.network-ip[*]"); addPairToMap(paramsMap, keyPrefix, V6_IP, ipv6Ips); @@ -681,14 +705,14 @@ public class VnfAdapterVfModuleObjectMapper { addPairToMap(paramsMap, keyPrefix, V6_IP + UNDERSCORE + i, ipv6Ips.get(i)); } } - + /* * Build floatingip_address for Heat Template - * Building Criteria : + * Building Criteria : * {vm-type}_subint_{network-role}_port_{index}_floating_ip -- for ipV4 */ protected void buildVfModuleFloatingIpV4HeatTemplate(Map paramsMap, String keyPrefix, String vnicSubInterfaces) { - + List floatingV4 = jsonPath.locateResultList(vnicSubInterfaces, "$.sub-interface-network-data[*].floating-ips.floating-ip-v4[*]"); if (!floatingV4.isEmpty()) { @@ -697,35 +721,35 @@ public class VnfAdapterVfModuleObjectMapper { addPairToMap(paramsMap, keyPrefix, FLOATING_IP, floatingV4); } - + /* * Build floatingip_address for Heat Template - * Building Criteria : + * Building Criteria : * {vm-type}_subint_{network-role}_port_{index}_floating_v6_ip -- for ipV6 */ protected void buildVfModuleFloatingIpV6HeatTemplate(Map paramsMap, String keyPrefix, String vnicSubInterfaces) { - + List floatingV6 = jsonPath.locateResultList(vnicSubInterfaces, "$.sub-interface-network-data[*].floating-ips.floating-ip-v6[*]"); - + if (!floatingV6.isEmpty()) { floatingV6 = Collections.singletonList(floatingV6.get(0)); } addPairToMap(paramsMap, keyPrefix, FLOATING_V6_IP, floatingV6); } - + protected void addPairToMap(Map paramsMap, String keyPrefix, String key, String value) { - + addPairToMap(paramsMap, keyPrefix, key, Collections.singletonList(value)); } protected void addPairToMap(Map paramsMap, String keyPrefix, String key, List value) { - + if (!value.isEmpty()) { paramsMap.put(keyPrefix + key, Joiner.on(",").join(value)); } } - - private void buildParamsMapFromSdncParams(Map paramsMap, GenericResourceApiParam parametersData) { + + private void buildParamsMapFromSdncParams(Map paramsMap, GenericResourceApiParam parametersData) { if (parametersData != null) { List paramsList = parametersData.getParam(); if (paramsList != null) { @@ -736,20 +760,20 @@ public class VnfAdapterVfModuleObjectMapper { String parameterValue = param.getValue(); paramsMap.put(parameterName, parameterValue); } - } + } } - } + } } - + private Map buildNetworkRoleMap(GenericResourceApiVfmoduletopologyVfModuleTopology vfModuleTopology) throws JsonParseException, JsonMappingException, IOException { - Map networkRoleMap = new HashMap<>(); + Map networkRoleMap = new HashMap<>(); GenericResourceApiVfmoduleassignmentsVfModuleAssignments vfModuleAssignments = vfModuleTopology.getVfModuleAssignments(); - if (vfModuleAssignments != null) { + if (vfModuleAssignments != null) { GenericResourceApiVfmoduleassignmentsVfmoduleassignmentsVms vms = vfModuleAssignments.getVms(); if (vms != null) { List vmsList = vms.getVm(); if (vmsList != null) { - for (GenericResourceApiVmTopologyData vm : vmsList){ + for (GenericResourceApiVmTopologyData vm : vmsList){ GenericResourceApiVmtopologydataVmNetworks vmNetworks = vm.getVmNetworks(); if (vmNetworks != null) { List vmNetworksList = vmNetworks.getVmNetwork(); @@ -771,8 +795,8 @@ public class VnfAdapterVfModuleObjectMapper { } return networkRoleMap; } - - public DeleteVfModuleRequest deleteVfModuleRequestMapper(RequestContext requestContext,CloudRegion cloudRegion, + + public DeleteVfModuleRequest deleteVfModuleRequestMapper(RequestContext requestContext,CloudRegion cloudRegion, ServiceInstance serviceInstance, GenericVnf genericVnf, VfModule vfModule) throws IOException { DeleteVfModuleRequest deleteVfModuleRequest = new DeleteVfModuleRequest(); @@ -787,20 +811,20 @@ public class VnfAdapterVfModuleObjectMapper { { deleteVfModuleRequest.setVfModuleStackId(vfModule.getVfModuleName()); } - + deleteVfModuleRequest.setSkipAAI(true); setIdAndUrl(deleteVfModuleRequest); - MsoRequest msoRequest = buildMsoRequest(requestContext, serviceInstance); + MsoRequest msoRequest = buildMsoRequest(requestContext, serviceInstance); deleteVfModuleRequest.setMsoRequest(msoRequest); return deleteVfModuleRequest; } - + protected void setIdAndUrl(DeleteVfModuleRequest deleteVfModuleRequest) throws UnsupportedEncodingException{ String messageId = vnfAdapterObjectMapperUtils.getRandomUuid(); - deleteVfModuleRequest.setMessageId(messageId); + deleteVfModuleRequest.setMessageId(messageId); deleteVfModuleRequest.setNotificationUrl(vnfAdapterObjectMapperUtils.createCallbackUrl("VNFAResponse", messageId)); } - + private String convertToString(Object obj) { String json; try { @@ -808,10 +832,10 @@ public class VnfAdapterVfModuleObjectMapper { } catch (JsonProcessingException e) { json = "{}"; } - + return json; } - + private VfModule getBaseVfModule(GenericVnf genericVnf) { List vfModules = genericVnf.getVfModules(); VfModule baseVfModule = null; @@ -819,7 +843,7 @@ public class VnfAdapterVfModuleObjectMapper { for(int i = 0; i < vfModules.size(); i++) { if (vfModules.get(i).getModelInfoVfModule().getIsBaseBoolean()) { baseVfModule = vfModules.get(i); - break; + break; } } } -- cgit 1.2.3-korg