aboutsummaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/main/java/org/onap
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-12-12 16:20:59 +0000
committerGerrit Code Review <gerrit@onap.org>2019-12-12 16:20:59 +0000
commitca8f3583c919bc5ce2d66c7f783f7dce4cf5a955 (patch)
tree8635167061ea830d2ae5de74c75fda82fc6f66c1 /vid-app-common/src/main/java/org/onap
parente90eb82a3d10dfd2675b78dfd5ef2abce1a49e9d (diff)
parentaa283f736b1892426303582d141d3d12cb19b162 (diff)
Merge changes from topics "VID-45", "VID-44"
* changes: Merge this if statement with the enclosing one. Merge this if statement with the enclosing one.
Diffstat (limited to 'vid-app-common/src/main/java/org/onap')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java b/vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java
index 1c8a465cb..45478e20f 100644
--- a/vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java
+++ b/vid-app-common/src/main/java/org/onap/vid/model/ServiceModel.java
@@ -360,12 +360,10 @@ public class ServiceModel {
" Associated VF Module customizationName=" + vfModuleComponent.getKey() + " with VNF customization name=" + vnfCustomizationName);
// now find if this vf module has volume groups, if so, find the volume group with the same customization name and put it under the VNF
- if ( vfModuleComponent.getValue().isVolumeGroupAllowed() ) {
- if (isVolumeGroupsContainsVfModuleCustomName(vfModuleCustomizationName)) {
+ if ( vfModuleComponent.getValue().isVolumeGroupAllowed() && isVolumeGroupsContainsVfModuleCustomName(vfModuleCustomizationName) ) {
(vnfComponent.getValue().getVolumeGroups()).put(vfModuleCustomizationName, (getVolumeGroups()).get(vfModuleCustomizationName));
}
}
- }
private boolean isVolumeGroupsContainsVfModuleCustomName(String vfModuleCustomizationName) {
return (!MapUtils.isEmpty(getVolumeGroups())) && (getVolumeGroups().containsKey((vfModuleCustomizationName)));