aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhangab <zhanganbing@chinamobile.com>2018-05-14 18:17:43 +0800
committerzhangab <zhanganbing@chinamobile.com>2018-05-14 18:17:50 +0800
commit8cd2b775a9e20f88436f6e1c996d327b1b1ceb43 (patch)
treefd82f65f85638826e3c863d5762d7ee60ee29805
parenta6776534081afef718ce03d5442d10a6754cc3f2 (diff)
print csar analysis result
Change-Id: I5ccfe022fa4c309f1a89028dd57e6484440fb905 Issue-ID: USECASEUI-115 Signed-off-by: zhangab <zhanganbing@chinamobile.com>
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java1
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java
index 9683eab3..6a7b7fa2 100644
--- a/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java
+++ b/server/src/main/java/org/onap/usecaseui/server/controller/lcm/ServiceTemplateController.java
@@ -52,6 +52,7 @@ public class ServiceTemplateController {
@ResponseBody
@RequestMapping(value = {"/uui-lcm/service-templates/{uuid}"}, method = RequestMethod.GET , produces = "application/json")
public ServiceTemplateInput getServiceTemplateInput(@PathVariable("uuid") String uuid, @RequestParam("toscaModelPath") String toscaModelPath){
+ logger.info("returned template content :"+serviceTemplateService.fetchServiceTemplateInput(uuid, toscaModelPath));
return serviceTemplateService.fetchServiceTemplateInput(uuid, toscaModelPath);
}
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 d4c9b1a4..1040ea42 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
@@ -91,7 +91,6 @@ public class DefaultServiceTemplateService implements ServiceTemplateService {
private ServiceTemplateInput fetchServiceTemplate(String uuid, String toscaModelPath, boolean isVF) {
String toPath = String.format("/home/uui/%s.csar", uuid);
-// String toPath = String.format("D:\\volte/%s.csar", uuid);
try {
downloadFile(toscaModelPath, toPath);
return extractTemplate(toPath, isVF);
@@ -116,6 +115,7 @@ public class DefaultServiceTemplateService implements ServiceTemplateService {
public ServiceTemplateInput extractTemplate(String toPath, boolean isVF) throws JToscaException, IOException {
ToscaTemplate tosca = translateToToscaTemplate(toPath);
+ logger.info("csar analysis result :" + tosca);
ServiceTemplateInput serviceTemplateInput = newServiceTemplateInput(tosca);
Map<String, Input> inputsMap = getInputsMap(tosca);
for (NodeTemplate nodeTemplate : tosca.getNodeTemplates()) {