From e601bbdc43bae9a08e2e10c5139a6f76b47860d7 Mon Sep 17 00:00:00 2001 From: Einat Vinouze Date: Tue, 16 Jul 2019 17:17:36 +0300 Subject: Implant vid-app-common org.onap.vid.job (main and test) Issue-ID: VID-378 Change-Id: I41b0bdc2c4e3635f3f3319b1cd63cefc61912dfc Signed-off-by: Einat Vinouze Signed-off-by: Ittay Stern --- .../src/main/java/org/onap/vid/model/aaiTree/Vnf.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'vid-app-common/src/main/java/org/onap/vid/model/aaiTree/Vnf.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/Vnf.java b/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/Vnf.java index 03c1508f9..2df5bdcf6 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/Vnf.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/Vnf.java @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,21 +20,19 @@ package org.onap.vid.model.aaiTree; -import org.onap.vid.aai.util.AAITreeConverter; -import org.onap.vid.services.AAITreeNodeBuilder; +import static org.onap.vid.aai.util.AAITreeConverter.VNF_TYPE; import java.util.HashMap; import java.util.Map; -import static org.onap.vid.aai.util.AAITreeConverter.VNF_TYPE; - public class Vnf extends Node { private Map> vfModules = new HashMap<>(); private Map networks = new HashMap<>(); public Vnf(AAITreeNode node) { - super(node, AAITreeConverter.ModelType.vnf); + super(node); + fillCloudConfigurationProperties(this, node.getCloudConfiguration()); } public Map> getVfModules() { @@ -60,11 +58,11 @@ public class Vnf extends Node { } node.getChildren().forEach(child -> { - if (child.getType().equals(AAITreeNodeBuilder.VF_MODULE)) { + if (child.getType() == NodeType.VF_MODULE) { vnf.getVfModules().putIfAbsent(child.getNodeKey(), new HashMap<>()); vnf.getVfModules().get(child.getNodeKey()) - .put(child.getUniqueNodeKey(), VfModule.from(child)); - } else if (child.getType().equals(AAITreeNodeBuilder.NETWORK)) { + .put(child.getUniqueNodeKey(), VfModule.from(child)); + } else if (child.getType() == NodeType.NETWORK) { vnf.getNetworks().put(child.getUniqueNodeKey(), Network.from(child)); } }); -- cgit 1.2.3-korg