diff options
Diffstat (limited to 'ncomp-sirius-manager-agent-server/src')
28 files changed, 1269 insertions, 152 deletions
diff --git a/ncomp-sirius-manager-agent-server/src/assembly/assemble_zip.xml b/ncomp-sirius-manager-agent-server/src/assembly/assemble_zip.xml index 4229587..76dfc18 100644 --- a/ncomp-sirius-manager-agent-server/src/assembly/assemble_zip.xml +++ b/ncomp-sirius-manager-agent-server/src/assembly/assemble_zip.xml @@ -56,6 +56,10 @@ <directory>src/main/server/scripts</directory> <outputDirectory>scripts</outputDirectory> </fileSet> + <fileSet> + <directory>src/assembly/swm</directory> + <outputDirectory>swm</outputDirectory> + </fileSet> </fileSets> </assembly> diff --git a/ncomp-sirius-manager-agent-server/src/main/java/org/openecomp/ncomp/sirius/manager/agent/server/tools/Generator.java b/ncomp-sirius-manager-agent-server/src/main/java/org/openecomp/ncomp/sirius/manager/agent/server/tools/Generator.java index f09b110..1ece2a6 100644 --- a/ncomp-sirius-manager-agent-server/src/main/java/org/openecomp/ncomp/sirius/manager/agent/server/tools/Generator.java +++ b/ncomp-sirius-manager-agent-server/src/main/java/org/openecomp/ncomp/sirius/manager/agent/server/tools/Generator.java @@ -19,48 +19,57 @@ * ============LICENSE_END============================================ */ -package org.openecomp.ncomp.sirius.manager.agent.server.tools;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel;
-import org.openecomp.ncomp.sirius.manager.controllermodel.ControllermodelFactory;
-import org.openecomp.ncomp.sirius.manager.generator.ControllerGenerator;
-import org.openecomp.ncomp.gwt.siriusportal.model.*;
-import org.openecomp.ncomp.sirius.manager.agent.monitoring.MonitoringFactory;
-
-
-public class Generator {
-
- /**
- * @param args
- */
- public static void main(String[] args) {
- @SuppressWarnings("unused")
- MonitoringFactory f = MonitoringFactory.eINSTANCE;
- EObject o = MonitoringFactory.eINSTANCE.createSiriusManagerAgentServer();
- EPackage p = o.eClass().getEPackage();
- 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.setPrefix("Agent");
- m.setPluginName(p.getNsURI());
- m.setName("SiriusManagerAgentServer");
- m.setTitle("SiriusManagerAgentServer");
- ControllerGenerator g = new ControllerGenerator(o,m);
- g.setEnableIRequestHandler(false);
- g.setEnableISiriusPlugin(true);
- EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();
- g.addObject("gui",gui,m);
- EObject e = org.openecomp.ncomp.sirius.manager.server.ServerFactory.eINSTANCE.createSouthBoundApi();
- g.addObject("south",e,m);
- //g.addFactory("org.openecomp.ncomp.sirius.servers.openstack.OsOpenstackFactory");
- //g.enableDrools();
- g.generate(dir);
- g.generateScripts("src/main/server-gen/bin","sirius-manager-agent-server");
- }
-
-
-}
+package org.openecomp.ncomp.sirius.manager.agent.server.tools; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EPackage; + +import org.openecomp.utils.YamlToJava; +import org.openecomp.ncomp.sirius.manager.controllermodel.ControllerModel; +import org.openecomp.ncomp.sirius.manager.controllermodel.ControllermodelFactory; +import org.openecomp.ncomp.sirius.manager.generator.ControllerGenerator; +import org.openecomp.ncomp.gwt.siriusportal.model.*; +import org.openecomp.ncomp.sirius.manager.agent.monitoring.MonitoringFactory; + + +public class Generator { + + /** + * @param args + */ + public static void main(String[] args) { + @SuppressWarnings("unused") + MonitoringFactory f = MonitoringFactory.eINSTANCE; + EObject o = MonitoringFactory.eINSTANCE.createSiriusManagerAgentServer(); + EPackage p = o.eClass().getEPackage(); + String dir = p.getNsURI().replace(p.getNsPrefix(),"") + "servers." + p.getNsPrefix(); + dir= "src/main/sirius-gen/" + dir.replace('.', '/'); + ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel(); + m.setTemplateDirectory("../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates"); + m.setPrefix("Agent"); + m.setPluginName(p.getNsURI()); + m.setName("SiriusManagerAgentServer"); + m.setTitle("SiriusManagerAgentServer"); + ControllerGenerator g = new ControllerGenerator(o,m); + g.setVersion("ONAP-R2"); + g.setEnableIRequestHandler(false); + g.setEnableISiriusPlugin(true); + EObject gui = ModelFactory.eINSTANCE.createGuiClientApi(); + g.addObject("gui",gui,m); + EObject e = org.openecomp.ncomp.sirius.manager.server.ServerFactory.eINSTANCE.createSouthBoundApi(); + g.addObject("south",e,m); + //g.addFactory("org.openecomp.ncomp.sirius.servers.openstack.OsOpenstackFactory"); + //g.enableDrools(); + g.generate(dir); + g.generateScripts("src/main/server-gen/bin","sirius-manager-agent-server"); + String pName = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".logging"; + YamlToJava.convert("src/main/sirius-gen/SiriusManagerAgentServer.yaml", dir + "/logging", pName); + String pName1 = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".south.logging"; + YamlToJava.convert("src/main/sirius-gen/SouthBoundApi.yaml", dir + "/south/logging", pName1); + String pName2 = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix() +".gui.logging"; + YamlToJava.convert("src/main/sirius-gen/GuiClientApi.yaml", dir + "/gui/logging", pName2); + + } + + +} diff --git a/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller b/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller index 86a0713..b6708e7 100644 --- a/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller +++ b/ncomp-sirius-manager-agent-server/src/main/server-gen/bin/sirius-manager-agent-server-controller @@ -63,22 +63,24 @@ CMD=$1 shift check_status + +CP=$(find $_DIR/lib/*/* -name \*.jar 2>/dev/null | xargs -I X printf ":%s" X) + +JVMARGS=$(grep 'server.jvmargs' $_DIR/config/monitoring.properties | sed -e 's/.*=//') + case $CMD in status) echo $_STATUS exit 0 ;; console) - CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X) - $GROOVY_HOME/bin/groovysh -cp $_DIR/config:$_DIR/lib:$CP + $GROOVY_HOME/bin/groovysh -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP ;; run) - CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X) - $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$CP "$@" + $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" ;; groovy) - CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X) - $GROOVY_HOME/bin/groovy -cp $_DIR/config:$_DIR/lib:$CP "$@" + $GROOVY_HOME/bin/groovy -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" ;; start) if [ "$_RUNNING" = "1" ]; then @@ -90,9 +92,8 @@ case $CMD in if [ -e $_DIR/logs/$PNAME.err.1 ]; then mv $_DIR/logs/$PNAME.err.1 $_DIR/logs/$PNAME.err.2; fi if [ -e $_DIR/logs/$PNAME.out ]; then mv $_DIR/logs/$PNAME.out $_DIR/logs/$PNAME.out.1; fi if [ -e $_DIR/logs/$PNAME.err ]; then mv $_DIR/logs/$PNAME.err $_DIR/logs/$PNAME.err.1; fi - CP=$(find $_DIR/lib -name \*.jar | xargs -I X printf ":%s" X) - nohup $JAVA_HOME/bin/java -cp $_DIR/config:$_DIR/lib:$CP "$@" $CLASS > $_DIR/logs/$PNAME.out 2> $_DIR/logs/$PNAME.err & + nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_DIR/lib/\*:$CP "$@" $CLASS >> $_DIR/logs/$PNAME.out 2>> $_DIR/logs/$PNAME.err & _PID=$! echo $_PID > $_PIDFILE diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/GuiClientApi.yaml b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/GuiClientApi.yaml new file mode 100644 index 0000000..1489339 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/GuiClientApi.yaml @@ -0,0 +1,57 @@ +operations: + GuiClientApi@getTree: {} + GuiClientApi@getObject: {} + GuiClientApi@getTimeSerie: {} + GuiClientApi@getTable: {} + GuiClientApi@getHtml: {} + GuiClientApi@getGraph: {} +messages: + dummy: {} + REQUEST-FAILED-getTree: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-getObject: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-getTimeSerie: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-getTable: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-getHtml: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-getGraph: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REMOTE-CALL-FAILED-getTree: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-getObject: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-getTimeSerie: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-getTable: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-getHtml: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-getGraph: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SiriusManagerAgentServer.yaml b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SiriusManagerAgentServer.yaml new file mode 100644 index 0000000..a053875 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SiriusManagerAgentServer.yaml @@ -0,0 +1,93 @@ +operations: + SiriusManagerAgentServer@logs: {} + SiriusManagerAgentServer@metrics: {} + SiriusManagerAgentServer@properties: {} + SiriusManagerAgentServer@uploadInfo: {} + SiriusManagerAgentServer@getValues: {} + SiriusManagerAgentServer@getValuesAll: {} + SiriusManagerAgentServer@getMessages: {} + SiriusManagerAgentServer@getRequestLogger: {} + SiriusManagerAgentServer@evaluate: {} + SiriusManagerAgentServer@update: {} +messages: + dummy: {} + REQUEST-FAILED-logs: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-metrics: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-properties: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-uploadInfo: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-getValues: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-getValuesAll: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-getMessages: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-getRequestLogger: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-evaluate: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-update: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REMOTE-CALL-FAILED-logs: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-metrics: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-properties: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-uploadInfo: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-getValues: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-getValuesAll: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-getMessages: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-getRequestLogger: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-evaluate: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-update: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SouthBoundApi.yaml b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SouthBoundApi.yaml new file mode 100644 index 0000000..f7ed5b2 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/SouthBoundApi.yaml @@ -0,0 +1,30 @@ +operations: + SouthBoundApi@logs: {} + SouthBoundApi@metrics: {} + SouthBoundApi@properties: {} +messages: + dummy: {} + REQUEST-FAILED-logs: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-metrics: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REQUEST-FAILED-properties: + errorCode: 4001W + messageFormat: '{0}' + description: Operation Failed with Exception + REMOTE-CALL-FAILED-logs: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-metrics: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception + REMOTE-CALL-FAILED-properties: + errorCode: 4001W + messageFormat: '{0}' + description: Remote Operation Failed with Exception diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServer.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServer.java index f4147a4..eb0a780 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServer.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServer.java @@ -23,18 +23,40 @@ // Do not edit. No need to extend this class. package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring; + + + + import java.io.InputStream; + import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; +import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; + +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; + import java.util.Date; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging.SiriusManagerAgentServerOperationEnum; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging.SiriusManagerAgentServerMessageEnum; + + + + @@ -42,10 +64,14 @@ import java.util.Date; + + import org.openecomp.ncomp.sirius.manager.server.LoggerInfo; + + import org.openecomp.ncomp.sirius.manager.server.ServerFactory; @@ -53,9 +79,10 @@ import org.openecomp.ncomp.sirius.manager.agent.monitoring.impl.SiriusManagerAge -public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl implements ISiriusPlugin { +public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl implements ISiriusProvider, ISiriusPlugin { public static final Logger logger = Logger.getLogger(AgentSiriusManagerAgentServer.class); - AgentSiriusManagerAgentServerProvider controller; + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); + public AgentSiriusManagerAgentServerProvider controller; ISiriusServer server; public AgentSiriusManagerAgentServer(ISiriusServer server) { @@ -69,6 +96,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_logs,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_logs,"self:" + ManagementServer.object2ref(this)); try { controller.logs(cx,logs); } @@ -77,8 +106,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_logs, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_logs,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_logs, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "logs", ApiRequestStatus.OKAY, duration_,cx,logs); @@ -91,6 +124,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_metrics,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_metrics,"self:" + ManagementServer.object2ref(this)); try { controller.metrics(cx,metrics); } @@ -99,8 +134,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_metrics, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_metrics, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.OKAY, duration_,cx,metrics); @@ -113,6 +152,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_properties,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_properties,"self:" + ManagementServer.object2ref(this)); try { controller.properties(cx,l); } @@ -121,8 +162,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_properties, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_properties,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_properties, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "properties", ApiRequestStatus.OKAY, duration_,cx,l); @@ -135,6 +180,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.START, duration_,cx,info); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_uploadInfo,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_uploadInfo,"self:" + ManagementServer.object2ref(this)); try { controller.uploadInfo(cx,info); } @@ -143,8 +190,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.ERROR, duration_,cx,info); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_uploadInfo, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_uploadInfo,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_uploadInfo, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.OKAY, duration_,cx,info); @@ -157,6 +208,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.START, duration_,cx,path,start,end,option,relativeInterval); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValues,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValues,"self:" + ManagementServer.object2ref(this)); try { res = controller.getValues(cx,path,start,end,option,relativeInterval); } @@ -165,8 +218,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.ERROR, duration_,cx,path,start,end,option,relativeInterval); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValues, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValues,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValues, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.OKAY, duration_,cx,path,start,end,option,relativeInterval); @@ -179,6 +236,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.START, duration_,cx,path,metrics,start,end,option,relativeInterval); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValuesAll,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValuesAll,"self:" + ManagementServer.object2ref(this)); try { res = controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval); } @@ -187,8 +246,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.ERROR, duration_,cx,path,metrics,start,end,option,relativeInterval); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValuesAll, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValuesAll,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getValuesAll, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.OKAY, duration_,cx,path,metrics,start,end,option,relativeInterval); @@ -201,6 +264,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.START, duration_,cx,path,start,end); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getMessages,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getMessages,"self:" + ManagementServer.object2ref(this)); try { res = controller.getMessages(cx,path,start,end); } @@ -209,8 +274,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.ERROR, duration_,cx,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getMessages, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getMessages,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getMessages, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.OKAY, duration_,cx,path,start,end); @@ -223,6 +292,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.START, duration_,userName,action,resourcePath,context); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getRequestLogger,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getRequestLogger,"self:" + ManagementServer.object2ref(this)); try { res = controller.getRequestLogger(userName,action,resourcePath,context); } @@ -231,8 +302,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.ERROR, duration_,userName,action,resourcePath,context); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getRequestLogger, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getRequestLogger,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_getRequestLogger, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.OKAY, duration_,userName,action,resourcePath,context); @@ -245,6 +320,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.START, duration_,path,function); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_evaluate,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_evaluate,"self:" + ManagementServer.object2ref(this)); try { res = controller.evaluate(path,function); } @@ -253,8 +330,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.ERROR, duration_,path,function); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_evaluate, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_evaluate,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_evaluate, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.OKAY, duration_,path,function); @@ -267,6 +348,8 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "update", ApiRequestStatus.START, duration_,path,function); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_update,server,this); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_update,"self:" + ManagementServer.object2ref(this)); try { controller.update(path,function); } @@ -275,8 +358,12 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl if (server != null) server.getServer().recordApi(null, this, "update", ApiRequestStatus.ERROR, duration_,path,function); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_update, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_update,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SiriusManagerAgentServerMessageEnum.REQUEST_FAILED_update, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "update", ApiRequestStatus.OKAY, duration_,path,function); @@ -288,14 +375,17 @@ public class AgentSiriusManagerAgentServer extends SiriusManagerAgentServerImpl + + @Override public void start() { controller.start(); } - public static void ecoreSetup() { AgentSiriusManagerAgentServerProvider.ecoreSetup(); } - + public AgentSiriusManagerAgentServerProvider getSiriusProvider() { + return controller; + } } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerClient.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerClient.java index db52905..da4fce5 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerClient.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerClient.java @@ -25,13 +25,21 @@ package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring; import org.openecomp.ncomp.sirius.manager.AbstractClient; import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient; -import org.openecomp.ncomp.sirius.manager.Jetty8Client; +import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; + +import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; + import org.openecomp.ncomp.sirius.manager.agent.monitoring.impl.SiriusManagerAgentServerImpl; import org.openecomp.ncomp.sirius.manager.agent.monitoring.MonitoringPackage; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging.SiriusManagerAgentServerOperationEnum; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging.SiriusManagerAgentServerMessageEnum; @@ -41,79 +49,209 @@ import org.openecomp.ncomp.sirius.manager.agent.monitoring.MonitoringPackage; @SuppressWarnings("unchecked") public class AgentSiriusManagerAgentServerClient extends SiriusManagerAgentServerImpl { public static final Logger logger = Logger.getLogger(AgentSiriusManagerAgentServerClient.class); + static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); public AbstractClient client; public AgentSiriusManagerAgentServerClient(String file, String name) { AgentSiriusManagerAgentServer.ecoreSetup(); - client = new Jetty8Client(file,name); + client = new GenericHttpClient(file,name); client.add("/resources", this); + client.setVersion("ONAP-R2"); } public AgentSiriusManagerAgentServerClient(String file, String name1, String name2) { HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2); client = client1.all; // requests should be forwarded to all. client.add("/resources", this); + client.setVersion("ONAP-R2"); } + + public AgentSiriusManagerAgentServerClient(AbstractClient c) { + client = c; + client.add("/resources", this); + client.setVersion("ONAP-R2"); + } + @Override public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_logs,client.getRemote()); + + try { + client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_logs, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } @Override public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_metrics,client.getRemote()); + + try { + client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } @Override public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_properties,client.getRemote()); + + try { + client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_properties, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } @Override public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_uploadInfo,client.getRemote()); + + try { + client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_uploadInfo, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } @Override public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - return (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValues", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end,option,relativeInterval); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValues,client.getRemote()); + EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res; + try { + res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValues", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end,option,relativeInterval); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValues, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValues,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValues,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(org.json.JSONObject cx, java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - return (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValuesAll", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,metrics,start,end,option,relativeInterval); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getValuesAll,client.getRemote()); + EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res; + try { + res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValuesAll", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,metrics,start,end,option,relativeInterval); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValuesAll, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - return (EList<org.openecomp.ncomp.core.logs.LogMessage>) client.operationPath("/resources", c, "getMessages", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getMessages,client.getRemote()); + EList<org.openecomp.ncomp.core.logs.LogMessage> res; + try { + res = (EList<org.openecomp.ncomp.core.logs.LogMessage>) client.operationPath("/resources", c, "getMessages", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getMessages, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getMessages,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getMessages,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - return (org.openecomp.ncomp.sirius.manager.server.LoggerInfo) client.operationPath("/resources", c, "getRequestLogger", null, userName,action,resourcePath,context); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_getRequestLogger,client.getRemote()); + org.openecomp.ncomp.sirius.manager.server.LoggerInfo res; + try { + res = (org.openecomp.ncomp.sirius.manager.server.LoggerInfo) client.operationPath("/resources", c, "getRequestLogger", null, userName,action,resourcePath,context); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - return (EList<org.openecomp.ncomp.core.function.ValuePair>) client.operationPath("/resources", c, "evaluate", null, path,function); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_evaluate,client.getRemote()); + EList<org.openecomp.ncomp.core.function.ValuePair> res; + try { + res = (EList<org.openecomp.ncomp.core.function.ValuePair>) client.operationPath("/resources", c, "evaluate", null, path,function); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_evaluate, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_evaluate,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_evaluate,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) { - EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); - client.operationPath("/resources", c, "update", null, path,function); + EClass c = MonitoringPackage.eINSTANCE.getSiriusManagerAgentServer(); + ecomplogger.recordMetricEventStart(SiriusManagerAgentServerOperationEnum.SiriusManagerAgentServer_update,client.getRemote()); + + try { + client.operationPath("/resources", c, "update", null, path,function); + } + catch (Exception e) { + ecomplogger.warn(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_update, e.toString()); + EcompException e1 = EcompException.create(SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_update,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SiriusManagerAgentServerMessageEnum.REMOTE_CALL_FAILED_update,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerConsole.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerConsole.java index 4efd29f..8c9ad68 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerConsole.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerConsole.java @@ -23,13 +23,18 @@ // Do not edit but extend this class as needed package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring; + import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; + import org.openecomp.ncomp.sirius.manager.console.Console; +import org.openecomp.ncomp.sirius.manager.AbstractClient; import org.openecomp.ncomp.sirius.manager.ManagementServerError; + import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.AgentGuiClientApiConsole; + import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.AgentSouthBoundApiConsole; @@ -50,6 +55,12 @@ public class AgentSiriusManagerAgentServerConsole extends Console { gui = new AgentGuiClientApiConsole(filename,name); south = new AgentSouthBoundApiConsole(filename,name); } + + public AgentSiriusManagerAgentServerConsole(AbstractClient c) { + controller = new AgentSiriusManagerAgentServerClient(c); + client = controller.client; + } + public void logs(EList<org.openecomp.ncomp.core.logs.LogMessage> logs) { diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerProviderTemplate.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerProviderTemplate.java index 82f9dc6..f600613 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerProviderTemplate.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerProviderTemplate.java @@ -19,8 +19,7 @@ * ============LICENSE_END============================================ */ -// Autogenerated -// Do not edit. No need to extend this class. + package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring; @@ -51,6 +50,7 @@ import org.openecomp.ncomp.sirius.manager.server.ServerFactory; import org.openecomp.ncomp.sirius.manager.BasicManagementServerProvider; + import org.openecomp.ncomp.sirius.manager.agent.monitoring.impl.SiriusManagerAgentServerImpl; import org.openecomp.ncomp.sirius.manager.agent.monitoring.SiriusManagerAgentServer; @@ -68,15 +68,7 @@ public class AgentSiriusManagerAgentServerProviderTemplate extends BasicManageme - public void start() { - // TODO Auto-generated method stub - } - - public static void ecoreSetup() { - // TODO Auto-generated method stub - - } } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerServer.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerServer.java index a98eabe..d14b82c 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerServer.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/AgentSiriusManagerAgentServerServer.java @@ -26,14 +26,16 @@ package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring; import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath; import java.io.IOException; +import java.io.InputStream; import java.util.Properties; import java.util.TimeZone; import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EFactory; - +import org.json.JSONObject; import org.openecomp.ncomp.sirius.manager.Jetty8Server; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.IRequestHandler; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.ncomp.sirius.manager.agent.monitoring.SiriusManagerAgentServer; @@ -47,7 +49,7 @@ import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.AgentSe -public class AgentSiriusManagerAgentServerServer implements ISiriusServer { +public class AgentSiriusManagerAgentServerServer implements ISiriusServer, IRequestHandler { public static final Logger logger = Logger.getLogger(AgentSiriusManagerAgentServerServer.class); String serverPath; ManagementServer server; @@ -56,6 +58,7 @@ public class AgentSiriusManagerAgentServerServer implements ISiriusServer { // LocationControllerApi api ; Jetty8Server webServer; AgentMonitoringFactory f = new AgentMonitoringFactory(this); + String guiPath; ManagementServer guiServer; @@ -70,6 +73,7 @@ public class AgentSiriusManagerAgentServerServer implements ISiriusServer { props = getPropertiesFromClasspath(filename); serverPath = (String) props.get("server.dir"); server = new ManagementServer(f, "SiriusManagerAgentServer", serverPath, filename); + ManagementServer.setBuildVersion("ONAP-R2"); server.addFactory(f); server.addRuntimeFactories(this); @@ -79,6 +83,7 @@ public class AgentSiriusManagerAgentServerServer implements ISiriusServer { controller = (AgentSiriusManagerAgentServer) server.find("/").o; webServer = new Jetty8Server("monitoring.properties"); webServer.add("/resources",server); + webServer.add("/api",this); @@ -113,4 +118,17 @@ public class AgentSiriusManagerAgentServerServer implements ISiriusServer { public ManagementServer getServer() { return server; } + public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, + String clientVersion) { + switch ((String) context.get("path")) { + case "/api/versions": + return server.supportedVersions(); + } + logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2)); + throw new RuntimeException("Unknown request"); + } + public Object handleBinary(String userName, String action, String resourcePath, InputStream in) { + return null; + } + } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApi.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApi.java index 37332ad..796c45e 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApi.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApi.java @@ -23,18 +23,40 @@ // Do not edit. No need to extend this class. package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui; + + + + import java.io.InputStream; + import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; +import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; + +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; + import java.util.Date; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging.GuiClientApiOperationEnum; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging.GuiClientApiMessageEnum; + + + + @@ -42,18 +64,26 @@ import org.openecomp.ncomp.sirius.gui.tools.*; + + import org.openecomp.ncomp.gwt.siriusportal.model.*; + + import org.openecomp.ncomp.sirius.manager.Subject; + + import org.openecomp.ncomp.sirius.manager.ManagementServer; + + import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer; @@ -61,9 +91,10 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl; -public class AgentGuiClientApi extends GuiClientApiImpl { +public class AgentGuiClientApi extends GuiClientApiImpl implements ISiriusProvider { public static final Logger logger = Logger.getLogger(AgentGuiClientApi.class); - AgentGuiClientApiProvider controller; + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); + public AgentGuiClientApiProvider controller; ISiriusServer server; public AgentGuiClientApi(ISiriusServer server) { @@ -77,6 +108,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTree(); } @@ -85,8 +118,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.OKAY, duration_); @@ -99,6 +136,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this)); try { res = controller.getObject(path); } @@ -107,8 +146,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.OKAY, duration_,path); @@ -121,6 +164,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.START, duration_,path,start,end,duration); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTimeSerie(path,start,end,duration); } @@ -129,8 +174,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.OKAY, duration_,path,start,end,duration); @@ -143,6 +192,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTable(path,start,end); } @@ -151,8 +202,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.OKAY, duration_,path,start,end); @@ -165,6 +220,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this)); try { res = controller.getHtml(path,start,end); } @@ -173,8 +230,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.OKAY, duration_,path,start,end); @@ -187,6 +248,8 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this)); try { res = controller.getGraph(path,start,end); } @@ -195,8 +258,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.OKAY, duration_,path,start,end); @@ -208,8 +275,12 @@ public class AgentGuiClientApi extends GuiClientApiImpl { + + public static void ecoreSetup() { AgentGuiClientApiProvider.ecoreSetup(); } - + public AgentGuiClientApiProvider getSiriusProvider() { + return controller; + } } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiClient.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiClient.java index f480a06..9140d0b 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiClient.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiClient.java @@ -25,13 +25,21 @@ package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui; import org.openecomp.ncomp.sirius.manager.AbstractClient; import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient; -import org.openecomp.ncomp.sirius.manager.Jetty8Client; +import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; + +import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; + import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl; import org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging.GuiClientApiOperationEnum; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging.GuiClientApiMessageEnum; import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.AgentSiriusManagerAgentServer; @@ -42,55 +50,137 @@ import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.AgentSiriusMa @SuppressWarnings("unchecked") public class AgentGuiClientApiClient extends GuiClientApiImpl { public static final Logger logger = Logger.getLogger(AgentGuiClientApiClient.class); + static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); public AbstractClient client; public AgentGuiClientApiClient(String file, String name) { AgentSiriusManagerAgentServer.ecoreSetup(); - client = new Jetty8Client(file,name); + client = new GenericHttpClient(file,name); client.add("/gui", this); + client.setVersion("ONAP-R2"); } public AgentGuiClientApiClient(String file, String name1, String name2) { HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2); client = client1.all; // requests should be forwarded to all. client.add("/gui", this); + client.setVersion("ONAP-R2"); } + + public AgentGuiClientApiClient(AbstractClient c) { + client = c; + client.add("/resources", this); + client.setVersion("ONAP-R2"); + } + @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiObject getObject(java.lang.String path) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie getTimeSerie(java.lang.String path, java.lang.String start, java.lang.String end, java.lang.String duration) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTable getTable(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml getHtml(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.sirius.manager.graph.GuiGraph getGraph(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); - return (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote()); + org.openecomp.ncomp.sirius.manager.graph.GuiGraph res; + try { + res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiConsole.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiConsole.java index 2a18f02..2cb0bc5 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiConsole.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiConsole.java @@ -23,9 +23,12 @@ // Do not edit but extend this class as needed package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui; + import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; + import org.openecomp.ncomp.sirius.manager.console.Console; +import org.openecomp.ncomp.sirius.manager.AbstractClient; import org.openecomp.ncomp.sirius.manager.ManagementServerError; @@ -44,6 +47,12 @@ public class AgentGuiClientApiConsole extends Console { client = controller.client; } + + public AgentGuiClientApiConsole(AbstractClient c) { + controller = new AgentGuiClientApiClient(c); + client = controller.client; + } + public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() { org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res = null; diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiProviderTemplate.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiProviderTemplate.java index 43754f4..c921aaa 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiProviderTemplate.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/AgentGuiClientApiProviderTemplate.java @@ -19,8 +19,7 @@ * ============LICENSE_END============================================ */ -// Autogenerated -// Do not edit. No need to extend this class. + package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui; @@ -57,6 +56,7 @@ import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer; import org.openecomp.ncomp.sirius.manager.BasicGuiClientApiProvider; + import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl; import org.openecomp.ncomp.gwt.siriusportal.model.GuiClientApi; @@ -74,10 +74,5 @@ public class AgentGuiClientApiProviderTemplate extends BasicGuiClientApiProvider - public static void ecoreSetup() { - // TODO Auto-generated method stub - - } - } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApi.properties b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApi.properties new file mode 100644 index 0000000..3822d29 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApi.properties @@ -0,0 +1,78 @@ + +dummy=\ + dummy-null|\ + null|\ + null|\ + null + +REQUEST_FAILED_getTree=\ + REQUEST-FAILED-getTree-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_getObject=\ + REQUEST-FAILED-getObject-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_getTimeSerie=\ + REQUEST-FAILED-getTimeSerie-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_getTable=\ + REQUEST-FAILED-getTable-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_getHtml=\ + REQUEST-FAILED-getHtml-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_getGraph=\ + REQUEST-FAILED-getGraph-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REMOTE_CALL_FAILED_getTree=\ + REMOTE-CALL-FAILED-getTree-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_getObject=\ + REMOTE-CALL-FAILED-getObject-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_getTimeSerie=\ + REMOTE-CALL-FAILED-getTimeSerie-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_getTable=\ + REMOTE-CALL-FAILED-getTable-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_getHtml=\ + REMOTE-CALL-FAILED-getHtml-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_getGraph=\ + REMOTE-CALL-FAILED-getGraph-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiMessageEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiMessageEnum.java new file mode 100644 index 0000000..606b10f --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiMessageEnum.java @@ -0,0 +1,26 @@ + +package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging; + +import com.att.eelf.i18n.EELFResourceManager; +import org.openecomp.logger.EcompMessageEnum; + +public enum GuiClientApiMessageEnum implements EcompMessageEnum { + + dummy, + REQUEST_FAILED_getTree, + REQUEST_FAILED_getObject, + REQUEST_FAILED_getTimeSerie, + REQUEST_FAILED_getTable, + REQUEST_FAILED_getHtml, + REQUEST_FAILED_getGraph, + REMOTE_CALL_FAILED_getTree, + REMOTE_CALL_FAILED_getObject, + REMOTE_CALL_FAILED_getTimeSerie, + REMOTE_CALL_FAILED_getTable, + REMOTE_CALL_FAILED_getHtml, + REMOTE_CALL_FAILED_getGraph; + + static { + EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApi"); + } +} diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiOperationEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiOperationEnum.java new file mode 100644 index 0000000..5b80740 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/gui/logging/GuiClientApiOperationEnum.java @@ -0,0 +1,27 @@ + +package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.gui.logging; + +import org.openecomp.entity.EcompOperationEnum; + +public enum GuiClientApiOperationEnum implements EcompOperationEnum { + + GuiClientApi_getTree("GuiClientApi@getTree"), + GuiClientApi_getObject("GuiClientApi@getObject"), + GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"), + GuiClientApi_getTable("GuiClientApi@getTable"), + GuiClientApi_getHtml("GuiClientApi@getHtml"), + GuiClientApi_getGraph("GuiClientApi@getGraph") ; + + + private String n; + + private GuiClientApiOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + +} diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServer.properties b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServer.properties new file mode 100644 index 0000000..945efe6 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServer.properties @@ -0,0 +1,126 @@ + +dummy=\ + dummy-null|\ + null|\ + null|\ + null + +REQUEST_FAILED_logs=\ + REQUEST-FAILED-logs-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_metrics=\ + REQUEST-FAILED-metrics-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_properties=\ + REQUEST-FAILED-properties-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_uploadInfo=\ + REQUEST-FAILED-uploadInfo-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_getValues=\ + REQUEST-FAILED-getValues-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_getValuesAll=\ + REQUEST-FAILED-getValuesAll-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_getMessages=\ + REQUEST-FAILED-getMessages-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_getRequestLogger=\ + REQUEST-FAILED-getRequestLogger-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_evaluate=\ + REQUEST-FAILED-evaluate-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_update=\ + REQUEST-FAILED-update-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REMOTE_CALL_FAILED_logs=\ + REMOTE-CALL-FAILED-logs-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_metrics=\ + REMOTE-CALL-FAILED-metrics-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_properties=\ + REMOTE-CALL-FAILED-properties-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_uploadInfo=\ + REMOTE-CALL-FAILED-uploadInfo-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_getValues=\ + REMOTE-CALL-FAILED-getValues-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_getValuesAll=\ + REMOTE-CALL-FAILED-getValuesAll-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_getMessages=\ + REMOTE-CALL-FAILED-getMessages-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_getRequestLogger=\ + REMOTE-CALL-FAILED-getRequestLogger-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_evaluate=\ + REMOTE-CALL-FAILED-evaluate-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_update=\ + REMOTE-CALL-FAILED-update-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerMessageEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerMessageEnum.java new file mode 100644 index 0000000..1f74179 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerMessageEnum.java @@ -0,0 +1,34 @@ + +package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging; + +import com.att.eelf.i18n.EELFResourceManager; +import org.openecomp.logger.EcompMessageEnum; + +public enum SiriusManagerAgentServerMessageEnum implements EcompMessageEnum { + + dummy, + REQUEST_FAILED_logs, + REQUEST_FAILED_metrics, + REQUEST_FAILED_properties, + REQUEST_FAILED_uploadInfo, + REQUEST_FAILED_getValues, + REQUEST_FAILED_getValuesAll, + REQUEST_FAILED_getMessages, + REQUEST_FAILED_getRequestLogger, + REQUEST_FAILED_evaluate, + REQUEST_FAILED_update, + REMOTE_CALL_FAILED_logs, + REMOTE_CALL_FAILED_metrics, + REMOTE_CALL_FAILED_properties, + REMOTE_CALL_FAILED_uploadInfo, + REMOTE_CALL_FAILED_getValues, + REMOTE_CALL_FAILED_getValuesAll, + REMOTE_CALL_FAILED_getMessages, + REMOTE_CALL_FAILED_getRequestLogger, + REMOTE_CALL_FAILED_evaluate, + REMOTE_CALL_FAILED_update; + + static { + EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServer"); + } +} diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerOperationEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerOperationEnum.java new file mode 100644 index 0000000..479129a --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/logging/SiriusManagerAgentServerOperationEnum.java @@ -0,0 +1,31 @@ + +package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.logging; + +import org.openecomp.entity.EcompOperationEnum; + +public enum SiriusManagerAgentServerOperationEnum implements EcompOperationEnum { + + SiriusManagerAgentServer_logs("SiriusManagerAgentServer@logs"), + SiriusManagerAgentServer_metrics("SiriusManagerAgentServer@metrics"), + SiriusManagerAgentServer_properties("SiriusManagerAgentServer@properties"), + SiriusManagerAgentServer_uploadInfo("SiriusManagerAgentServer@uploadInfo"), + SiriusManagerAgentServer_getValues("SiriusManagerAgentServer@getValues"), + SiriusManagerAgentServer_getValuesAll("SiriusManagerAgentServer@getValuesAll"), + SiriusManagerAgentServer_getMessages("SiriusManagerAgentServer@getMessages"), + SiriusManagerAgentServer_getRequestLogger("SiriusManagerAgentServer@getRequestLogger"), + SiriusManagerAgentServer_evaluate("SiriusManagerAgentServer@evaluate"), + SiriusManagerAgentServer_update("SiriusManagerAgentServer@update") ; + + + private String n; + + private SiriusManagerAgentServerOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + +} diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApi.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApi.java index 9f3fe78..90027c8 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApi.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApi.java @@ -23,27 +23,48 @@ // Do not edit. No need to extend this class. package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south; + + + + import java.io.InputStream; + import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; +import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; + +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; + import java.util.Date; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging.SouthBoundApiOperationEnum; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging.SouthBoundApiMessageEnum; + + import org.openecomp.ncomp.sirius.manager.server.impl.SouthBoundApiImpl; -public class AgentSouthBoundApi extends SouthBoundApiImpl { +public class AgentSouthBoundApi extends SouthBoundApiImpl implements ISiriusProvider { public static final Logger logger = Logger.getLogger(AgentSouthBoundApi.class); - AgentSouthBoundApiProvider controller; + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); + public AgentSouthBoundApiProvider controller; ISiriusServer server; public AgentSouthBoundApi(ISiriusServer server) { @@ -57,6 +78,8 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl { if (server != null) server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SouthBoundApiOperationEnum.SouthBoundApi_logs,server,this); + ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_logs,"self:" + ManagementServer.object2ref(this)); try { controller.logs(cx,logs); } @@ -65,8 +88,12 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl { if (server != null) server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SouthBoundApiMessageEnum.REQUEST_FAILED_logs, e.toString()); + EcompException e1 = EcompException.create(SouthBoundApiMessageEnum.REQUEST_FAILED_logs,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SouthBoundApiMessageEnum.REQUEST_FAILED_logs, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "logs", ApiRequestStatus.OKAY, duration_,cx,logs); @@ -79,6 +106,8 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl { if (server != null) server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SouthBoundApiOperationEnum.SouthBoundApi_metrics,server,this); + ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_metrics,"self:" + ManagementServer.object2ref(this)); try { controller.metrics(cx,metrics); } @@ -87,8 +116,12 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl { if (server != null) server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SouthBoundApiMessageEnum.REQUEST_FAILED_metrics, e.toString()); + EcompException e1 = EcompException.create(SouthBoundApiMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SouthBoundApiMessageEnum.REQUEST_FAILED_metrics, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.OKAY, duration_,cx,metrics); @@ -101,6 +134,8 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl { if (server != null) server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(SouthBoundApiOperationEnum.SouthBoundApi_properties,server,this); + ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_properties,"self:" + ManagementServer.object2ref(this)); try { controller.properties(cx,l); } @@ -109,8 +144,12 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl { if (server != null) server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(SouthBoundApiMessageEnum.REQUEST_FAILED_properties, e.toString()); + EcompException e1 = EcompException.create(SouthBoundApiMessageEnum.REQUEST_FAILED_properties,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, SouthBoundApiMessageEnum.REQUEST_FAILED_properties, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "properties", ApiRequestStatus.OKAY, duration_,cx,l); @@ -122,8 +161,12 @@ public class AgentSouthBoundApi extends SouthBoundApiImpl { + + public static void ecoreSetup() { AgentSouthBoundApiProvider.ecoreSetup(); } - + public AgentSouthBoundApiProvider getSiriusProvider() { + return controller; + } } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiClient.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiClient.java index 223f47d..7ab4356 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiClient.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiClient.java @@ -25,13 +25,21 @@ package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south; import org.openecomp.ncomp.sirius.manager.AbstractClient; import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient; -import org.openecomp.ncomp.sirius.manager.Jetty8Client; +import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; + +import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; + import org.openecomp.ncomp.sirius.manager.server.impl.SouthBoundApiImpl; import org.openecomp.ncomp.sirius.manager.server.ServerPackage; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging.SouthBoundApiOperationEnum; +import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging.SouthBoundApiMessageEnum; import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.AgentSiriusManagerAgentServer; @@ -42,37 +50,83 @@ import org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.AgentSiriusMa @SuppressWarnings("unchecked") public class AgentSouthBoundApiClient extends SouthBoundApiImpl { public static final Logger logger = Logger.getLogger(AgentSouthBoundApiClient.class); + static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); public AbstractClient client; public AgentSouthBoundApiClient(String file, String name) { AgentSiriusManagerAgentServer.ecoreSetup(); - client = new Jetty8Client(file,name); + client = new GenericHttpClient(file,name); client.add("/south", this); + client.setVersion("ONAP-R2"); } public AgentSouthBoundApiClient(String file, String name1, String name2) { HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2); client = client1.all; // requests should be forwarded to all. client.add("/south", this); + client.setVersion("ONAP-R2"); } + + public AgentSouthBoundApiClient(AbstractClient c) { + client = c; + client.add("/resources", this); + client.setVersion("ONAP-R2"); + } + @Override public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) { - EClass c = ServerPackage.eINSTANCE.getSouthBoundApi(); - client.operationPath("/south", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs); + EClass c = ServerPackage.eINSTANCE.getSouthBoundApi(); + ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_logs,client.getRemote()); + + try { + client.operationPath("/south", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs); + } + catch (Exception e) { + ecomplogger.warn(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_logs, e.toString()); + EcompException e1 = EcompException.create(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } @Override public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) { - EClass c = ServerPackage.eINSTANCE.getSouthBoundApi(); - client.operationPath("/south", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics); + EClass c = ServerPackage.eINSTANCE.getSouthBoundApi(); + ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_metrics,client.getRemote()); + + try { + client.operationPath("/south", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics); + } + catch (Exception e) { + ecomplogger.warn(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString()); + EcompException e1 = EcompException.create(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } @Override public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) { - EClass c = ServerPackage.eINSTANCE.getSouthBoundApi(); - client.operationPath("/south", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l); + EClass c = ServerPackage.eINSTANCE.getSouthBoundApi(); + ecomplogger.recordMetricEventStart(SouthBoundApiOperationEnum.SouthBoundApi_properties,client.getRemote()); + + try { + client.operationPath("/south", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l); + } + catch (Exception e) { + ecomplogger.warn(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_properties, e.toString()); + EcompException e1 = EcompException.create(SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,SouthBoundApiMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiConsole.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiConsole.java index e65be04..8ec10e7 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiConsole.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiConsole.java @@ -23,9 +23,12 @@ // Do not edit but extend this class as needed package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south; + import org.apache.log4j.Logger; import org.eclipse.emf.common.util.EList; + import org.openecomp.ncomp.sirius.manager.console.Console; +import org.openecomp.ncomp.sirius.manager.AbstractClient; import org.openecomp.ncomp.sirius.manager.ManagementServerError; @@ -44,6 +47,12 @@ public class AgentSouthBoundApiConsole extends Console { client = controller.client; } + + public AgentSouthBoundApiConsole(AbstractClient c) { + controller = new AgentSouthBoundApiClient(c); + client = controller.client; + } + public void logs(EList<org.openecomp.ncomp.core.logs.LogMessage> logs) { diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiProviderTemplate.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiProviderTemplate.java index fb7d5df..03cd5b3 100644 --- a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiProviderTemplate.java +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/AgentSouthBoundApiProviderTemplate.java @@ -19,8 +19,7 @@ * ============LICENSE_END============================================ */ -// Autogenerated -// Do not edit. No need to extend this class. + package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south; @@ -42,6 +41,7 @@ import org.json.JSONObject; import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider; + import org.openecomp.ncomp.sirius.manager.server.impl.SouthBoundApiImpl; import org.openecomp.ncomp.sirius.manager.server.SouthBoundApi; @@ -77,10 +77,5 @@ public class AgentSouthBoundApiProviderTemplate extends BasicAdaptorProvider { - public static void ecoreSetup() { - // TODO Auto-generated method stub - - } - } diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApi.properties b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApi.properties new file mode 100644 index 0000000..eec7023 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApi.properties @@ -0,0 +1,42 @@ + +dummy=\ + dummy-null|\ + null|\ + null|\ + null + +REQUEST_FAILED_logs=\ + REQUEST-FAILED-logs-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_metrics=\ + REQUEST-FAILED-metrics-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REQUEST_FAILED_properties=\ + REQUEST-FAILED-properties-4001W|\ + {0}|\ + null|\ + Operation Failed with Exception + +REMOTE_CALL_FAILED_logs=\ + REMOTE-CALL-FAILED-logs-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_metrics=\ + REMOTE-CALL-FAILED-metrics-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception + +REMOTE_CALL_FAILED_properties=\ + REMOTE-CALL-FAILED-properties-4001W|\ + {0}|\ + null|\ + Remote Operation Failed with Exception diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiMessageEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiMessageEnum.java new file mode 100644 index 0000000..10ad171 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiMessageEnum.java @@ -0,0 +1,20 @@ + +package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging; + +import com.att.eelf.i18n.EELFResourceManager; +import org.openecomp.logger.EcompMessageEnum; + +public enum SouthBoundApiMessageEnum implements EcompMessageEnum { + + dummy, + REQUEST_FAILED_logs, + REQUEST_FAILED_metrics, + REQUEST_FAILED_properties, + REMOTE_CALL_FAILED_logs, + REMOTE_CALL_FAILED_metrics, + REMOTE_CALL_FAILED_properties; + + static { + EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApi"); + } +} diff --git a/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiOperationEnum.java b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiOperationEnum.java new file mode 100644 index 0000000..9095cb5 --- /dev/null +++ b/ncomp-sirius-manager-agent-server/src/main/sirius-gen/org/openecomp/ncomp/sirius/manager/agent/servers/monitoring/south/logging/SouthBoundApiOperationEnum.java @@ -0,0 +1,24 @@ + +package org.openecomp.ncomp.sirius.manager.agent.servers.monitoring.south.logging; + +import org.openecomp.entity.EcompOperationEnum; + +public enum SouthBoundApiOperationEnum implements EcompOperationEnum { + + SouthBoundApi_logs("SouthBoundApi@logs"), + SouthBoundApi_metrics("SouthBoundApi@metrics"), + SouthBoundApi_properties("SouthBoundApi@properties") ; + + + private String n; + + private SouthBoundApiOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + +} |