diff options
author | Vijay Venkatesh Kumar <vv770d@att.com> | 2017-04-19 15:13:21 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-04-19 15:13:21 +0000 |
commit | fc0f682713cfee3ef48467e1b7d04738e5f83312 (patch) | |
tree | cde7cc365b9f396030753b58a141eb87dbb71ba5 /ncomp-openstack-controller/src/main/java | |
parent | 325522e47a7d7a135a995680640c7a0c86720bbb (diff) | |
parent | accd25463d8aef29d33cb2f2675164a3bdbce9c0 (diff) |
Merge "[DCAE-15] Changes related to version 1.1"
Diffstat (limited to 'ncomp-openstack-controller/src/main/java')
2 files changed, 9 insertions, 8 deletions
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);
diff --git a/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerProvider.java b/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerProvider.java index 07941a9..26bf870 100644 --- a/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerProvider.java +++ b/ncomp-openstack-controller/src/main/java/org/openecomp/ncomp/servers/openstack/OsOpenStackControllerProvider.java @@ -27,7 +27,7 @@ import java.util.HashMap; import org.apache.log4j.Logger; import org.json.JSONObject; -import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; import org.openecomp.ncomp.openstack.OpenStackController; import org.openecomp.ncomp.openstack.controller.tools.OpenStackUtil; import org.openecomp.ncomp.openstack.location.OpenStackLocation; @@ -38,11 +38,12 @@ import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.ncomp.sirius.manager.ManagementServer; import org.openecomp.ncomp.sirius.manager.ManagementServerError; import org.openecomp.ncomp.sirius.manager.ManagementServerUtils; +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; import org.openecomp.ncomp.sirius.manager.server.ServerPackage; public class OsOpenStackControllerProvider extends BasicAdaptorProvider { public static final Logger logger = Logger.getLogger(OsOpenStackControllerProvider.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); private HashMap<String, OpenStackUtil> utils = new HashMap<String, OpenStackUtil>(); private HashMap<String, Thread> pollers = new HashMap<String, Thread>(); private HashMap<String, Date> lastPoll = new HashMap<String, Date>(); @@ -71,20 +72,20 @@ public class OsOpenStackControllerProvider extends BasicAdaptorProvider { t = new Thread("openstackPoller " + l.getName()) { @Override public void run() { - ecomplogger.setOperation(OpenStackAdaptorOperationEnum.POLLING); while (true) { Date lastPoll2 = lastPoll.get(l.getName()); if (lastPoll2 == null || lastPoll2.getTime() + pollingFrequency < new Date().getTime()) { try { + ecomplogger.setOperation(OpenStackAdaptorOperationEnum.POLLING); ecomplogger.newRequestId(); + ecomplogger.setInstanceId(controller, l); ecomplogger.recordAuditEventStart(); openstackPolling(l); + ecomplogger.recordAuditEventEnd(); } catch (Exception e) { ecomplogger.warn(OpenStackAdaptorMessageEnum.POLLING_FAILED, ManagementServer.object2ref(l)); ManagementServerUtils.printStackTrace(e); - } - finally { - ecomplogger.recordAuditEventEnd(); + ecomplogger.recordAuditEventEnd(StatusCodeEnum.ERROR); } } try { |