aboutsummaryrefslogtreecommitdiffstats
path: root/ncomp-cdap-adaptor
diff options
context:
space:
mode:
Diffstat (limited to 'ncomp-cdap-adaptor')
-rw-r--r--ncomp-cdap-adaptor/.classpath1
-rw-r--r--ncomp-cdap-adaptor/META-INF/MANIFEST.MF8
-rw-r--r--ncomp-cdap-adaptor/pom.xml2
-rw-r--r--ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/cdap/adaptor/tools/Generator.java3
-rw-r--r--ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java23
-rw-r--r--ncomp-cdap-adaptor/src/main/server-gen/bin/cdap-adaptor-controller2
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/CdapCluster.yaml495
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml72
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptor.java20
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorClient.java5
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorServer.java24
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java455
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java488
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java33
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java18
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApi.java74
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApiClient.java71
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApi.properties50
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiMessageEnum.java47
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiOperationEnum.java52
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptor.properties2
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorMessageEnum.java23
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorOperationEnum.java34
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapCluster.properties350
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterMessageEnum.java185
-rw-r--r--ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterOperationEnum.java154
26 files changed, 1496 insertions, 1195 deletions
diff --git a/ncomp-cdap-adaptor/.classpath b/ncomp-cdap-adaptor/.classpath
index d2d34b3..89273c0 100644
--- a/ncomp-cdap-adaptor/.classpath
+++ b/ncomp-cdap-adaptor/.classpath
@@ -21,7 +21,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
- <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
diff --git a/ncomp-cdap-adaptor/META-INF/MANIFEST.MF b/ncomp-cdap-adaptor/META-INF/MANIFEST.MF
index 9da1c17..85fe2d7 100644
--- a/ncomp-cdap-adaptor/META-INF/MANIFEST.MF
+++ b/ncomp-cdap-adaptor/META-INF/MANIFEST.MF
@@ -5,10 +5,4 @@ Bundle-SymbolicName: ncomp-cdap-adaptor
Bundle-Version: 0.1.0.qualifier
Export-Package: org.openecomp.ncomp.cdap.adaptor.tools,
org.openecomp.ncomp.servers.cdap
-Require-Bundle: ncomp-core-types,
- ncomp-sirius-manager-model,
- ncomp-sirius-manager-server,
- ncomp-sirius-manager-console,
- ncomp-sirius-manager-generator,
- ncomp-cdap-model;bundle-version="0.1.0",
- ncomp-utils-java;bundle-version="0.1.0"
+
diff --git a/ncomp-cdap-adaptor/pom.xml b/ncomp-cdap-adaptor/pom.xml
index bcd98e2..4173a1a 100644
--- a/ncomp-cdap-adaptor/pom.xml
+++ b/ncomp-cdap-adaptor/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.openecomp.ncomp.sirius.manager</groupId>
<artifactId>ncomp-sirius-manager-base</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-base</relativePath>
</parent>
diff --git a/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/cdap/adaptor/tools/Generator.java b/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/cdap/adaptor/tools/Generator.java
index e61709d..1fb499f 100644
--- a/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/cdap/adaptor/tools/Generator.java
+++ b/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/cdap/adaptor/tools/Generator.java
@@ -46,12 +46,13 @@ public class Generator {
String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();
dir= "src/main/sirius-gen/" + dir.replace('.', '/');
ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
- m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
+ m.setTemplateDirectory("../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
m.setPrefix("Cdap");
m.setPluginName(p.getNsURI());
m.setName("Cdap");
m.setTitle("Cdap");
ControllerGenerator g = new ControllerGenerator(o,m);
+ g.setVersion("ONAP-R2");
g.setEnableIRequestHandler(false);
g.setEnableISiriusPlugin(false);
EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();
diff --git a/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java b/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java
index 84ce4a3..737a98c 100644
--- a/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java
+++ b/ncomp-cdap-adaptor/src/main/java/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProvider.java
@@ -444,4 +444,27 @@ public class CdapCdapClusterProvider extends BasicAdaptorProvider {
+ serviceId);
}
+ public String suspendSchedule(String namespace, String appId, String scheduleId) {
+ return customRunCDAPcliCommand(namespace, "suspend schedule " + appId + "." + scheduleId);
+ }
+
+ public String resumeSchedule(String namespace, String appId, String scheduleId) {
+ return customRunCDAPcliCommand(namespace, "resume schedule " + appId + "." + scheduleId);
+ }
+
+ public String loadArtifactWithConfig(String namespace, String artifactName, String jarfile, String version,
+ String config) {
+ Date now = new Date();
+ String filename = "/tmp/"+ now.getTime() + ".appConfig";
+ try {
+ OutputStreamWriter w = FileUtils.filename2writer(filename);
+ w.append(config);
+ w.close();
+ } catch (Exception e) {
+ ManagementServerUtils.printStackTrace(e);
+ logger.fatal("configurationChanged" + e);
+ }
+ return customRunCDAPcliCommand(namespace, "load artifact " + jarfile + " config-file " + filename + " name " + artifactName + " version " + version);
+ }
+
}
diff --git a/ncomp-cdap-adaptor/src/main/server-gen/bin/cdap-adaptor-controller b/ncomp-cdap-adaptor/src/main/server-gen/bin/cdap-adaptor-controller
index 3999772..780012a 100644
--- a/ncomp-cdap-adaptor/src/main/server-gen/bin/cdap-adaptor-controller
+++ b/ncomp-cdap-adaptor/src/main/server-gen/bin/cdap-adaptor-controller
@@ -93,7 +93,7 @@ case $CMD in
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
- nohup $JAVA_HOME/bin/java $JVMARGS -cp $_DIR/config:$_DIR/lib:$_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-cdap-adaptor/src/main/sirius-gen/CdapCluster.yaml b/ncomp-cdap-adaptor/src/main/sirius-gen/CdapCluster.yaml
index aeaf129..378f961 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/CdapCluster.yaml
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/CdapCluster.yaml
@@ -1,432 +1,381 @@
operations:
- createNamespace: {}
- deleteNamespace: {}
- deployApp: {}
- loadArtifact: {}
- deleteArtifact: {}
- startFlow: {}
- startWorker: {}
- startService: {}
- startApp: {}
- stopApp: {}
- deleteApp: {}
- loadPreferencesApp: {}
- loadPreferencesFlow: {}
- loadPreferencesNameSpace: {}
- setPreferencesApp: {}
- setPreferencesFlow: {}
- setPreferencesWorker: {}
- setPreferencesService: {}
- setPreferencesNameSpace: {}
- setFlowRunTimeArgs: {}
- setFlowletInstances: {}
- stopFlow: {}
- stopWorker: {}
- stopService: {}
- truncateDataSet: {}
- deleteDataset: {}
- createStream: {}
- deleteStream: {}
- getStreamEvents: {}
- getStreamStats: {}
- sendEventToStream: {}
- trucateStream: {}
- setStreamProperties: {}
- restartApp: {}
- createApp: {}
- createAppWithConfig: {}
- setDatasetProperties: {}
- setStreamTTL: {}
- poll: {}
- REMOTE_createNamespace:
- decription: Remote call createNamespace
- REMOTE_deleteNamespace:
- decription: Remote call deleteNamespace
- REMOTE_deployApp:
- decription: Remote call deployApp
- REMOTE_loadArtifact:
- decription: Remote call loadArtifact
- REMOTE_deleteArtifact:
- decription: Remote call deleteArtifact
- REMOTE_startFlow:
- decription: Remote call startFlow
- REMOTE_startWorker:
- decription: Remote call startWorker
- REMOTE_startService:
- decription: Remote call startService
- REMOTE_startApp:
- decription: Remote call startApp
- REMOTE_stopApp:
- decription: Remote call stopApp
- REMOTE_deleteApp:
- decription: Remote call deleteApp
- REMOTE_loadPreferencesApp:
- decription: Remote call loadPreferencesApp
- REMOTE_loadPreferencesFlow:
- decription: Remote call loadPreferencesFlow
- REMOTE_loadPreferencesNameSpace:
- decription: Remote call loadPreferencesNameSpace
- REMOTE_setPreferencesApp:
- decription: Remote call setPreferencesApp
- REMOTE_setPreferencesFlow:
- decription: Remote call setPreferencesFlow
- REMOTE_setPreferencesWorker:
- decription: Remote call setPreferencesWorker
- REMOTE_setPreferencesService:
- decription: Remote call setPreferencesService
- REMOTE_setPreferencesNameSpace:
- decription: Remote call setPreferencesNameSpace
- REMOTE_setFlowRunTimeArgs:
- decription: Remote call setFlowRunTimeArgs
- REMOTE_setFlowletInstances:
- decription: Remote call setFlowletInstances
- REMOTE_stopFlow:
- decription: Remote call stopFlow
- REMOTE_stopWorker:
- decription: Remote call stopWorker
- REMOTE_stopService:
- decription: Remote call stopService
- REMOTE_truncateDataSet:
- decription: Remote call truncateDataSet
- REMOTE_deleteDataset:
- decription: Remote call deleteDataset
- REMOTE_createStream:
- decription: Remote call createStream
- REMOTE_deleteStream:
- decription: Remote call deleteStream
- REMOTE_getStreamEvents:
- decription: Remote call getStreamEvents
- REMOTE_getStreamStats:
- decription: Remote call getStreamStats
- REMOTE_sendEventToStream:
- decription: Remote call sendEventToStream
- REMOTE_trucateStream:
- decription: Remote call trucateStream
- REMOTE_setStreamProperties:
- decription: Remote call setStreamProperties
- REMOTE_restartApp:
- decription: Remote call restartApp
- REMOTE_createApp:
- decription: Remote call createApp
- REMOTE_createAppWithConfig:
- decription: Remote call createAppWithConfig
- REMOTE_setDatasetProperties:
- decription: Remote call setDatasetProperties
- REMOTE_setStreamTTL:
- decription: Remote call setStreamTTL
- REMOTE_poll:
- decription: Remote call poll
+ CdapCluster@createNamespace: {}
+ CdapCluster@deleteNamespace: {}
+ CdapCluster@deployApp: {}
+ CdapCluster@loadArtifact: {}
+ CdapCluster@loadArtifactWithConfig: {}
+ CdapCluster@deleteArtifact: {}
+ CdapCluster@startFlow: {}
+ CdapCluster@startWorker: {}
+ CdapCluster@startService: {}
+ CdapCluster@startApp: {}
+ CdapCluster@stopApp: {}
+ CdapCluster@deleteApp: {}
+ CdapCluster@loadPreferencesApp: {}
+ CdapCluster@loadPreferencesFlow: {}
+ CdapCluster@loadPreferencesNameSpace: {}
+ CdapCluster@setPreferencesApp: {}
+ CdapCluster@setPreferencesFlow: {}
+ CdapCluster@setPreferencesWorker: {}
+ CdapCluster@setPreferencesService: {}
+ CdapCluster@setPreferencesNameSpace: {}
+ CdapCluster@setFlowRunTimeArgs: {}
+ CdapCluster@setFlowletInstances: {}
+ CdapCluster@stopFlow: {}
+ CdapCluster@stopWorker: {}
+ CdapCluster@stopService: {}
+ CdapCluster@truncateDataSet: {}
+ CdapCluster@deleteDataset: {}
+ CdapCluster@createStream: {}
+ CdapCluster@deleteStream: {}
+ CdapCluster@getStreamEvents: {}
+ CdapCluster@getStreamStats: {}
+ CdapCluster@sendEventToStream: {}
+ CdapCluster@trucateStream: {}
+ CdapCluster@setStreamProperties: {}
+ CdapCluster@restartApp: {}
+ CdapCluster@createApp: {}
+ CdapCluster@createAppWithConfig: {}
+ CdapCluster@setDatasetProperties: {}
+ CdapCluster@setStreamTTL: {}
+ CdapCluster@suspendSchedule: {}
+ CdapCluster@resumeSchedule: {}
+ CdapCluster@poll: {}
messages:
dummy: {}
- createNamespace:
- errorCode: createNamespace-FAILED-5001W
+ REQUEST-FAILED-createNamespace:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteNamespace:
- errorCode: deleteNamespace-FAILED-5001W
+ REQUEST-FAILED-deleteNamespace:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deployApp:
- errorCode: deployApp-FAILED-5001W
+ REQUEST-FAILED-deployApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- loadArtifact:
- errorCode: loadArtifact-FAILED-5001W
+ REQUEST-FAILED-loadArtifact:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteArtifact:
- errorCode: deleteArtifact-FAILED-5001W
+ REQUEST-FAILED-loadArtifactWithConfig:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- startFlow:
- errorCode: startFlow-FAILED-5001W
+ REQUEST-FAILED-deleteArtifact:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- startWorker:
- errorCode: startWorker-FAILED-5001W
+ REQUEST-FAILED-startFlow:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- startService:
- errorCode: startService-FAILED-5001W
+ REQUEST-FAILED-startWorker:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- startApp:
- errorCode: startApp-FAILED-5001W
+ REQUEST-FAILED-startService:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- stopApp:
- errorCode: stopApp-FAILED-5001W
+ REQUEST-FAILED-startApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteApp:
- errorCode: deleteApp-FAILED-5001W
+ REQUEST-FAILED-stopApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- loadPreferencesApp:
- errorCode: loadPreferencesApp-FAILED-5001W
+ REQUEST-FAILED-deleteApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- loadPreferencesFlow:
- errorCode: loadPreferencesFlow-FAILED-5001W
+ REQUEST-FAILED-loadPreferencesApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- loadPreferencesNameSpace:
- errorCode: loadPreferencesNameSpace-FAILED-5001W
+ REQUEST-FAILED-loadPreferencesFlow:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setPreferencesApp:
- errorCode: setPreferencesApp-FAILED-5001W
+ REQUEST-FAILED-loadPreferencesNameSpace:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setPreferencesFlow:
- errorCode: setPreferencesFlow-FAILED-5001W
+ REQUEST-FAILED-setPreferencesApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setPreferencesWorker:
- errorCode: setPreferencesWorker-FAILED-5001W
+ REQUEST-FAILED-setPreferencesFlow:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setPreferencesService:
- errorCode: setPreferencesService-FAILED-5001W
+ REQUEST-FAILED-setPreferencesWorker:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setPreferencesNameSpace:
- errorCode: setPreferencesNameSpace-FAILED-5001W
+ REQUEST-FAILED-setPreferencesService:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setFlowRunTimeArgs:
- errorCode: setFlowRunTimeArgs-FAILED-5001W
+ REQUEST-FAILED-setPreferencesNameSpace:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setFlowletInstances:
- errorCode: setFlowletInstances-FAILED-5001W
+ REQUEST-FAILED-setFlowRunTimeArgs:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- stopFlow:
- errorCode: stopFlow-FAILED-5001W
+ REQUEST-FAILED-setFlowletInstances:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- stopWorker:
- errorCode: stopWorker-FAILED-5001W
+ REQUEST-FAILED-stopFlow:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- stopService:
- errorCode: stopService-FAILED-5001W
+ REQUEST-FAILED-stopWorker:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- truncateDataSet:
- errorCode: truncateDataSet-FAILED-5001W
+ REQUEST-FAILED-stopService:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteDataset:
- errorCode: deleteDataset-FAILED-5001W
+ REQUEST-FAILED-truncateDataSet:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createStream:
- errorCode: createStream-FAILED-5001W
+ REQUEST-FAILED-deleteDataset:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- deleteStream:
- errorCode: deleteStream-FAILED-5001W
+ REQUEST-FAILED-createStream:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- getStreamEvents:
- errorCode: getStreamEvents-FAILED-5001W
+ REQUEST-FAILED-deleteStream:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- getStreamStats:
- errorCode: getStreamStats-FAILED-5001W
+ REQUEST-FAILED-getStreamEvents:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- sendEventToStream:
- errorCode: sendEventToStream-FAILED-5001W
+ REQUEST-FAILED-getStreamStats:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- trucateStream:
- errorCode: trucateStream-FAILED-5001W
+ REQUEST-FAILED-sendEventToStream:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setStreamProperties:
- errorCode: setStreamProperties-FAILED-5001W
+ REQUEST-FAILED-trucateStream:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- restartApp:
- errorCode: restartApp-FAILED-5001W
+ REQUEST-FAILED-setStreamProperties:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createApp:
- errorCode: createApp-FAILED-5001W
+ REQUEST-FAILED-restartApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- createAppWithConfig:
- errorCode: createAppWithConfig-FAILED-5001W
+ REQUEST-FAILED-createApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setDatasetProperties:
- errorCode: setDatasetProperties-FAILED-5001W
+ REQUEST-FAILED-createAppWithConfig:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- setStreamTTL:
- errorCode: setStreamTTL-FAILED-5001W
+ REQUEST-FAILED-setDatasetProperties:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- poll:
- errorCode: poll-FAILED-5001W
+ REQUEST-FAILED-setStreamTTL:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- REMOTE_createNamespace:
- errorCode: REMOTE-createNamespace-FAILED-5001W
+ REQUEST-FAILED-suspendSchedule:
+ errorCode: 4001W
+ messageFormat: '{0}'
+ description: Operation Failed with Exception
+ REQUEST-FAILED-resumeSchedule:
+ errorCode: 4001W
+ messageFormat: '{0}'
+ description: Operation Failed with Exception
+ REQUEST-FAILED-poll:
+ errorCode: 4001W
+ messageFormat: '{0}'
+ description: Operation Failed with Exception
+ REMOTE-CALL-FAILED-createNamespace:
+ errorCode: 4001W
+ messageFormat: '{0}'
+ description: Remote Operation Failed with Exception
+ REMOTE-CALL-FAILED-deleteNamespace:
+ errorCode: 4001W
+ messageFormat: '{0}'
+ description: Remote Operation Failed with Exception
+ REMOTE-CALL-FAILED-deployApp:
+ errorCode: 4001W
+ messageFormat: '{0}'
+ description: Remote Operation Failed with Exception
+ REMOTE-CALL-FAILED-loadArtifact:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteNamespace:
- errorCode: REMOTE-deleteNamespace-FAILED-5001W
+ REMOTE-CALL-FAILED-loadArtifactWithConfig:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deployApp:
- errorCode: REMOTE-deployApp-FAILED-5001W
+ REMOTE-CALL-FAILED-deleteArtifact:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_loadArtifact:
- errorCode: REMOTE-loadArtifact-FAILED-5001W
+ REMOTE-CALL-FAILED-startFlow:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteArtifact:
- errorCode: REMOTE-deleteArtifact-FAILED-5001W
+ REMOTE-CALL-FAILED-startWorker:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_startFlow:
- errorCode: REMOTE-startFlow-FAILED-5001W
+ REMOTE-CALL-FAILED-startService:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_startWorker:
- errorCode: REMOTE-startWorker-FAILED-5001W
+ REMOTE-CALL-FAILED-startApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_startService:
- errorCode: REMOTE-startService-FAILED-5001W
+ REMOTE-CALL-FAILED-stopApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_startApp:
- errorCode: REMOTE-startApp-FAILED-5001W
+ REMOTE-CALL-FAILED-deleteApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_stopApp:
- errorCode: REMOTE-stopApp-FAILED-5001W
+ REMOTE-CALL-FAILED-loadPreferencesApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteApp:
- errorCode: REMOTE-deleteApp-FAILED-5001W
+ REMOTE-CALL-FAILED-loadPreferencesFlow:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_loadPreferencesApp:
- errorCode: REMOTE-loadPreferencesApp-FAILED-5001W
+ REMOTE-CALL-FAILED-loadPreferencesNameSpace:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_loadPreferencesFlow:
- errorCode: REMOTE-loadPreferencesFlow-FAILED-5001W
+ REMOTE-CALL-FAILED-setPreferencesApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_loadPreferencesNameSpace:
- errorCode: REMOTE-loadPreferencesNameSpace-FAILED-5001W
+ REMOTE-CALL-FAILED-setPreferencesFlow:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setPreferencesApp:
- errorCode: REMOTE-setPreferencesApp-FAILED-5001W
+ REMOTE-CALL-FAILED-setPreferencesWorker:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setPreferencesFlow:
- errorCode: REMOTE-setPreferencesFlow-FAILED-5001W
+ REMOTE-CALL-FAILED-setPreferencesService:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setPreferencesWorker:
- errorCode: REMOTE-setPreferencesWorker-FAILED-5001W
+ REMOTE-CALL-FAILED-setPreferencesNameSpace:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setPreferencesService:
- errorCode: REMOTE-setPreferencesService-FAILED-5001W
+ REMOTE-CALL-FAILED-setFlowRunTimeArgs:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setPreferencesNameSpace:
- errorCode: REMOTE-setPreferencesNameSpace-FAILED-5001W
+ REMOTE-CALL-FAILED-setFlowletInstances:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setFlowRunTimeArgs:
- errorCode: REMOTE-setFlowRunTimeArgs-FAILED-5001W
+ REMOTE-CALL-FAILED-stopFlow:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setFlowletInstances:
- errorCode: REMOTE-setFlowletInstances-FAILED-5001W
+ REMOTE-CALL-FAILED-stopWorker:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_stopFlow:
- errorCode: REMOTE-stopFlow-FAILED-5001W
+ REMOTE-CALL-FAILED-stopService:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_stopWorker:
- errorCode: REMOTE-stopWorker-FAILED-5001W
+ REMOTE-CALL-FAILED-truncateDataSet:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_stopService:
- errorCode: REMOTE-stopService-FAILED-5001W
+ REMOTE-CALL-FAILED-deleteDataset:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_truncateDataSet:
- errorCode: REMOTE-truncateDataSet-FAILED-5001W
+ REMOTE-CALL-FAILED-createStream:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteDataset:
- errorCode: REMOTE-deleteDataset-FAILED-5001W
+ REMOTE-CALL-FAILED-deleteStream:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createStream:
- errorCode: REMOTE-createStream-FAILED-5001W
+ REMOTE-CALL-FAILED-getStreamEvents:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_deleteStream:
- errorCode: REMOTE-deleteStream-FAILED-5001W
+ REMOTE-CALL-FAILED-getStreamStats:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_getStreamEvents:
- errorCode: REMOTE-getStreamEvents-FAILED-5001W
+ REMOTE-CALL-FAILED-sendEventToStream:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_getStreamStats:
- errorCode: REMOTE-getStreamStats-FAILED-5001W
+ REMOTE-CALL-FAILED-trucateStream:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_sendEventToStream:
- errorCode: REMOTE-sendEventToStream-FAILED-5001W
+ REMOTE-CALL-FAILED-setStreamProperties:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_trucateStream:
- errorCode: REMOTE-trucateStream-FAILED-5001W
+ REMOTE-CALL-FAILED-restartApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setStreamProperties:
- errorCode: REMOTE-setStreamProperties-FAILED-5001W
+ REMOTE-CALL-FAILED-createApp:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_restartApp:
- errorCode: REMOTE-restartApp-FAILED-5001W
+ REMOTE-CALL-FAILED-createAppWithConfig:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createApp:
- errorCode: REMOTE-createApp-FAILED-5001W
+ REMOTE-CALL-FAILED-setDatasetProperties:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_createAppWithConfig:
- errorCode: REMOTE-createAppWithConfig-FAILED-5001W
+ REMOTE-CALL-FAILED-setStreamTTL:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setDatasetProperties:
- errorCode: REMOTE-setDatasetProperties-FAILED-5001W
+ REMOTE-CALL-FAILED-suspendSchedule:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_setStreamTTL:
- errorCode: REMOTE-setStreamTTL-FAILED-5001W
+ REMOTE-CALL-FAILED-resumeSchedule:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_poll:
- errorCode: REMOTE-poll-FAILED-5001W
+ REMOTE-CALL-FAILED-poll:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml b/ncomp-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml
index bf3d69d..1489339 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml
@@ -1,69 +1,57 @@
operations:
- getTree: {}
- getObject: {}
- getTimeSerie: {}
- getTable: {}
- getHtml: {}
- getGraph: {}
- REMOTE_getTree:
- decription: Remote call getTree
- REMOTE_getObject:
- decription: Remote call getObject
- REMOTE_getTimeSerie:
- decription: Remote call getTimeSerie
- REMOTE_getTable:
- decription: Remote call getTable
- REMOTE_getHtml:
- decription: Remote call getHtml
- REMOTE_getGraph:
- decription: Remote call getGraph
+ GuiClientApi@getTree: {}
+ GuiClientApi@getObject: {}
+ GuiClientApi@getTimeSerie: {}
+ GuiClientApi@getTable: {}
+ GuiClientApi@getHtml: {}
+ GuiClientApi@getGraph: {}
messages:
dummy: {}
- getTree:
- errorCode: getTree-FAILED-5001W
+ REQUEST-FAILED-getTree:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- getObject:
- errorCode: getObject-FAILED-5001W
+ REQUEST-FAILED-getObject:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- getTimeSerie:
- errorCode: getTimeSerie-FAILED-5001W
+ REQUEST-FAILED-getTimeSerie:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- getTable:
- errorCode: getTable-FAILED-5001W
+ REQUEST-FAILED-getTable:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- getHtml:
- errorCode: getHtml-FAILED-5001W
+ REQUEST-FAILED-getHtml:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- getGraph:
- errorCode: getGraph-FAILED-5001W
+ REQUEST-FAILED-getGraph:
+ errorCode: 4001W
messageFormat: '{0}'
description: Operation Failed with Exception
- REMOTE_getTree:
- errorCode: REMOTE-getTree-FAILED-5001W
+ REMOTE-CALL-FAILED-getTree:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_getObject:
- errorCode: REMOTE-getObject-FAILED-5001W
+ REMOTE-CALL-FAILED-getObject:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_getTimeSerie:
- errorCode: REMOTE-getTimeSerie-FAILED-5001W
+ REMOTE-CALL-FAILED-getTimeSerie:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_getTable:
- errorCode: REMOTE-getTable-FAILED-5001W
+ REMOTE-CALL-FAILED-getTable:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_getHtml:
- errorCode: REMOTE-getHtml-FAILED-5001W
+ REMOTE-CALL-FAILED-getHtml:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
- REMOTE_getGraph:
- errorCode: REMOTE-getGraph-FAILED-5001W
+ REMOTE-CALL-FAILED-getGraph:
+ errorCode: 4001W
messageFormat: '{0}'
description: Remote Operation Failed with Exception
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptor.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptor.java
index 0944f8c..e60bdbe 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptor.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptor.java
@@ -25,24 +25,34 @@ package org.openecomp.ncomp.servers.cdap;
+
+
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.logger.EcompLogger;
+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.servers.cdap.logging.CdapAdaptorOperationEnum;
+import org.openecomp.ncomp.servers.cdap.logging.CdapAdaptorMessageEnum;
@@ -51,9 +61,9 @@ import org.openecomp.ncomp.cdap.impl.CdapAdaptorImpl;
-public class CdapCdapAdaptor extends CdapAdaptorImpl {
+public class CdapCdapAdaptor extends CdapAdaptorImpl implements ISiriusProvider {
public static final Logger logger = Logger.getLogger(CdapCdapAdaptor.class);
- static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+ static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
public CdapCdapAdaptorProvider controller;
ISiriusServer server;
@@ -67,10 +77,12 @@ public class CdapCdapAdaptor extends CdapAdaptorImpl {
+
+
public static void ecoreSetup() {
CdapCdapAdaptorProvider.ecoreSetup();
}
- public CdapCdapAdaptorProvider getSomfProvider() {
+ public CdapCdapAdaptorProvider getSiriusProvider() {
return controller;
}
}
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorClient.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorClient.java
index afc8bfb..b91abdc 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorClient.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorClient.java
@@ -30,6 +30,8 @@ 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;
@@ -54,17 +56,20 @@ public class CdapCdapAdaptorClient extends CdapAdaptorImpl {
CdapCdapAdaptor.ecoreSetup();
client = new GenericHttpClient(file,name);
client.add("/resources", this);
+ client.setVersion("ONAP-R2");
}
public CdapCdapAdaptorClient(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 CdapCdapAdaptorClient(AbstractClient c) {
client = c;
client.add("/resources", this);
+ client.setVersion("ONAP-R2");
}
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorServer.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorServer.java
index c44a17a..c51464a 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorServer.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapAdaptorServer.java
@@ -26,17 +26,16 @@ package org.openecomp.ncomp.servers.cdap;
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.openecomp.entity.EcompComponent;
-import org.openecomp.entity.EcompSubComponent;
-import org.openecomp.entity.EcompSubComponentInstance;
+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.cdap.CdapAdaptor;
@@ -50,7 +49,7 @@ import org.openecomp.ncomp.servers.cdap.gui.CdapModelFactory;
-public class CdapCdapAdaptorServer implements ISiriusServer {
+public class CdapCdapAdaptorServer implements ISiriusServer, IRequestHandler {
public static final Logger logger = Logger.getLogger(CdapCdapAdaptorServer.class);
String serverPath;
ManagementServer server;
@@ -74,6 +73,7 @@ public class CdapCdapAdaptorServer implements ISiriusServer {
props = getPropertiesFromClasspath(filename);
serverPath = (String) props.get("server.dir");
server = new ManagementServer(f, "CdapAdaptor", serverPath, filename);
+ ManagementServer.setBuildVersion("ONAP-R2");
server.addFactory(f);
server.addRuntimeFactories(this);
@@ -83,6 +83,7 @@ public class CdapCdapAdaptorServer implements ISiriusServer {
controller = (CdapCdapAdaptor) server.find("/").o;
webServer = new Jetty8Server("cdap.properties");
webServer.add("/resources",server);
+ webServer.add("/api",this);
@@ -111,4 +112,17 @@ public class CdapCdapAdaptorServer 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-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java
index ed5ffef..75c3598 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapCluster.java
@@ -25,24 +25,34 @@ package org.openecomp.ncomp.servers.cdap;
+
+
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.logger.EcompLogger;
+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.servers.cdap.logging.CdapClusterOperationEnum;
+import org.openecomp.ncomp.servers.cdap.logging.CdapClusterMessageEnum;
@@ -51,9 +61,9 @@ import org.openecomp.ncomp.cdap.impl.CdapClusterImpl;
-public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
+public class CdapCdapCluster extends CdapClusterImpl implements ISiriusProvider, ISiriusPlugin {
public static final Logger logger = Logger.getLogger(CdapCdapCluster.class);
- static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+ static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
public CdapCdapClusterProvider controller;
ISiriusServer server;
@@ -68,8 +78,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "poll", ApiRequestStatus.START, duration_);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.poll);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_poll,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_poll,"self:" + ManagementServer.object2ref(this));
try {
controller.poll();
}
@@ -78,7 +88,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "poll", ApiRequestStatus.ERROR, duration_);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_poll, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_poll,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_poll, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -93,8 +106,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "createNamespace", ApiRequestStatus.START, duration_,namespace);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.createNamespace);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_createNamespace,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_createNamespace,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createNamespace(namespace);
}
@@ -103,7 +116,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "createNamespace", ApiRequestStatus.ERROR, duration_,namespace);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_createNamespace, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_createNamespace,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_createNamespace, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -118,8 +134,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deleteNamespace", ApiRequestStatus.START, duration_,namespace);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.deleteNamespace);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_deleteNamespace,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteNamespace,"self:" + ManagementServer.object2ref(this));
try {
res = controller.deleteNamespace(namespace);
}
@@ -128,7 +144,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deleteNamespace", ApiRequestStatus.ERROR, duration_,namespace);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_deleteNamespace, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_deleteNamespace,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_deleteNamespace, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -143,8 +162,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deployApp", ApiRequestStatus.START, duration_,namespace,jarfile);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.deployApp);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_deployApp,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deployApp,"self:" + ManagementServer.object2ref(this));
try {
res = controller.deployApp(namespace,jarfile);
}
@@ -153,7 +172,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deployApp", ApiRequestStatus.ERROR, duration_,namespace,jarfile);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_deployApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_deployApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_deployApp, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -168,8 +190,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "loadArtifact", ApiRequestStatus.START, duration_,namespace,artifactName,jarfile,version);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.loadArtifact);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_loadArtifact,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadArtifact,"self:" + ManagementServer.object2ref(this));
try {
res = controller.loadArtifact(namespace,artifactName,jarfile,version);
}
@@ -178,7 +200,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "loadArtifact", ApiRequestStatus.ERROR, duration_,namespace,artifactName,jarfile,version);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_loadArtifact, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_loadArtifact,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_loadArtifact, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -187,14 +212,42 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
return res;
}
+ public java.lang.String loadArtifactWithConfig(java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version, java.lang.String config) {
+ java.lang.String res = null;
+ long duration_ = 0;
+ if (server != null)
+ server.getServer().recordApi(null, this, "loadArtifactWithConfig", ApiRequestStatus.START, duration_,namespace,artifactName,jarfile,version,config);
+ Date now_ = new Date();
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_loadArtifactWithConfig,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadArtifactWithConfig,"self:" + ManagementServer.object2ref(this));
+ try {
+ res = controller.loadArtifactWithConfig(namespace,artifactName,jarfile,version,config);
+ }
+ catch (Exception e) {
+ duration_ = new Date().getTime()-now_.getTime();
+ if (server != null)
+ server.getServer().recordApi(null, this, "loadArtifactWithConfig", ApiRequestStatus.ERROR, duration_,namespace,artifactName,jarfile,version,config);
+ System.err.println("ERROR: " + e);
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_loadArtifactWithConfig, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_loadArtifactWithConfig,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_loadArtifactWithConfig, e.getMessage());
+ throw e1;
+ }
+ ecomplogger.recordMetricEventEnd();
+ duration_ = new Date().getTime()-now_.getTime();
+ if (server != null)
+ server.getServer().recordApi(null, this, "loadArtifactWithConfig", ApiRequestStatus.OKAY, duration_,namespace,artifactName,jarfile,version,config);
+ return res;
+ }
+
public java.lang.String deleteArtifact(java.lang.String namespace, java.lang.String artifactName, java.lang.String artifactVersion) {
java.lang.String res = null;
long duration_ = 0;
if (server != null)
server.getServer().recordApi(null, this, "deleteArtifact", ApiRequestStatus.START, duration_,namespace,artifactName,artifactVersion);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.deleteArtifact);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_deleteArtifact,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteArtifact,"self:" + ManagementServer.object2ref(this));
try {
res = controller.deleteArtifact(namespace,artifactName,artifactVersion);
}
@@ -203,7 +256,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deleteArtifact", ApiRequestStatus.ERROR, duration_,namespace,artifactName,artifactVersion);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_deleteArtifact, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_deleteArtifact,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_deleteArtifact, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -218,8 +274,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "startFlow", ApiRequestStatus.START, duration_,namespace,appName,flowId,extraArgs);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.startFlow);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_startFlow,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_startFlow,"self:" + ManagementServer.object2ref(this));
try {
res = controller.startFlow(namespace,appName,flowId,extraArgs);
}
@@ -228,7 +284,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "startFlow", ApiRequestStatus.ERROR, duration_,namespace,appName,flowId,extraArgs);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_startFlow, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_startFlow,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_startFlow, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -243,8 +302,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "startWorker", ApiRequestStatus.START, duration_,namespace,appName,workerId,extraArgs);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.startWorker);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_startWorker,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_startWorker,"self:" + ManagementServer.object2ref(this));
try {
res = controller.startWorker(namespace,appName,workerId,extraArgs);
}
@@ -253,7 +312,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "startWorker", ApiRequestStatus.ERROR, duration_,namespace,appName,workerId,extraArgs);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_startWorker, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_startWorker,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_startWorker, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -268,8 +330,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "startService", ApiRequestStatus.START, duration_,namespace,appName,serviceId,extraArgs);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.startService);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_startService,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_startService,"self:" + ManagementServer.object2ref(this));
try {
res = controller.startService(namespace,appName,serviceId,extraArgs);
}
@@ -278,7 +340,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "startService", ApiRequestStatus.ERROR, duration_,namespace,appName,serviceId,extraArgs);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_startService, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_startService,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_startService, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -293,8 +358,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "startApp", ApiRequestStatus.START, duration_,namespace,appName);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.startApp);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_startApp,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_startApp,"self:" + ManagementServer.object2ref(this));
try {
res = controller.startApp(namespace,appName);
}
@@ -303,7 +368,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "startApp", ApiRequestStatus.ERROR, duration_,namespace,appName);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_startApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_startApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_startApp, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -318,8 +386,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.START, duration_,namespace,appName);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.stopApp);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_stopApp,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_stopApp,"self:" + ManagementServer.object2ref(this));
try {
res = controller.stopApp(namespace,appName);
}
@@ -328,7 +396,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "stopApp", ApiRequestStatus.ERROR, duration_,namespace,appName);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_stopApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_stopApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_stopApp, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -343,8 +414,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deleteApp", ApiRequestStatus.START, duration_,namespace,appName);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.deleteApp);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_deleteApp,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteApp,"self:" + ManagementServer.object2ref(this));
try {
res = controller.deleteApp(namespace,appName);
}
@@ -353,7 +424,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deleteApp", ApiRequestStatus.ERROR, duration_,namespace,appName);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_deleteApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_deleteApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_deleteApp, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -368,8 +442,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "loadPreferencesApp", ApiRequestStatus.START, duration_,namespace,prefsFile,appId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.loadPreferencesApp);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_loadPreferencesApp,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadPreferencesApp,"self:" + ManagementServer.object2ref(this));
try {
res = controller.loadPreferencesApp(namespace,prefsFile,appId);
}
@@ -378,7 +452,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "loadPreferencesApp", ApiRequestStatus.ERROR, duration_,namespace,prefsFile,appId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_loadPreferencesApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_loadPreferencesApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_loadPreferencesApp, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -393,8 +470,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "loadPreferencesFlow", ApiRequestStatus.START, duration_,namespace,prefsFile,appId,flowId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.loadPreferencesFlow);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_loadPreferencesFlow,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadPreferencesFlow,"self:" + ManagementServer.object2ref(this));
try {
res = controller.loadPreferencesFlow(namespace,prefsFile,appId,flowId);
}
@@ -403,7 +480,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "loadPreferencesFlow", ApiRequestStatus.ERROR, duration_,namespace,prefsFile,appId,flowId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_loadPreferencesFlow, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_loadPreferencesFlow,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_loadPreferencesFlow, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -418,8 +498,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "loadPreferencesNameSpace", ApiRequestStatus.START, duration_,namespace,prefsFile);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.loadPreferencesNameSpace);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_loadPreferencesNameSpace,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadPreferencesNameSpace,"self:" + ManagementServer.object2ref(this));
try {
res = controller.loadPreferencesNameSpace(namespace,prefsFile);
}
@@ -428,7 +508,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "loadPreferencesNameSpace", ApiRequestStatus.ERROR, duration_,namespace,prefsFile);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_loadPreferencesNameSpace, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_loadPreferencesNameSpace,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_loadPreferencesNameSpace, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -443,8 +526,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesApp", ApiRequestStatus.START, duration_,namespace,prefsString,appId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setPreferencesApp);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setPreferencesApp,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesApp,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setPreferencesApp(namespace,prefsString,appId);
}
@@ -453,7 +536,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesApp", ApiRequestStatus.ERROR, duration_,namespace,prefsString,appId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesApp, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -468,8 +554,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesFlow", ApiRequestStatus.START, duration_,namespace,prefsString,appId,flowId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setPreferencesFlow);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setPreferencesFlow,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesFlow,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setPreferencesFlow(namespace,prefsString,appId,flowId);
}
@@ -478,7 +564,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesFlow", ApiRequestStatus.ERROR, duration_,namespace,prefsString,appId,flowId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesFlow, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesFlow,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesFlow, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -493,8 +582,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesWorker", ApiRequestStatus.START, duration_,namespace,prefsString,appId,workerId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setPreferencesWorker);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setPreferencesWorker,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesWorker,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setPreferencesWorker(namespace,prefsString,appId,workerId);
}
@@ -503,7 +592,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesWorker", ApiRequestStatus.ERROR, duration_,namespace,prefsString,appId,workerId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesWorker, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesWorker,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesWorker, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -518,8 +610,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesService", ApiRequestStatus.START, duration_,namespace,prefsString,appId,serviceId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setPreferencesService);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setPreferencesService,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesService,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setPreferencesService(namespace,prefsString,appId,serviceId);
}
@@ -528,7 +620,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesService", ApiRequestStatus.ERROR, duration_,namespace,prefsString,appId,serviceId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesService, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesService,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesService, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -543,8 +638,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesNameSpace", ApiRequestStatus.START, duration_,namespace,prefsString);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setPreferencesNameSpace);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setPreferencesNameSpace,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesNameSpace,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setPreferencesNameSpace(namespace,prefsString);
}
@@ -553,7 +648,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setPreferencesNameSpace", ApiRequestStatus.ERROR, duration_,namespace,prefsString);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesNameSpace, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesNameSpace,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setPreferencesNameSpace, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -568,8 +666,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setFlowRunTimeArgs", ApiRequestStatus.START, duration_,namespace,appId,flowId,args);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setFlowRunTimeArgs);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setFlowRunTimeArgs,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setFlowRunTimeArgs,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setFlowRunTimeArgs(namespace,appId,flowId,args);
}
@@ -578,7 +676,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setFlowRunTimeArgs", ApiRequestStatus.ERROR, duration_,namespace,appId,flowId,args);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setFlowRunTimeArgs, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setFlowRunTimeArgs,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setFlowRunTimeArgs, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -593,8 +694,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setFlowletInstances", ApiRequestStatus.START, duration_,namespace,appId,flowId,flowletId,nInstances);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setFlowletInstances);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setFlowletInstances,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setFlowletInstances,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setFlowletInstances(namespace,appId,flowId,flowletId,nInstances);
}
@@ -603,7 +704,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setFlowletInstances", ApiRequestStatus.ERROR, duration_,namespace,appId,flowId,flowletId,nInstances);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setFlowletInstances, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setFlowletInstances,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setFlowletInstances, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -618,8 +722,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "stopFlow", ApiRequestStatus.START, duration_,namespace,appId,flowId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.stopFlow);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_stopFlow,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_stopFlow,"self:" + ManagementServer.object2ref(this));
try {
res = controller.stopFlow(namespace,appId,flowId);
}
@@ -628,7 +732,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "stopFlow", ApiRequestStatus.ERROR, duration_,namespace,appId,flowId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_stopFlow, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_stopFlow,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_stopFlow, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -643,8 +750,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "stopWorker", ApiRequestStatus.START, duration_,namespace,appId,workerId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.stopWorker);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_stopWorker,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_stopWorker,"self:" + ManagementServer.object2ref(this));
try {
res = controller.stopWorker(namespace,appId,workerId);
}
@@ -653,7 +760,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "stopWorker", ApiRequestStatus.ERROR, duration_,namespace,appId,workerId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_stopWorker, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_stopWorker,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_stopWorker, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -668,8 +778,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "stopService", ApiRequestStatus.START, duration_,namespace,appId,serviceId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.stopService);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_stopService,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_stopService,"self:" + ManagementServer.object2ref(this));
try {
res = controller.stopService(namespace,appId,serviceId);
}
@@ -678,7 +788,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "stopService", ApiRequestStatus.ERROR, duration_,namespace,appId,serviceId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_stopService, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_stopService,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_stopService, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -693,8 +806,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "truncateDataSet", ApiRequestStatus.START, duration_,namespace,datasetName);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.truncateDataSet);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_truncateDataSet,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_truncateDataSet,"self:" + ManagementServer.object2ref(this));
try {
res = controller.truncateDataSet(namespace,datasetName);
}
@@ -703,7 +816,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "truncateDataSet", ApiRequestStatus.ERROR, duration_,namespace,datasetName);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_truncateDataSet, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_truncateDataSet,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_truncateDataSet, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -718,8 +834,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deleteDataset", ApiRequestStatus.START, duration_,namespace,datasetName);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.deleteDataset);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_deleteDataset,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteDataset,"self:" + ManagementServer.object2ref(this));
try {
res = controller.deleteDataset(namespace,datasetName);
}
@@ -728,7 +844,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deleteDataset", ApiRequestStatus.ERROR, duration_,namespace,datasetName);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_deleteDataset, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_deleteDataset,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_deleteDataset, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -743,8 +862,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "createStream", ApiRequestStatus.START, duration_,namespace,newStreamId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.createStream);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_createStream,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_createStream,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createStream(namespace,newStreamId);
}
@@ -753,7 +872,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "createStream", ApiRequestStatus.ERROR, duration_,namespace,newStreamId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_createStream, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_createStream,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_createStream, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -768,8 +890,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deleteStream", ApiRequestStatus.START, duration_,namespace,streamId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.deleteStream);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_deleteStream,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteStream,"self:" + ManagementServer.object2ref(this));
try {
res = controller.deleteStream(namespace,streamId);
}
@@ -778,7 +900,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "deleteStream", ApiRequestStatus.ERROR, duration_,namespace,streamId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_deleteStream, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_deleteStream,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_deleteStream, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -793,8 +918,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "getStreamEvents", ApiRequestStatus.START, duration_,namespace,streamId,startTime,endTime,limit);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.getStreamEvents);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_getStreamEvents,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_getStreamEvents,"self:" + ManagementServer.object2ref(this));
try {
res = controller.getStreamEvents(namespace,streamId,startTime,endTime,limit);
}
@@ -803,7 +928,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "getStreamEvents", ApiRequestStatus.ERROR, duration_,namespace,streamId,startTime,endTime,limit);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_getStreamEvents, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_getStreamEvents,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_getStreamEvents, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -818,8 +946,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "getStreamStats", ApiRequestStatus.START, duration_,namespace,streamId,startTime,endTime,limit);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.getStreamStats);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_getStreamStats,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_getStreamStats,"self:" + ManagementServer.object2ref(this));
try {
res = controller.getStreamStats(namespace,streamId,startTime,endTime,limit);
}
@@ -828,7 +956,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "getStreamStats", ApiRequestStatus.ERROR, duration_,namespace,streamId,startTime,endTime,limit);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_getStreamStats, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_getStreamStats,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_getStreamStats, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -843,8 +974,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "sendEventToStream", ApiRequestStatus.START, duration_,namespace,streamId,event);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.sendEventToStream);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_sendEventToStream,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_sendEventToStream,"self:" + ManagementServer.object2ref(this));
try {
res = controller.sendEventToStream(namespace,streamId,event);
}
@@ -853,7 +984,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "sendEventToStream", ApiRequestStatus.ERROR, duration_,namespace,streamId,event);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_sendEventToStream, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_sendEventToStream,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_sendEventToStream, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -868,8 +1002,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "trucateStream", ApiRequestStatus.START, duration_,namespace,streamId);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.trucateStream);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_trucateStream,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_trucateStream,"self:" + ManagementServer.object2ref(this));
try {
res = controller.trucateStream(namespace,streamId);
}
@@ -878,7 +1012,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "trucateStream", ApiRequestStatus.ERROR, duration_,namespace,streamId);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_trucateStream, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_trucateStream,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_trucateStream, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -893,8 +1030,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setStreamProperties", ApiRequestStatus.START, duration_,namespace,streamId,propsFile);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setStreamProperties);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setStreamProperties,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setStreamProperties,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setStreamProperties(namespace,streamId,propsFile);
}
@@ -903,7 +1040,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setStreamProperties", ApiRequestStatus.ERROR, duration_,namespace,streamId,propsFile);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setStreamProperties, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setStreamProperties,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setStreamProperties, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -918,8 +1058,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "restartApp", ApiRequestStatus.START, duration_,namespace,appId,progTypes);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.restartApp);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_restartApp,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_restartApp,"self:" + ManagementServer.object2ref(this));
try {
res = controller.restartApp(namespace,appId,progTypes);
}
@@ -928,7 +1068,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "restartApp", ApiRequestStatus.ERROR, duration_,namespace,appId,progTypes);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_restartApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_restartApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_restartApp, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -943,8 +1086,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "createApp", ApiRequestStatus.START, duration_,namespace,appId,artifactName,artifactVersion,scope);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.createApp);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_createApp,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_createApp,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createApp(namespace,appId,artifactName,artifactVersion,scope);
}
@@ -953,7 +1096,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "createApp", ApiRequestStatus.ERROR, duration_,namespace,appId,artifactName,artifactVersion,scope);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_createApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_createApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_createApp, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -968,8 +1114,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "createAppWithConfig", ApiRequestStatus.START, duration_,namespace,appId,artifactName,artifactVersion,scope,appConfig);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.createAppWithConfig);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_createAppWithConfig,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_createAppWithConfig,"self:" + ManagementServer.object2ref(this));
try {
res = controller.createAppWithConfig(namespace,appId,artifactName,artifactVersion,scope,appConfig);
}
@@ -978,7 +1124,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "createAppWithConfig", ApiRequestStatus.ERROR, duration_,namespace,appId,artifactName,artifactVersion,scope,appConfig);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_createAppWithConfig, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_createAppWithConfig,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_createAppWithConfig, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -993,8 +1142,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setDatasetProperties", ApiRequestStatus.START, duration_,namespace,datasetName,datasetProperties);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setDatasetProperties);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setDatasetProperties,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setDatasetProperties,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setDatasetProperties(namespace,datasetName,datasetProperties);
}
@@ -1003,7 +1152,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setDatasetProperties", ApiRequestStatus.ERROR, duration_,namespace,datasetName,datasetProperties);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setDatasetProperties, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setDatasetProperties,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setDatasetProperties, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -1018,8 +1170,8 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setStreamTTL", ApiRequestStatus.START, duration_,namespace,streamName,ttlSeconds);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.setStreamTTL);
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_setStreamTTL,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setStreamTTL,"self:" + ManagementServer.object2ref(this));
try {
res = controller.setStreamTTL(namespace,streamName,ttlSeconds);
}
@@ -1028,7 +1180,10 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
if (server != null)
server.getServer().recordApi(null, this, "setStreamTTL", ApiRequestStatus.ERROR, duration_,namespace,streamName,ttlSeconds);
System.err.println("ERROR: " + e);
- throw e;
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_setStreamTTL, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_setStreamTTL,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_setStreamTTL, e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
duration_ = new Date().getTime()-now_.getTime();
@@ -1037,6 +1192,64 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
return res;
}
+ public java.lang.String suspendSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+ java.lang.String res = null;
+ long duration_ = 0;
+ if (server != null)
+ server.getServer().recordApi(null, this, "suspendSchedule", ApiRequestStatus.START, duration_,namespace,appId,scheduleId);
+ Date now_ = new Date();
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_suspendSchedule,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_suspendSchedule,"self:" + ManagementServer.object2ref(this));
+ try {
+ res = controller.suspendSchedule(namespace,appId,scheduleId);
+ }
+ catch (Exception e) {
+ duration_ = new Date().getTime()-now_.getTime();
+ if (server != null)
+ server.getServer().recordApi(null, this, "suspendSchedule", ApiRequestStatus.ERROR, duration_,namespace,appId,scheduleId);
+ System.err.println("ERROR: " + e);
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_suspendSchedule, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_suspendSchedule,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_suspendSchedule, e.getMessage());
+ throw e1;
+ }
+ ecomplogger.recordMetricEventEnd();
+ duration_ = new Date().getTime()-now_.getTime();
+ if (server != null)
+ server.getServer().recordApi(null, this, "suspendSchedule", ApiRequestStatus.OKAY, duration_,namespace,appId,scheduleId);
+ return res;
+ }
+
+ public java.lang.String resumeSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+ java.lang.String res = null;
+ long duration_ = 0;
+ if (server != null)
+ server.getServer().recordApi(null, this, "resumeSchedule", ApiRequestStatus.START, duration_,namespace,appId,scheduleId);
+ Date now_ = new Date();
+ ecomplogger.recordAuditEventStartIfNeeded(CdapClusterOperationEnum.CdapCluster_resumeSchedule,server,this);
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_resumeSchedule,"self:" + ManagementServer.object2ref(this));
+ try {
+ res = controller.resumeSchedule(namespace,appId,scheduleId);
+ }
+ catch (Exception e) {
+ duration_ = new Date().getTime()-now_.getTime();
+ if (server != null)
+ server.getServer().recordApi(null, this, "resumeSchedule", ApiRequestStatus.ERROR, duration_,namespace,appId,scheduleId);
+ System.err.println("ERROR: " + e);
+ ecomplogger.warn(CdapClusterMessageEnum.REQUEST_FAILED_resumeSchedule, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REQUEST_FAILED_resumeSchedule,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapClusterMessageEnum.REQUEST_FAILED_resumeSchedule, e.getMessage());
+ throw e1;
+ }
+ ecomplogger.recordMetricEventEnd();
+ duration_ = new Date().getTime()-now_.getTime();
+ if (server != null)
+ server.getServer().recordApi(null, this, "resumeSchedule", ApiRequestStatus.OKAY, duration_,namespace,appId,scheduleId);
+ return res;
+ }
+
+
+
@@ -1050,7 +1263,7 @@ public class CdapCdapCluster extends CdapClusterImpl implements ISiriusPlugin {
public static void ecoreSetup() {
CdapCdapClusterProvider.ecoreSetup();
}
- public CdapCdapClusterProvider getSomfProvider() {
+ public CdapCdapClusterProvider getSiriusProvider() {
return controller;
}
}
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java
index f24ff72..e49315d 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterClient.java
@@ -30,6 +30,8 @@ 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;
@@ -55,33 +57,37 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
CdapCdapAdaptor.ecoreSetup();
client = new GenericHttpClient(file,name);
client.add("/cluster", this);
+ client.setVersion("ONAP-R2");
}
public CdapCdapClusterClient(String file, String name1, String name2) {
HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2);
client = client1.all; // requests should be forwarded to all.
client.add("/cluster", this);
+ client.setVersion("ONAP-R2");
}
public CdapCdapClusterClient(AbstractClient c) {
client = c;
client.add("/resources", this);
+ client.setVersion("ONAP-R2");
}
public void poll(String path) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_poll);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_poll,client.getRemote());
try {
client.operationPath(path, c, "poll", null);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_poll, e.toString());
- throw new RuntimeException("remote call failed: poll", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_poll, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_poll,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_poll,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
@@ -89,16 +95,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String createNamespace(String path, java.lang.String namespace) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_createNamespace);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_createNamespace,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "createNamespace", null, namespace);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_createNamespace, e.toString());
- throw new RuntimeException("remote call failed: createNamespace", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_createNamespace, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_createNamespace,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_createNamespace,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -106,16 +113,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String deleteNamespace(String path, java.lang.String namespace) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_deleteNamespace);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteNamespace,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "deleteNamespace", null, namespace);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_deleteNamespace, e.toString());
- throw new RuntimeException("remote call failed: deleteNamespace", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteNamespace, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteNamespace,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteNamespace,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -123,16 +131,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String deployApp(String path, java.lang.String namespace, java.lang.String jarfile) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_deployApp);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deployApp,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "deployApp", null, namespace,jarfile);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_deployApp, e.toString());
- throw new RuntimeException("remote call failed: deployApp", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deployApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deployApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_deployApp,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -140,16 +149,35 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String loadArtifact(String path, java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_loadArtifact);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadArtifact,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "loadArtifact", null, namespace,artifactName,jarfile,version);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_loadArtifact, e.toString());
- throw new RuntimeException("remote call failed: loadArtifact", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadArtifact, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadArtifact,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadArtifact,e.getMessage());
+ throw e1;
+ }
+ ecomplogger.recordMetricEventEnd();
+ return res;
+ }
+
+
+ public java.lang.String loadArtifactWithConfig(String path, java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version, java.lang.String config) {
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadArtifactWithConfig,client.getRemote());
+ java.lang.String res;
+ try {
+ res = (java.lang.String) client.operationPath(path, c, "loadArtifactWithConfig", null, namespace,artifactName,jarfile,version,config);
+ }
+ catch (Exception e) {
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadArtifactWithConfig, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadArtifactWithConfig,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadArtifactWithConfig,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -157,16 +185,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String deleteArtifact(String path, java.lang.String namespace, java.lang.String artifactName, java.lang.String artifactVersion) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_deleteArtifact);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteArtifact,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "deleteArtifact", null, namespace,artifactName,artifactVersion);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_deleteArtifact, e.toString());
- throw new RuntimeException("remote call failed: deleteArtifact", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteArtifact, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteArtifact,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteArtifact,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -174,16 +203,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String startFlow(String path, java.lang.String namespace, java.lang.String appName, java.lang.String flowId, java.lang.String extraArgs) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_startFlow);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_startFlow,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "startFlow", null, namespace,appName,flowId,extraArgs);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_startFlow, e.toString());
- throw new RuntimeException("remote call failed: startFlow", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_startFlow, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_startFlow,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_startFlow,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -191,16 +221,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String startWorker(String path, java.lang.String namespace, java.lang.String appName, java.lang.String workerId, java.lang.String extraArgs) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_startWorker);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_startWorker,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "startWorker", null, namespace,appName,workerId,extraArgs);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_startWorker, e.toString());
- throw new RuntimeException("remote call failed: startWorker", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_startWorker, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_startWorker,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_startWorker,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -208,16 +239,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String startService(String path, java.lang.String namespace, java.lang.String appName, java.lang.String serviceId, java.lang.String extraArgs) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_startService);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_startService,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "startService", null, namespace,appName,serviceId,extraArgs);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_startService, e.toString());
- throw new RuntimeException("remote call failed: startService", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_startService, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_startService,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_startService,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -225,16 +257,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String startApp(String path, java.lang.String namespace, java.lang.String appName) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_startApp);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_startApp,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "startApp", null, namespace,appName);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_startApp, e.toString());
- throw new RuntimeException("remote call failed: startApp", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_startApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_startApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_startApp,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -242,16 +275,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String stopApp(String path, java.lang.String namespace, java.lang.String appName) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_stopApp);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_stopApp,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "stopApp", null, namespace,appName);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_stopApp, e.toString());
- throw new RuntimeException("remote call failed: stopApp", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopApp,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -259,16 +293,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String deleteApp(String path, java.lang.String namespace, java.lang.String appName) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_deleteApp);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteApp,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "deleteApp", null, namespace,appName);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_deleteApp, e.toString());
- throw new RuntimeException("remote call failed: deleteApp", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteApp,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -276,16 +311,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String loadPreferencesApp(String path, java.lang.String namespace, java.lang.String prefsFile, java.lang.String appId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_loadPreferencesApp);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadPreferencesApp,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "loadPreferencesApp", null, namespace,prefsFile,appId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_loadPreferencesApp, e.toString());
- throw new RuntimeException("remote call failed: loadPreferencesApp", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadPreferencesApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadPreferencesApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadPreferencesApp,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -293,16 +329,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String loadPreferencesFlow(String path, java.lang.String namespace, java.lang.String prefsFile, java.lang.String appId, java.lang.String flowId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_loadPreferencesFlow);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadPreferencesFlow,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "loadPreferencesFlow", null, namespace,prefsFile,appId,flowId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_loadPreferencesFlow, e.toString());
- throw new RuntimeException("remote call failed: loadPreferencesFlow", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadPreferencesFlow, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadPreferencesFlow,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadPreferencesFlow,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -310,16 +347,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String loadPreferencesNameSpace(String path, java.lang.String namespace, java.lang.String prefsFile) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_loadPreferencesNameSpace);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_loadPreferencesNameSpace,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "loadPreferencesNameSpace", null, namespace,prefsFile);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_loadPreferencesNameSpace, e.toString());
- throw new RuntimeException("remote call failed: loadPreferencesNameSpace", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadPreferencesNameSpace, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadPreferencesNameSpace,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_loadPreferencesNameSpace,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -327,16 +365,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setPreferencesApp(String path, java.lang.String namespace, java.lang.String prefsString, java.lang.String appId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setPreferencesApp);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesApp,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setPreferencesApp", null, namespace,prefsString,appId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setPreferencesApp, e.toString());
- throw new RuntimeException("remote call failed: setPreferencesApp", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesApp,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -344,16 +383,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setPreferencesFlow(String path, java.lang.String namespace, java.lang.String prefsString, java.lang.String appId, java.lang.String flowId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setPreferencesFlow);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesFlow,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setPreferencesFlow", null, namespace,prefsString,appId,flowId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setPreferencesFlow, e.toString());
- throw new RuntimeException("remote call failed: setPreferencesFlow", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesFlow, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesFlow,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesFlow,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -361,16 +401,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setPreferencesWorker(String path, java.lang.String namespace, java.lang.String prefsString, java.lang.String appId, java.lang.String workerId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setPreferencesWorker);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesWorker,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setPreferencesWorker", null, namespace,prefsString,appId,workerId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setPreferencesWorker, e.toString());
- throw new RuntimeException("remote call failed: setPreferencesWorker", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesWorker, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesWorker,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesWorker,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -378,16 +419,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setPreferencesService(String path, java.lang.String namespace, java.lang.String prefsString, java.lang.String appId, java.lang.String serviceId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setPreferencesService);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesService,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setPreferencesService", null, namespace,prefsString,appId,serviceId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setPreferencesService, e.toString());
- throw new RuntimeException("remote call failed: setPreferencesService", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesService, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesService,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesService,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -395,16 +437,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setPreferencesNameSpace(String path, java.lang.String namespace, java.lang.String prefsString) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setPreferencesNameSpace);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setPreferencesNameSpace,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setPreferencesNameSpace", null, namespace,prefsString);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setPreferencesNameSpace, e.toString());
- throw new RuntimeException("remote call failed: setPreferencesNameSpace", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesNameSpace, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesNameSpace,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setPreferencesNameSpace,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -412,16 +455,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setFlowRunTimeArgs(String path, java.lang.String namespace, java.lang.String appId, java.lang.String flowId, java.lang.String args) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setFlowRunTimeArgs);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setFlowRunTimeArgs,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setFlowRunTimeArgs", null, namespace,appId,flowId,args);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setFlowRunTimeArgs, e.toString());
- throw new RuntimeException("remote call failed: setFlowRunTimeArgs", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setFlowRunTimeArgs, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setFlowRunTimeArgs,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setFlowRunTimeArgs,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -429,16 +473,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setFlowletInstances(String path, java.lang.String namespace, java.lang.String appId, java.lang.String flowId, java.lang.String flowletId, int nInstances) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setFlowletInstances);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setFlowletInstances,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setFlowletInstances", null, namespace,appId,flowId,flowletId,nInstances);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setFlowletInstances, e.toString());
- throw new RuntimeException("remote call failed: setFlowletInstances", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setFlowletInstances, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setFlowletInstances,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setFlowletInstances,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -446,16 +491,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String stopFlow(String path, java.lang.String namespace, java.lang.String appId, java.lang.String flowId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_stopFlow);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_stopFlow,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "stopFlow", null, namespace,appId,flowId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_stopFlow, e.toString());
- throw new RuntimeException("remote call failed: stopFlow", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopFlow, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopFlow,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopFlow,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -463,16 +509,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String stopWorker(String path, java.lang.String namespace, java.lang.String appId, java.lang.String workerId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_stopWorker);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_stopWorker,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "stopWorker", null, namespace,appId,workerId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_stopWorker, e.toString());
- throw new RuntimeException("remote call failed: stopWorker", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopWorker, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopWorker,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopWorker,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -480,16 +527,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String stopService(String path, java.lang.String namespace, java.lang.String appId, java.lang.String serviceId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_stopService);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_stopService,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "stopService", null, namespace,appId,serviceId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_stopService, e.toString());
- throw new RuntimeException("remote call failed: stopService", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopService, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopService,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_stopService,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -497,16 +545,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String truncateDataSet(String path, java.lang.String namespace, java.lang.String datasetName) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_truncateDataSet);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_truncateDataSet,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "truncateDataSet", null, namespace,datasetName);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_truncateDataSet, e.toString());
- throw new RuntimeException("remote call failed: truncateDataSet", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_truncateDataSet, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_truncateDataSet,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_truncateDataSet,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -514,16 +563,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String deleteDataset(String path, java.lang.String namespace, java.lang.String datasetName) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_deleteDataset);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteDataset,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "deleteDataset", null, namespace,datasetName);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_deleteDataset, e.toString());
- throw new RuntimeException("remote call failed: deleteDataset", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteDataset, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteDataset,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteDataset,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -531,16 +581,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String createStream(String path, java.lang.String namespace, java.lang.String newStreamId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_createStream);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_createStream,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "createStream", null, namespace,newStreamId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_createStream, e.toString());
- throw new RuntimeException("remote call failed: createStream", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_createStream, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_createStream,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_createStream,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -548,16 +599,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String deleteStream(String path, java.lang.String namespace, java.lang.String streamId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_deleteStream);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_deleteStream,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "deleteStream", null, namespace,streamId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_deleteStream, e.toString());
- throw new RuntimeException("remote call failed: deleteStream", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteStream, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteStream,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_deleteStream,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -565,16 +617,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public EList<java.lang.String> getStreamEvents(String path, java.lang.String namespace, java.lang.String streamId, java.lang.String startTime, java.lang.String endTime, int limit) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_getStreamEvents);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_getStreamEvents,client.getRemote());
EList<java.lang.String> res;
try {
res = (EList<java.lang.String>) client.operationPath(path, c, "getStreamEvents", null, namespace,streamId,startTime,endTime,limit);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_getStreamEvents, e.toString());
- throw new RuntimeException("remote call failed: getStreamEvents", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_getStreamEvents, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_getStreamEvents,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_getStreamEvents,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -582,16 +635,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public EList<java.lang.String> getStreamStats(String path, java.lang.String namespace, java.lang.String streamId, java.lang.String startTime, java.lang.String endTime, int limit) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_getStreamStats);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_getStreamStats,client.getRemote());
EList<java.lang.String> res;
try {
res = (EList<java.lang.String>) client.operationPath(path, c, "getStreamStats", null, namespace,streamId,startTime,endTime,limit);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_getStreamStats, e.toString());
- throw new RuntimeException("remote call failed: getStreamStats", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_getStreamStats, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_getStreamStats,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_getStreamStats,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -599,16 +653,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String sendEventToStream(String path, java.lang.String namespace, java.lang.String streamId, java.lang.String event) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_sendEventToStream);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_sendEventToStream,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "sendEventToStream", null, namespace,streamId,event);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_sendEventToStream, e.toString());
- throw new RuntimeException("remote call failed: sendEventToStream", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_sendEventToStream, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_sendEventToStream,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_sendEventToStream,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -616,16 +671,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String trucateStream(String path, java.lang.String namespace, java.lang.String streamId) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_trucateStream);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_trucateStream,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "trucateStream", null, namespace,streamId);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_trucateStream, e.toString());
- throw new RuntimeException("remote call failed: trucateStream", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_trucateStream, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_trucateStream,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_trucateStream,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -633,16 +689,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setStreamProperties(String path, java.lang.String namespace, java.lang.String streamId, java.lang.String propsFile) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setStreamProperties);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setStreamProperties,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setStreamProperties", null, namespace,streamId,propsFile);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setStreamProperties, e.toString());
- throw new RuntimeException("remote call failed: setStreamProperties", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setStreamProperties, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setStreamProperties,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setStreamProperties,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -650,16 +707,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String restartApp(String path, java.lang.String namespace, java.lang.String appId, java.lang.String progTypes) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_restartApp);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_restartApp,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "restartApp", null, namespace,appId,progTypes);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_restartApp, e.toString());
- throw new RuntimeException("remote call failed: restartApp", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_restartApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_restartApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_restartApp,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -667,16 +725,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String createApp(String path, java.lang.String namespace, java.lang.String appId, java.lang.String artifactName, java.lang.String artifactVersion, java.lang.String scope) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_createApp);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_createApp,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "createApp", null, namespace,appId,artifactName,artifactVersion,scope);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_createApp, e.toString());
- throw new RuntimeException("remote call failed: createApp", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_createApp, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_createApp,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_createApp,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -684,16 +743,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String createAppWithConfig(String path, java.lang.String namespace, java.lang.String appId, java.lang.String artifactName, java.lang.String artifactVersion, java.lang.String scope, java.lang.String appConfig) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_createAppWithConfig);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_createAppWithConfig,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "createAppWithConfig", null, namespace,appId,artifactName,artifactVersion,scope,appConfig);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_createAppWithConfig, e.toString());
- throw new RuntimeException("remote call failed: createAppWithConfig", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_createAppWithConfig, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_createAppWithConfig,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_createAppWithConfig,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -701,16 +761,17 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setDatasetProperties(String path, java.lang.String namespace, java.lang.String datasetName, java.lang.String datasetProperties) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setDatasetProperties);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setDatasetProperties,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setDatasetProperties", null, namespace,datasetName,datasetProperties);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setDatasetProperties, e.toString());
- throw new RuntimeException("remote call failed: setDatasetProperties", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setDatasetProperties, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setDatasetProperties,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setDatasetProperties,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
@@ -718,16 +779,53 @@ public class CdapCdapClusterClient extends CdapClusterImpl {
public java.lang.String setStreamTTL(String path, java.lang.String namespace, java.lang.String streamName, int ttlSeconds) {
- EClass c = CdapPackage.eINSTANCE.getCdapCluster(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(CdapClusterOperationEnum.REMOTE_setStreamTTL);
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_setStreamTTL,client.getRemote());
java.lang.String res;
try {
res = (java.lang.String) client.operationPath(path, c, "setStreamTTL", null, namespace,streamName,ttlSeconds);
}
catch (Exception e) {
- ecomplogger.warn(CdapClusterMessageEnum.REMOTE_setStreamTTL, e.toString());
- throw new RuntimeException("remote call failed: setStreamTTL", e);
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setStreamTTL, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_setStreamTTL,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_setStreamTTL,e.getMessage());
+ throw e1;
+ }
+ ecomplogger.recordMetricEventEnd();
+ return res;
+ }
+
+
+ public java.lang.String suspendSchedule(String path, java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_suspendSchedule,client.getRemote());
+ java.lang.String res;
+ try {
+ res = (java.lang.String) client.operationPath(path, c, "suspendSchedule", null, namespace,appId,scheduleId);
+ }
+ catch (Exception e) {
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_suspendSchedule, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_suspendSchedule,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_suspendSchedule,e.getMessage());
+ throw e1;
+ }
+ ecomplogger.recordMetricEventEnd();
+ return res;
+ }
+
+
+ public java.lang.String resumeSchedule(String path, java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+ EClass c = CdapPackage.eINSTANCE.getCdapCluster();
+ ecomplogger.recordMetricEventStart(CdapClusterOperationEnum.CdapCluster_resumeSchedule,client.getRemote());
+ java.lang.String res;
+ try {
+ res = (java.lang.String) client.operationPath(path, c, "resumeSchedule", null, namespace,appId,scheduleId);
+ }
+ catch (Exception e) {
+ ecomplogger.warn(CdapClusterMessageEnum.REMOTE_CALL_FAILED_resumeSchedule, e.toString());
+ EcompException e1 = EcompException.create(CdapClusterMessageEnum.REMOTE_CALL_FAILED_resumeSchedule,e,e.getMessage());
+ ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapClusterMessageEnum.REMOTE_CALL_FAILED_resumeSchedule,e.getMessage());
+ throw e1;
}
ecomplogger.recordMetricEventEnd();
return res;
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java
index e1a7363..bd302cd 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterConsole.java
@@ -109,6 +109,17 @@ public class CdapCdapClusterConsole extends Console {
return res;
}
+ public java.lang.String loadArtifactWithConfig(String path, java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version, java.lang.String config) {
+ java.lang.String res = null;
+ try {
+ res = controller.loadArtifactWithConfig(path,namespace,artifactName,jarfile,version,config);
+ }
+ catch (ManagementServerError e) {
+ System.err.println("ERROR: " + e.getJson().toString(2));
+ }
+ return res;
+ }
+
public java.lang.String deleteArtifact(String path, java.lang.String namespace, java.lang.String artifactName, java.lang.String artifactVersion) {
java.lang.String res = null;
try {
@@ -483,4 +494,26 @@ public class CdapCdapClusterConsole extends Console {
return res;
}
+ public java.lang.String suspendSchedule(String path, java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+ java.lang.String res = null;
+ try {
+ res = controller.suspendSchedule(path,namespace,appId,scheduleId);
+ }
+ catch (ManagementServerError e) {
+ System.err.println("ERROR: " + e.getJson().toString(2));
+ }
+ return res;
+ }
+
+ public java.lang.String resumeSchedule(String path, java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+ java.lang.String res = null;
+ try {
+ res = controller.resumeSchedule(path,namespace,appId,scheduleId);
+ }
+ catch (ManagementServerError e) {
+ System.err.println("ERROR: " + e.getJson().toString(2));
+ }
+ return res;
+ }
+
}
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java
index f25f9a9..c5956b7 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/CdapCdapClusterProviderTemplate.java
@@ -85,6 +85,12 @@ public class CdapCdapClusterProviderTemplate extends BasicAdaptorProvider {
throw new UnsupportedOperationException();
}
+ public java.lang.String loadArtifactWithConfig(java.lang.String namespace, java.lang.String artifactName, java.lang.String jarfile, java.lang.String version, java.lang.String config) {
+ java.lang.String res = null;
+ // TODO IMPLEMENT
+ throw new UnsupportedOperationException();
+ }
+
public java.lang.String deleteArtifact(java.lang.String namespace, java.lang.String artifactName, java.lang.String artifactVersion) {
java.lang.String res = null;
// TODO IMPLEMENT
@@ -289,6 +295,18 @@ public class CdapCdapClusterProviderTemplate extends BasicAdaptorProvider {
throw new UnsupportedOperationException();
}
+ public java.lang.String suspendSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+ java.lang.String res = null;
+ // TODO IMPLEMENT
+ throw new UnsupportedOperationException();
+ }
+
+ public java.lang.String resumeSchedule(java.lang.String namespace, java.lang.String appId, java.lang.String scheduleId) {
+ java.lang.String res = null;
+ // TODO IMPLEMENT
+ throw new UnsupportedOperationException();
+ }
+
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApi.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApi.java
index 26b8604..8d90f66 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApi.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApi.java
@@ -25,24 +25,34 @@ package org.openecomp.ncomp.servers.cdap.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.logger.EcompLogger;
+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.servers.cdap.gui.logging.GuiClientApiOperationEnum;
+import org.openecomp.ncomp.servers.cdap.gui.logging.GuiClientApiMessageEnum;
@@ -81,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl;
-public class CdapGuiClientApi extends GuiClientApiImpl {
+public class CdapGuiClientApi extends GuiClientApiImpl implements ISiriusProvider {
public static final Logger logger = Logger.getLogger(CdapGuiClientApi.class);
- static final EcompLogger ecomplogger = EcompLogger.getEcompLogger();
+ static final NcompLogger ecomplogger = NcompLogger.getNcompLogger();
public CdapGuiClientApiProvider controller;
ISiriusServer server;
@@ -98,8 +108,8 @@ public class CdapGuiClientApi extends GuiClientApiImpl {
if (server != null)
server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.getTree);
+ ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this);
+ ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this));
try {
res = controller.getTree();
}
@@ -108,7 +118,10 @@ public class CdapGuiClientApi 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();
@@ -123,8 +136,8 @@ public class CdapGuiClientApi extends GuiClientApiImpl {
if (server != null)
server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.getObject);
+ ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this);
+ ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this));
try {
res = controller.getObject(path);
}
@@ -133,7 +146,10 @@ public class CdapGuiClientApi 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();
@@ -148,8 +164,8 @@ public class CdapGuiClientApi extends GuiClientApiImpl {
if (server != null)
server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.START, duration_,path,start,end,duration);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.getTimeSerie);
+ ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this);
+ ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this));
try {
res = controller.getTimeSerie(path,start,end,duration);
}
@@ -158,7 +174,10 @@ public class CdapGuiClientApi 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();
@@ -173,8 +192,8 @@ public class CdapGuiClientApi extends GuiClientApiImpl {
if (server != null)
server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.START, duration_,path,start,end);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.getTable);
+ ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this);
+ ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this));
try {
res = controller.getTable(path,start,end);
}
@@ -183,7 +202,10 @@ public class CdapGuiClientApi 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();
@@ -198,8 +220,8 @@ public class CdapGuiClientApi extends GuiClientApiImpl {
if (server != null)
server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.START, duration_,path,start,end);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.getHtml);
+ ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this);
+ ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this));
try {
res = controller.getHtml(path,start,end);
}
@@ -208,7 +230,10 @@ public class CdapGuiClientApi 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();
@@ -223,8 +248,8 @@ public class CdapGuiClientApi extends GuiClientApiImpl {
if (server != null)
server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.START, duration_,path,start,end);
Date now_ = new Date();
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.getGraph);
+ ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this);
+ ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this));
try {
res = controller.getGraph(path,start,end);
}
@@ -233,7 +258,10 @@ public class CdapGuiClientApi 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();
@@ -247,10 +275,12 @@ public class CdapGuiClientApi extends GuiClientApiImpl {
+
+
public static void ecoreSetup() {
CdapGuiClientApiProvider.ecoreSetup();
}
- public CdapGuiClientApiProvider getSomfProvider() {
+ public CdapGuiClientApiProvider getSiriusProvider() {
return controller;
}
}
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApiClient.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApiClient.java
index 7a2e601..106208d 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApiClient.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/CdapGuiClientApiClient.java
@@ -30,6 +30,8 @@ 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;
@@ -55,33 +57,37 @@ public class CdapGuiClientApiClient extends GuiClientApiImpl {
CdapCdapAdaptor.ecoreSetup();
client = new GenericHttpClient(file,name);
client.add("/gui", this);
+ client.setVersion("ONAP-R2");
}
public CdapGuiClientApiClient(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 CdapGuiClientApiClient(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(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree);
+ 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_getTree, e.toString());
- throw new RuntimeException("remote call failed: getTree", 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;
@@ -89,16 +95,17 @@ public class CdapGuiClientApiClient extends GuiClientApiImpl {
@Override
public org.openecomp.ncomp.gwt.siriusportal.model.GuiObject getObject(java.lang.String path) {
- EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getObject);
+ 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_getObject, e.toString());
- throw new RuntimeException("remote call failed: getObject", 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;
@@ -106,16 +113,17 @@ public class CdapGuiClientApiClient extends GuiClientApiImpl {
@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(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTimeSerie);
+ 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_getTimeSerie, e.toString());
- throw new RuntimeException("remote call failed: getTimeSerie", 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;
@@ -123,16 +131,17 @@ public class CdapGuiClientApiClient extends GuiClientApiImpl {
@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(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTable);
+ 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_getTable, e.toString());
- throw new RuntimeException("remote call failed: getTable", 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;
@@ -140,16 +149,17 @@ public class CdapGuiClientApiClient extends GuiClientApiImpl {
@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(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getHtml);
+ 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_getHtml, e.toString());
- throw new RuntimeException("remote call failed: getHtml", 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;
@@ -157,16 +167,17 @@ public class CdapGuiClientApiClient extends GuiClientApiImpl {
@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(); //foo
- ecomplogger.recordMetricEventStart();
- ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getGraph);
+ 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_getGraph, e.toString());
- throw new RuntimeException("remote call failed: getGraph", 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-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApi.properties b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApi.properties
index 8705ab8..3822d29 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApi.properties
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApi.properties
@@ -1,78 +1,78 @@
dummy=\
- null|\
+ dummy-null|\
null|\
null|\
null
-getTree=\
- getTree-FAILED-5001W|\
+REQUEST_FAILED_getTree=\
+ REQUEST-FAILED-getTree-4001W|\
{0}|\
null|\
Operation Failed with Exception
-getObject=\
- getObject-FAILED-5001W|\
+REQUEST_FAILED_getObject=\
+ REQUEST-FAILED-getObject-4001W|\
{0}|\
null|\
Operation Failed with Exception
-getTimeSerie=\
- getTimeSerie-FAILED-5001W|\
+REQUEST_FAILED_getTimeSerie=\
+ REQUEST-FAILED-getTimeSerie-4001W|\
{0}|\
null|\
Operation Failed with Exception
-getTable=\
- getTable-FAILED-5001W|\
+REQUEST_FAILED_getTable=\
+ REQUEST-FAILED-getTable-4001W|\
{0}|\
null|\
Operation Failed with Exception
-getHtml=\
- getHtml-FAILED-5001W|\
+REQUEST_FAILED_getHtml=\
+ REQUEST-FAILED-getHtml-4001W|\
{0}|\
null|\
Operation Failed with Exception
-getGraph=\
- getGraph-FAILED-5001W|\
+REQUEST_FAILED_getGraph=\
+ REQUEST-FAILED-getGraph-4001W|\
{0}|\
null|\
Operation Failed with Exception
-REMOTE_getTree=\
- REMOTE-getTree-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTree=\
+ REMOTE-CALL-FAILED-getTree-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_getObject=\
- REMOTE-getObject-FAILED-5001W|\
+REMOTE_CALL_FAILED_getObject=\
+ REMOTE-CALL-FAILED-getObject-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_getTimeSerie=\
- REMOTE-getTimeSerie-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTimeSerie=\
+ REMOTE-CALL-FAILED-getTimeSerie-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_getTable=\
- REMOTE-getTable-FAILED-5001W|\
+REMOTE_CALL_FAILED_getTable=\
+ REMOTE-CALL-FAILED-getTable-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_getHtml=\
- REMOTE-getHtml-FAILED-5001W|\
+REMOTE_CALL_FAILED_getHtml=\
+ REMOTE-CALL-FAILED-getHtml-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_getGraph=\
- REMOTE-getGraph-FAILED-5001W|\
+REMOTE_CALL_FAILED_getGraph=\
+ REMOTE-CALL-FAILED-getGraph-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiMessageEnum.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiMessageEnum.java
index 670c327..65a9515 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiMessageEnum.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiMessageEnum.java
@@ -1,25 +1,4 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.cdap.gui.logging;
import com.att.eelf.i18n.EELFResourceManager;
@@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum;
public enum GuiClientApiMessageEnum implements EcompMessageEnum {
dummy,
- getTree,
- getObject,
- getTimeSerie,
- getTable,
- getHtml,
- getGraph,
- REMOTE_getTree,
- REMOTE_getObject,
- REMOTE_getTimeSerie,
- REMOTE_getTable,
- REMOTE_getHtml,
- REMOTE_getGraph;
+ 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.servers.cdap.gui.logging.GuiClientApi");
+ EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApi");
}
}
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiOperationEnum.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiOperationEnum.java
index 0be34d7..c43c389 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiOperationEnum.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/gui/logging/GuiClientApiOperationEnum.java
@@ -1,41 +1,27 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.cdap.gui.logging;
import org.openecomp.entity.EcompOperationEnum;
public enum GuiClientApiOperationEnum implements EcompOperationEnum {
- getTree,
- getObject,
- getTimeSerie,
- getTable,
- getHtml,
- getGraph,
- REMOTE_getTree,
- REMOTE_getObject,
- REMOTE_getTimeSerie,
- REMOTE_getTable,
- REMOTE_getHtml,
- REMOTE_getGraph;
+ 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-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptor.properties b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptor.properties
index 555c4fc..11f5270 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptor.properties
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptor.properties
@@ -1,6 +1,6 @@
dummy=\
- null|\
+ dummy-null|\
null|\
null|\
null
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorMessageEnum.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorMessageEnum.java
index 935f1cd..2260c99 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorMessageEnum.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorMessageEnum.java
@@ -1,25 +1,4 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.cdap.logging;
import com.att.eelf.i18n.EELFResourceManager;
@@ -30,6 +9,6 @@ public enum CdapAdaptorMessageEnum implements EcompMessageEnum {
dummy;
static {
- EELFResourceManager.loadMessageBundle("org.openecomp.ncomp.servers.cdap.logging.CdapAdaptor");
+ EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/servers/cdap/logging/CdapAdaptor");
}
}
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorOperationEnum.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorOperationEnum.java
index 3260c81..b183b47 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorOperationEnum.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapAdaptorOperationEnum.java
@@ -1,29 +1,21 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.cdap.logging;
import org.openecomp.entity.EcompOperationEnum;
public enum CdapAdaptorOperationEnum implements EcompOperationEnum {
+ ;
+
+
+ private String n;
+
+ private CdapAdaptorOperationEnum(String n) {
+ this.n = n;
+ }
+
+ @Override
+ public String toString() {
+ return n;
+ }
}
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapCluster.properties b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapCluster.properties
index b367850..b4844f4 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapCluster.properties
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapCluster.properties
@@ -1,474 +1,510 @@
dummy=\
- null|\
+ dummy-null|\
null|\
null|\
null
-createNamespace=\
- createNamespace-FAILED-5001W|\
+REQUEST_FAILED_createNamespace=\
+ REQUEST-FAILED-createNamespace-4001W|\
+ {0}|\
+ null|\
+ Operation Failed with Exception
+
+REQUEST_FAILED_deleteNamespace=\
+ REQUEST-FAILED-deleteNamespace-4001W|\
+ {0}|\
+ null|\
+ Operation Failed with Exception
+
+REQUEST_FAILED_deployApp=\
+ REQUEST-FAILED-deployApp-4001W|\
+ {0}|\
+ null|\
+ Operation Failed with Exception
+
+REQUEST_FAILED_loadArtifact=\
+ REQUEST-FAILED-loadArtifact-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteNamespace=\
- deleteNamespace-FAILED-5001W|\
+REQUEST_FAILED_loadArtifactWithConfig=\
+ REQUEST-FAILED-loadArtifactWithConfig-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deployApp=\
- deployApp-FAILED-5001W|\
+REQUEST_FAILED_deleteArtifact=\
+ REQUEST-FAILED-deleteArtifact-4001W|\
{0}|\
null|\
Operation Failed with Exception
-loadArtifact=\
- loadArtifact-FAILED-5001W|\
+REQUEST_FAILED_startFlow=\
+ REQUEST-FAILED-startFlow-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteArtifact=\
- deleteArtifact-FAILED-5001W|\
+REQUEST_FAILED_startWorker=\
+ REQUEST-FAILED-startWorker-4001W|\
{0}|\
null|\
Operation Failed with Exception
-startFlow=\
- startFlow-FAILED-5001W|\
+REQUEST_FAILED_startService=\
+ REQUEST-FAILED-startService-4001W|\
{0}|\
null|\
Operation Failed with Exception
-startWorker=\
- startWorker-FAILED-5001W|\
+REQUEST_FAILED_startApp=\
+ REQUEST-FAILED-startApp-4001W|\
{0}|\
null|\
Operation Failed with Exception
-startService=\
- startService-FAILED-5001W|\
+REQUEST_FAILED_stopApp=\
+ REQUEST-FAILED-stopApp-4001W|\
{0}|\
null|\
Operation Failed with Exception
-startApp=\
- startApp-FAILED-5001W|\
+REQUEST_FAILED_deleteApp=\
+ REQUEST-FAILED-deleteApp-4001W|\
{0}|\
null|\
Operation Failed with Exception
-stopApp=\
- stopApp-FAILED-5001W|\
+REQUEST_FAILED_loadPreferencesApp=\
+ REQUEST-FAILED-loadPreferencesApp-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteApp=\
- deleteApp-FAILED-5001W|\
+REQUEST_FAILED_loadPreferencesFlow=\
+ REQUEST-FAILED-loadPreferencesFlow-4001W|\
{0}|\
null|\
Operation Failed with Exception
-loadPreferencesApp=\
- loadPreferencesApp-FAILED-5001W|\
+REQUEST_FAILED_loadPreferencesNameSpace=\
+ REQUEST-FAILED-loadPreferencesNameSpace-4001W|\
{0}|\
null|\
Operation Failed with Exception
-loadPreferencesFlow=\
- loadPreferencesFlow-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesApp=\
+ REQUEST-FAILED-setPreferencesApp-4001W|\
{0}|\
null|\
Operation Failed with Exception
-loadPreferencesNameSpace=\
- loadPreferencesNameSpace-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesFlow=\
+ REQUEST-FAILED-setPreferencesFlow-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setPreferencesApp=\
- setPreferencesApp-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesWorker=\
+ REQUEST-FAILED-setPreferencesWorker-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setPreferencesFlow=\
- setPreferencesFlow-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesService=\
+ REQUEST-FAILED-setPreferencesService-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setPreferencesWorker=\
- setPreferencesWorker-FAILED-5001W|\
+REQUEST_FAILED_setPreferencesNameSpace=\
+ REQUEST-FAILED-setPreferencesNameSpace-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setPreferencesService=\
- setPreferencesService-FAILED-5001W|\
+REQUEST_FAILED_setFlowRunTimeArgs=\
+ REQUEST-FAILED-setFlowRunTimeArgs-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setPreferencesNameSpace=\
- setPreferencesNameSpace-FAILED-5001W|\
+REQUEST_FAILED_setFlowletInstances=\
+ REQUEST-FAILED-setFlowletInstances-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setFlowRunTimeArgs=\
- setFlowRunTimeArgs-FAILED-5001W|\
+REQUEST_FAILED_stopFlow=\
+ REQUEST-FAILED-stopFlow-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setFlowletInstances=\
- setFlowletInstances-FAILED-5001W|\
+REQUEST_FAILED_stopWorker=\
+ REQUEST-FAILED-stopWorker-4001W|\
{0}|\
null|\
Operation Failed with Exception
-stopFlow=\
- stopFlow-FAILED-5001W|\
+REQUEST_FAILED_stopService=\
+ REQUEST-FAILED-stopService-4001W|\
{0}|\
null|\
Operation Failed with Exception
-stopWorker=\
- stopWorker-FAILED-5001W|\
+REQUEST_FAILED_truncateDataSet=\
+ REQUEST-FAILED-truncateDataSet-4001W|\
{0}|\
null|\
Operation Failed with Exception
-stopService=\
- stopService-FAILED-5001W|\
+REQUEST_FAILED_deleteDataset=\
+ REQUEST-FAILED-deleteDataset-4001W|\
{0}|\
null|\
Operation Failed with Exception
-truncateDataSet=\
- truncateDataSet-FAILED-5001W|\
+REQUEST_FAILED_createStream=\
+ REQUEST-FAILED-createStream-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteDataset=\
- deleteDataset-FAILED-5001W|\
+REQUEST_FAILED_deleteStream=\
+ REQUEST-FAILED-deleteStream-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createStream=\
- createStream-FAILED-5001W|\
+REQUEST_FAILED_getStreamEvents=\
+ REQUEST-FAILED-getStreamEvents-4001W|\
{0}|\
null|\
Operation Failed with Exception
-deleteStream=\
- deleteStream-FAILED-5001W|\
+REQUEST_FAILED_getStreamStats=\
+ REQUEST-FAILED-getStreamStats-4001W|\
{0}|\
null|\
Operation Failed with Exception
-getStreamEvents=\
- getStreamEvents-FAILED-5001W|\
+REQUEST_FAILED_sendEventToStream=\
+ REQUEST-FAILED-sendEventToStream-4001W|\
{0}|\
null|\
Operation Failed with Exception
-getStreamStats=\
- getStreamStats-FAILED-5001W|\
+REQUEST_FAILED_trucateStream=\
+ REQUEST-FAILED-trucateStream-4001W|\
{0}|\
null|\
Operation Failed with Exception
-sendEventToStream=\
- sendEventToStream-FAILED-5001W|\
+REQUEST_FAILED_setStreamProperties=\
+ REQUEST-FAILED-setStreamProperties-4001W|\
{0}|\
null|\
Operation Failed with Exception
-trucateStream=\
- trucateStream-FAILED-5001W|\
+REQUEST_FAILED_restartApp=\
+ REQUEST-FAILED-restartApp-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setStreamProperties=\
- setStreamProperties-FAILED-5001W|\
+REQUEST_FAILED_createApp=\
+ REQUEST-FAILED-createApp-4001W|\
{0}|\
null|\
Operation Failed with Exception
-restartApp=\
- restartApp-FAILED-5001W|\
+REQUEST_FAILED_createAppWithConfig=\
+ REQUEST-FAILED-createAppWithConfig-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createApp=\
- createApp-FAILED-5001W|\
+REQUEST_FAILED_setDatasetProperties=\
+ REQUEST-FAILED-setDatasetProperties-4001W|\
{0}|\
null|\
Operation Failed with Exception
-createAppWithConfig=\
- createAppWithConfig-FAILED-5001W|\
+REQUEST_FAILED_setStreamTTL=\
+ REQUEST-FAILED-setStreamTTL-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setDatasetProperties=\
- setDatasetProperties-FAILED-5001W|\
+REQUEST_FAILED_suspendSchedule=\
+ REQUEST-FAILED-suspendSchedule-4001W|\
{0}|\
null|\
Operation Failed with Exception
-setStreamTTL=\
- setStreamTTL-FAILED-5001W|\
+REQUEST_FAILED_resumeSchedule=\
+ REQUEST-FAILED-resumeSchedule-4001W|\
{0}|\
null|\
Operation Failed with Exception
-poll=\
- poll-FAILED-5001W|\
+REQUEST_FAILED_poll=\
+ REQUEST-FAILED-poll-4001W|\
{0}|\
null|\
Operation Failed with Exception
-REMOTE_createNamespace=\
- REMOTE-createNamespace-FAILED-5001W|\
+REMOTE_CALL_FAILED_createNamespace=\
+ REMOTE-CALL-FAILED-createNamespace-4001W|\
+ {0}|\
+ null|\
+ Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_deleteNamespace=\
+ REMOTE-CALL-FAILED-deleteNamespace-4001W|\
+ {0}|\
+ null|\
+ Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_deployApp=\
+ REMOTE-CALL-FAILED-deployApp-4001W|\
+ {0}|\
+ null|\
+ Remote Operation Failed with Exception
+
+REMOTE_CALL_FAILED_loadArtifact=\
+ REMOTE-CALL-FAILED-loadArtifact-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteNamespace=\
- REMOTE-deleteNamespace-FAILED-5001W|\
+REMOTE_CALL_FAILED_loadArtifactWithConfig=\
+ REMOTE-CALL-FAILED-loadArtifactWithConfig-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deployApp=\
- REMOTE-deployApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteArtifact=\
+ REMOTE-CALL-FAILED-deleteArtifact-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_loadArtifact=\
- REMOTE-loadArtifact-FAILED-5001W|\
+REMOTE_CALL_FAILED_startFlow=\
+ REMOTE-CALL-FAILED-startFlow-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteArtifact=\
- REMOTE-deleteArtifact-FAILED-5001W|\
+REMOTE_CALL_FAILED_startWorker=\
+ REMOTE-CALL-FAILED-startWorker-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_startFlow=\
- REMOTE-startFlow-FAILED-5001W|\
+REMOTE_CALL_FAILED_startService=\
+ REMOTE-CALL-FAILED-startService-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_startWorker=\
- REMOTE-startWorker-FAILED-5001W|\
+REMOTE_CALL_FAILED_startApp=\
+ REMOTE-CALL-FAILED-startApp-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_startService=\
- REMOTE-startService-FAILED-5001W|\
+REMOTE_CALL_FAILED_stopApp=\
+ REMOTE-CALL-FAILED-stopApp-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_startApp=\
- REMOTE-startApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteApp=\
+ REMOTE-CALL-FAILED-deleteApp-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_stopApp=\
- REMOTE-stopApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_loadPreferencesApp=\
+ REMOTE-CALL-FAILED-loadPreferencesApp-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteApp=\
- REMOTE-deleteApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_loadPreferencesFlow=\
+ REMOTE-CALL-FAILED-loadPreferencesFlow-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_loadPreferencesApp=\
- REMOTE-loadPreferencesApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_loadPreferencesNameSpace=\
+ REMOTE-CALL-FAILED-loadPreferencesNameSpace-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_loadPreferencesFlow=\
- REMOTE-loadPreferencesFlow-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesApp=\
+ REMOTE-CALL-FAILED-setPreferencesApp-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_loadPreferencesNameSpace=\
- REMOTE-loadPreferencesNameSpace-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesFlow=\
+ REMOTE-CALL-FAILED-setPreferencesFlow-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setPreferencesApp=\
- REMOTE-setPreferencesApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesWorker=\
+ REMOTE-CALL-FAILED-setPreferencesWorker-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setPreferencesFlow=\
- REMOTE-setPreferencesFlow-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesService=\
+ REMOTE-CALL-FAILED-setPreferencesService-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setPreferencesWorker=\
- REMOTE-setPreferencesWorker-FAILED-5001W|\
+REMOTE_CALL_FAILED_setPreferencesNameSpace=\
+ REMOTE-CALL-FAILED-setPreferencesNameSpace-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setPreferencesService=\
- REMOTE-setPreferencesService-FAILED-5001W|\
+REMOTE_CALL_FAILED_setFlowRunTimeArgs=\
+ REMOTE-CALL-FAILED-setFlowRunTimeArgs-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setPreferencesNameSpace=\
- REMOTE-setPreferencesNameSpace-FAILED-5001W|\
+REMOTE_CALL_FAILED_setFlowletInstances=\
+ REMOTE-CALL-FAILED-setFlowletInstances-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setFlowRunTimeArgs=\
- REMOTE-setFlowRunTimeArgs-FAILED-5001W|\
+REMOTE_CALL_FAILED_stopFlow=\
+ REMOTE-CALL-FAILED-stopFlow-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setFlowletInstances=\
- REMOTE-setFlowletInstances-FAILED-5001W|\
+REMOTE_CALL_FAILED_stopWorker=\
+ REMOTE-CALL-FAILED-stopWorker-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_stopFlow=\
- REMOTE-stopFlow-FAILED-5001W|\
+REMOTE_CALL_FAILED_stopService=\
+ REMOTE-CALL-FAILED-stopService-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_stopWorker=\
- REMOTE-stopWorker-FAILED-5001W|\
+REMOTE_CALL_FAILED_truncateDataSet=\
+ REMOTE-CALL-FAILED-truncateDataSet-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_stopService=\
- REMOTE-stopService-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteDataset=\
+ REMOTE-CALL-FAILED-deleteDataset-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_truncateDataSet=\
- REMOTE-truncateDataSet-FAILED-5001W|\
+REMOTE_CALL_FAILED_createStream=\
+ REMOTE-CALL-FAILED-createStream-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteDataset=\
- REMOTE-deleteDataset-FAILED-5001W|\
+REMOTE_CALL_FAILED_deleteStream=\
+ REMOTE-CALL-FAILED-deleteStream-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createStream=\
- REMOTE-createStream-FAILED-5001W|\
+REMOTE_CALL_FAILED_getStreamEvents=\
+ REMOTE-CALL-FAILED-getStreamEvents-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_deleteStream=\
- REMOTE-deleteStream-FAILED-5001W|\
+REMOTE_CALL_FAILED_getStreamStats=\
+ REMOTE-CALL-FAILED-getStreamStats-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_getStreamEvents=\
- REMOTE-getStreamEvents-FAILED-5001W|\
+REMOTE_CALL_FAILED_sendEventToStream=\
+ REMOTE-CALL-FAILED-sendEventToStream-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_getStreamStats=\
- REMOTE-getStreamStats-FAILED-5001W|\
+REMOTE_CALL_FAILED_trucateStream=\
+ REMOTE-CALL-FAILED-trucateStream-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_sendEventToStream=\
- REMOTE-sendEventToStream-FAILED-5001W|\
+REMOTE_CALL_FAILED_setStreamProperties=\
+ REMOTE-CALL-FAILED-setStreamProperties-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_trucateStream=\
- REMOTE-trucateStream-FAILED-5001W|\
+REMOTE_CALL_FAILED_restartApp=\
+ REMOTE-CALL-FAILED-restartApp-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setStreamProperties=\
- REMOTE-setStreamProperties-FAILED-5001W|\
+REMOTE_CALL_FAILED_createApp=\
+ REMOTE-CALL-FAILED-createApp-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_restartApp=\
- REMOTE-restartApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_createAppWithConfig=\
+ REMOTE-CALL-FAILED-createAppWithConfig-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createApp=\
- REMOTE-createApp-FAILED-5001W|\
+REMOTE_CALL_FAILED_setDatasetProperties=\
+ REMOTE-CALL-FAILED-setDatasetProperties-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_createAppWithConfig=\
- REMOTE-createAppWithConfig-FAILED-5001W|\
+REMOTE_CALL_FAILED_setStreamTTL=\
+ REMOTE-CALL-FAILED-setStreamTTL-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setDatasetProperties=\
- REMOTE-setDatasetProperties-FAILED-5001W|\
+REMOTE_CALL_FAILED_suspendSchedule=\
+ REMOTE-CALL-FAILED-suspendSchedule-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_setStreamTTL=\
- REMOTE-setStreamTTL-FAILED-5001W|\
+REMOTE_CALL_FAILED_resumeSchedule=\
+ REMOTE-CALL-FAILED-resumeSchedule-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
-REMOTE_poll=\
- REMOTE-poll-FAILED-5001W|\
+REMOTE_CALL_FAILED_poll=\
+ REMOTE-CALL-FAILED-poll-4001W|\
{0}|\
null|\
Remote Operation Failed with Exception
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterMessageEnum.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterMessageEnum.java
index 49490a7..01f2b50 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterMessageEnum.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterMessageEnum.java
@@ -1,25 +1,4 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.cdap.logging;
import com.att.eelf.i18n.EELFResourceManager;
@@ -28,86 +7,92 @@ import org.openecomp.logger.EcompMessageEnum;
public enum CdapClusterMessageEnum implements EcompMessageEnum {
dummy,
- createNamespace,
- deleteNamespace,
- deployApp,
- loadArtifact,
- deleteArtifact,
- startFlow,
- startWorker,
- startService,
- startApp,
- stopApp,
- deleteApp,
- loadPreferencesApp,
- loadPreferencesFlow,
- loadPreferencesNameSpace,
- setPreferencesApp,
- setPreferencesFlow,
- setPreferencesWorker,
- setPreferencesService,
- setPreferencesNameSpace,
- setFlowRunTimeArgs,
- setFlowletInstances,
- stopFlow,
- stopWorker,
- stopService,
- truncateDataSet,
- deleteDataset,
- createStream,
- deleteStream,
- getStreamEvents,
- getStreamStats,
- sendEventToStream,
- trucateStream,
- setStreamProperties,
- restartApp,
- createApp,
- createAppWithConfig,
- setDatasetProperties,
- setStreamTTL,
- poll,
- REMOTE_createNamespace,
- REMOTE_deleteNamespace,
- REMOTE_deployApp,
- REMOTE_loadArtifact,
- REMOTE_deleteArtifact,
- REMOTE_startFlow,
- REMOTE_startWorker,
- REMOTE_startService,
- REMOTE_startApp,
- REMOTE_stopApp,
- REMOTE_deleteApp,
- REMOTE_loadPreferencesApp,
- REMOTE_loadPreferencesFlow,
- REMOTE_loadPreferencesNameSpace,
- REMOTE_setPreferencesApp,
- REMOTE_setPreferencesFlow,
- REMOTE_setPreferencesWorker,
- REMOTE_setPreferencesService,
- REMOTE_setPreferencesNameSpace,
- REMOTE_setFlowRunTimeArgs,
- REMOTE_setFlowletInstances,
- REMOTE_stopFlow,
- REMOTE_stopWorker,
- REMOTE_stopService,
- REMOTE_truncateDataSet,
- REMOTE_deleteDataset,
- REMOTE_createStream,
- REMOTE_deleteStream,
- REMOTE_getStreamEvents,
- REMOTE_getStreamStats,
- REMOTE_sendEventToStream,
- REMOTE_trucateStream,
- REMOTE_setStreamProperties,
- REMOTE_restartApp,
- REMOTE_createApp,
- REMOTE_createAppWithConfig,
- REMOTE_setDatasetProperties,
- REMOTE_setStreamTTL,
- REMOTE_poll;
+ REQUEST_FAILED_createNamespace,
+ REQUEST_FAILED_deleteNamespace,
+ REQUEST_FAILED_deployApp,
+ REQUEST_FAILED_loadArtifact,
+ REQUEST_FAILED_loadArtifactWithConfig,
+ REQUEST_FAILED_deleteArtifact,
+ REQUEST_FAILED_startFlow,
+ REQUEST_FAILED_startWorker,
+ REQUEST_FAILED_startService,
+ REQUEST_FAILED_startApp,
+ REQUEST_FAILED_stopApp,
+ REQUEST_FAILED_deleteApp,
+ REQUEST_FAILED_loadPreferencesApp,
+ REQUEST_FAILED_loadPreferencesFlow,
+ REQUEST_FAILED_loadPreferencesNameSpace,
+ REQUEST_FAILED_setPreferencesApp,
+ REQUEST_FAILED_setPreferencesFlow,
+ REQUEST_FAILED_setPreferencesWorker,
+ REQUEST_FAILED_setPreferencesService,
+ REQUEST_FAILED_setPreferencesNameSpace,
+ REQUEST_FAILED_setFlowRunTimeArgs,
+ REQUEST_FAILED_setFlowletInstances,
+ REQUEST_FAILED_stopFlow,
+ REQUEST_FAILED_stopWorker,
+ REQUEST_FAILED_stopService,
+ REQUEST_FAILED_truncateDataSet,
+ REQUEST_FAILED_deleteDataset,
+ REQUEST_FAILED_createStream,
+ REQUEST_FAILED_deleteStream,
+ REQUEST_FAILED_getStreamEvents,
+ REQUEST_FAILED_getStreamStats,
+ REQUEST_FAILED_sendEventToStream,
+ REQUEST_FAILED_trucateStream,
+ REQUEST_FAILED_setStreamProperties,
+ REQUEST_FAILED_restartApp,
+ REQUEST_FAILED_createApp,
+ REQUEST_FAILED_createAppWithConfig,
+ REQUEST_FAILED_setDatasetProperties,
+ REQUEST_FAILED_setStreamTTL,
+ REQUEST_FAILED_suspendSchedule,
+ REQUEST_FAILED_resumeSchedule,
+ REQUEST_FAILED_poll,
+ REMOTE_CALL_FAILED_createNamespace,
+ REMOTE_CALL_FAILED_deleteNamespace,
+ REMOTE_CALL_FAILED_deployApp,
+ REMOTE_CALL_FAILED_loadArtifact,
+ REMOTE_CALL_FAILED_loadArtifactWithConfig,
+ REMOTE_CALL_FAILED_deleteArtifact,
+ REMOTE_CALL_FAILED_startFlow,
+ REMOTE_CALL_FAILED_startWorker,
+ REMOTE_CALL_FAILED_startService,
+ REMOTE_CALL_FAILED_startApp,
+ REMOTE_CALL_FAILED_stopApp,
+ REMOTE_CALL_FAILED_deleteApp,
+ REMOTE_CALL_FAILED_loadPreferencesApp,
+ REMOTE_CALL_FAILED_loadPreferencesFlow,
+ REMOTE_CALL_FAILED_loadPreferencesNameSpace,
+ REMOTE_CALL_FAILED_setPreferencesApp,
+ REMOTE_CALL_FAILED_setPreferencesFlow,
+ REMOTE_CALL_FAILED_setPreferencesWorker,
+ REMOTE_CALL_FAILED_setPreferencesService,
+ REMOTE_CALL_FAILED_setPreferencesNameSpace,
+ REMOTE_CALL_FAILED_setFlowRunTimeArgs,
+ REMOTE_CALL_FAILED_setFlowletInstances,
+ REMOTE_CALL_FAILED_stopFlow,
+ REMOTE_CALL_FAILED_stopWorker,
+ REMOTE_CALL_FAILED_stopService,
+ REMOTE_CALL_FAILED_truncateDataSet,
+ REMOTE_CALL_FAILED_deleteDataset,
+ REMOTE_CALL_FAILED_createStream,
+ REMOTE_CALL_FAILED_deleteStream,
+ REMOTE_CALL_FAILED_getStreamEvents,
+ REMOTE_CALL_FAILED_getStreamStats,
+ REMOTE_CALL_FAILED_sendEventToStream,
+ REMOTE_CALL_FAILED_trucateStream,
+ REMOTE_CALL_FAILED_setStreamProperties,
+ REMOTE_CALL_FAILED_restartApp,
+ REMOTE_CALL_FAILED_createApp,
+ REMOTE_CALL_FAILED_createAppWithConfig,
+ REMOTE_CALL_FAILED_setDatasetProperties,
+ REMOTE_CALL_FAILED_setStreamTTL,
+ REMOTE_CALL_FAILED_suspendSchedule,
+ REMOTE_CALL_FAILED_resumeSchedule,
+ REMOTE_CALL_FAILED_poll;
static {
- EELFResourceManager.loadMessageBundle("org.openecomp.ncomp.servers.cdap.logging.CdapCluster");
+ EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/servers/cdap/logging/CdapCluster");
}
}
diff --git a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterOperationEnum.java b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterOperationEnum.java
index 559f80e..828b1ea 100644
--- a/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterOperationEnum.java
+++ b/ncomp-cdap-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/cdap/logging/CdapClusterOperationEnum.java
@@ -1,107 +1,63 @@
-/*-
- * ============LICENSE_START==========================================
- * OPENECOMP - DCAE
- * ===================================================================
- * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- */
-
-
package org.openecomp.ncomp.servers.cdap.logging;
import org.openecomp.entity.EcompOperationEnum;
public enum CdapClusterOperationEnum implements EcompOperationEnum {
- createNamespace,
- deleteNamespace,
- deployApp,
- loadArtifact,
- deleteArtifact,
- startFlow,
- startWorker,
- startService,
- startApp,
- stopApp,
- deleteApp,
- loadPreferencesApp,
- loadPreferencesFlow,
- loadPreferencesNameSpace,
- setPreferencesApp,
- setPreferencesFlow,
- setPreferencesWorker,
- setPreferencesService,
- setPreferencesNameSpace,
- setFlowRunTimeArgs,
- setFlowletInstances,
- stopFlow,
- stopWorker,
- stopService,
- truncateDataSet,
- deleteDataset,
- createStream,
- deleteStream,
- getStreamEvents,
- getStreamStats,
- sendEventToStream,
- trucateStream,
- setStreamProperties,
- restartApp,
- createApp,
- createAppWithConfig,
- setDatasetProperties,
- setStreamTTL,
- poll,
- REMOTE_createNamespace,
- REMOTE_deleteNamespace,
- REMOTE_deployApp,
- REMOTE_loadArtifact,
- REMOTE_deleteArtifact,
- REMOTE_startFlow,
- REMOTE_startWorker,
- REMOTE_startService,
- REMOTE_startApp,
- REMOTE_stopApp,
- REMOTE_deleteApp,
- REMOTE_loadPreferencesApp,
- REMOTE_loadPreferencesFlow,
- REMOTE_loadPreferencesNameSpace,
- REMOTE_setPreferencesApp,
- REMOTE_setPreferencesFlow,
- REMOTE_setPreferencesWorker,
- REMOTE_setPreferencesService,
- REMOTE_setPreferencesNameSpace,
- REMOTE_setFlowRunTimeArgs,
- REMOTE_setFlowletInstances,
- REMOTE_stopFlow,
- REMOTE_stopWorker,
- REMOTE_stopService,
- REMOTE_truncateDataSet,
- REMOTE_deleteDataset,
- REMOTE_createStream,
- REMOTE_deleteStream,
- REMOTE_getStreamEvents,
- REMOTE_getStreamStats,
- REMOTE_sendEventToStream,
- REMOTE_trucateStream,
- REMOTE_setStreamProperties,
- REMOTE_restartApp,
- REMOTE_createApp,
- REMOTE_createAppWithConfig,
- REMOTE_setDatasetProperties,
- REMOTE_setStreamTTL,
- REMOTE_poll;
+ CdapCluster_createNamespace("CdapCluster@createNamespace"),
+ CdapCluster_deleteNamespace("CdapCluster@deleteNamespace"),
+ CdapCluster_deployApp("CdapCluster@deployApp"),
+ CdapCluster_loadArtifact("CdapCluster@loadArtifact"),
+ CdapCluster_loadArtifactWithConfig("CdapCluster@loadArtifactWithConfig"),
+ CdapCluster_deleteArtifact("CdapCluster@deleteArtifact"),
+ CdapCluster_startFlow("CdapCluster@startFlow"),
+ CdapCluster_startWorker("CdapCluster@startWorker"),
+ CdapCluster_startService("CdapCluster@startService"),
+ CdapCluster_startApp("CdapCluster@startApp"),
+ CdapCluster_stopApp("CdapCluster@stopApp"),
+ CdapCluster_deleteApp("CdapCluster@deleteApp"),
+ CdapCluster_loadPreferencesApp("CdapCluster@loadPreferencesApp"),
+ CdapCluster_loadPreferencesFlow("CdapCluster@loadPreferencesFlow"),
+ CdapCluster_loadPreferencesNameSpace("CdapCluster@loadPreferencesNameSpace"),
+ CdapCluster_setPreferencesApp("CdapCluster@setPreferencesApp"),
+ CdapCluster_setPreferencesFlow("CdapCluster@setPreferencesFlow"),
+ CdapCluster_setPreferencesWorker("CdapCluster@setPreferencesWorker"),
+ CdapCluster_setPreferencesService("CdapCluster@setPreferencesService"),
+ CdapCluster_setPreferencesNameSpace("CdapCluster@setPreferencesNameSpace"),
+ CdapCluster_setFlowRunTimeArgs("CdapCluster@setFlowRunTimeArgs"),
+ CdapCluster_setFlowletInstances("CdapCluster@setFlowletInstances"),
+ CdapCluster_stopFlow("CdapCluster@stopFlow"),
+ CdapCluster_stopWorker("CdapCluster@stopWorker"),
+ CdapCluster_stopService("CdapCluster@stopService"),
+ CdapCluster_truncateDataSet("CdapCluster@truncateDataSet"),
+ CdapCluster_deleteDataset("CdapCluster@deleteDataset"),
+ CdapCluster_createStream("CdapCluster@createStream"),
+ CdapCluster_deleteStream("CdapCluster@deleteStream"),
+ CdapCluster_getStreamEvents("CdapCluster@getStreamEvents"),
+ CdapCluster_getStreamStats("CdapCluster@getStreamStats"),
+ CdapCluster_sendEventToStream("CdapCluster@sendEventToStream"),
+ CdapCluster_trucateStream("CdapCluster@trucateStream"),
+ CdapCluster_setStreamProperties("CdapCluster@setStreamProperties"),
+ CdapCluster_restartApp("CdapCluster@restartApp"),
+ CdapCluster_createApp("CdapCluster@createApp"),
+ CdapCluster_createAppWithConfig("CdapCluster@createAppWithConfig"),
+ CdapCluster_setDatasetProperties("CdapCluster@setDatasetProperties"),
+ CdapCluster_setStreamTTL("CdapCluster@setStreamTTL"),
+ CdapCluster_suspendSchedule("CdapCluster@suspendSchedule"),
+ CdapCluster_resumeSchedule("CdapCluster@resumeSchedule"),
+ CdapCluster_poll("CdapCluster@poll") ;
+
+
+ private String n;
+
+ private CdapClusterOperationEnum(String n) {
+ this.n = n;
+ }
+
+ @Override
+ public String toString() {
+ return n;
+ }
+
}