From: zhangab <zhanganbing@chinamobile.com>
Date: Mon, 14 May 2018 03:49:55 +0000 (+0800)
Subject: change lcm service create request body
X-Git-Tag: v1.1.1~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F33%2F47333%2F1;p=usecase-ui%2Fserver.git

change lcm service create request body

Change-Id: Ib839e16621a6a0bf40fa5d09962e54c8439fee9e
Issue-ID: USECASEUI-115
Signed-off-by: zhangab <zhanganbing@chinamobile.com>
---

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 fb749476..d4c9b1a4 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
@@ -90,7 +90,7 @@ 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("/home/uui/%s.csar", uuid);
 //        String toPath = String.format("D:\\volte/%s.csar", uuid);
         try {
             downloadFile(toscaModelPath, toPath);
@@ -119,17 +119,8 @@ public class DefaultServiceTemplateService implements ServiceTemplateService {
         ServiceTemplateInput serviceTemplateInput = newServiceTemplateInput(tosca);
         Map<String, Input> inputsMap = getInputsMap(tosca);
         for (NodeTemplate nodeTemplate : tosca.getNodeTemplates()) {
-            String nodeType = nodeTemplate.getMetaData().getValue("type");
-            if ("VF".equals(nodeType)) {
-                ServiceTemplateInput nodeService = fetchVFNodeTemplateInput(nodeTemplate);
-                if (nodeService == null) {
-                    continue;
-                }
-                serviceTemplateInput.addNestedTemplate(nodeService);
-            } else {
                 ServiceTemplateInput nodeService = fetchVLServiceTemplateInput(nodeTemplate, inputsMap);
                 serviceTemplateInput.addNestedTemplate(nodeService);
-            }
         }
         List<TemplateInput> serviceInputs = getServiceInputs(inputsMap.values());
         serviceTemplateInput.addInputs(serviceInputs);