aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuji7 <lu.ji3@zte.com.cn>2017-11-14 23:23:37 +0800
committerLuji7 <lu.ji3@zte.com.cn>2017-11-14 23:23:44 +0800
commit198e088c9dfc7bc93555965579e4428c6a67a0a0 (patch)
tree3b9235efe5e69d3022d9ca93a884c436d21a7fdc
parentfb78e0fdda1f851a6642fcc84ba8bf53205f0a87 (diff)
Fix vf onboard issue.
Change-Id: Ie08e8c1d9257248aef232f69786cd3f2a8b3c980 Issue-id: USECASEUI-55 Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java2
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java2
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java3
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/vfc/VfcService.java2
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java4
5 files changed, 7 insertions, 6 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
index 588108dc..96dae5ad 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/PackageDistributionController.java
@@ -77,7 +77,7 @@ public class PackageDistributionController {
@ResponseBody
@RequestMapping(value = {"/uui-lcm/vf-packages/{casrId}"}, method = RequestMethod.DELETE , produces = "application/json")
- public DistributionResult deleteVfPackage(@PathVariable("casrId") String casrId){
+ public Job deleteVfPackage(@PathVariable("casrId") String casrId){
return packageDistributionService.deleteVfPackage(casrId);
}
}
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java
index 0aa72266..4171c5e8 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/PackageDistributionService.java
@@ -33,5 +33,5 @@ public interface PackageDistributionService {
DistributionResult deleteNsPackage(String csarId);
- DistributionResult deleteVfPackage(String csarId);
+ Job deleteVfPackage(String csarId);
}
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java
index d5f4ed5a..dbcefcb0 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/so/SOService.java
@@ -42,6 +42,7 @@ public interface SOService {
"Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
"Accept: application/json"
})
- @DELETE("/ecomp/mso/infra/e2eServiceInstances/v3/{serviceId}")
+// @DELETE("/ecomp/mso/infra/e2eServiceInstances/v3/{serviceId}")
+ @HTTP(method="DELETE", path="/ecomp/mso/infra/e2eServiceInstances/v3/{serviceId}", hasBody = true)
Call<DeleteOperationRsp> terminateService(@Path("serviceId") String serviceId, @Body RequestBody body);
}
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/vfc/VfcService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/vfc/VfcService.java
index 2e8ba8d9..fec91ea3 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/vfc/VfcService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/vfc/VfcService.java
@@ -37,5 +37,5 @@ public interface VfcService {
Call<DistributionResult> deleteNsPackage(@Path("csarId") String csarId);
@DELETE("/api/catalog/v1/vnfpackages/{csarId}")
- Call<DistributionResult> deleteVnfPackage(@Path("csarId") String csarId);
+ Call<Job> deleteVnfPackage(@Path("csarId") String csarId);
}
diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java
index 6514fd90..991612ab 100644
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionService.java
@@ -152,9 +152,9 @@ public class DefaultPackageDistributionService implements PackageDistributionSer
}
@Override
- public DistributionResult deleteVfPackage(String csarId) {
+ public Job deleteVfPackage(String csarId) {
try {
- Response<DistributionResult> response = vfcService.deleteVnfPackage(csarId).execute();
+ Response<Job> response = vfcService.deleteVnfPackage(csarId).execute();
if (response.isSuccessful()) {
return response.body();
} else {