From: Luji7 <lu.ji3@zte.com.cn>
Date: Tue, 24 Oct 2017 08:54:16 +0000 (+0800)
Subject: Fix query para is wrong.
X-Git-Tag: v1.1.0~19
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F20309%2F1;p=usecase-ui%2Fserver.git

Fix query para is wrong.

Change-Id: I50bd5e57136c0b0b4cb943dc82cf1fe7781db707
Issue-id: USECASEUI-53
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>
---

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<List<Vnf>> listResources(@Query("resourceType") String resourceType, @Query("distributionStatus") String distributionStatus);
+    Call<List<Vnf>> 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<Vnf> getVFResource() throws IOException {
-        Response<List<Vnf>> response = sdcCatalogService.listResources(RESOURCETYPE_VF, DISTRIBUTION_STATUS_DISTRIBUTED).execute();
+        Response<List<Vnf>> 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<List<Vnf>> vnfCall = successfulCall(vnf);
-        when(sdcService.listResources(RESOURCETYPE_VF, DISTRIBUTION_STATUS_DISTRIBUTED)).thenReturn(vnfCall);
+        when(sdcService.listResources(RESOURCETYPE_VF)).thenReturn(vnfCall);
         return sdcService;
     }