diff options
8 files changed, 224 insertions, 14 deletions
diff --git a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java index 25e086c59b..f6691a4789 100644 --- a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java +++ b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/BpmnInstanceRequest.java @@ -13,6 +13,9 @@ public class BpmnInstanceRequest { @JsonProperty(value = "modelVersionId") private String modelVersionId; + @JsonProperty(value = "k8sRBInstanceReleaseName") + private String k8sRBInstanceReleaseName; + @JsonProperty(value = "k8sRBProfileName") private String k8sRBProfileName; @@ -52,6 +55,14 @@ public class BpmnInstanceRequest { this.k8sRBProfileName = k8sRBProfileName; } + public String getK8sRBInstanceReleaseName() { + return k8sRBInstanceReleaseName; + } + + public void setK8sRBInstanceReleaseName(String k8sRBInstanceReleaseName) { + this.k8sRBInstanceReleaseName = k8sRBInstanceReleaseName; + } + public String getCloudRegionId() { return cloudRegionId; } diff --git a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java index b1719cbd7d..20af63e886 100644 --- a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java +++ b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/model/MulticloudInstanceRequest.java @@ -26,7 +26,7 @@ public class MulticloudInstanceRequest { private Map<String, String> overrideValues; @JsonProperty(value = "release-name") - private String vfModuleUuid; + private String releaseName; public String getCloudRegion() { return cloudRegion; @@ -76,12 +76,12 @@ public class MulticloudInstanceRequest { this.overrideValues = overrideValues; } - public String getVfModuleUuid() { - return vfModuleUuid; + public String getReleaseName() { + return releaseName; } - public void setVfModuleUuid(String vfModuleUuid) { - this.vfModuleUuid = vfModuleUuid; + public void setReleaseName(String releaseName) { + this.releaseName = releaseName; } } diff --git a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java index a134bace1f..9f02c53a99 100644 --- a/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java +++ b/adapters/mso-cnf-adapter/src/main/java/org/onap/so/adapters/cnf/service/CnfAdapterService.java @@ -90,7 +90,12 @@ public class CnfAdapterService { multicloudInstanceRequest.setProfileName(bpmnInstanceRequest.getK8sRBProfileName()); multicloudInstanceRequest.setRbName(bpmnInstanceRequest.getModelInvariantId()); multicloudInstanceRequest.setRbVersion(bpmnInstanceRequest.getModelVersionId()); - multicloudInstanceRequest.setVfModuleUuid(bpmnInstanceRequest.getVfModuleUUID()); + + if (bpmnInstanceRequest.getK8sRBInstanceReleaseName() != null) + multicloudInstanceRequest.setReleaseName(bpmnInstanceRequest.getK8sRBInstanceReleaseName()); + else + multicloudInstanceRequest.setReleaseName( + bpmnInstanceRequest.getK8sRBProfileName() + "-" + bpmnInstanceRequest.getVfModuleUUID()); } else { logger.error("k8sProfileName should not be null"); // return instanceResponse; diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java index 2bb383e4ec..90e23e1524 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupMapperLayer.java @@ -96,6 +96,7 @@ import java.util.Optional; @Component("BBInputSetupMapperLayer") public class BBInputSetupMapperLayer { + private static final String USER_PARAM_NAME_KEY = "name"; private static final String USER_PARAM_VALUE_KEY = "value"; @@ -103,6 +104,20 @@ public class BBInputSetupMapperLayer { private ModelMapper modelMapper = new ModelMapper(); + public BBInputSetupMapperLayer() { + initPnfTypeMaps(); + } + + private void initPnfTypeMaps() { + modelMapper.typeMap(org.onap.aai.domain.yang.Pnf.class, Pnf.class) + .addMappings(mapper -> mapper.<String>map(src -> src.getModelCustomizationId(), + (dest, v) -> dest.getModelInfoPnf().setModelCustomizationUuid(v))) + .addMappings(mapper -> mapper.<String>map(src -> src.getModelInvariantId(), + (dest, v) -> dest.getModelInfoPnf().setModelInvariantUuid(v))) + .addMappings(mapper -> mapper.<String>map(src -> src.getModelVersionId(), + (dest, v) -> dest.getModelInfoPnf().setModelUuid(v))); + } + public Customer mapAAICustomer(org.onap.aai.domain.yang.Customer customerAAI) { return modelMapper.map(customerAAI, Customer.class); } @@ -215,10 +230,11 @@ public class BBInputSetupMapperLayer { protected ModelInfoInstanceGroup mapCatalogInstanceGroupToInstanceGroup( CollectionResourceCustomization collectionCust, InstanceGroup instanceGroup) { ModelInfoInstanceGroup modelInfoInstanceGroup = modelMapper.map(instanceGroup, ModelInfoInstanceGroup.class); - if (instanceGroup.getType() != null && instanceGroup.getType().equals(InstanceGroupType.L3_NETWORK)) + if (instanceGroup.getType() != null && instanceGroup.getType().equals(InstanceGroupType.L3_NETWORK)) { modelInfoInstanceGroup.setType(ModelInfoInstanceGroup.TYPE_L3_NETWORK); - else + } else { modelInfoInstanceGroup.setType(ModelInfoInstanceGroup.TYPE_VNFC); + } if (collectionCust != null) { List<CollectionResourceInstanceGroupCustomization> instanceGroupCustList = instanceGroup.getCollectionInstanceGroupCustomizations(); @@ -434,10 +450,12 @@ public class BBInputSetupMapperLayer { protected CloudRegion mapCloudRegion(CloudConfiguration cloudConfiguration, org.onap.aai.domain.yang.CloudRegion aaiCloudRegion) { CloudRegion cloudRegion = new CloudRegion(); - if (cloudConfiguration != null) + if (cloudConfiguration != null) { cloudRegion = modelMapper.map(cloudConfiguration, CloudRegion.class); - if (aaiCloudRegion != null) + } + if (aaiCloudRegion != null) { modelMapper.map(aaiCloudRegion, cloudRegion); + } return cloudRegion; } diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/PnfExpected.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/PnfExpected.json index 460f72aa31..e47f4bac22 100644 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/PnfExpected.json +++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/PnfExpected.json @@ -4,5 +4,9 @@ "nf-role":"gNB", "orchestration-status":"INVENTORIED", "cloud-region":null, - "model-info-pnf":null + "model-info-pnf": { + "model-customization-uuid": "model-customization-uuid", + "model-invariant-uuid": "model-invariant-uuid", + "model-uuid": "model-uuid" + } }
\ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiPnfInput.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiPnfInput.json index da0039c923..1b51355906 100644 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiPnfInput.json +++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/aaiPnfInput.json @@ -26,9 +26,9 @@ "nfRole":"gNB", "adminStatus":null, "operationalStatus":null, - "modelCustomizationId":null, - "modelInvariantId":null, - "modelVersionId":null, + "modelCustomizationId":"model-customization-uuid", + "modelInvariantId":"model-invariant-uuid", + "modelVersionId":"model-uuid", "pnfIpv4Address":null, "pnfIpv6Address":null, "softwareVersions":null, diff --git a/docs/release-notes.rst b/docs/release-notes.rst index 3d4d041643..f2c6a8331a 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -14,6 +14,139 @@ The SO provides the highest level of service orchestration in the ONAP architect Release Notes ============= +Version: 1.7.12 +============== + +:Release Date: 2021-04-27 + +SO Release Image Versions +-------------------------- + - so-bpmn-infra + + :Version: 1.7.12 + + - so-catalog-db-adapter + + :Version: 1.7.12 + + - so-monitoring + + :Version: 1.7.12 + + - so/nssmf-adapter + + :Version: 1.7.12 + + - so/openstack-adapter + + :Version: 1.7.12 + + - so/request-db-adapter + + :Version: 1.7.12 + + - so/sdc-controller + + :Version: 1.7.12 + + - so/sdnc-adapter + + :Version: 1.7.12 + + - so/vnfm-adapter + + :Version: 1.7.12 + + - so/api-handler-infra + + :Version: 1.7.12 + + - so/api-handler-infra + + :Version: 1.7.12 + + - so/so-etsi-nfvo-ns-lcm + + :Version: 1.7.12 + + - so/so-oof-adapter + + :Version: 1.7.12 + + - so/cnf-adapter + + :Version: 1.7.12 + +Release Purpose +---------------- +SO Guilin maintenance Release + +**Epics** + + N/A + +**Stories** + + N/A + +**Tasks** + + N/A + +**Bug Fixes** + +* `SO-3401 <https://jira.onap.org/browse/SO-3401>`_ +* `SO-3484 <https://jira.onap.org/browse/SO-3484>`_ +* `SO-3397 <https://jira.onap.org/browse/SO-3397>`_ +* `SO-3465 <https://jira.onap.org/browse/SO-3465>`_ +* `SO-3470 <https://jira.onap.org/browse/SO-3470>`_ +* `SO-3484 <https://jira.onap.org/browse/SO-3484>`_ +* `SO-3607 <https://jira.onap.org/browse/SO-3607>`_ +* `SO-3609 <https://jira.onap.org/browse/SO-3609>`_ +* `SO-3432 <https://jira.onap.org/browse/SO-3432>`_ +* `SO-3401 <https://jira.onap.org/browse/SO-3401>`_ +* `SO-3468 <https://jira.onap.org/browse/SO-3468>`_ + + +Security Notes +-------------- + +*Fixed Security Issues* + + N/A + +*Known Security Issues* + +* `SO-3237 <https://jira.onap.org/browse/SO-SO-3237>`_ - Exposed HTTP port. + +*Known Vulnerabilities in Used Modules* + + N/A + +Quick Links: + +- `SO project page <https://wiki.onap.org/display/DW/Service+Orchestrator+Project>`__ +- `Passing Badge information for SDC <https://bestpractices.coreinfrastructure.org/en/projects/1702>`__ + +**Known Issues** + +* `SO-3237 <https://jira.onap.org/browse/SO-SO-3237>`_ - Exposed HTTP port. + +**Upgrade Notes** + + N/A + +**Deprecation Notes** + + SO modules Ve-Vnfm-adapter and appc-orchestrator are deprectaed for the Guilin release. + +**Other** + + N/A +*************************************************************************************** + + + Version: 1.7.10 ============== diff --git a/releases/1.7.12.yaml b/releases/1.7.12.yaml new file mode 100644 index 0000000000..e5de7eeccf --- /dev/null +++ b/releases/1.7.12.yaml @@ -0,0 +1,39 @@ +--- +distribution_type: 'container' +container_release_tag: '1.7.12' +project: 'so' +log_dir: 'so-maven-docker-stage-guilin/160/' +ref: '2aefbb9e2ca30af1f9cba3f5cb8f88937e01c5d2' +containers: + - name: 'so/vnfm-adapter' + version: '1.7.8-20210426T1747' + - name: 'so/catalog-db-adapter' + version: '1.7.8-20210426T1747' + - name: 'so/request-db-adapter' + version: '1.7.8-20210426T1747' + - name: 'so/openstack-adapter' + version: '1.7.8-20210426T1747' + - name: 'so/sdnc-adapter' + version: '1.7.8-20210426T1747' + - name: 'so/vfc-adapter' + version: '1.7.8-20210426T1747' + - name: 'so/sdc-controller' + version: '1.7.8-20210426T1747' + - name: 'so/bpmn-infra' + version: '1.7.8-20210426T1747' + - name: 'so/so-monitoring' + version: '1.7.8-20210426T1747' + - name: 'so/api-handler-infra' + version: '1.7.8-20210426T1747' + - name: 'so/nssmf-adapter' + version: '1.7.8-20210426T1747' + - name: 'so/mso-cnf-adapter' + version: '1.7.8-20210426T1747' + - name: 'so/so-oof-adapter' + version: '1.7.8-20210426T1747' + - name: 'so/so-etsi-nfvo-ns-lcm' + version: '1.7.8-20210426T1747' + - name: 'so/so-appc-orchestrator' + version: '1.7.8-20210426T1747' + - name: 'so/so-simulator' + version: '1.7.8-20210426T1747' |