From 4270210537f2b8f74c41b9a210ca3b7a12450875 Mon Sep 17 00:00:00 2001 From: Luji7 Date: Tue, 24 Oct 2017 16:54:16 +0800 Subject: [PATCH] Fix query para is wrong. Change-Id: I50bd5e57136c0b0b4cb943dc82cf1fe7781db707 Issue-id: USECASEUI-53 Signed-off-by: Luji7 --- .../onap/usecaseui/server/service/lcm/domain/sdc/SDCCatalogService.java | 2 +- .../server/service/lcm/impl/DefaultPackageDistributionService.java | 2 +- .../server/service/lcm/impl/DefaultPackageDistributionServiceTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/SDCCatalogService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/SDCCatalogService.java index ae82131f..7c80c38b 100644 --- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/SDCCatalogService.java +++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/sdc/SDCCatalogService.java @@ -51,5 +51,5 @@ public interface SDCCatalogService { "Authorization: Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=" }) @GET("/api/sdc/v1/catalog/resources") - Call> listResources(@Query("resourceType") String resourceType, @Query("distributionStatus") String distributionStatus); + Call> listResources(@Query("resourceType") String resourceType); } \ No newline at end of file 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 f2231544..da8fd699 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 @@ -72,7 +72,7 @@ public class DefaultPackageDistributionService implements PackageDistributionSer } private List getVFResource() throws IOException { - Response> response = sdcCatalogService.listResources(RESOURCETYPE_VF, DISTRIBUTION_STATUS_DISTRIBUTED).execute(); + Response> response = sdcCatalogService.listResources(RESOURCETYPE_VF).execute(); if (response.isSuccessful()) { return response.body(); } else { diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionServiceTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionServiceTest.java index fd258793..f7009b18 100644 --- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionServiceTest.java +++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/impl/DefaultPackageDistributionServiceTest.java @@ -76,7 +76,7 @@ public class DefaultPackageDistributionServiceTest { when(sdcService.listServices(CATEGORY_NS, DISTRIBUTION_STATUS_DISTRIBUTED)).thenReturn(serviceCall); Call> vnfCall = successfulCall(vnf); - when(sdcService.listResources(RESOURCETYPE_VF, DISTRIBUTION_STATUS_DISTRIBUTED)).thenReturn(vnfCall); + when(sdcService.listResources(RESOURCETYPE_VF)).thenReturn(vnfCall); return sdcService; } -- 2.16.6