summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguochuyicmri <guochuyi@chinamobile.com>2018-11-25 10:45:55 +0800
committerguochuyicmri <guochuyi@chinamobile.com>2018-11-25 10:46:06 +0800
commitc826c096388b56a50e1ed81a4a14bbce959e9bc9 (patch)
treea12dd4377d5f6733ceeadb911efbf90ceb24bc4f
parentb248d33597f58a0b42cbc9cb22177b87ce2d660c (diff)
Support NS Instance Query for VF-C
Change-Id: Id582140578cc24f580b4e7df4313efcee064eabb Issue-ID: USECASEUI-164 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceInstanceService.java3
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java1
2 files changed, 1 insertions, 3 deletions
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 376961c9..04561302 100644
--- 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 abad7fb1..704e4112 100644
--- 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) {