From accd25463d8aef29d33cb2f2675164a3bdbce9c0 Mon Sep 17 00:00:00 2001 From: Carsten Lund Date: Sun, 16 Apr 2017 14:13:29 +0000 Subject: [DCAE-15] Changes related to version 1.1 See Jira for details Change-Id: Icf804164264baf85a2f81553f74289549e3da953 Signed-off-by: Carsten Lund --- .../org/openecomp/ncomp/openstack/controller/tools/Generator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java') diff --git a/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java b/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java index 397b827..b5c366e 100644 --- a/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java +++ b/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/openstack/controller/tools/Generator.java @@ -47,12 +47,13 @@ public class Generator { String dir = p.getNsURI().replace(p.getNsPrefix(),"") + "servers." + p.getNsPrefix(); dir= "src/main/sirius-gen/" + dir.replace('.', '/'); ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel(); - m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates"); + m.setTemplateDirectory("../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates"); m.setPrefix("Os"); m.setPluginName(p.getNsURI()); m.setName("OpenStackController"); m.setTitle("OpenStack Controller"); ControllerGenerator g = new ControllerGenerator(o,m); + g.setVersion("ONAP-R2"); EObject loc =LocationFactory.eINSTANCE.createOpenStackLocation(); g.addObject("loc",loc,m); g.setEnableIRequestHandler(false); @@ -62,7 +63,6 @@ public class Generator { //g.addApi("e",e,m); //g.addFactory("org.openecomp.ncomp.sirius.servers.openstack.OsOpenstackFactory"); g.generate(dir); - g.generateAnt("./ant.xml",true,true); g.generateScripts("src/main/server-gen/bin","openstack-controller"); String pName = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".logging"; YamlToJava.convert("src/main/resources/OpenStackAdaptor.yaml", dir + "/logging", pName); -- cgit 1.2.3-korg