From b8e2faf476202b6ffe61bc3a9a37df1304881d40 Mon Sep 17 00:00:00 2001 From: Avi Ziv Date: Tue, 18 Jul 2017 19:45:38 +0300 Subject: [SDC] Onboarding 1710 rebase. Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535 Signed-off-by: Avi Ziv --- .../openecomp-sdc-tosca-generator-api/pom.xml | 68 ++++++++++++++++ .../generator/datatypes/tosca/ComputeFlavor.java | 69 ++++++++++++++++ .../datatypes/tosca/DeploymentFlavorModel.java | 90 +++++++++++++++++++++ .../generator/datatypes/tosca/LicenseFlavor.java | 42 ++++++++++ .../datatypes/tosca/MultiFlavorVfcImage.java | 91 ++++++++++++++++++++++ .../sdc/generator/datatypes/tosca/VendorInfo.java | 58 ++++++++++++++ .../generator/datatypes/tosca/VspModelInfo.java | 58 ++++++++++++++ .../sdc/generator/util/GeneratorConstants.java | 25 ++++++ 8 files changed, 501 insertions(+) create mode 100644 openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml create mode 100644 openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/ComputeFlavor.java create mode 100644 openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/DeploymentFlavorModel.java create mode 100644 openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/LicenseFlavor.java create mode 100644 openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/MultiFlavorVfcImage.java create mode 100644 openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VendorInfo.java create mode 100644 openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VspModelInfo.java create mode 100644 openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/util/GeneratorConstants.java (limited to 'openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api') diff --git a/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml new file mode 100644 index 0000000000..047fe7f843 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/pom.xml @@ -0,0 +1,68 @@ + + 4.0.0 + + openecomp-sdc-tosca-generator-api + openecomp-sdc-tosca-generator-api + + + + org.openecomp.sdc + openecomp-sdc-lib + 1.1.0-SNAPSHOT + ../.. + + + + + org.openecomp.sdc.core + openecomp-facade-core + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-validation-api + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-validation-core + ${project.version} + runtime + + + io.swagger + swagger-annotations + 1.5.3 + + + org.openecomp.sdc.core + openecomp-tosca-lib + ${project.version} + + + org.openecomp.sdc.common + openecomp-configuration-management-core + ${openecomp.sdc.common.version} + runtime + + + org.slf4j + slf4j-log4j12 + + + + + org.openecomp.sdc.common + openecomp-configuration-management-api + ${project.version} + + + org.openecomp.sdc + openecomp-sdc-vendor-software-product-api + ${project.version} + + + + 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/ComputeFlavor.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/ComputeFlavor.java new file mode 100644 index 0000000000..d888bd311b --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/ComputeFlavor.java @@ -0,0 +1,69 @@ +package org.openecomp.sdc.generator.datatypes.tosca; + +@SuppressWarnings("CheckStyle") +public class ComputeFlavor { + + private int num_cpus; + private String disk_size; + private String mem_size; + + public int getNum_cpus() { + return num_cpus; + } + + public void setNum_cpus(int num_cpus) { + this.num_cpus = num_cpus; + } + + public String getDisk_size() { + return disk_size; + } + + public void setDisk_size(String disk_size) { + this.disk_size = disk_size; + } + + public String getMem_size() { + return mem_size; + } + + public void setMem_size(String mem_size) { + this.mem_size = mem_size; + } + + @Override + public String toString() { + return "ComputeFlavor{ num_cpus=" + num_cpus + ", disk_size= " + disk_size + + ", mem_size=" + mem_size + "}"; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (getClass() != obj.getClass()) + return false; + ComputeFlavor other = (ComputeFlavor) obj; + if (num_cpus != other.num_cpus) + return false; + if (this.disk_size == null) { + if (other.disk_size != null) + return false; + } else if (!disk_size.equals(other.disk_size)) + return false; + if (this.mem_size == null) { + if (other.mem_size != null) + return false; + } else if (!mem_size.equals(other.mem_size)) + return false; + return true; + } + + @Override + public int hashCode() { + int result = num_cpus; + result = 31 * result + (disk_size != null ? disk_size.hashCode() : 0); + result = 31 * result + (mem_size != null ? mem_size.hashCode() : 0); + return result; + } +} 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/DeploymentFlavorModel.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/DeploymentFlavorModel.java new file mode 100644 index 0000000000..a0d5f40b8c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/DeploymentFlavorModel.java @@ -0,0 +1,90 @@ +package org.openecomp.sdc.generator.datatypes.tosca; + +@SuppressWarnings("CheckStyle") +public class DeploymentFlavorModel { + + private String sp_part_number; + private VendorInfo vendor_info; + private ComputeFlavor compute_flavor; + private LicenseFlavor license_flavor; + + public String getSp_part_number() { + return sp_part_number; + } + + public void setSp_part_number(String sp_part_number) { + this.sp_part_number = sp_part_number; + } + + public VendorInfo getVendor_info() { + return vendor_info; + } + + public void setVendor_info(VendorInfo vendor_info) { + this.vendor_info = vendor_info; + } + + public ComputeFlavor getCompute_flavor() { + return compute_flavor; + } + + public void setCompute_flavor(ComputeFlavor compute_flavor) { + this.compute_flavor = compute_flavor; + } + + public LicenseFlavor getLicense_flavor() { + return license_flavor; + } + + public void setLicense_flavor(LicenseFlavor license_flavor) { + this.license_flavor = license_flavor; + } + + @Override + public String toString() { + return "DeploymentFlavorModel{" + "sp_part_number='" + sp_part_number + '\'' + + ", vendor_info=" + vendor_info + + ", compute_flavor=" + compute_flavor + + ", license_flavor=" + license_flavor + + '}'; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (getClass() != obj.getClass()) + return false; + DeploymentFlavorModel other = (DeploymentFlavorModel) obj; + if (this.sp_part_number == null) { + if (other.sp_part_number != null) + return false; + } else if (!sp_part_number.equals(other.sp_part_number)) + return false; + if (this.vendor_info == null) { + if (other.vendor_info != null) + return false; + } else if (!vendor_info.equals(other.vendor_info)) + return false; + if (this.compute_flavor == null) { + if (other.compute_flavor != null) + return false; + } else if (!compute_flavor.equals(other.compute_flavor)) + return false; + if (this.license_flavor == null) { + if (other.license_flavor != null) + return false; + } else if (!license_flavor.equals(other.license_flavor)) + return false; + return true; + } + + @Override + public int hashCode() { + int result = sp_part_number != null ? sp_part_number.hashCode() : 0; + result = 31 * result + (vendor_info != null ? vendor_info.hashCode() : 0); + result = 31 * result + (compute_flavor != null ? compute_flavor.hashCode() : 0); + result = 31 * result + (license_flavor != null ? license_flavor.hashCode() : 0); + return result; + } +} 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/LicenseFlavor.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/LicenseFlavor.java new file mode 100644 index 0000000000..f459d9e993 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/LicenseFlavor.java @@ -0,0 +1,42 @@ +package org.openecomp.sdc.generator.datatypes.tosca; + +@SuppressWarnings("CheckStyle") +public class LicenseFlavor { + + String feature_group_uuid; + + public String getFeature_group_uuid() { + return feature_group_uuid; + } + + public void setFeature_group_uuid(String feature_group_uuid) { + this.feature_group_uuid = feature_group_uuid; + } + + @Override + public String toString() { + return "LicenseFlavor{" + + "feature_group_uuid='" + feature_group_uuid + '\'' + + '}'; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (getClass() != obj.getClass()) + return false; + LicenseFlavor other = (LicenseFlavor) obj; + if (this.feature_group_uuid == null) { + if (other.feature_group_uuid != null) + return false; + } else if (!feature_group_uuid.equals(other.feature_group_uuid)) + return false; + return true; + } + + @Override + public int hashCode() { + return feature_group_uuid != null ? feature_group_uuid.hashCode() : 0; + } +} 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/MultiFlavorVfcImage.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/MultiFlavorVfcImage.java new file mode 100644 index 0000000000..6cd713e2d1 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/MultiFlavorVfcImage.java @@ -0,0 +1,91 @@ +package org.openecomp.sdc.generator.datatypes.tosca; + +@SuppressWarnings("CheckStyle") +public class MultiFlavorVfcImage { + + private String file_name; + private String file_hash; + private String file_hash_type; + private String software_version; + + public String getFile_name() { + return file_name; + } + + public void setFile_name(String file_name) { + this.file_name = file_name; + } + + public String getFile_hash() { + return file_hash; + } + + public void setFile_hash(String file_hash) { + this.file_hash = file_hash; + } + + public String getFile_hash_type() { + return file_hash_type; + } + + public void setFile_hash_type(String file_hash_type) { + this.file_hash_type = file_hash_type; + } + + public String getSoftware_version() { + return software_version; + } + + public void setSoftware_version(String software_version) { + this.software_version = software_version; + } + + @Override + public String toString() { + return "MultiFlavorVfcImage{" + + "file_name='" + file_name + '\'' + + ", file_hash='" + file_hash + '\'' + + ", file_hash_type='" + file_hash_type + '\'' + + ", software_version='" + software_version + '\'' + + '}'; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (getClass() != obj.getClass()) + return false; + MultiFlavorVfcImage other = (MultiFlavorVfcImage) obj; + if (this.file_name == null) { + if (other.file_name != null) + return false; + } else if (!file_name.equals(other.file_name)) + return false; + if (this.file_hash == null) { + if (other.file_hash != null) + return false; + } else if (!file_hash.equals(other.file_hash)) + return false; + if (this.file_hash_type == null) { + if (other.file_hash_type != null) + return false; + } else if (!file_hash_type.equals(other.file_hash_type)) + return false; + if (this.software_version == null) { + if (other.software_version != null) + return false; + } else if (!software_version.equals(other.software_version)) + return false; + return true; + } + + @Override + public int hashCode() { + int result = file_name != null ? file_name.hashCode() : 0; + result = 31 * result + (file_hash != null ? file_hash.hashCode() : 0); + result = 31 * result + (file_hash_type != null ? file_hash_type.hashCode() : 0); + result = 31 * result + (software_version != null ? software_version.hashCode() : 0); + return result; + } +} 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/VendorInfo.java b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VendorInfo.java new file mode 100644 index 0000000000..22348f3083 --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/datatypes/tosca/VendorInfo.java @@ -0,0 +1,58 @@ +package org.openecomp.sdc.generator.datatypes.tosca; + +@SuppressWarnings("CheckStyle") +public class VendorInfo { + + private String manufacturer_reference_number; + private String vendor_model; + + public String getManufacturer_reference_number() { + return manufacturer_reference_number; + } + + public void setManufacturer_reference_number(String manufacturer_reference_number) { + this.manufacturer_reference_number = manufacturer_reference_number; + } + + public String getVendor_model() { + return vendor_model; + } + + public void setVendor_model(String vendor_model) { + this.vendor_model = vendor_model; + } + + @Override + public String toString() { + return "VendorInfo{manufacturer_reference_number='" + manufacturer_reference_number + '\'' + + ", vendor_model='" + vendor_model + '\'' + '}'; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (getClass() != obj.getClass()) + return false; + VendorInfo other = (VendorInfo) obj; + if (this.manufacturer_reference_number == null) { + if (other.manufacturer_reference_number != null) + return false; + } else if (!manufacturer_reference_number.equals(other.manufacturer_reference_number)) + return false; + if (this.vendor_model == null) { + if (other.vendor_model != null) + return false; + } else if (!vendor_model.equals(other.vendor_model)) + return false; + return true; + } + + @Override + public int hashCode() { + int result = + manufacturer_reference_number != null ? manufacturer_reference_number.hashCode() : 0; + result = 31 * result + (vendor_model != null ? vendor_model.hashCode() : 0); + return result; + } +} 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 new file mode 100644 index 0000000000..1fb1030dd3 --- /dev/null +++ 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 @@ -0,0 +1,58 @@ +package org.openecomp.sdc.generator.datatypes.tosca; + +import org.openecomp.sdc.vendorsoftwareproduct.types.composition.Nic; + +import java.util.List; +import java.util.Map; + +public class VspModelInfo { + private String releaseVendor; + //Map of component id and name + private Map components; + //Map of part number and deployment flavor model + private Map allowedFlavors; + //Map of component id and images + private Map> multiFlavorVfcImages; + //Map of component and ports (NICs) + private Map> nics; + + public String getReleaseVendor() { + return releaseVendor; + } + + public void setReleaseVendor(String releaseVendor) { + this.releaseVendor = releaseVendor; + } + + public Map getComponents() { + return components; + } + + public void setComponents(Map components) { + this.components = components; + } + + public Map getAllowedFlavors() { + return allowedFlavors; + } + + public void setAllowedFlavors(Map allowedFlavors) { + this.allowedFlavors = allowedFlavors; + } + + public Map> getMultiFlavorVfcImages() { + return multiFlavorVfcImages; + } + + public void setMultiFlavorVfcImages(Map> multiFlavorVfcImages) { + this.multiFlavorVfcImages = multiFlavorVfcImages; + } + + public Map> getNics() { + return nics; + } + + public void setNics(Map> nics) { + this.nics = nics; + } +} 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 new file mode 100644 index 0000000000..b24a85d61c --- /dev/null +++ b/openecomp-be/lib/openecomp-sdc-tosca-generator-lib/openecomp-sdc-tosca-generator-api/src/main/java/org/openecomp/sdc/generator/util/GeneratorConstants.java @@ -0,0 +1,25 @@ +package org.openecomp.sdc.generator.util; + +public class GeneratorConstants { + public static final String ALLOWED_FLAVORS_PROPERTY = "allowed_flavors"; + 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 TOSCA_SERVICE_TEMPLATE_FILE_NAME_SUFFIX = "ServiceTemplate.yaml"; + + //Manual VSP propeties + public static final String NUM_CPUS = "num_cpus"; + public static final String DISK_SIZE = "disk_size"; + public static final String MEM_SIZE = "mem_size"; + + public static final String NUM_CPUS_PROP_DESC_PREFIX = "Number of cpu for "; + public static final String DISK_SIZE_PROP_DESC_PREFIX = "Disk size for "; + public static final String MEM_SIZE_PROP_DESC_PREFIX = "Memory size for "; + + + +} -- cgit 1.2.3-korg