Support NS Instance Query for VF-C

Change-Id: Id582140578cc24f580b4e7df4313efcee064eabb
Issue-ID: USECASEUI-164
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
index 376961c..0456130 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java
@@ -115,9 +115,6 @@ public class DefaultServiceInstanceService implements ServiceInstanceService {
                        String serviceDomain = serviceBean.getServiceDomain();
                                object.put("serviceDomain",serviceDomain);
                                object.put("serviceStatus",serviceBean.getStatus());
-                               if("error".equals(serviceBean.getStatus())){
-                                       continue;
-                               }
                                object.put("operationId",serviceBean.getOperationId());
                                if("SOTN".equals(serviceDomain)||"CCVPN".equals(serviceDomain)||"E2E Service".equals(serviceDomain)||"Network Service".equals(serviceDomain)){
                                        List<String> parentIds = serviceLcmService.getServiceInstanceIdByParentId(serviceInstanceId);

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java
index abad7fb..704e411 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java
@@ -107,6 +107,7 @@ public class DefaultServiceTemplateService implements ServiceTemplateService {
         try {
             String msbUrl = RestfulServices.getMsbAddress();
             String templateUrl = String.format("http://%s%s", msbUrl, toscaModelPath);
+            logger.info("download Csar File Url is:"+templateUrl);
             ResponseBody body = sdcCatalog.downloadCsar(templateUrl).execute().body();
             Files.write(body.bytes(),new File(toPath));
         } catch (IOException e) {