From 61070c9c6b665fdea79b3ccdfeafc3a6b50d262e Mon Sep 17 00:00:00 2001
From: Avi Ziv <AVIZI@amdocs.com>
Date: Wed, 26 Jul 2017 17:37:57 +0300
Subject: [SDC] Full OnBoard health-check and NFoD support

Change-Id: I606f8a52c7e6d2bd5558f824957d890e552c5423
Signed-off-by: Avi Ziv <avi.ziv@amdocs.com>
---
 .../generator/datatypes/tosca/VspModelInfo.java    | 75 ++++++++++++++++++++++
 .../sdc/generator/util/GeneratorConstants.java     |  5 +-
 2 files changed, 78 insertions(+), 2 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main')

diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VspModelInfo.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VspModelInfo.java
index 1fb1030dd3..025db1cafc 100644
--- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VspModelInfo.java
+++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VspModelInfo.java
@@ -55,4 +55,79 @@ public class VspModelInfo {
   public void setNics(Map<String, List<Nic>> nics) {
     this.nics = nics;
   }
+
+  @Override
+  public int hashCode() {
+    int result = releaseVendor != null ? releaseVendor.hashCode() : 0;
+    result = 31 * result + (components != null ? components.hashCode() : 0);
+    result = 31 * result + (allowedFlavors != null ? allowedFlavors.hashCode() : 0);
+    result = 31 * result + (multiFlavorVfcImages != null ? multiFlavorVfcImages.hashCode() : 0);
+    result = 31 * result + (nics != null ? nics.hashCode() : 0);
+    return result;
+  }
+
+  @Override
+  public String toString() {
+    return "VspModelInfo{"
+       + "releaseVendor='" + releaseVendor + '\''
+       + ", components=" + components
+       + ", allowedFlavors=" + allowedFlavors
+       + ", multiFlavorVfcImages=" + multiFlavorVfcImages
+       + ", nics=" + nics
+       + '}';
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj) {
+      return true;
+    }
+    if (getClass() != obj.getClass()) {
+      return false;
+    }
+    VspModelInfo other = (VspModelInfo) obj;
+    if (this.releaseVendor == null) {
+      if (other.releaseVendor != null) {
+        return false;
+      }
+    } else if (!releaseVendor.equals(other.releaseVendor)) {
+      return false;
+    }
+    if (this.components == null) {
+      if (other.components != null) {
+        return false;
+      }
+    } else if (!components.equals(other.components)) {
+      return false;
+    }
+    if (this.allowedFlavors == null) {
+      if (other.allowedFlavors != null) {
+        return false;
+      }
+    } else if (!allowedFlavors.equals(other.allowedFlavors)) {
+      return false;
+    }
+    if (this.multiFlavorVfcImages == null) {
+      if (other.multiFlavorVfcImages != null) {
+        return false;
+      }
+    } else if (!multiFlavorVfcImages.equals(other.multiFlavorVfcImages)) {
+      return false;
+    }
+    if (this.multiFlavorVfcImages == null) {
+      if (other.multiFlavorVfcImages != null) {
+        return false;
+      }
+    } else if (!multiFlavorVfcImages.equals(other.multiFlavorVfcImages)) {
+      return false;
+    }
+    if (this.nics == null) {
+      if (other.nics != null) {
+        return false;
+      }
+    } else if (!nics.equals(other.nics)) {
+      return false;
+    }
+    return true;
+  }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/util/GeneratorConstants.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/util/GeneratorConstants.java
index b24a85d61c..5464627927 100644
--- a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/util/GeneratorConstants.java
+++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/util/GeneratorConstants.java
@@ -5,9 +5,10 @@ public class GeneratorConstants {
   public static final String IMAGES_PROPERTY = "images";
   public static final String RELEASE_VENDOR = "releaseVendor";
   public static final String VNF_CONFIG_NODE_TEMPLATE_ID_SUFFIX = "_VNF_Configuration";
-  public static final String VFC_NODE_TEMPLATE_ID_SUFFIX = "_VFC";
   public static final String VNF_NODE_TEMPLATE_ID_SUFFIX = "_VNF";
-  public static final String PORT_NODE_TEMPLATE_ID_SUFFIX = "_wan_port";
+  public static final String PORT_TYPE_INTERNAL_NODE_TEMPLATE_SUFFIX = "_lan";
+  public static final String PORT_TYPE_EXTERNAL_NODE_TEMPLATE_SUFFIX = "_wan";
+  public static final String PORT_NODE_TEMPLATE_ID_SUFFIX = "_port";
 
   public static final String TOSCA_SERVICE_TEMPLATE_FILE_NAME_SUFFIX = "ServiceTemplate.yaml";
 
-- 
cgit 1.2.3-korg