From f34ab88d68f04501b6c499cece5fdf1b1d0141a6 Mon Sep 17 00:00:00 2001 From: nancylizi Date: Sat, 4 Feb 2017 15:53:43 +0800 Subject: Modify the api of uploadPackage. Fix the logic of "reupload a package which has been onobarded". Issue-id:TOSCA-238 Change-Id: I3acbf8e3233657a6cc47d3c3999fd619b3248433 Signed-off-by: nancylizi --- .../openo/commontosca/catalog/wrapper/PackageWrapper.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java index 5614ff92..ae35659d 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java @@ -1,5 +1,5 @@ /** - * Copyright 2016 ZTE Corporation. + * Copyright 2016-2017 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -146,7 +146,12 @@ public class PackageWrapper { List existPackageDatas = PackageManager.getInstance().queryPackage(packageData.getName(), packageData.getProvider(), packageData.getVersion(), null, packageData.getType()); - + if (null != existPackageDatas && existPackageDatas.size() > 0 + && existPackageDatas.get(0).getOnBoardState().equals("onBoarded")) { + LOG.error("Package onboarded. Can not be reupload! onBoardState = " + + existPackageDatas.get(0).getOnBoardState()); + return Response.serverError().build(); + } packateDbData = PackageManager.getInstance().addPackage(packageData); LOG.info("Store package data to database succed ! packateDbData = " + ToolUtil.objectToString(packateDbData)); @@ -340,8 +345,9 @@ public class PackageWrapper { */ public Response updatePackageStatus(String csarId, String operationalState, String usageState, String onBoardState, String processState, String deletionPending) { - LOG.info("update package status info.csarId:" + csarId + " operationalState:" - + operationalState); + LOG.info("update package status info.csarId:" + csarId + " operationalState:" + operationalState + + "usageState:" + usageState + "onBoardState:" + onBoardState + "processState:" + + processState + "deletionPending" + deletionPending); if (ToolUtil.isEmptyString(csarId)) { LOG.error("update csar status fail, csarid is null"); return Response.serverError().build(); -- cgit 1.2.3-korg