diff options
Diffstat (limited to 'dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor')
24 files changed, 981 insertions, 924 deletions
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/.classpath b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/.classpath index d2d34b3..89273c0 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/.classpath +++ b/dcae-controller-service-cdap/dcae-controller-service-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/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/META-INF/MANIFEST.MF b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/META-INF/MANIFEST.MF index 92614d2..dbe2557 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/META-INF/MANIFEST.MF +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/META-INF/MANIFEST.MF @@ -5,14 +5,4 @@ Bundle-SymbolicName: dcae-controller-service-cdap-adaptor Bundle-Version: 0.1.0.qualifier Export-Package: org.openecomp.dcae.controller.service.cdap.adaptor.tools, org.openecomp.dcae.controller.service.servers.cdap -Require-Bundle: ncomp-core-types, - ncomp-sirius-manager-model, - ncomp-sirius-manager-server, - ncomp-sirius-manager-console, - ncomp-sirius-manager-generator, - dcae-controller-service-cdap-model;bundle-version="0.1.0", - ncomp-utils-java;bundle-version="0.1.0", - dcae-controller-service-cdap-cluster-model, - dcae-controller-service-vm-adaptor;bundle-version="0.1.0", - dcae-controller-service-cdap-cluster-manager, - dcae-controller-core-model + diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java index 0174c12..c043f16 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/cdap/adaptor/tools/Generator.java @@ -53,12 +53,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("Dcae");
m.setPluginName(p.getNsURI());
m.setName("ControllerServiceCdapManager");
m.setTitle("ControllerServiceCdapManager");
ControllerGenerator g = new ControllerGenerator(o, m);
+ g.setVersion("ONAP-R2"); g.setEnableIRequestHandler(false);
g.setEnableISiriusPlugin(false);
g.addFactory("org.openecomp.ncomp.servers.cdap.CdapCdapFactory");
@@ -82,12 +83,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("Dcae");
m.setPluginName(p.getNsURI());
m.setName("CdapService");
m.setTitle("CdapService");
ControllerGenerator g = new ControllerGenerator(o,m);
+ g.setVersion("ONAP-R2"); g.setEnableIRequestHandler(false);
g.setEnableISiriusPlugin(true);
// EObject gui = ModelFactory.eINSTANCE.createGuiClientApi();
diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java index 8e802e1..e89de5c 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/java/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceProvider.java @@ -18,7 +18,7 @@ * limitations under the License. * ============LICENSE_END============================================ */ - + package org.openecomp.dcae.controller.service.servers.cdap; import java.util.ArrayList; @@ -41,14 +41,30 @@ import org.openecomp.dcae.controller.core.stream.DcaeStream; import org.openecomp.dcae.controller.core.stream.DmaapStream; import org.openecomp.dcae.controller.service.cdap.CdapApplication; import org.openecomp.dcae.controller.service.cdap.CdapArtifact; +import org.openecomp.dcae.controller.service.cdap.CdapCreateAppStep; +import org.openecomp.dcae.controller.service.cdap.CdapCreateAppWithConfigStep; +import org.openecomp.dcae.controller.service.cdap.CdapDeployAppStep; import org.openecomp.dcae.controller.service.cdap.CdapFactory; import org.openecomp.dcae.controller.service.cdap.CdapInternalApplicationConfiguration; +import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactStep; +import org.openecomp.dcae.controller.service.cdap.CdapLoadArtifactWithConfigStep; +import org.openecomp.dcae.controller.service.cdap.CdapResumeScheduleStep; import org.openecomp.dcae.controller.service.cdap.CdapService; import org.openecomp.dcae.controller.service.cdap.CdapServiceInstance; +import org.openecomp.dcae.controller.service.cdap.CdapStartAppStep; +import org.openecomp.dcae.controller.service.cdap.CdapStartFlowStep; +import org.openecomp.dcae.controller.service.cdap.CdapStartServiceStep; +import org.openecomp.dcae.controller.service.cdap.CdapStartWorkerStep; +import org.openecomp.dcae.controller.service.cdap.CdapStep; +import org.openecomp.dcae.controller.service.cdap.CdapStopAppStep; +import org.openecomp.dcae.controller.service.cdap.CdapStopFlowStep; +import org.openecomp.dcae.controller.service.cdap.CdapStopServiceStep; +import org.openecomp.dcae.controller.service.cdap.CdapStopWorkerStep; import org.openecomp.dcae.controller.service.cdap.cluster.servers.manager.DcaeCdapClusterManagerConsole; import org.openecomp.dcae.controller.service.cdap.cluster.servers.service.DcaeCdapClusterService; import org.openecomp.dcae.controller.service.cdap.cluster.servers.service.DcaeCdapClusterServiceProvider; import org.openecomp.dcae.controller.service.cdap.cluster.service.CdapClusterServiceInstance; +import org.openecomp.dcae.controller.service.vm.VirtualMachineService; import org.openecomp.ncomp.cdap.CdapEntityWithPreferences; import org.openecomp.ncomp.cdap.CdapKeyPair; import org.openecomp.ncomp.cdap.CdapNamespace; @@ -56,6 +72,7 @@ import org.openecomp.ncomp.core.DeploymentStatus; import org.openecomp.ncomp.core.NamedEntity; import org.openecomp.ncomp.sirius.manager.AbstractClient; import org.openecomp.ncomp.sirius.manager.BasicAdaptorProvider; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.ncomp.sirius.manager.JavaHttpClient; import org.openecomp.ncomp.sirius.manager.ManagementServer; @@ -88,42 +105,111 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { DcaeCdapClusterManagerConsole console = consoleCluster(i); // console.loadArtifact(i.getCdapNamespace().getName(), i.getName(), // i.getJarFile()); - try { - console.createNamespace(i.getCdapName()); - } catch (Exception e1) { - logger.warn("reusing existing namespace"); - } - try { - for (CdapArtifact a : i.getArtifacts()) { - if (a.getVersion() != null) - console.loadArtifact(i.getCdapName(), a.getName(), a.getJarFile(), a.getVersion()); - console.deployApp(i.getCdapName(), a.getJarFile()); + synchronized (i) { + try { + console.createNamespace(i.getCdapName()); + } catch (Exception e1) { + logger.warn("reusing existing namespace"); } - for (CdapApplication a : i.getApps()) { -// System.err.println("CDAP: start app 1"); - console.loadArtifact(i.getCdapName(), a.getArtifactName(), a.getJarFile(), a.getVersion()); -// System.err.println("CDAP: start app 2"); - if (a.getAppConfigFileContent() == null) - console.createApp(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(), "user"); - else - console.createAppWithConfig(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(), "user", - a.getAppConfigFileContent()); -// System.err.println("CDAP: start app 3"); - } - } catch (Exception e) { - logger.warn("unable to start CDAP app: " + ManagementServer.object2ref(i)); - e.printStackTrace(); - throw new RuntimeException("Unable to start CDAP app: " + ManagementServer.object2ref(i) + " " + e); + try { + for (CdapArtifact a : i.getArtifacts()) { + if (a.getVersion() != null) + console.loadArtifact(i.getCdapName(), a.getName(), a.getJarFile(), a.getVersion()); + console.deployApp(i.getCdapName(), a.getJarFile()); + } + for (CdapApplication a : i.getApps()) { + // System.err.println("CDAP: start app 1"); + console.loadArtifact(i.getCdapName(), a.getArtifactName(), a.getJarFile(), a.getVersion()); + // System.err.println("CDAP: start app 2"); + if (a.getAppConfigFileContent() == null) + console.createApp(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(), "user"); + else + console.createAppWithConfig(i.getCdapName(), a.getName(), a.getArtifactName(), a.getVersion(), + "user", a.getAppConfigFileContent()); + // System.err.println("CDAP: start app 3"); + } + doSteps(console, i, i.getDeploySteps()); + } catch (Exception e) { + logger.warn("unable to start CDAP app: " + ManagementServer.object2ref(i)); + e.printStackTrace(); + throw new RuntimeException("Unable to start CDAP app: " + ManagementServer.object2ref(i) + " " + e); + } + } o.pushManagerConfiguration(instanceName); } + private void doSteps(DcaeCdapClusterManagerConsole console, CdapServiceInstance i, EList<CdapStep> steps) { + for (CdapStep s : steps) { + if (s instanceof CdapLoadArtifactStep) { + CdapLoadArtifactStep s1 = (CdapLoadArtifactStep) s; + console.loadArtifact(i.getCdapName(), s1.getArtifactName(), s1.getJarfile(), s1.getVersion()); + } + if (s instanceof CdapLoadArtifactWithConfigStep) { + CdapLoadArtifactWithConfigStep s1 = (CdapLoadArtifactWithConfigStep) s; + console.loadArtifactWithConfig(i.getCdapName(), s1.getArtifactName(), s1.getJarfile(), s1.getVersion(), + s1.getConfig()); + } + if (s instanceof CdapDeployAppStep) { + CdapDeployAppStep s1 = (CdapDeployAppStep) s; + console.deployApp(i.getCdapName(), s1.getJarfile()); + } + if (s instanceof CdapCreateAppStep) { + CdapCreateAppStep s1 = (CdapCreateAppStep) s; + console.createApp(i.getCdapName(), s1.getAppId(), s1.getArtifactName(), s1.getVersion(), s1.getScope()); + } + if (s instanceof CdapCreateAppWithConfigStep) { + CdapCreateAppWithConfigStep s1 = (CdapCreateAppWithConfigStep) s; + console.createAppWithConfig(i.getCdapName(), s1.getAppId(), s1.getArtifactName(), s1.getVersion(), + s1.getScope(), s1.getAppConfig()); + } + if (s instanceof CdapStartAppStep) { + CdapStartAppStep s1 = (CdapStartAppStep) s; + console.startApp(i.getCdapName(), s1.getAppId()); + } + if (s instanceof CdapStartFlowStep) { + CdapStartFlowStep s1 = (CdapStartFlowStep) s; + console.startFlow(i.getCdapName(), s1.getAppId(), s1.getFlowId(), s1.getExtraArgs()); + } + if (s instanceof CdapStartWorkerStep) { + CdapStartWorkerStep s1 = (CdapStartWorkerStep) s; + console.startWorker(i.getCdapName(), s1.getAppId(), s1.getWorkerId(), s1.getExtraArgs()); + } + if (s instanceof CdapStartServiceStep) { + CdapStartServiceStep s1 = (CdapStartServiceStep) s; + console.startService(i.getCdapName(), s1.getAppId(), s1.getServiceId(), s1.getExtraArgs()); + } + if (s instanceof CdapStopAppStep) { + CdapStopAppStep s1 = (CdapStopAppStep) s; + console.stopApp(i.getCdapName(), s1.getAppId()); + } + if (s instanceof CdapStopFlowStep) { + CdapStopFlowStep s1 = (CdapStopFlowStep) s; + console.stopFlow(i.getCdapName(), s1.getAppId(), s1.getFlowId()); + } + if (s instanceof CdapStopWorkerStep) { + CdapStopWorkerStep s1 = (CdapStopWorkerStep) s; + console.stopWorker(i.getCdapName(), s1.getAppId(), s1.getWorkerId()); + } + if (s instanceof CdapStopServiceStep) { + CdapStopServiceStep s1 = (CdapStopServiceStep) s; + console.stopService(i.getCdapName(), s1.getAppId(), s1.getServiceId()); + } + if (s instanceof CdapResumeScheduleStep) { + CdapResumeScheduleStep s1 = (CdapResumeScheduleStep) s; + console.resumeSchedule(i.getCdapName(), s1.getAppId(), s1.getScheduleId()); + + } + } + } + public void undeploy(String instanceName) { CdapServiceInstance i = findInstance(instanceName); DcaeCdapClusterManagerConsole console = consoleCluster(i); if (i.getCdapName() == null) { i.setCdapName(cdapName(i)); } + doSteps(console, i, i.getUndeploySteps()); for (String f : i.getFlowNames()) { String[] a = f.split("\\."); if (a.length != 2) @@ -143,7 +229,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { } for (CdapArtifact a : i.getArtifacts()) { try { -// console.stopApp(i.getCdapName(), a.getName()); + // console.stopApp(i.getCdapName(), a.getName()); console.deleteApp(i.getCdapName(), a.getName()); if (a.getVersion() != null) { console.deleteArtifact(i.getCdapName(), a.getName(), a.getVersion()); @@ -161,121 +247,127 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { e.printStackTrace(); } } -// console.deleteNamespace(i.getCdapName()); + // console.deleteNamespace(i.getCdapName()); } public void pushManagerConfiguration(String instanceName) { CdapServiceInstance i = findInstance(instanceName); o.updateInstanceConfiguration(instanceName); DcaeCdapClusterManagerConsole console = consoleCluster(i); - for (CdapArtifact a : i.getArtifacts()) { - try { - console.stopApp(i.getCdapName(), a.getName()); - } catch (Exception e) { - e.printStackTrace(); + synchronized (i) { + for (CdapArtifact a : i.getArtifacts()) { + try { + console.stopApp(i.getCdapName(), a.getName()); + } catch (Exception e) { + e.printStackTrace(); + } } - } - for (CdapApplication a : i.getApps()) { - try { - console.stopApp(i.getCdapName(), a.getName()); - } catch (Exception e) { - e.printStackTrace(); + for (CdapApplication a : i.getApps()) { + try { + console.stopApp(i.getCdapName(), a.getName()); + } catch (Exception e) { + e.printStackTrace(); + } } - } - for (String f : i.getFlowNames()) { - String[] a = f.split("\\."); - if (a.length != 2) - throw new RuntimeException("Bad flow name: " + f); - try { - console.stopFlow(i.getCdapName(), a[0], a[1]); - } catch (Exception e) { - e.printStackTrace(); + for (String f : i.getFlowNames()) { + String[] a = f.split("\\."); + if (a.length != 2) + throw new RuntimeException("Bad flow name: " + f); + try { + console.stopFlow(i.getCdapName(), a[0], a[1]); + } catch (Exception e) { + e.printStackTrace(); + } } - } - for (String w : i.getWorkerNames()) { - String[] a = w.split("\\."); - if (a.length != 2) - throw new RuntimeException("Bad worker name: " + w); - try { - console.stopWorker(i.getCdapName(), a[0], a[1]); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + for (String w : i.getWorkerNames()) { + String[] a = w.split("\\."); + if (a.length != 2) + throw new RuntimeException("Bad worker name: " + w); + try { + console.stopWorker(i.getCdapName(), a[0], a[1]); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } - } - for (String s : i.getServiceNames()) { - String[] a = s.split("\\."); - if (a.length != 2) - throw new RuntimeException("Bad service name: " + s); - try { - console.stopService(i.getCdapName(), a[0], a[1]); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + for (String s : i.getServiceNames()) { + String[] a = s.split("\\."); + if (a.length != 2) + throw new RuntimeException("Bad service name: " + s); + try { + console.stopService(i.getCdapName(), a[0], a[1]); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } - } - - console.setPreferencesNameSpace(i.getCdapName(), list2string(i.getCdapConfiguration().getPreferences())); - for (CdapEntityWithPreferences w : i.getCdapConfiguration().getWorkers()) { - if (w.getPreferences().size() == 0) - continue; - String[] a = w.getName().split("\\.");if (a.length != 2) - throw new RuntimeException("Bad worker name: " + w.getName()); - console.setPreferencesWorker(i.getCdapName(), list2string(w.getPreferences()),a[0],a[1]); - } - for (CdapEntityWithPreferences s : i.getCdapConfiguration().getServices()) { - if (s.getPreferences().size() == 0) - continue; - String[] a = s.getName().split("\\.");if (a.length != 2) - throw new RuntimeException("Bad service name: " + s.getName()); - console.setPreferencesService(i.getCdapName(), list2string(s.getPreferences()),a[0],a[1]); - } - for (CdapEntityWithPreferences f : i.getCdapConfiguration().getFlows()) { - if (f.getPreferences().size() == 0) - continue; - String[] a = f.getName().split("\\.");if (a.length != 2) - throw new RuntimeException("Bad flow name: " + f.getName()); - console.setPreferencesFlow(i.getCdapName(), list2string(f.getPreferences()), a[0],a[1]); - } - for (CdapEntityWithPreferences a : i.getCdapConfiguration().getApps()) { - if (a.getPreferences().size() == 0) - continue; - console.setPreferencesApp(i.getCdapName(), list2string(a.getPreferences()), a.getName()); - } - // TODO what should we do. ?? - for (String f : i.getFlowNames()) { - String[] a = f.split("\\."); - if (a.length != 2) - throw new RuntimeException("Bad flow name: " + f); - console.startFlow(i.getCdapName(), a[0], a[1], null); - } - for (String w : i.getWorkerNames()) { - String[] a = w.split("\\."); - if (a.length != 2) - throw new RuntimeException("Bad worker name: " + w); - console.startWorker(i.getCdapName(), a[0], a[1], null); - } - for (String s : i.getServiceNames()) { - String[] a = s.split("\\."); - if (a.length != 2) - throw new RuntimeException("Bad service name: " + s); - console.startService(i.getCdapName(), a[0], a[1], null); - } - for (CdapArtifact a : i.getArtifacts()) { - try { - console.startApp(i.getCdapName(), a.getName()); - } catch (Exception e) { - e.printStackTrace(); + doSteps(console, i, i.getPreConfigurationSteps()); + + console.setPreferencesNameSpace(i.getCdapName(), list2string(i.getCdapConfiguration().getPreferences())); + for (CdapEntityWithPreferences w : i.getCdapConfiguration().getWorkers()) { + if (w.getPreferences().size() == 0) + continue; + String[] a = w.getName().split("\\."); + if (a.length != 2) + throw new RuntimeException("Bad worker name: " + w.getName()); + console.setPreferencesWorker(i.getCdapName(), list2string(w.getPreferences()), a[0], a[1]); } - } - for (CdapApplication a : i.getApps()) { - try { - console.startApp(i.getCdapName(), a.getName()); - } catch (Exception e) { - e.printStackTrace(); + for (CdapEntityWithPreferences s : i.getCdapConfiguration().getServices()) { + if (s.getPreferences().size() == 0) + continue; + String[] a = s.getName().split("\\."); + if (a.length != 2) + throw new RuntimeException("Bad service name: " + s.getName()); + console.setPreferencesService(i.getCdapName(), list2string(s.getPreferences()), a[0], a[1]); + } + for (CdapEntityWithPreferences f : i.getCdapConfiguration().getFlows()) { + if (f.getPreferences().size() == 0) + continue; + String[] a = f.getName().split("\\."); + if (a.length != 2) + throw new RuntimeException("Bad flow name: " + f.getName()); + console.setPreferencesFlow(i.getCdapName(), list2string(f.getPreferences()), a[0], a[1]); + } + for (CdapEntityWithPreferences a : i.getCdapConfiguration().getApps()) { + if (a.getPreferences().size() == 0) + continue; + console.setPreferencesApp(i.getCdapName(), list2string(a.getPreferences()), a.getName()); + } + doSteps(console, i, i.getPostConfigurationSteps()); + // TODO what should we do. ?? + for (String f : i.getFlowNames()) { + String[] a = f.split("\\."); + if (a.length != 2) + throw new RuntimeException("Bad flow name: " + f); + console.startFlow(i.getCdapName(), a[0], a[1], null); + } + for (String w : i.getWorkerNames()) { + String[] a = w.split("\\."); + if (a.length != 2) + throw new RuntimeException("Bad worker name: " + w); + console.startWorker(i.getCdapName(), a[0], a[1], null); + } + for (String s : i.getServiceNames()) { + String[] a = s.split("\\."); + if (a.length != 2) + throw new RuntimeException("Bad service name: " + s); + console.startService(i.getCdapName(), a[0], a[1], null); + } + for (CdapArtifact a : i.getArtifacts()) { + try { + console.startApp(i.getCdapName(), a.getName()); + } catch (Exception e) { + e.printStackTrace(); + } + } + for (CdapApplication a : i.getApps()) { + try { + console.startApp(i.getCdapName(), a.getName()); + } catch (Exception e) { + e.printStackTrace(); + } } } - } public void pollManagerConfiguration(String instanceName) { @@ -301,13 +393,13 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { public HealthTestResponse test(String instanceName) { CdapServiceInstance i = findInstance(instanceName); HealthTestResponse res = ServiceFactory.eINSTANCE.createHealthTestResponse(); - + // simple check. Verify that namespace exists in cluster. - + CdapClusterServiceInstance s = i.getClusterService(); if (s.getStatus() != DeploymentStatus.DEPLOYED) { res.setStatus(HealthTestStatus.YELLOW); - res.setMessageCode("Cluster not deployed"); + res.setMessageCode("Cluster not deployed"); return res; } if (s.getCluster() == null) { @@ -319,11 +411,11 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { res.setStatus(HealthTestStatus.RED); res.setMessageCode("No Namepace for instance"); return res; - } + } for (CdapNamespace n : s.getCluster().getNamespaces()) { if (i.getNamespace().equals(n.getName())) { res.setStatus(HealthTestStatus.GREEN); - return res; + return res; } } res.setStatus(HealthTestStatus.YELLOW); @@ -379,7 +471,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { } private String cdapName(CdapServiceInstance i) { -// String n = "dcae:" + o.getName() + ":" + i.getName(); + // String n = "dcae:" + o.getName() + ":" + i.getName(); // return n.replace("-", "X").replace(":", "Y"); return i.getNamespace(); // return "dcae"+ new Date().getTime(); @@ -390,8 +482,20 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { // need to assign the leader EList<DcaeBasicServer> l = instance.getServers(); instance.setLeaderServer(l.get(l.size() - 1)); - DcaeCdapClusterService service = (DcaeCdapClusterService) instance.getService(); - DcaeCdapClusterServiceProvider provider = service.getSomfProvider(); + if (instance.getCdapServiceServers().size() == 0) { + // no configuration use last server per default + instance.getCdapServiceServers().add(instance.getLeaderServer().getName()); + } + for (DcaeBasicServer s : l) { + if (!instance.getCdapServiceServers().contains(s.getName())) + continue; + if (s.getHealthTestStatus() != HealthTestStatus.GREEN) + continue; + instance.setLeaderServer(s); + } + VirtualMachineService service = instance.getService(); + DcaeCdapClusterServiceProvider provider = (DcaeCdapClusterServiceProvider) ((ISiriusProvider) service) + .getSiriusProvider(); AbstractClient c = provider.getClient(instance); return new DcaeCdapClusterManagerConsole(c); } @@ -408,18 +512,19 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { // dmaap.XX.dmaapPassword if (p.getName().startsWith("dmaap") && p.getName().endsWith("dmaapPassword")) { String pw = p.getValue(); - if (! pw.startsWith("rsa:")) { -// System.err.println("ZZZZZ: unencrypted pw: " + ManagementServer.object2ref(p)); + if (!pw.startsWith("rsa:")) { + // System.err.println("ZZZZZ: unencrypted pw: " + + // ManagementServer.object2ref(p)); } try { pw = JavaHttpClient.decryptPassword(pw); } catch (Exception e) { -// System.err.println("ZZZZZ: badly encrypted password: " + ManagementServer.object2ref(p)); + // System.err.println("ZZZZZ: badly encrypted password: " + + // ManagementServer.object2ref(p)); pw = "badly encrypted password"; } buf.append(p.getName()).append("=").append(pw); - } - else { + } else { String v = p.getValue(); if (v.startsWith("rsa:")) { try { @@ -443,7 +548,8 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { throw new RuntimeException("Unable to find instance: " + instanceName); } - private void updateConfigSimple(EObject root, EObject i, String destination, CdapInternalApplicationConfiguration a) { + private void updateConfigSimple(EObject root, EObject i, String destination, + CdapInternalApplicationConfiguration a) { if (i == null) return; for (EAttribute attr : i.eClass().getEAllAttributes()) { @@ -459,7 +565,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { if (anno == null) continue; String destination = anno.getDetails().get("destination"); -// System.err.println("AAAAA" + attr.getName() + " " + destination); + // System.err.println("AAAAA" + attr.getName() + " " + destination); add(root, i, attr, destination, appConfig); } for (EReference ref : i.eClass().getEAllContainments()) { @@ -473,10 +579,12 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { updateConfig(root, (EObject) i.eGet(ref), appConfig); } } -// System.err.println(ManagementServer.ecore2json(appConfig, 1000, null, true).toString(2)); + // System.err.println(ManagementServer.ecore2json(appConfig, 1000, null, + // true).toString(2)); } - private void add(EObject root, EObject i, EAttribute attr, String destination, CdapInternalApplicationConfiguration appConfig) { + private void add(EObject root, EObject i, EAttribute attr, String destination, + CdapInternalApplicationConfiguration appConfig) { // Make this more complex later if (i instanceof NamedEntity) { NamedEntity n = (NamedEntity) i; @@ -487,7 +595,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { String path1 = ManagementServer.object2ref(root); String path2 = ManagementServer.object2ref(i); String path = path2.replace("/", ".").substring(path1.length() + 1); - destination = destination.replace("${path}", path ); + destination = destination.replace("${path}", path); String[] a = destination.split(":"); if (a.length != 3) { throw new RuntimeException("Bad CDAP destination annotation: " + destination); @@ -511,7 +619,8 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { private org.openecomp.ncomp.cdap.CdapFactory f = org.openecomp.ncomp.cdap.CdapFactory.eINSTANCE; - private void add(EObject root, EList<CdapEntityWithPreferences> l, String name, String cdapKey, EObject i, EAttribute attr) { + private void add(EObject root, EList<CdapEntityWithPreferences> l, String name, String cdapKey, EObject i, + EAttribute attr) { CdapEntityWithPreferences p = null; for (CdapEntityWithPreferences p1 : l) { if (p1.getName().equals(name)) { @@ -524,7 +633,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { l.add(p); p.setName(name); } - add(root,p.getPreferences(), cdapKey, i, attr); + add(root, p.getPreferences(), cdapKey, i, attr); } private void add(EObject root, EList<CdapKeyPair> prefs, String cdapKey, EObject i, EAttribute attr) { @@ -537,15 +646,14 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { l2.add((String) ManagementServer.attr2jsonValue(0, o, attr.getEType())); } value = StringUtil.join(l2, ":"); - } - else + } else value = (String) ManagementServer.attr2jsonValue(0, i.eGet(attr), attr.getEType()); CdapKeyPair pair = f.createCdapKeyPair(); pair.setName(cdapKey); pair.setValue(value); prefs.add(pair); } - + public void start() { Thread t = new Thread("cdap service: " + o.getName()) { @@ -559,7 +667,7 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { Thread.sleep(60000); // sleep 60 seconds } catch (Exception e) { ManagementServerUtils.printStackTrace(e); - logger.fatal("vm service: " + o.getName() + " : " + e); + logger.fatal("cdap service: " + o.getName() + " : " + e); try { Thread.sleep(30000); } catch (InterruptedException e1) { @@ -573,15 +681,15 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { } public void updateDeploymentStatus() { -// System.out.println("CDAP updateDeploymentStatus 1: "); + System.out.println("CDAP updateDeploymentStatus 1: "); for (CdapServiceInstance instance : o.getInstances()) { // TODO Docker deployment status instance.setStatus(DeploymentStatus.UNDEPLOYED); -// System.out.println("CDAP updateDeploymentStatus 2: " + instance.getName() + " " + instance.getNamespace()); + System.out.println("CDAP updateDeploymentStatus 2: " + instance.getName() + " " + instance.getNamespace()); if (instance.getClusterService() == null) continue; for (CdapNamespace c : instance.getClusterService().getCluster().getNamespaces()) { -// System.out.println("CDAP updateDeploymentStatus 4: " + c.getName()); + System.out.println("CDAP updateDeploymentStatus 4: " + c.getName()); if (instance.getNamespace() != null && instance.getNamespace().equals(c.getName())) { instance.setStatus(DeploymentStatus.DEPLOYED); } @@ -589,5 +697,4 @@ public class DcaeCdapServiceProvider extends BasicAdaptorProvider { } } - } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapManager.yaml b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapManager.yaml index 6ab6771..6c497b2 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapManager.yaml +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapManager.yaml @@ -1,69 +1,57 @@ operations: - test: {} - suspend: {} - resume: {} - publicKey: {} - configurationChanged: {} - updateStreams: {} - REMOTE_test: - decription: Remote call test - REMOTE_suspend: - decription: Remote call suspend - REMOTE_resume: - decription: Remote call resume - REMOTE_publicKey: - decription: Remote call publicKey - REMOTE_configurationChanged: - decription: Remote call configurationChanged - REMOTE_updateStreams: - decription: Remote call updateStreams + CdapManager@test: {} + CdapManager@suspend: {} + CdapManager@resume: {} + CdapManager@publicKey: {} + CdapManager@configurationChanged: {} + CdapManager@updateStreams: {} messages: dummy: {} - test: - errorCode: test-FAILED-5001W + REQUEST-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - suspend: - errorCode: suspend-FAILED-5001W + REQUEST-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - resume: - errorCode: resume-FAILED-5001W + REQUEST-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - publicKey: - errorCode: publicKey-FAILED-5001W + REQUEST-FAILED-publicKey: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - configurationChanged: - errorCode: configurationChanged-FAILED-5001W + REQUEST-FAILED-configurationChanged: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - updateStreams: - errorCode: updateStreams-FAILED-5001W + REQUEST-FAILED-updateStreams: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - REMOTE_test: - errorCode: REMOTE-test-FAILED-5001W + REMOTE-CALL-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_suspend: - errorCode: REMOTE-suspend-FAILED-5001W + REMOTE-CALL-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_resume: - errorCode: REMOTE-resume-FAILED-5001W + REMOTE-CALL-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_publicKey: - errorCode: REMOTE-publicKey-FAILED-5001W + REMOTE-CALL-FAILED-publicKey: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_configurationChanged: - errorCode: REMOTE-configurationChanged-FAILED-5001W + REMOTE-CALL-FAILED-configurationChanged: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_updateStreams: - errorCode: REMOTE-updateStreams-FAILED-5001W + REMOTE-CALL-FAILED-updateStreams: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapService.yaml b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapService.yaml index 1bb496e..9f76512 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapService.yaml +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/CdapService.yaml @@ -1,135 +1,111 @@ operations: - deploy: {} - undeploy: {} - test: {} - suspend: {} - resume: {} - pushManagerConfiguration: {} - pollManagerConfiguration: {} - managerConfiguration: {} - managerOperation: {} - updateConfigurationFromPolicy: {} - runHealthTests: {} - updateInstanceConfiguration: {} - REMOTE_deploy: - decription: Remote call deploy - REMOTE_undeploy: - decription: Remote call undeploy - REMOTE_test: - decription: Remote call test - REMOTE_suspend: - decription: Remote call suspend - REMOTE_resume: - decription: Remote call resume - REMOTE_pushManagerConfiguration: - decription: Remote call pushManagerConfiguration - REMOTE_pollManagerConfiguration: - decription: Remote call pollManagerConfiguration - REMOTE_managerConfiguration: - decription: Remote call managerConfiguration - REMOTE_managerOperation: - decription: Remote call managerOperation - REMOTE_updateConfigurationFromPolicy: - decription: Remote call updateConfigurationFromPolicy - REMOTE_runHealthTests: - decription: Remote call runHealthTests - REMOTE_updateInstanceConfiguration: - decription: Remote call updateInstanceConfiguration + CdapService@deploy: {} + CdapService@undeploy: {} + CdapService@test: {} + CdapService@suspend: {} + CdapService@resume: {} + CdapService@pushManagerConfiguration: {} + CdapService@pollManagerConfiguration: {} + CdapService@managerConfiguration: {} + CdapService@managerOperation: {} + CdapService@updateConfigurationFromPolicy: {} + CdapService@runHealthTests: {} + CdapService@updateInstanceConfiguration: {} messages: dummy: {} - deploy: - errorCode: deploy-FAILED-5001W + REQUEST-FAILED-deploy: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - undeploy: - errorCode: undeploy-FAILED-5001W + REQUEST-FAILED-undeploy: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - test: - errorCode: test-FAILED-5001W + REQUEST-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - suspend: - errorCode: suspend-FAILED-5001W + REQUEST-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - resume: - errorCode: resume-FAILED-5001W + REQUEST-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - pushManagerConfiguration: - errorCode: pushManagerConfiguration-FAILED-5001W + REQUEST-FAILED-pushManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - pollManagerConfiguration: - errorCode: pollManagerConfiguration-FAILED-5001W + REQUEST-FAILED-pollManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - managerConfiguration: - errorCode: managerConfiguration-FAILED-5001W + REQUEST-FAILED-managerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - managerOperation: - errorCode: managerOperation-FAILED-5001W + REQUEST-FAILED-managerOperation: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - updateConfigurationFromPolicy: - errorCode: updateConfigurationFromPolicy-FAILED-5001W + REQUEST-FAILED-updateConfigurationFromPolicy: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - runHealthTests: - errorCode: runHealthTests-FAILED-5001W + REQUEST-FAILED-runHealthTests: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - updateInstanceConfiguration: - errorCode: updateInstanceConfiguration-FAILED-5001W + REQUEST-FAILED-updateInstanceConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - REMOTE_deploy: - errorCode: REMOTE-deploy-FAILED-5001W + REMOTE-CALL-FAILED-deploy: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_undeploy: - errorCode: REMOTE-undeploy-FAILED-5001W + REMOTE-CALL-FAILED-undeploy: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_test: - errorCode: REMOTE-test-FAILED-5001W + REMOTE-CALL-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_suspend: - errorCode: REMOTE-suspend-FAILED-5001W + REMOTE-CALL-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_resume: - errorCode: REMOTE-resume-FAILED-5001W + REMOTE-CALL-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_pushManagerConfiguration: - errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-pushManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_pollManagerConfiguration: - errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-pollManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_managerConfiguration: - errorCode: REMOTE-managerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-managerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_managerOperation: - errorCode: REMOTE-managerOperation-FAILED-5001W + REMOTE-CALL-FAILED-managerOperation: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_updateConfigurationFromPolicy: - errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W + REMOTE-CALL-FAILED-updateConfigurationFromPolicy: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_runHealthTests: - errorCode: REMOTE-runHealthTests-FAILED-5001W + REMOTE-CALL-FAILED-runHealthTests: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_updateInstanceConfiguration: - errorCode: REMOTE-updateInstanceConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-updateInstanceConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml index bf3d69d..1489339 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/GuiClientApi.yaml +++ b/dcae-controller-service-cdap/dcae-controller-service-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/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapService.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapService.java index 9d71a7e..b15216f 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapService.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapService.java @@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.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; @@ -54,9 +61,9 @@ import org.openecomp.dcae.controller.service.cdap.impl.CdapServiceImpl; -public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { +public class DcaeCdapService extends CdapServiceImpl implements ISiriusProvider, ISiriusPlugin { public static final Logger logger = Logger.getLogger(DcaeCdapService.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); public DcaeCdapServiceProvider controller; ISiriusServer server; @@ -71,9 +78,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "updateInstanceConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.updateInstanceConfiguration); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_updateInstanceConfiguration,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_updateInstanceConfiguration,"self:" + ManagementServer.object2ref(this)); try { controller.updateInstanceConfiguration(instanceName); } @@ -82,8 +88,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "updateInstanceConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.updateInstanceConfiguration, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_updateInstanceConfiguration, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_updateInstanceConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_updateInstanceConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -98,9 +106,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.deploy); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_deploy,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_deploy,"self:" + ManagementServer.object2ref(this)); try { controller.deploy(instanceName,containerPath); } @@ -109,8 +116,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.deploy, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_deploy, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -125,9 +134,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.undeploy); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_undeploy,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_undeploy,"self:" + ManagementServer.object2ref(this)); try { controller.undeploy(instanceName); } @@ -136,8 +144,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.undeploy, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -152,9 +162,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.test); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_test,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_test,"self:" + ManagementServer.object2ref(this)); try { res = controller.test(instanceName); } @@ -163,8 +172,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.test, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_test, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -179,9 +190,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.suspend); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_suspend,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_suspend,"self:" + ManagementServer.object2ref(this)); try { controller.suspend(instanceName); } @@ -190,8 +200,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.suspend, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -206,9 +218,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.resume); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_resume,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_resume,"self:" + ManagementServer.object2ref(this)); try { controller.resume(instanceName); } @@ -217,8 +228,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.resume, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -233,9 +246,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.pushManagerConfiguration); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_pushManagerConfiguration,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this)); try { controller.pushManagerConfiguration(instanceName); } @@ -244,8 +256,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.pushManagerConfiguration, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -260,9 +274,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.pollManagerConfiguration); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_pollManagerConfiguration,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this)); try { controller.pollManagerConfiguration(instanceName); } @@ -271,8 +284,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.pollManagerConfiguration, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -287,9 +302,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.managerConfiguration); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_managerConfiguration,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_managerConfiguration,"self:" + ManagementServer.object2ref(this)); try { res = controller.managerConfiguration(instanceName); } @@ -298,8 +312,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.managerConfiguration, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -314,9 +330,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.managerOperation); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_managerOperation,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_managerOperation,"self:" + ManagementServer.object2ref(this)); try { res = controller.managerOperation(instanceName,operation,parameters); } @@ -325,8 +340,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.managerOperation, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -341,9 +358,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.updateConfigurationFromPolicy); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_updateConfigurationFromPolicy,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this)); try { controller.updateConfigurationFromPolicy(instanceName); } @@ -352,8 +368,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.updateConfigurationFromPolicy, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -368,9 +386,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.runHealthTests); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapServiceOperationEnum.CdapService_runHealthTests,server,this); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_runHealthTests,"self:" + ManagementServer.object2ref(this)); try { controller.runHealthTests(); } @@ -379,8 +396,10 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapServiceMessageEnum.runHealthTests, e.toString()); - throw e; + ecomplogger.warn(CdapServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -394,6 +413,8 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { + + @Override public void start() { controller.start(); @@ -402,7 +423,7 @@ public class DcaeCdapService extends CdapServiceImpl implements ISiriusPlugin { public static void ecoreSetup() { DcaeCdapServiceProvider.ecoreSetup(); } - public DcaeCdapServiceProvider getSomfProvider() { + public DcaeCdapServiceProvider getSiriusProvider() { return controller; } } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceClient.java index 01afc0f..d3dae82 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceClient.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceClient.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,33 +56,37 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { DcaeCdapService.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/resources", this); + client.setVersion("ONAP-R2"); } public DcaeCdapServiceClient(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 DcaeCdapServiceClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } @Override public void updateInstanceConfiguration(java.lang.String instanceName) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_updateInstanceConfiguration); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_updateInstanceConfiguration,client.getRemote()); try { client.operationPath("/resources", c, "updateInstanceConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_updateInstanceConfiguration, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateInstanceConfiguration: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateInstanceConfiguration, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateInstanceConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateInstanceConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -88,16 +94,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public void deploy(java.lang.String instanceName, java.lang.String containerPath) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_deploy); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_deploy,client.getRemote()); try { client.operationPath("/resources", c, "deploy", null, instanceName,containerPath); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_deploy, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@deploy: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -105,16 +112,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public void undeploy(java.lang.String instanceName) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_undeploy); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_undeploy,client.getRemote()); try { client.operationPath("/resources", c, "undeploy", null, instanceName); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_undeploy, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@undeploy: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -122,16 +130,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_test); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_test,client.getRemote()); org.openecomp.dcae.controller.core.service.HealthTestResponse res; try { res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_test, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -139,16 +148,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public void suspend(java.lang.String instanceName) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_suspend); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_suspend,client.getRemote()); try { client.operationPath("/resources", c, "suspend", null, instanceName); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_suspend, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -156,16 +166,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public void resume(java.lang.String instanceName) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_resume); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_resume,client.getRemote()); try { client.operationPath("/resources", c, "resume", null, instanceName); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_resume, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -173,16 +184,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public void pushManagerConfiguration(java.lang.String instanceName) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_pushManagerConfiguration); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_pushManagerConfiguration,client.getRemote()); try { client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@pushManagerConfiguration: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -190,16 +202,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public void pollManagerConfiguration(java.lang.String instanceName) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_pollManagerConfiguration); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_pollManagerConfiguration,client.getRemote()); try { client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@pollManagerConfiguration: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -207,16 +220,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_managerConfiguration); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_managerConfiguration,client.getRemote()); org.eclipse.emf.ecore.EObject res; try { res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_managerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerConfiguration: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -224,16 +238,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_managerOperation); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_managerOperation,client.getRemote()); org.json.JSONObject res; try { res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_managerOperation, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerOperation: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -241,16 +256,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public void updateConfigurationFromPolicy(java.lang.String instanceName) { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_updateConfigurationFromPolicy); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_updateConfigurationFromPolicy,client.getRemote()); try { client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateConfigurationFromPolicy: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -258,16 +274,17 @@ public class DcaeCdapServiceClient extends CdapServiceImpl { @Override public void runHealthTests() { - EClass c = CdapPackage.eINSTANCE.getCdapService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapServiceOperationEnum.REMOTE_runHealthTests); + EClass c = CdapPackage.eINSTANCE.getCdapService(); + ecomplogger.recordMetricEventStart(CdapServiceOperationEnum.CdapService_runHealthTests,client.getRemote()); try { client.operationPath("/resources", c, "runHealthTests", null); } catch (Exception e) { - ecomplogger.warn(CdapServiceMessageEnum.REMOTE_runHealthTests, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@runHealthTests: " + e); + ecomplogger.warn(CdapServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString()); + EcompException e1 = EcompException.create(CdapServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceServer.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceServer.java index 78b58cd..6bfad39 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceServer.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/DcaeCdapServiceServer.java @@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.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.dcae.controller.service.cdap.CdapService; @@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.cdap.CdapService; -public class DcaeCdapServiceServer implements ISiriusServer { +public class DcaeCdapServiceServer implements ISiriusServer, IRequestHandler { public static final Logger logger = Logger.getLogger(DcaeCdapServiceServer.class); String serverPath; ManagementServer server; @@ -64,6 +63,7 @@ public class DcaeCdapServiceServer implements ISiriusServer { props = getPropertiesFromClasspath(filename); serverPath = (String) props.get("server.dir"); server = new ManagementServer(f, "CdapService", serverPath, filename); + ManagementServer.setBuildVersion("ONAP-R2"); server.addFactory(f); server.addRuntimeFactories(this); @@ -73,6 +73,7 @@ public class DcaeCdapServiceServer implements ISiriusServer { controller = (DcaeCdapService) server.find("/").o; webServer = new Jetty8Server("cdap.properties"); webServer.add("/resources",server); + webServer.add("/api",this); @@ -95,4 +96,17 @@ public class DcaeCdapServiceServer 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/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService.properties b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService.properties index 364ae3b..1579cf5 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService.properties +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService.properties @@ -1,150 +1,150 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -deploy=\ - deploy-FAILED-5001W|\ +REQUEST_FAILED_deploy=\ + REQUEST-FAILED-deploy-4001W|\ {0}|\ null|\ Operation Failed with Exception -undeploy=\ - undeploy-FAILED-5001W|\ +REQUEST_FAILED_undeploy=\ + REQUEST-FAILED-undeploy-4001W|\ {0}|\ null|\ Operation Failed with Exception -test=\ - test-FAILED-5001W|\ +REQUEST_FAILED_test=\ + REQUEST-FAILED-test-4001W|\ {0}|\ null|\ Operation Failed with Exception -suspend=\ - suspend-FAILED-5001W|\ +REQUEST_FAILED_suspend=\ + REQUEST-FAILED-suspend-4001W|\ {0}|\ null|\ Operation Failed with Exception -resume=\ - resume-FAILED-5001W|\ +REQUEST_FAILED_resume=\ + REQUEST-FAILED-resume-4001W|\ {0}|\ null|\ Operation Failed with Exception -pushManagerConfiguration=\ - pushManagerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_pushManagerConfiguration=\ + REQUEST-FAILED-pushManagerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -pollManagerConfiguration=\ - pollManagerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_pollManagerConfiguration=\ + REQUEST-FAILED-pollManagerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -managerConfiguration=\ - managerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_managerConfiguration=\ + REQUEST-FAILED-managerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -managerOperation=\ - managerOperation-FAILED-5001W|\ +REQUEST_FAILED_managerOperation=\ + REQUEST-FAILED-managerOperation-4001W|\ {0}|\ null|\ Operation Failed with Exception -updateConfigurationFromPolicy=\ - updateConfigurationFromPolicy-FAILED-5001W|\ +REQUEST_FAILED_updateConfigurationFromPolicy=\ + REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\ {0}|\ null|\ Operation Failed with Exception -runHealthTests=\ - runHealthTests-FAILED-5001W|\ +REQUEST_FAILED_runHealthTests=\ + REQUEST-FAILED-runHealthTests-4001W|\ {0}|\ null|\ Operation Failed with Exception -updateInstanceConfiguration=\ - updateInstanceConfiguration-FAILED-5001W|\ +REQUEST_FAILED_updateInstanceConfiguration=\ + REQUEST-FAILED-updateInstanceConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_deploy=\ - REMOTE-deploy-FAILED-5001W|\ +REMOTE_CALL_FAILED_deploy=\ + REMOTE-CALL-FAILED-deploy-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_undeploy=\ - REMOTE-undeploy-FAILED-5001W|\ +REMOTE_CALL_FAILED_undeploy=\ + REMOTE-CALL-FAILED-undeploy-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_test=\ - REMOTE-test-FAILED-5001W|\ +REMOTE_CALL_FAILED_test=\ + REMOTE-CALL-FAILED-test-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_suspend=\ - REMOTE-suspend-FAILED-5001W|\ +REMOTE_CALL_FAILED_suspend=\ + REMOTE-CALL-FAILED-suspend-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_resume=\ - REMOTE-resume-FAILED-5001W|\ +REMOTE_CALL_FAILED_resume=\ + REMOTE-CALL-FAILED-resume-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_pushManagerConfiguration=\ - REMOTE-pushManagerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_pushManagerConfiguration=\ + REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_pollManagerConfiguration=\ - REMOTE-pollManagerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_pollManagerConfiguration=\ + REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_managerConfiguration=\ - REMOTE-managerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_managerConfiguration=\ + REMOTE-CALL-FAILED-managerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_managerOperation=\ - REMOTE-managerOperation-FAILED-5001W|\ +REMOTE_CALL_FAILED_managerOperation=\ + REMOTE-CALL-FAILED-managerOperation-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_updateConfigurationFromPolicy=\ - REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\ +REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\ + REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_runHealthTests=\ - REMOTE-runHealthTests-FAILED-5001W|\ +REMOTE_CALL_FAILED_runHealthTests=\ + REMOTE-CALL-FAILED-runHealthTests-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_updateInstanceConfiguration=\ - REMOTE-updateInstanceConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_updateInstanceConfiguration=\ + REMOTE-CALL-FAILED-updateInstanceConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceMessageEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceMessageEnum.java index 15e7393..50fada2 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceMessageEnum.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceMessageEnum.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.dcae.controller.service.servers.cdap.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,32 +7,32 @@ import org.openecomp.logger.EcompMessageEnum; public enum CdapServiceMessageEnum implements EcompMessageEnum { dummy, - deploy, - undeploy, - test, - suspend, - resume, - pushManagerConfiguration, - pollManagerConfiguration, - managerConfiguration, - managerOperation, - updateConfigurationFromPolicy, - runHealthTests, - updateInstanceConfiguration, - REMOTE_deploy, - REMOTE_undeploy, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_pushManagerConfiguration, - REMOTE_pollManagerConfiguration, - REMOTE_managerConfiguration, - REMOTE_managerOperation, - REMOTE_updateConfigurationFromPolicy, - REMOTE_runHealthTests, - REMOTE_updateInstanceConfiguration; + REQUEST_FAILED_deploy, + REQUEST_FAILED_undeploy, + REQUEST_FAILED_test, + REQUEST_FAILED_suspend, + REQUEST_FAILED_resume, + REQUEST_FAILED_pushManagerConfiguration, + REQUEST_FAILED_pollManagerConfiguration, + REQUEST_FAILED_managerConfiguration, + REQUEST_FAILED_managerOperation, + REQUEST_FAILED_updateConfigurationFromPolicy, + REQUEST_FAILED_runHealthTests, + REQUEST_FAILED_updateInstanceConfiguration, + REMOTE_CALL_FAILED_deploy, + REMOTE_CALL_FAILED_undeploy, + REMOTE_CALL_FAILED_test, + REMOTE_CALL_FAILED_suspend, + REMOTE_CALL_FAILED_resume, + REMOTE_CALL_FAILED_pushManagerConfiguration, + REMOTE_CALL_FAILED_pollManagerConfiguration, + REMOTE_CALL_FAILED_managerConfiguration, + REMOTE_CALL_FAILED_managerOperation, + REMOTE_CALL_FAILED_updateConfigurationFromPolicy, + REMOTE_CALL_FAILED_runHealthTests, + REMOTE_CALL_FAILED_updateInstanceConfiguration; static { - EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.cdap.logging.CdapService"); + EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/cdap/logging/CdapService"); } } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceOperationEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceOperationEnum.java index d67c6be..3da3fd7 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceOperationEnum.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdap/logging/CdapServiceOperationEnum.java @@ -1,53 +1,33 @@ -/*- - * ============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.dcae.controller.service.servers.cdap.logging; import org.openecomp.entity.EcompOperationEnum; public enum CdapServiceOperationEnum implements EcompOperationEnum { - deploy, - undeploy, - test, - suspend, - resume, - pushManagerConfiguration, - pollManagerConfiguration, - managerConfiguration, - managerOperation, - updateConfigurationFromPolicy, - runHealthTests, - updateInstanceConfiguration, - REMOTE_deploy, - REMOTE_undeploy, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_pushManagerConfiguration, - REMOTE_pollManagerConfiguration, - REMOTE_managerConfiguration, - REMOTE_managerOperation, - REMOTE_updateConfigurationFromPolicy, - REMOTE_runHealthTests, - REMOTE_updateInstanceConfiguration; + CdapService_deploy("CdapService@deploy"), + CdapService_undeploy("CdapService@undeploy"), + CdapService_test("CdapService@test"), + CdapService_suspend("CdapService@suspend"), + CdapService_resume("CdapService@resume"), + CdapService_pushManagerConfiguration("CdapService@pushManagerConfiguration"), + CdapService_pollManagerConfiguration("CdapService@pollManagerConfiguration"), + CdapService_managerConfiguration("CdapService@managerConfiguration"), + CdapService_managerOperation("CdapService@managerOperation"), + CdapService_updateConfigurationFromPolicy("CdapService@updateConfigurationFromPolicy"), + CdapService_runHealthTests("CdapService@runHealthTests"), + CdapService_updateInstanceConfiguration("CdapService@updateInstanceConfiguration") ; + + + private String n; + + private CdapServiceOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManager.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManager.java index dcddd85..0e8ef8c 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManager.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManager.java @@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.servers.cdapmanager; + 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; @@ -54,9 +61,9 @@ import org.openecomp.dcae.controller.service.cdapmanager.impl.CdapManagerImpl; -public class DcaeCdapManager extends CdapManagerImpl { +public class DcaeCdapManager extends CdapManagerImpl implements ISiriusProvider { public static final Logger logger = Logger.getLogger(DcaeCdapManager.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); public DcaeCdapManagerProvider controller; ISiriusServer server; @@ -71,9 +78,8 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.test); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_test,server,this); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_test,"self:" + ManagementServer.object2ref(this)); try { res = controller.test(); } @@ -82,8 +88,10 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapManagerMessageEnum.test, e.toString()); - throw e; + ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_test, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -98,9 +106,8 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.suspend); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_suspend,server,this); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_suspend,"self:" + ManagementServer.object2ref(this)); try { controller.suspend(); } @@ -109,8 +116,10 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapManagerMessageEnum.suspend, e.toString()); - throw e; + ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -125,9 +134,8 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.resume); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_resume,server,this); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_resume,"self:" + ManagementServer.object2ref(this)); try { controller.resume(); } @@ -136,8 +144,10 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapManagerMessageEnum.resume, e.toString()); - throw e; + ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -152,9 +162,8 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.publicKey); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_publicKey,server,this); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_publicKey,"self:" + ManagementServer.object2ref(this)); try { res = controller.publicKey(); } @@ -163,8 +172,10 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapManagerMessageEnum.publicKey, e.toString()); - throw e; + ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -179,9 +190,8 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.configurationChanged); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_configurationChanged,server,this); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_configurationChanged,"self:" + ManagementServer.object2ref(this)); try { controller.configurationChanged(); } @@ -190,8 +200,10 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapManagerMessageEnum.configurationChanged, e.toString()); - throw e; + ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -206,9 +218,8 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.updateStreams); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(CdapManagerOperationEnum.CdapManager_updateStreams,server,this); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_updateStreams,"self:" + ManagementServer.object2ref(this)); try { controller.updateStreams(inputStreams,outputStreams); } @@ -217,8 +228,10 @@ public class DcaeCdapManager extends CdapManagerImpl { if (server != null) server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams); System.err.println("ERROR: " + e); - ecomplogger.warn(CdapManagerMessageEnum.updateStreams, e.toString()); - throw e; + ecomplogger.warn(CdapManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, CdapManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -232,10 +245,12 @@ public class DcaeCdapManager extends CdapManagerImpl { + + public static void ecoreSetup() { DcaeCdapManagerProvider.ecoreSetup(); } - public DcaeCdapManagerProvider getSomfProvider() { + public DcaeCdapManagerProvider getSiriusProvider() { return controller; } } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerClient.java index 7c43951..24b147a 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerClient.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerClient.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,33 +56,37 @@ public class DcaeCdapManagerClient extends CdapManagerImpl { DcaeCdapManager.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/resources", this); + client.setVersion("ONAP-R2"); } public DcaeCdapManagerClient(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 DcaeCdapManagerClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } @Override public org.openecomp.dcae.controller.core.service.HealthTestResponse test() { - EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_test); + EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_test,client.getRemote()); org.openecomp.dcae.controller.core.service.HealthTestResponse res; try { res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null); } catch (Exception e) { - ecomplogger.warn(CdapManagerMessageEnum.REMOTE_test, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e); + ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -88,16 +94,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl { @Override public void suspend() { - EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_suspend); + EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_suspend,client.getRemote()); try { client.operationPath("/resources", c, "suspend", null); } catch (Exception e) { - ecomplogger.warn(CdapManagerMessageEnum.REMOTE_suspend, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e); + ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -105,16 +112,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl { @Override public void resume() { - EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_resume); + EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_resume,client.getRemote()); try { client.operationPath("/resources", c, "resume", null); } catch (Exception e) { - ecomplogger.warn(CdapManagerMessageEnum.REMOTE_resume, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e); + ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -122,16 +130,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl { @Override public java.lang.String publicKey() { - EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_publicKey); + EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_publicKey,client.getRemote()); java.lang.String res; try { res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null); } catch (Exception e) { - ecomplogger.warn(CdapManagerMessageEnum.REMOTE_publicKey, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@publicKey: " + e); + ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -139,16 +148,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl { @Override public void configurationChanged() { - EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_configurationChanged); + EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_configurationChanged,client.getRemote()); try { client.operationPath("/resources", c, "configurationChanged", null); } catch (Exception e) { - ecomplogger.warn(CdapManagerMessageEnum.REMOTE_configurationChanged, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@configurationChanged: " + e); + ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -156,16 +166,17 @@ public class DcaeCdapManagerClient extends CdapManagerImpl { @Override public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) { - EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(CdapManagerOperationEnum.REMOTE_updateStreams); + EClass c = CdapmanagerPackage.eINSTANCE.getCdapManager(); + ecomplogger.recordMetricEventStart(CdapManagerOperationEnum.CdapManager_updateStreams,client.getRemote()); try { client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams); } catch (Exception e) { - ecomplogger.warn(CdapManagerMessageEnum.REMOTE_updateStreams, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateStreams: " + e); + ecomplogger.warn(CdapManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString()); + EcompException e1 = EcompException.create(CdapManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,CdapManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerServer.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerServer.java index cbe7dc6..710ea86 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerServer.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/DcaeCdapManagerServer.java @@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.servers.cdapmanager; 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.dcae.controller.service.cdapmanager.CdapManager; @@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.servers.cdapmanager.gui.DcaeModelFa -public class DcaeCdapManagerServer implements ISiriusServer { +public class DcaeCdapManagerServer implements ISiriusServer, IRequestHandler { public static final Logger logger = Logger.getLogger(DcaeCdapManagerServer.class); String serverPath; ManagementServer server; @@ -69,6 +68,7 @@ public class DcaeCdapManagerServer implements ISiriusServer { props = getPropertiesFromClasspath(filename); serverPath = (String) props.get("server.dir"); server = new ManagementServer(f, "CdapManager", serverPath, filename); + ManagementServer.setBuildVersion("ONAP-R2"); server.addFactory(f); server.addFactory(new org.openecomp.ncomp.servers.cdap.CdapCdapFactory(this)); @@ -84,6 +84,7 @@ public class DcaeCdapManagerServer implements ISiriusServer { controller = (DcaeCdapManager) server.find("/").o; webServer = new Jetty8Server("cdapmanager.properties"); webServer.add("/resources",server); + webServer.add("/api",this); @@ -112,4 +113,17 @@ public class DcaeCdapManagerServer 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/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApi.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApi.java index fc913e9..6ce4d7c 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApi.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApi.java @@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.servers.cdapmanager.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; @@ -84,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl; -public class DcaeGuiClientApi extends GuiClientApiImpl { +public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider { public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); public DcaeGuiClientApiProvider controller; ISiriusServer server; @@ -101,9 +108,8 @@ public class DcaeGuiClientApi 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.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTree(); } @@ -112,8 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getTree, e.toString()); - 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(); @@ -128,9 +136,8 @@ public class DcaeGuiClientApi 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.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this)); try { res = controller.getObject(path); } @@ -139,8 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getObject, e.toString()); - 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(); @@ -155,9 +164,8 @@ public class DcaeGuiClientApi 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.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTimeSerie(path,start,end,duration); } @@ -166,8 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getTimeSerie, e.toString()); - 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(); @@ -182,9 +192,8 @@ public class DcaeGuiClientApi 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.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTable(path,start,end); } @@ -193,8 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getTable, e.toString()); - 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(); @@ -209,9 +220,8 @@ public class DcaeGuiClientApi 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.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this)); try { res = controller.getHtml(path,start,end); } @@ -220,8 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getHtml, e.toString()); - 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(); @@ -236,9 +248,8 @@ public class DcaeGuiClientApi 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.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this)); try { res = controller.getGraph(path,start,end); } @@ -247,8 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getGraph, e.toString()); - 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(); @@ -262,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { + + public static void ecoreSetup() { DcaeGuiClientApiProvider.ecoreSetup(); } - public DcaeGuiClientApiProvider getSomfProvider() { + public DcaeGuiClientApiProvider getSiriusProvider() { return controller; } } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiClient.java index 3ced93a..fa02d0a 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiClient.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/DcaeGuiClientApiClient.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 DcaeGuiClientApiClient extends GuiClientApiImpl { DcaeCdapManager.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/gui", this); + client.setVersion("ONAP-R2"); } public DcaeGuiClientApiClient(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 DcaeGuiClientApiClient(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: " + client.getRemote() + "@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 DcaeGuiClientApiClient 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: " + client.getRemote() + "@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 DcaeGuiClientApiClient 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: " + client.getRemote() + "@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 DcaeGuiClientApiClient 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: " + client.getRemote() + "@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 DcaeGuiClientApiClient 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: " + client.getRemote() + "@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 DcaeGuiClientApiClient 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: " + client.getRemote() + "@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/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApi.properties b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApi.properties index 8705ab8..3822d29 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApi.properties +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/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/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiMessageEnum.java index bf9107c..33c5e79 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiMessageEnum.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/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.dcae.controller.service.servers.cdapmanager.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.dcae.controller.service.servers.cdapmanager.gui.logging.GuiClientApi"); + EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApi"); } } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiOperationEnum.java index ecfbf9e..256ed6b 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/gui/logging/GuiClientApiOperationEnum.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/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.dcae.controller.service.servers.cdapmanager.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/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager.properties b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager.properties index ef19f9b..4580ed4 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager.properties +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager.properties @@ -1,78 +1,78 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -test=\ - test-FAILED-5001W|\ +REQUEST_FAILED_test=\ + REQUEST-FAILED-test-4001W|\ {0}|\ null|\ Operation Failed with Exception -suspend=\ - suspend-FAILED-5001W|\ +REQUEST_FAILED_suspend=\ + REQUEST-FAILED-suspend-4001W|\ {0}|\ null|\ Operation Failed with Exception -resume=\ - resume-FAILED-5001W|\ +REQUEST_FAILED_resume=\ + REQUEST-FAILED-resume-4001W|\ {0}|\ null|\ Operation Failed with Exception -publicKey=\ - publicKey-FAILED-5001W|\ +REQUEST_FAILED_publicKey=\ + REQUEST-FAILED-publicKey-4001W|\ {0}|\ null|\ Operation Failed with Exception -configurationChanged=\ - configurationChanged-FAILED-5001W|\ +REQUEST_FAILED_configurationChanged=\ + REQUEST-FAILED-configurationChanged-4001W|\ {0}|\ null|\ Operation Failed with Exception -updateStreams=\ - updateStreams-FAILED-5001W|\ +REQUEST_FAILED_updateStreams=\ + REQUEST-FAILED-updateStreams-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_test=\ - REMOTE-test-FAILED-5001W|\ +REMOTE_CALL_FAILED_test=\ + REMOTE-CALL-FAILED-test-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_suspend=\ - REMOTE-suspend-FAILED-5001W|\ +REMOTE_CALL_FAILED_suspend=\ + REMOTE-CALL-FAILED-suspend-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_resume=\ - REMOTE-resume-FAILED-5001W|\ +REMOTE_CALL_FAILED_resume=\ + REMOTE-CALL-FAILED-resume-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_publicKey=\ - REMOTE-publicKey-FAILED-5001W|\ +REMOTE_CALL_FAILED_publicKey=\ + REMOTE-CALL-FAILED-publicKey-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_configurationChanged=\ - REMOTE-configurationChanged-FAILED-5001W|\ +REMOTE_CALL_FAILED_configurationChanged=\ + REMOTE-CALL-FAILED-configurationChanged-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_updateStreams=\ - REMOTE-updateStreams-FAILED-5001W|\ +REMOTE_CALL_FAILED_updateStreams=\ + REMOTE-CALL-FAILED-updateStreams-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerMessageEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerMessageEnum.java index bfc7789..6747f76 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerMessageEnum.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerMessageEnum.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.dcae.controller.service.servers.cdapmanager.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum; public enum CdapManagerMessageEnum implements EcompMessageEnum { dummy, - test, - suspend, - resume, - publicKey, - configurationChanged, - updateStreams, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_publicKey, - REMOTE_configurationChanged, - REMOTE_updateStreams; + REQUEST_FAILED_test, + REQUEST_FAILED_suspend, + REQUEST_FAILED_resume, + REQUEST_FAILED_publicKey, + REQUEST_FAILED_configurationChanged, + REQUEST_FAILED_updateStreams, + REMOTE_CALL_FAILED_test, + REMOTE_CALL_FAILED_suspend, + REMOTE_CALL_FAILED_resume, + REMOTE_CALL_FAILED_publicKey, + REMOTE_CALL_FAILED_configurationChanged, + REMOTE_CALL_FAILED_updateStreams; static { - EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.servers.cdapmanager.logging.CdapManager"); + EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManager"); } } diff --git a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerOperationEnum.java b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerOperationEnum.java index 4a0f398..e6667ec 100644 --- a/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerOperationEnum.java +++ b/dcae-controller-service-cdap/dcae-controller-service-cdap-adaptor/src/main/sirius-gen/org/openecomp/dcae/controller/service/servers/cdapmanager/logging/CdapManagerOperationEnum.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.dcae.controller.service.servers.cdapmanager.logging; import org.openecomp.entity.EcompOperationEnum; public enum CdapManagerOperationEnum implements EcompOperationEnum { - test, - suspend, - resume, - publicKey, - configurationChanged, - updateStreams, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_publicKey, - REMOTE_configurationChanged, - REMOTE_updateStreams; + CdapManager_test("CdapManager@test"), + CdapManager_suspend("CdapManager@suspend"), + CdapManager_resume("CdapManager@resume"), + CdapManager_publicKey("CdapManager@publicKey"), + CdapManager_configurationChanged("CdapManager@configurationChanged"), + CdapManager_updateStreams("CdapManager@updateStreams") ; + + + private String n; + + private CdapManagerOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } |