summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzhangab <zhanganbing@chinamobile.com>2018-05-14 11:49:55 +0800
committerzhangab <zhanganbing@chinamobile.com>2018-05-14 11:50:02 +0800
commita6776534081afef718ce03d5442d10a6754cc3f2 (patch)
tree3e1e923974f51308f39a1cbd74ebfdb467ab2220
parentfda7f149d4d2888e2b3a8ea34cf0764e9fef88b8 (diff)
change lcm service create request body
Change-Id: Ib839e16621a6a0bf40fa5d09962e54c8439fee9e Issue-ID: USECASEUI-115 Signed-off-by: zhangab <zhanganbing@chinamobile.com>
-rw-r--r--server/src/main/java/org/onap/usecaseui/server/service/lcm/impl/DefaultServiceTemplateService.java11
1 files changed, 1 insertions, 10 deletions
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);