diff options
author | Ittay Stern <ittay.stern@att.com> | 2019-01-10 12:42:59 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-01-10 12:42:59 +0000 |
commit | 659874df80409170e57b6dd6197eb3a81eb3468e (patch) | |
tree | 08e79fd57aa0ed299586fd88f69f87a5a2f5ded1 /vid-app-common/src/main/java/org/onap/vid/model/Group.java | |
parent | 143784a849ece4fc35cc290e33f829b72bf1fc79 (diff) | |
parent | 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (diff) |
Merge "Merge from ECOMP's repository"
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/model/Group.java')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/model/Group.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/Group.java b/vid-app-common/src/main/java/org/onap/vid/model/Group.java index 5f98341d..3da15879 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/Group.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/Group.java @@ -1,11 +1,13 @@ package org.onap.vid.model; import org.onap.vid.asdc.beans.tosca.Input; -import org.onap.vid.asdc.parser.ToscaParserImpl2; +import org.onap.vid.asdc.parser.ToscaParserImpl2.Constants; import java.util.Map; -public class Group { +import static org.onap.vid.asdc.parser.ToscaParserImpl2.isModuleTypeIsBaseObjectSafe; + +public class Group implements MinimalNode { /** The uuid. */ @@ -182,7 +184,11 @@ public class Group { protected static GroupProperties extractPropertiesForGroup(org.onap.vid.asdc.beans.tosca.Group group){ - String [] propertyKeys = {ToscaParserImpl2.Constants.MIN_VF_MODULE_INSTANCES, ToscaParserImpl2.Constants.MAX_VF_MODULE_INSTANCES, ToscaParserImpl2.Constants.INITIAL_COUNT}; + String [] propertyKeys = { + Constants.MIN_VF_MODULE_INSTANCES, + Constants.MAX_VF_MODULE_INSTANCES, + Constants.INITIAL_COUNT, + }; GroupProperties groupProperties = new GroupProperties(); for(String propertyKey : propertyKeys){ @@ -191,18 +197,21 @@ public class Group { setInGroupProperties(groupProperties, propertyKey, (Integer) val); } } + + groupProperties.setBaseModule(isModuleTypeIsBaseObjectSafe(group.getProperties().get(Constants.VF_MODULE_TYPE))); + return groupProperties; } private static void setInGroupProperties(GroupProperties groupProperties, String propertyKey, Integer propertyValue){ switch (propertyKey) { - case ToscaParserImpl2.Constants.MIN_VF_MODULE_INSTANCES: + case Constants.MIN_VF_MODULE_INSTANCES: groupProperties.setMinCountInstances(propertyValue); break; - case ToscaParserImpl2.Constants.MAX_VF_MODULE_INSTANCES: + case Constants.MAX_VF_MODULE_INSTANCES: groupProperties.setMaxCountInstances(propertyValue); break; - case ToscaParserImpl2.Constants.INITIAL_COUNT: + case Constants.INITIAL_COUNT: groupProperties.setInitialCount(propertyValue); break; default: |