X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=vid-app-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fvid%2Fmodel%2FaaiTree%2FRelatedVnf.java;h=febd8e0fdcd9b05ed6bd34f585f94aeb51439d92;hb=e601bbdc43bae9a08e2e10c5139a6f76b47860d7;hp=37dc45afdbf6bfc995c48e162b5c2b4d5c2879ea;hpb=76c6ee4a697617ec4cdee2f3b48bc83136c858c5;p=vid.git diff --git a/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/RelatedVnf.java b/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/RelatedVnf.java index 37dc45afd..febd8e0fd 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/RelatedVnf.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/aaiTree/RelatedVnf.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,10 +20,10 @@ package org.onap.vid.model.aaiTree; -import org.onap.vid.aai.util.AAITreeConverter; - import static org.onap.vid.aai.util.AAITreeConverter.VNF_TYPE; +import org.apache.commons.lang3.builder.ToStringBuilder; + public class RelatedVnf extends Node { private String serviceInstanceId; @@ -55,13 +55,15 @@ public class RelatedVnf extends Node { } public RelatedVnf(AAITreeNode node) { - super(node, AAITreeConverter.ModelType.vnf); + super(node); } public static RelatedVnf from(AAITreeNode node) { RelatedVnf vnf = new RelatedVnf(node); - vnf.setServiceInstanceId(node.getParent().getId()); - vnf.setServiceInstanceName(node.getParent().getName()); + if (node.getParent() != null && node.getParent().getType() == NodeType.SERVICE_INSTANCE) { + vnf.setServiceInstanceId(node.getParent().getId()); + vnf.setServiceInstanceName(node.getParent().getName()); + } if (node.getAdditionalProperties().get(VNF_TYPE) != null) { vnf.setInstanceType(node.getAdditionalProperties().get(VNF_TYPE).toString()); @@ -69,4 +71,22 @@ public class RelatedVnf extends Node { return vnf; } + + @Override + public String toString() { + return new ToStringBuilder(this) + .append("serviceInstanceId", serviceInstanceId) + .append("serviceInstanceName", serviceInstanceName) + .append("tenantName", tenantName) + .append("action", action) + .append("instanceName", instanceName) + .append("instanceId", instanceId) + .append("orchStatus", orchStatus) + .append("productFamilyId", productFamilyId) + .append("lcpCloudRegionId", lcpCloudRegionId) + .append("tenantId", tenantId) + .append("cloudOwner", cloudOwner) + .append("modelInfo", modelInfo) + .toString(); + } }