diff options
| author |   Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2018-05-23 17:55:32 +0300 |
|---|---|---|
| committer | Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2018-05-23 18:43:07 +0300 |
| commit | daa1cf9ca3d60c5e5c0313a2cb42778d3934e1dc (patch) | |
| tree | 9b510f5fe37be84f00171fce6c3ebadea0f4bbf8 /vid-app-common/src/main/java/org | |
| parent | 910d67051377e37a592f9db17a69c4e469f05369 (diff) | |
Scale out fixes
Change-Id: I189e563641d267fa082ccab726c9df7d0402c112
Issue-ID: VID-188
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
Diffstat (limited to 'vid-app-common/src/main/java/org')
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/asdc/parser/ToscaParserImpl2.java | 1 | ||||
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/model/VfModule.java | 11 |
2 files changed, 12 insertions, 0 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/parser/ToscaParserImpl2.java b/vid-app-common/src/main/java/org/onap/vid/asdc/parser/ToscaParserImpl2.java index 2200b798..e75bb306 100644 --- a/vid-app-common/src/main/java/org/onap/vid/asdc/parser/ToscaParserImpl2.java +++ b/vid-app-common/src/main/java/org/onap/vid/asdc/parser/ToscaParserImpl2.java @@ -269,6 +269,7 @@ public class ToscaParserImpl2 { vfModule.setDescription(group.getDescription()); vfModule.setInvariantUuid(group.getMetadata().getValue(Constants.vfModuleModelInvariantUUID)); vfModule.setUuid(group.getMetadata().getValue(Constants.vfModuleModelUUID)); + vfModule.setProperties(group.getProperties()); return vfModule; } diff --git a/vid-app-common/src/main/java/org/onap/vid/model/VfModule.java b/vid-app-common/src/main/java/org/onap/vid/model/VfModule.java index 9ddff8d8..f7b4d88f 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/VfModule.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/VfModule.java @@ -29,6 +29,7 @@ import java.util.Map.Entry; import org.onap.vid.asdc.beans.tosca.Group; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.sdc.toscaparser.api.Property; /** * The Class VfModule. @@ -68,6 +69,9 @@ public class VfModule { /** The model customization name. */ private String modelCustomizationName; + /** The model properties. */ + private Map<String, Property> properties; + /** * Instantiates a new vf module. */ @@ -246,6 +250,7 @@ public class VfModule { vfModule.setVersion(group.getMetadata().getVfModuleModelVersion()); vfModule.setCustomizationUuid(group.getMetadata().getVfModuleModelCustomizationUUID()); vfModule.setModelCustomizationName (modelCustomizationName); + //?vfModule.setProperties(group.getProperties()); if (group.getProperties().containsKey("volume_group")) { if (group.getProperties().get("volume_group") != null) { @@ -305,4 +310,10 @@ public class VfModule { }*/ return vfModule; } + public Map<String, Property> getProperties() { + return properties; + } + public void setProperties(Map<String, Property> properties) { + this.properties = properties; + } } |