aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali-P <murali.p@huawei.com>2018-03-23 11:29:05 +0530
committerMurali-P <murali.p@huawei.com>2018-03-23 12:54:05 +0530
commite41d0e724015fb9d02916516fe560102e558a438 (patch)
tree505f111a2831d8ef24ac68980b131b884541a235
parent333da2a6d7a99ff6c612ed91bb936012abc1af11 (diff)
Package name should be unique
Error if someone upload with same name Issue-ID: VNFSDK-142 Change-Id: I4b2cf10e58c62e14bccc5b0dbcf997745d1e9137 Signed-off-by: Murali-P <murali.p@huawei.com>
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java7
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java9
2 files changed, 15 insertions, 1 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java
index d793a32b..cc3ec203 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/wrapper/PackageWrapper.java
@@ -198,6 +198,13 @@ public class PackageWrapper {
LOG.info("packageMeta = " + ToolUtil.objectToString(packageMeta));
PackageData packageData = PackageWrapperUtil.getPackageData(packageMeta);
+
+ List<PackageData> lstPkgData = PackageManager.getInstance().queryPackage(packageMeta.getName(), "", "", "", "");
+ if (!lstPkgData.isEmpty())
+ {
+ LOG.error ("Package name is not unique");
+ return null;
+ }
String destPath = File.separator + path + File.separator + File.separator;
boolean uploadResult = FileManagerFactory.createFileManager().upload(localDirName, destPath);
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
index de3ba455..c9c03cc9 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/test/java/org/onap/vnfsdk/marketplace/resource/PackageResourceTest.java
@@ -640,6 +640,13 @@ public class PackageResourceTest {
packageDataList.add(packageData);
return packageDataList;
}
+
+ @Mock
+ public List<PackageData> getPackageDataSubset(Map<String, String> paramsMap) {
+ List<PackageData> packageDataList = new ArrayList<PackageData>();
+
+ return packageDataList;
+ }
};
new MockUp<HttpFileManagerImpl>() {
@@ -739,7 +746,7 @@ public class PackageResourceTest {
if(ins != null) {
try {
result = PackageWrapper.getInstance().uploadPackage(ins, fileDetail, null, null);
- PackageWrapper.getInstance().updateValidateStatus(ins);
+ // PackageWrapper.getInstance().updateValidateStatus(ins);
} catch(Exception e3) {
e3.printStackTrace();
}