From: zhangab Date: Tue, 15 May 2018 08:20:05 +0000 (+0800) Subject: fix e2e service template analysis bug X-Git-Tag: v1.1.1~5 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F59%2F47559%2F1;p=usecase-ui%2Fserver.git fix e2e service template analysis bug Change-Id: I33166564350e5f41b4f460c1434b2dd3fb033c7f Issue-ID: USECASEUI-115 Signed-off-by: zhangab --- 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 b24fe6d3..faf511d5 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 @@ -137,21 +137,10 @@ public class DefaultServiceTemplateService implements ServiceTemplateService { serviceTemplateInput.setType("VF"); appendLocationParameters(serviceTemplateInput, tosca); appendSdnControllerParameter(serviceTemplateInput); - appendTest2Input(serviceTemplateInput); - }else{ - appendTest1Input(serviceTemplateInput); } return serviceTemplateInput; } - private void appendTest1Input(ServiceTemplateInput serviceTemplateInput){ - serviceTemplateInput.addInput( new TemplateInput("ns1_name1", "testType", "test1","true","" ) ); - serviceTemplateInput.addInput( new TemplateInput("ns1_name2", "testType", "test2","true","" ) ); - } - private void appendTest2Input(ServiceTemplateInput serviceTemplateInput){ - serviceTemplateInput.addInput( new TemplateInput("ns1_vnf_name1", "testType", "test1","true","" ) ); - serviceTemplateInput.addInput( new TemplateInput("ns1_vnf_name2", "testType", "test2","true","" ) ); - } private void appendLocationParameters(ServiceTemplateInput serviceTemplateInput, ToscaTemplate tosca) { for (NodeTemplate nodeTemplate : tosca.getNodeTemplates()) { String type = nodeTemplate.getMetaData().getValue("type");