summaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorMax Benjamin <max.benjamin@att.com>2021-03-04 16:40:21 +0000
committerGerrit Code Review <gerrit@onap.org>2021-03-04 16:40:21 +0000
commit6f850ed046028a5713a393c945bd733adb62a417 (patch)
treeff6a517b051e37845d91a307bb35691b4f4a2e7f /bpmn
parent8f5a919f24909dcd61c4a4b65e5a53e8d5053cda (diff)
parentdaf0b6edbce77e0a5de849ebff5c698993f9c372 (diff)
Merge "create protected method for vf module bb logic"
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java22
1 files changed, 13 insertions, 9 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
index 7c283ab153..5cbadd6b75 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
@@ -410,15 +410,7 @@ public class BBInputSetup implements JavaDelegate {
parameter.getLookupKeyMap().put(ResourceKey.VOLUME_GROUP_ID, parameter.getResourceId());
this.populateVolumeGroup(parameter);
} else if (modelType.equals(ModelType.vfModule)) {
- if (parameter.getBbName().contains("Configuration")) {
- parameter.setResourceId(parameter.getLookupKeyMap().get(ResourceKey.CONFIGURATION_ID));
- parameter.getModelInfo().setModelCustomizationUuid(parameter.getConfigurationKey());
- populateConfiguration(parameter);
- } else {
- parameter.getLookupKeyMap().put(ResourceKey.VF_MODULE_ID, parameter.getResourceId());
- parameter.setCloudConfiguration(parameter.getRequestDetails().getCloudConfiguration());
- this.populateVfModule(parameter);
- }
+ populateVfModuleOnAssignAndCreateFlows(parameter);
} else if (modelType.equals(ModelType.instanceGroup)) {
parameter.getLookupKeyMap().put(ResourceKey.INSTANCE_GROUP_ID, parameter.getResourceId());
this.populateInstanceGroup(parameter);
@@ -435,6 +427,18 @@ public class BBInputSetup implements JavaDelegate {
parameter.getServiceInstance().getInstanceGroups().add(instanceGroup);
}
+ protected void populateVfModuleOnAssignAndCreateFlows(BBInputSetupParameter parameter) throws Exception {
+ if (parameter.getBbName().contains("Configuration")) {
+ parameter.setResourceId(parameter.getLookupKeyMap().get(ResourceKey.CONFIGURATION_ID));
+ parameter.getModelInfo().setModelCustomizationUuid(parameter.getConfigurationKey());
+ populateConfiguration(parameter);
+ } else {
+ parameter.getLookupKeyMap().put(ResourceKey.VF_MODULE_ID, parameter.getResourceId());
+ parameter.setCloudConfiguration(parameter.getRequestDetails().getCloudConfiguration());
+ this.populateVfModule(parameter);
+ }
+ }
+
protected void mapCatalogInstanceGroup(InstanceGroup instanceGroup, ModelInfo modelInfo, Service service) {
// @TODO: this will populate the instanceGroup model info.
// Dependent on MSO-5821 653458 US - MSO - Enhance Catalog DB Schema & Adapter