diff options
| author |   andre.schmid <andre.schmid@est.tech> | 2021-07-29 10:14:19 +0100 |
|---|---|---|
| committer |   Vasyl Razinkov <vasyl.razinkov@est.tech> | 2021-08-17 08:12:35 +0000 |
| commit | 6e75dd1bfd8c1a4625c9c61a60883d28ca88fff7 (patch) | |
| tree | a489c38d90b399e7c446e082c977aa3d4974ba94 /openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core | |
| parent | 855a434b4f6555aa43091cdaeef14a33e418458d (diff) | |
Handle VSP package upload for multi-model
Change-Id: Iceca3f160eaeb1a6431fc3c5bbab92847e95ae4d
Issue-ID: SDC-3667
Signed-off-by: André Schmid <andre.schmid@est.tech>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core')
2 files changed, 4 insertions, 4 deletions
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 591af3c8b9..f8b75496e5 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 @@ -76,8 +76,8 @@ public class PackageInfoDaoImpl extends CassandraBaseDao<PackageInfo> implements @Accessor interface PackageInfoAccessor { - @Query("SELECT vsp_id,version,display_name,vsp_name,vsp_description,vendor_name,category" - + " ,sub_category, vendor_release,package_checksum,package_type, resource_type FROM package_details") + @Query("SELECT vsp_id, version, version_id, display_name, vsp_name, vsp_description, vendor_name, category" + + " , sub_category, vendor_release, package_checksum, package_type, resource_type, models FROM package_details") Result<PackageInfo> listInfo(); } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java index 1118260a16..4929668753 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/test/java/org/openecomp/sdc/vendorsoftwareproduct/dao/ServiceModelDaoFactoryTest.java @@ -87,8 +87,8 @@ public class ServiceModelDaoFactoryTest { zusammenAdaptor); zusammenAdaptor.setItemVersion(itemVersionmock); - ToscaServiceModel model = getToscaServiceModel(); - serviceModelDaoZusammen.storeServiceModel(vspId, version, model); + ToscaServiceModel toscaServiceModel = getToscaServiceModel(); + serviceModelDaoZusammen.storeServiceModel(vspId, version, toscaServiceModel); } @Test |