From d0031501cd81a9046396358f42657f168b5a58a8 Mon Sep 17 00:00:00 2001 From: kooper Date: Tue, 19 Mar 2019 13:31:54 +0000 Subject: Display PNF/VNF Type for PNF (backend) Change-Id: Ie3fabe2a91c1e9040939e2bfe97705cfee15b201 Issue-ID: SDC-2157 Signed-off-by: kooper --- .../pom.xml | 11 ++ .../dao/type/PackageInfo.java | 111 ++------------------- .../dao/impl/PackageInfoDaoImpl.java | 2 +- .../openecomp/sdc/tosca/csar/CSARConstants.java | 2 +- 4 files changed, 20 insertions(+), 106 deletions(-) (limited to 'openecomp-be/lib') diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml index cc92abe405..efffcbe463 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/pom.xml @@ -55,6 +55,17 @@ openecomp-config-lib ${project.version} + + org.projectlombok + lombok + provided + + + org.openecomp.sdc.be + common-be + ${project.version} + compile + diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/PackageInfo.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/PackageInfo.java index abd3e2decf..6aac77acfa 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/PackageInfo.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/PackageInfo.java @@ -23,11 +23,16 @@ package org.openecomp.sdc.vendorsoftwareproduct.dao.type; import com.datastax.driver.mapping.annotations.Column; import com.datastax.driver.mapping.annotations.PartitionKey; import com.datastax.driver.mapping.annotations.Table; +import lombok.NoArgsConstructor; +import lombok.Data; +import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; import org.openecomp.sdc.versioning.dao.types.Version; import java.nio.ByteBuffer; +@Data +@NoArgsConstructor @Table(keyspace = "dox", name = "package_details") public class PackageInfo { @@ -68,113 +73,11 @@ public class PackageInfo { @Column(name = "translate_content") private ByteBuffer translatedFile; - /** - * Every entity class must have a default constructor according to - * - * Definition of mapped classes. - */ - public PackageInfo() { - // Don't delete! Default constructor is required by DataStax driver - } + @Column(name = "resource_type") + private String resourceType = ResourceTypeEnum.VF.name(); public PackageInfo(String packageId, Version version) { this.vspId = packageId; this.version = version.getName(); } - - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - public String getVspDescription() { - return vspDescription; - } - - public void setVspDescription(String vspDescription) { - this.vspDescription = vspDescription; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } - - public String getVspId() { - return vspId; - } - - public void setVspId(String vspId) { - this.vspId = vspId; - } - - public String getCategory() { - return category; - } - - public void setCategory(String category) { - this.category = category; - } - - public String getSubCategory() { - return subCategory; - } - - public void setSubCategory(String subCategory) { - this.subCategory = subCategory; - } - - public String getVendorName() { - return vendorName; - } - - public void setVendorName(String vendorName) { - this.vendorName = vendorName; - } - - public String getVendorRelease() { - return vendorRelease; - } - - public void setVendorRelease(String vendorRelease) { - this.vendorRelease = vendorRelease; - } - - public String getPackageChecksum() { - return packageChecksum; - } - - public void setPackageChecksum(String packageChecksum) { - this.packageChecksum = packageChecksum; - } - - public String getPackageType() { - return packageType; - } - - public void setPackageType(String packageType) { - this.packageType = packageType; - } - - public ByteBuffer getTranslatedFile() { - return translatedFile; - } - - public void setTranslatedFile(ByteBuffer translatedFile) { - this.translatedFile = translatedFile; - } - - public String getVspName() { - return vspName; - } - - public void setVspName(String vendorName) { - this.vspName = vendorName; - } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/PackageInfoDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/PackageInfoDaoImpl.java index 6b8144cd09..ff4fd45420 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/PackageInfoDaoImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/PackageInfoDaoImpl.java @@ -82,7 +82,7 @@ public class PackageInfoDaoImpl extends CassandraBaseDao implements @Query( "SELECT vsp_id,version,display_name,vsp_name,vsp_description,vendor_name,category" - + " ,sub_category, vendor_release,package_checksum,package_type FROM package_details") + + " ,sub_category, vendor_release,package_checksum,package_type, resource_type FROM package_details") Result listInfo(); } } diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/CSARConstants.java b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/CSARConstants.java index 15fe9ed14e..826a72b6fd 100644 --- a/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/CSARConstants.java +++ b/openecomp-be/lib/openecomp-tosca-lib/src/main/java/org/openecomp/sdc/tosca/csar/CSARConstants.java @@ -39,7 +39,7 @@ public class CSARConstants { public static final ImmutableSet ELIGIBLE_FILES = of(MAIN_SERVICE_TEMPLATE_MF_FILE_NAME,MAIN_SERVICE_TEMPLATE_YAML_FILE_NAME); public static final ImmutableSet MANIFEST_PNF_METADATA = - of("pnf_provider_id", "pnf_product_name", "pnf_release_date_time", "pnf_package_version"); + of("pnfd_provider", "pnfd_name", "pnfd_release_date_time", "pnfd_archive_version"); public static final ImmutableSet MANIFEST_VNF_METADATA = of("vnf_provider_id", "vnf_product_name", "vnf_release_date_time", "vnf_package_version"); public static final int MANIFEST_METADATA_LIMIT = 4; -- cgit 1.2.3-korg