From 572921972ce687527d6d60849eed8a55211b72ef Mon Sep 17 00:00:00 2001 From: Carsten Lund Date: Sun, 16 Apr 2017 14:12:28 +0000 Subject: [DCAE-15] Changes related to version 1.1 See Jira for details Change-Id: Ic346dd5d5faf9816faa84eddb89f14654ea20156 Signed-off-by: Carsten Lund --- .gitreview | 2 +- ncomp-docker-adaptor/.classpath | 3 - ncomp-docker-adaptor/META-INF/MANIFEST.MF | 7 - ncomp-docker-adaptor/pom.xml | 2 +- .../ncomp/docker/adaptor/tools/Generator.java | 5 +- .../ncomp/servers/docker/DockerAbstractClient.java | 8 +- .../servers/docker/DockerDockerHostProvider.java | 27 ++- .../ncomp/servers/docker/TestPolling.java | 5 - .../src/main/sirius-gen/DockerHost.yaml | 179 ++++++---------- .../src/main/sirius-gen/GuiClientApi.yaml | 72 +++---- .../ncomp/servers/docker/DockerDockerAdaptor.java | 29 ++- .../servers/docker/DockerDockerAdaptorClient.java | 12 ++ .../servers/docker/DockerDockerAdaptorServer.java | 22 +- .../ncomp/servers/docker/DockerDockerHost.java | 141 ++++++++++-- .../servers/docker/DockerDockerHostClient.java | 236 ++++++++++++++++++--- .../servers/docker/gui/DockerGuiClientApi.java | 87 +++++++- .../docker/gui/DockerGuiClientApiClient.java | 108 ++++++++-- .../docker/gui/logging/GuiClientApi.properties | 50 ++--- .../gui/logging/GuiClientApiMessageEnum.java | 47 ++-- .../gui/logging/GuiClientApiOperationEnum.java | 52 ++--- .../docker/logging/DockerAdaptor.properties | 2 +- .../docker/logging/DockerAdaptorMessageEnum.java | 23 +- .../docker/logging/DockerAdaptorOperationEnum.java | 34 ++- .../servers/docker/logging/DockerHost.properties | 126 +++++------ .../docker/logging/DockerHostMessageEnum.java | 81 +++---- .../docker/logging/DockerHostOperationEnum.java | 78 +++---- ncomp-docker-model/META-INF/MANIFEST.MF | 6 +- ncomp-docker-model/pom.xml | 2 +- .../openecomp/ncomp/docker/ContainerCpuStats.java | 2 +- .../openecomp/ncomp/docker/ContainerCpuUsage.java | 2 +- .../ncomp/docker/ContainerMemoryStats.java | 2 +- .../ncomp/docker/ContainerMemoryUsage.java | 2 +- .../ncomp/docker/ContainerNetworkStats.java | 2 +- .../openecomp/ncomp/docker/ContainerOptions.java | 2 +- .../ncomp/docker/ContainerPortBindings.java | 2 +- .../ncomp/docker/ContainerRestartPolicy.java | 2 +- .../org/openecomp/ncomp/docker/DockerActor.java | 2 +- .../ncomp/docker/DockerActorAttributes.java | 2 +- .../org/openecomp/ncomp/docker/DockerAdaptor.java | 2 +- .../openecomp/ncomp/docker/DockerContainer.java | 2 +- .../ncomp/docker/DockerContainerStats.java | 2 +- .../ncomp/docker/DockerCreateRequest.java | 2 +- .../org/openecomp/ncomp/docker/DockerEvents.java | 2 +- .../org/openecomp/ncomp/docker/DockerHost.java | 2 +- .../org/openecomp/ncomp/docker/DockerImage.java | 2 +- .../org/openecomp/ncomp/docker/DockerIpam.java | 2 +- .../openecomp/ncomp/docker/DockerIpamConfig.java | 2 +- .../org/openecomp/ncomp/docker/DockerKeyPair.java | 2 +- .../org/openecomp/ncomp/docker/DockerMount.java | 2 +- .../org/openecomp/ncomp/docker/DockerNetwork.java | 2 +- .../ncomp/docker/DockerNetworkContainer.java | 2 +- .../org/openecomp/ncomp/docker/DockerPackage.java | 18 ++ .../org/openecomp/ncomp/docker/DockerPort.java | 2 +- .../org/openecomp/ncomp/docker/DockerProcess.java | 2 +- .../ncomp/docker/impl/ContainerCpuStatsImpl.java | 2 +- .../ncomp/docker/impl/ContainerCpuUsageImpl.java | 2 +- .../docker/impl/ContainerMemoryStatsImpl.java | 2 +- .../docker/impl/ContainerMemoryUsageImpl.java | 2 +- .../docker/impl/ContainerNetworkStatsImpl.java | 2 +- .../ncomp/docker/impl/ContainerOptionsImpl.java | 2 +- .../docker/impl/ContainerPortBindingsImpl.java | 2 +- .../docker/impl/ContainerRestartPolicyImpl.java | 2 +- .../docker/impl/DockerActorAttributesImpl.java | 2 +- .../ncomp/docker/impl/DockerActorImpl.java | 2 +- .../ncomp/docker/impl/DockerAdaptorImpl.java | 2 +- .../ncomp/docker/impl/DockerContainerImpl.java | 2 +- .../docker/impl/DockerContainerStatsImpl.java | 2 +- .../ncomp/docker/impl/DockerCreateRequestImpl.java | 2 +- .../ncomp/docker/impl/DockerEventsImpl.java | 2 +- .../ncomp/docker/impl/DockerHostImpl.java | 2 +- .../ncomp/docker/impl/DockerImageImpl.java | 2 +- .../ncomp/docker/impl/DockerIpamConfigImpl.java | 2 +- .../ncomp/docker/impl/DockerIpamImpl.java | 2 +- .../ncomp/docker/impl/DockerKeyPairImpl.java | 2 +- .../ncomp/docker/impl/DockerMountImpl.java | 2 +- .../docker/impl/DockerNetworkContainerImpl.java | 2 +- .../ncomp/docker/impl/DockerNetworkImpl.java | 2 +- .../ncomp/docker/impl/DockerPortImpl.java | 2 +- .../ncomp/docker/impl/DockerProcessImpl.java | 2 +- .../openecomp/ncomp/docker/util/DockerSwitch.java | 2 +- pom.xml | 8 +- version.properties | 2 +- 82 files changed, 947 insertions(+), 629 deletions(-) diff --git a/.gitreview b/.gitreview index 59144b0..54a08d8 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=gerrit.openecomp.org +host=gerrit.onap.org port=29418 project=ncomp/docker.git diff --git a/ncomp-docker-adaptor/.classpath b/ncomp-docker-adaptor/.classpath index d2d34b3..65e14ce 100644 --- a/ncomp-docker-adaptor/.classpath +++ b/ncomp-docker-adaptor/.classpath @@ -1,6 +1,5 @@ - @@ -8,7 +7,6 @@ - @@ -21,7 +19,6 @@ - diff --git a/ncomp-docker-adaptor/META-INF/MANIFEST.MF b/ncomp-docker-adaptor/META-INF/MANIFEST.MF index 2d28d28..079ad08 100644 --- a/ncomp-docker-adaptor/META-INF/MANIFEST.MF +++ b/ncomp-docker-adaptor/META-INF/MANIFEST.MF @@ -5,10 +5,3 @@ Bundle-SymbolicName: ncomp-docker-adaptor Bundle-Version: 0.1.0.qualifier Export-Package: org.openecomp.ncomp.docker.adaptor.tools, org.openecomp.ncomp.servers.docker -Require-Bundle: ncomp-core-types, - ncomp-sirius-manager-model, - ncomp-sirius-manager-server, - ncomp-sirius-manager-console, - ncomp-sirius-manager-generator, - ncomp-docker-model;bundle-version="0.1.0", - ncomp-utils-java;bundle-version="0.1.0" diff --git a/ncomp-docker-adaptor/pom.xml b/ncomp-docker-adaptor/pom.xml index fa32d4f..b86a84b 100644 --- a/ncomp-docker-adaptor/pom.xml +++ b/ncomp-docker-adaptor/pom.xml @@ -6,7 +6,7 @@ org.openecomp.ncomp.sirius.manager ncomp-sirius-manager-base - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-base diff --git a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/docker/adaptor/tools/Generator.java b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/docker/adaptor/tools/Generator.java index 09f3f3f..2de12d8 100644 --- a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/docker/adaptor/tools/Generator.java +++ b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/docker/adaptor/tools/Generator.java @@ -45,12 +45,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("Docker"); m.setPluginName(p.getNsURI()); m.setName("Docker"); m.setTitle("Docker"); - ControllerGenerator g = new ControllerGenerator(o, m); + ControllerGenerator g = new ControllerGenerator(o, m); + g.setVersion("ONAP-R2"); EObject h = DockerFactory.eINSTANCE.createDockerHost(); g.addApi("host", h, m, false, true); g.setEnableIRequestHandler(false); diff --git a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerAbstractClient.java b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerAbstractClient.java index 30a5777..2fc41a8 100644 --- a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerAbstractClient.java +++ b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerAbstractClient.java @@ -74,8 +74,8 @@ public abstract class DockerAbstractClient { EOperation op = EUtils.name2operation(o.eClass(), opName); if (op == null) throw new RuntimeException("no such operation: " + opName + " on " + o); - JSONObject res = operationPath2(path, opName, timeout, ManagementServer.params2json(op, params)); - return ManagementServer.json2response(op, res); + JSONObject res = operationPath2(path, opName, timeout, ManagementServer.params2json(op, params, "UNKNOWN")); + return ManagementServer.json2response(op, res, "UNKNOWN"); } public JSONObject operation(String resourcePath, String opName, Long timeout, JSONObject json) { @@ -96,14 +96,14 @@ public abstract class DockerAbstractClient { throw new RuntimeException("Unknown operation " + opName + " on Eclass " + c.getName()); } JSONObject res; - JSONObject json1 = ManagementServer.params2json(op, params); + JSONObject json1 = ManagementServer.params2json(op, params, "UNKNOWN"); if (language != null && language.equals("restconf")) { res = operationOdl("/restconf/operations/" + namespace + ":" + opName,timeout,json1); } else { res = operationPath2(resourcePath, op.getName(), timeout, json1 ); } - return ManagementServer.json2response(op, res); + return ManagementServer.json2response(op, res, "UNKNOWN"); } // abstract public void sendToDataRouter(String feedname, String fileId, diff --git a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerDockerHostProvider.java b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerDockerHostProvider.java index d3888dc..8ea1ba9 100644 --- a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerDockerHostProvider.java +++ b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/DockerDockerHostProvider.java @@ -40,7 +40,6 @@ import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.ncomp.sirius.manager.ManagementServer; import org.openecomp.ncomp.sirius.manager.ManagementServerUtils; -import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; @@ -63,6 +62,7 @@ import org.openecomp.ncomp.docker.DockerImage; import org.openecomp.ncomp.docker.DockerNetwork; import org.openecomp.ncomp.docker.DockerPackage; + import org.eclipse.emf.common.util.EList; class DockerDockerHostProvider extends BasicAdaptorProvider { @@ -102,11 +102,6 @@ class DockerDockerHostProvider extends BasicAdaptorProvider { CREATE, START, STOP, RESTART, PAUSE, UNPAUSE, KILL, DESTORY } - private JSONObject encodeAuth(String json) { - String auth = Base64.encodeBase64String(json.getBytes()); - return new JSONObject(auth); - } - public DockerDockerHostProvider(ISiriusServer controller, DockerHost o) { super(controller, o); this.o = o; @@ -405,9 +400,9 @@ class DockerDockerHostProvider extends BasicAdaptorProvider { // EList cp = container.getProcesses(); // cp = (EList)Arrays.asList(dp); - System.err.println("XXXX " - + ManagementServer.ecore2json(container, 100, null, true) - .toString(2)); +// System.err.println("XXXX " +// + ManagementServer.ecore2json(container, 100, null, true) +// .toString(2)); o.getContainers().add(container); } } @@ -423,7 +418,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider { fixNull(j); rename(j, "created", "dockerCreated"); if (j.has("labels")) j.remove("labels"); - System.err.println("XXXX " + j.toString()); +// System.err.println("XXXX " + j.toString()); DockerImage image = (DockerImage) controller.getServer() .json2ecore(DockerPackage.eINSTANCE.getDockerImage(), j); // System.err.println("XXXX " + ManagementServer.ecore2json(image, @@ -460,7 +455,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider { JSONObject netwks = j.getJSONObject("networks"); for(String net : JSONObject.getNames(netwks)) { JSONObject intf = netwks.getJSONObject(net); - System.err.println(net + " <- " + intf.toString(4)); +// System.err.println(net + " <- " + intf.toString(4)); ContainerNetworkStats cnet = DockerFactory.eINSTANCE.createContainerNetworkStats(); cnet.setIntf(net); cnet.setRx_bytes(intf.getInt("rx_bytes")); @@ -484,7 +479,10 @@ class DockerDockerHostProvider extends BasicAdaptorProvider { memusg.setUsage(mem.getInt("usage")); memusg.setMax_usage(mem.getInt("max_usage")); memusg.setLimit(mem.getInt("limit")); - memusg.setFailcnt(mem.getInt("failcnt")); + try { + memusg.setFailcnt(mem.getInt("failcnt")); + } catch (Exception e) { + } /* * memory stats @@ -551,6 +549,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider { cstats.setCpu(ccpustats); c.setStats(cstats); + controller.getServer().save(); } } @@ -616,7 +615,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider { // System.err.println("XXXX " + v.getClass().getName()); if (v.getClass().getName().equals("org.json.JSONObject$Null")) { j.put(k, new JSONArray()); - System.err.println("XXXX change null to empty array " + k); +// System.err.println("XXXX change null to empty array " + k); } } } @@ -906,7 +905,7 @@ class DockerDockerHostProvider extends BasicAdaptorProvider { // 404 - no such container // 500 - server err } - + private List getImageNameElements(String image) { List a = new ArrayList<>(); diff --git a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/TestPolling.java b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/TestPolling.java index 450a41f..43f3910 100644 --- a/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/TestPolling.java +++ b/ncomp-docker-adaptor/src/main/java/org/openecomp/ncomp/servers/docker/TestPolling.java @@ -24,11 +24,6 @@ package org.openecomp.ncomp.servers.docker; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.ncomp.sirius.manager.ManagementServer; -/* - * the polled docker-engine is defined in docker.properties - * dockerHost.endpoint=https://host.domaon:port - * - */ public class TestPolling implements ISiriusServer { public static void main(String[] args) { diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/DockerHost.yaml b/ncomp-docker-adaptor/src/main/sirius-gen/DockerHost.yaml index b86e0ef..e2add00 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/DockerHost.yaml +++ b/ncomp-docker-adaptor/src/main/sirius-gen/DockerHost.yaml @@ -1,168 +1,129 @@ operations: - poll: {} - startContainer: {} - stopContainer: {} - restartContainer: {} - pauseContainer: {} - unpauseContainer: {} - removeContainer: {} - inspectContainer: {} - killContainer: {} - dockerRun: {} - dockerRunWithName: {} - dockerRunWithOptions: {} - containerStats: {} - containerProcesses: {} - pullImage: {} - REMOTE_poll: - decription: Remote call poll - REMOTE_startContainer: - decription: Remote call startContainer - REMOTE_stopContainer: - decription: Remote call stopContainer - REMOTE_restartContainer: - decription: Remote call restartContainer - REMOTE_pauseContainer: - decription: Remote call pauseContainer - REMOTE_unpauseContainer: - decription: Remote call unpauseContainer - REMOTE_removeContainer: - decription: Remote call removeContainer - REMOTE_inspectContainer: - decription: Remote call inspectContainer - REMOTE_killContainer: - decription: Remote call killContainer - REMOTE_dockerRun: - decription: Remote call dockerRun - REMOTE_dockerRunWithName: - decription: Remote call dockerRunWithName - REMOTE_dockerRunWithOptions: - decription: Remote call dockerRunWithOptions - REMOTE_containerStats: - decription: Remote call containerStats - REMOTE_containerProcesses: - decription: Remote call containerProcesses - REMOTE_pullImage: - decription: Remote call pullImage + DockerHost@poll: {} + DockerHost@startContainer: {} + DockerHost@stopContainer: {} + DockerHost@restartContainer: {} + DockerHost@pauseContainer: {} + DockerHost@unpauseContainer: {} + DockerHost@removeContainer: {} + DockerHost@inspectContainer: {} + DockerHost@killContainer: {} + DockerHost@dockerRun: {} + DockerHost@dockerRunWithName: {} + DockerHost@dockerRunWithOptions: {} + DockerHost@containerStats: {} + DockerHost@containerProcesses: {} messages: dummy: {} - poll: - errorCode: poll-FAILED-5001W + REQUEST-FAILED-poll: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - startContainer: - errorCode: startContainer-FAILED-5001W + REQUEST-FAILED-startContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - stopContainer: - errorCode: stopContainer-FAILED-5001W + REQUEST-FAILED-stopContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - restartContainer: - errorCode: restartContainer-FAILED-5001W + REQUEST-FAILED-restartContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - pauseContainer: - errorCode: pauseContainer-FAILED-5001W + REQUEST-FAILED-pauseContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - unpauseContainer: - errorCode: unpauseContainer-FAILED-5001W + REQUEST-FAILED-unpauseContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - removeContainer: - errorCode: removeContainer-FAILED-5001W + REQUEST-FAILED-removeContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - inspectContainer: - errorCode: inspectContainer-FAILED-5001W + REQUEST-FAILED-inspectContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - killContainer: - errorCode: killContainer-FAILED-5001W + REQUEST-FAILED-killContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - dockerRun: - errorCode: dockerRun-FAILED-5001W + REQUEST-FAILED-dockerRun: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - dockerRunWithName: - errorCode: dockerRunWithName-FAILED-5001W + REQUEST-FAILED-dockerRunWithName: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - dockerRunWithOptions: - errorCode: dockerRunWithOptions-FAILED-5001W + REQUEST-FAILED-dockerRunWithOptions: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - containerStats: - errorCode: containerStats-FAILED-5001W + REQUEST-FAILED-containerStats: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - containerProcesses: - errorCode: containerProcesses-FAILED-5001W + REQUEST-FAILED-containerProcesses: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - pullImage: - errorCode: pullImage-FAILED-5001W - messageFormat: '{0}' - description: Operation Failed with Exception - REMOTE_poll: - errorCode: REMOTE-poll-FAILED-5001W - messageFormat: '{0}' - description: Remote Operation Failed with Exception - REMOTE_startContainer: - errorCode: REMOTE-startContainer-FAILED-5001W + REMOTE-CALL-FAILED-poll: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_stopContainer: - errorCode: REMOTE-stopContainer-FAILED-5001W + REMOTE-CALL-FAILED-startContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_restartContainer: - errorCode: REMOTE-restartContainer-FAILED-5001W + REMOTE-CALL-FAILED-stopContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_pauseContainer: - errorCode: REMOTE-pauseContainer-FAILED-5001W + REMOTE-CALL-FAILED-restartContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_unpauseContainer: - errorCode: REMOTE-unpauseContainer-FAILED-5001W + REMOTE-CALL-FAILED-pauseContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_removeContainer: - errorCode: REMOTE-removeContainer-FAILED-5001W + REMOTE-CALL-FAILED-unpauseContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_inspectContainer: - errorCode: REMOTE-inspectContainer-FAILED-5001W + REMOTE-CALL-FAILED-removeContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_killContainer: - errorCode: REMOTE-killContainer-FAILED-5001W + REMOTE-CALL-FAILED-inspectContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_dockerRun: - errorCode: REMOTE-dockerRun-FAILED-5001W + REMOTE-CALL-FAILED-killContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_dockerRunWithName: - errorCode: REMOTE-dockerRunWithName-FAILED-5001W + REMOTE-CALL-FAILED-dockerRun: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_dockerRunWithOptions: - errorCode: REMOTE-dockerRunWithOptions-FAILED-5001W + REMOTE-CALL-FAILED-dockerRunWithName: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_containerStats: - errorCode: REMOTE-containerStats-FAILED-5001W + REMOTE-CALL-FAILED-dockerRunWithOptions: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_containerProcesses: - errorCode: REMOTE-containerProcesses-FAILED-5001W + REMOTE-CALL-FAILED-containerStats: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_pullImage: - errorCode: REMOTE-pullImage-FAILED-5001W + REMOTE-CALL-FAILED-containerProcesses: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/GuiClientApi.yaml b/ncomp-docker-adaptor/src/main/sirius-gen/GuiClientApi.yaml index bf3d69d..1489339 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/GuiClientApi.yaml +++ b/ncomp-docker-adaptor/src/main/sirius-gen/GuiClientApi.yaml @@ -1,69 +1,57 @@ operations: - getTree: {} - getObject: {} - getTimeSerie: {} - getTable: {} - getHtml: {} - getGraph: {} - REMOTE_getTree: - decription: Remote call getTree - REMOTE_getObject: - decription: Remote call getObject - REMOTE_getTimeSerie: - decription: Remote call getTimeSerie - REMOTE_getTable: - decription: Remote call getTable - REMOTE_getHtml: - decription: Remote call getHtml - REMOTE_getGraph: - decription: Remote call getGraph + GuiClientApi@getTree: {} + GuiClientApi@getObject: {} + GuiClientApi@getTimeSerie: {} + GuiClientApi@getTable: {} + GuiClientApi@getHtml: {} + GuiClientApi@getGraph: {} messages: dummy: {} - getTree: - errorCode: getTree-FAILED-5001W + REQUEST-FAILED-getTree: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getObject: - errorCode: getObject-FAILED-5001W + REQUEST-FAILED-getObject: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getTimeSerie: - errorCode: getTimeSerie-FAILED-5001W + REQUEST-FAILED-getTimeSerie: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getTable: - errorCode: getTable-FAILED-5001W + REQUEST-FAILED-getTable: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getHtml: - errorCode: getHtml-FAILED-5001W + REQUEST-FAILED-getHtml: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getGraph: - errorCode: getGraph-FAILED-5001W + REQUEST-FAILED-getGraph: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - REMOTE_getTree: - errorCode: REMOTE-getTree-FAILED-5001W + REMOTE-CALL-FAILED-getTree: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getObject: - errorCode: REMOTE-getObject-FAILED-5001W + REMOTE-CALL-FAILED-getObject: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getTimeSerie: - errorCode: REMOTE-getTimeSerie-FAILED-5001W + REMOTE-CALL-FAILED-getTimeSerie: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getTable: - errorCode: REMOTE-getTable-FAILED-5001W + REMOTE-CALL-FAILED-getTable: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getHtml: - errorCode: REMOTE-getHtml-FAILED-5001W + REMOTE-CALL-FAILED-getHtml: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getGraph: - errorCode: REMOTE-getGraph-FAILED-5001W + REMOTE-CALL-FAILED-getGraph: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptor.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptor.java index 2cdc121..2e235bb 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptor.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptor.java @@ -23,27 +23,48 @@ // Do not edit. No need to extend this class. package org.openecomp.ncomp.servers.docker; + + + + import java.io.InputStream; + import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; +import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; + +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; + import java.util.Date; +import org.openecomp.ncomp.servers.docker.logging.DockerAdaptorOperationEnum; +import org.openecomp.ncomp.servers.docker.logging.DockerAdaptorMessageEnum; + + import org.openecomp.ncomp.docker.impl.DockerAdaptorImpl; -public class DockerDockerAdaptor extends DockerAdaptorImpl { +public class DockerDockerAdaptor extends DockerAdaptorImpl implements ISiriusProvider { public static final Logger logger = Logger.getLogger(DockerDockerAdaptor.class); - DockerDockerAdaptorProvider controller; + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); + public DockerDockerAdaptorProvider controller; ISiriusServer server; public DockerDockerAdaptor(ISiriusServer server) { @@ -56,10 +77,12 @@ public class DockerDockerAdaptor extends DockerAdaptorImpl { + + public static void ecoreSetup() { DockerDockerAdaptorProvider.ecoreSetup(); } - public DockerDockerAdaptorProvider getSomfProvider() { + public DockerDockerAdaptorProvider getSiriusProvider() { return controller; } } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptorClient.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptorClient.java index e629eb5..31de114 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptorClient.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptorClient.java @@ -28,10 +28,18 @@ import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient; import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; + +import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; + import org.openecomp.ncomp.docker.impl.DockerAdaptorImpl; import org.openecomp.ncomp.docker.DockerPackage; +import org.openecomp.ncomp.servers.docker.logging.DockerAdaptorOperationEnum; +import org.openecomp.ncomp.servers.docker.logging.DockerAdaptorMessageEnum; @@ -41,23 +49,27 @@ import org.openecomp.ncomp.docker.DockerPackage; @SuppressWarnings("unchecked") public class DockerDockerAdaptorClient extends DockerAdaptorImpl { public static final Logger logger = Logger.getLogger(DockerDockerAdaptorClient.class); + static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); public AbstractClient client; public DockerDockerAdaptorClient(String file, String name) { DockerDockerAdaptor.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/resources", this); + client.setVersion("ONAP-R2"); } public DockerDockerAdaptorClient(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 DockerDockerAdaptorClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptorServer.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptorServer.java index b4e83fa..5c7a17f 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptorServer.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptorServer.java @@ -26,14 +26,16 @@ package org.openecomp.ncomp.servers.docker; import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath; import java.io.IOException; +import java.io.InputStream; import java.util.Properties; import java.util.TimeZone; import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EFactory; - +import org.json.JSONObject; import org.openecomp.ncomp.sirius.manager.Jetty8Server; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.IRequestHandler; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.ncomp.docker.DockerAdaptor; @@ -47,7 +49,7 @@ import org.openecomp.ncomp.servers.docker.gui.DockerModelFactory; -public class DockerDockerAdaptorServer implements ISiriusServer { +public class DockerDockerAdaptorServer implements ISiriusServer, IRequestHandler { public static final Logger logger = Logger.getLogger(DockerDockerAdaptorServer.class); String serverPath; ManagementServer server; @@ -56,6 +58,7 @@ public class DockerDockerAdaptorServer implements ISiriusServer { // LocationControllerApi api ; Jetty8Server webServer; DockerDockerFactory f = new DockerDockerFactory(this); + String hostPath; ManagementServer hostServer; @@ -70,6 +73,7 @@ public class DockerDockerAdaptorServer implements ISiriusServer { props = getPropertiesFromClasspath(filename); serverPath = (String) props.get("server.dir"); server = new ManagementServer(f, "DockerAdaptor", serverPath, filename); + ManagementServer.setBuildVersion("ONAP-R2"); server.addFactory(f); server.addRuntimeFactories(this); @@ -79,6 +83,7 @@ public class DockerDockerAdaptorServer implements ISiriusServer { controller = (DockerDockerAdaptor) server.find("/").o; webServer = new Jetty8Server("docker.properties"); webServer.add("/resources",server); + webServer.add("/api",this); @@ -107,4 +112,17 @@ public class DockerDockerAdaptorServer implements ISiriusServer { public ManagementServer getServer() { return server; } + public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, + String clientVersion) { + switch ((String) context.get("path")) { + case "/api/versions": + return server.supportedVersions(); + } + logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2)); + throw new RuntimeException("Unknown request"); + } + public Object handleBinary(String userName, String action, String resourcePath, InputStream in) { + return null; + } + } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerHost.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerHost.java index d16b4ff..74492fe 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerHost.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerHost.java @@ -23,27 +23,48 @@ // Do not edit. No need to extend this class. package org.openecomp.ncomp.servers.docker; + + + + import java.io.InputStream; + import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; +import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; + +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; + import java.util.Date; +import org.openecomp.ncomp.servers.docker.logging.DockerHostOperationEnum; +import org.openecomp.ncomp.servers.docker.logging.DockerHostMessageEnum; + + import org.openecomp.ncomp.docker.impl.DockerHostImpl; -public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { +public class DockerDockerHost extends DockerHostImpl implements ISiriusProvider, ISiriusPlugin { public static final Logger logger = Logger.getLogger(DockerDockerHost.class); - DockerDockerHostProvider controller; + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); + public DockerDockerHostProvider controller; ISiriusServer server; public DockerDockerHost(ISiriusServer server) { @@ -57,6 +78,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "poll", ApiRequestStatus.START, duration_); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_poll,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_poll,"self:" + ManagementServer.object2ref(this)); try { controller.poll(); } @@ -65,8 +88,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "poll", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_poll, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_poll,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_poll, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "poll", ApiRequestStatus.OKAY, duration_); @@ -79,6 +106,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "startContainer", ApiRequestStatus.START, duration_,name); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_startContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_startContainer,"self:" + ManagementServer.object2ref(this)); try { controller.startContainer(name); } @@ -87,8 +116,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "startContainer", ApiRequestStatus.ERROR, duration_,name); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_startContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_startContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_startContainer, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "startContainer", ApiRequestStatus.OKAY, duration_,name); @@ -101,6 +134,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "stopContainer", ApiRequestStatus.START, duration_,name,seconds); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_stopContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_stopContainer,"self:" + ManagementServer.object2ref(this)); try { controller.stopContainer(name,seconds); } @@ -109,8 +144,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "stopContainer", ApiRequestStatus.ERROR, duration_,name,seconds); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_stopContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_stopContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_stopContainer, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "stopContainer", ApiRequestStatus.OKAY, duration_,name,seconds); @@ -123,6 +162,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "restartContainer", ApiRequestStatus.START, duration_,name,seconds); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_restartContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_restartContainer,"self:" + ManagementServer.object2ref(this)); try { controller.restartContainer(name,seconds); } @@ -131,8 +172,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "restartContainer", ApiRequestStatus.ERROR, duration_,name,seconds); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_restartContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_restartContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_restartContainer, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "restartContainer", ApiRequestStatus.OKAY, duration_,name,seconds); @@ -145,6 +190,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "pauseContainer", ApiRequestStatus.START, duration_,name); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_pauseContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_pauseContainer,"self:" + ManagementServer.object2ref(this)); try { controller.pauseContainer(name); } @@ -153,8 +200,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "pauseContainer", ApiRequestStatus.ERROR, duration_,name); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_pauseContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_pauseContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_pauseContainer, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "pauseContainer", ApiRequestStatus.OKAY, duration_,name); @@ -167,6 +218,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "unpauseContainer", ApiRequestStatus.START, duration_,name); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_unpauseContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_unpauseContainer,"self:" + ManagementServer.object2ref(this)); try { controller.unpauseContainer(name); } @@ -175,8 +228,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "unpauseContainer", ApiRequestStatus.ERROR, duration_,name); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_unpauseContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_unpauseContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_unpauseContainer, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "unpauseContainer", ApiRequestStatus.OKAY, duration_,name); @@ -189,6 +246,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "removeContainer", ApiRequestStatus.START, duration_,name,remove,force); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_removeContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_removeContainer,"self:" + ManagementServer.object2ref(this)); try { controller.removeContainer(name,remove,force); } @@ -197,8 +256,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "removeContainer", ApiRequestStatus.ERROR, duration_,name,remove,force); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_removeContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_removeContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_removeContainer, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "removeContainer", ApiRequestStatus.OKAY, duration_,name,remove,force); @@ -211,6 +274,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "inspectContainer", ApiRequestStatus.START, duration_,name); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_inspectContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_inspectContainer,"self:" + ManagementServer.object2ref(this)); try { controller.inspectContainer(name); } @@ -219,8 +284,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "inspectContainer", ApiRequestStatus.ERROR, duration_,name); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_inspectContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_inspectContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_inspectContainer, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "inspectContainer", ApiRequestStatus.OKAY, duration_,name); @@ -233,6 +302,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "killContainer", ApiRequestStatus.START, duration_,name,sigint); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_killContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_killContainer,"self:" + ManagementServer.object2ref(this)); try { controller.killContainer(name,sigint); } @@ -241,8 +312,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "killContainer", ApiRequestStatus.ERROR, duration_,name,sigint); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_killContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_killContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_killContainer, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "killContainer", ApiRequestStatus.OKAY, duration_,name,sigint); @@ -255,6 +330,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "dockerRun", ApiRequestStatus.START, duration_,image); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_dockerRun,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_dockerRun,"self:" + ManagementServer.object2ref(this)); try { controller.dockerRun(image); } @@ -263,8 +340,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "dockerRun", ApiRequestStatus.ERROR, duration_,image); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_dockerRun, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_dockerRun,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_dockerRun, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "dockerRun", ApiRequestStatus.OKAY, duration_,image); @@ -277,6 +358,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "dockerRunWithName", ApiRequestStatus.START, duration_,image,name); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_dockerRunWithName,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_dockerRunWithName,"self:" + ManagementServer.object2ref(this)); try { controller.dockerRunWithName(image,name); } @@ -285,8 +368,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "dockerRunWithName", ApiRequestStatus.ERROR, duration_,image,name); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_dockerRunWithName, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_dockerRunWithName,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_dockerRunWithName, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "dockerRunWithName", ApiRequestStatus.OKAY, duration_,image,name); @@ -299,6 +386,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "dockerRunWithOptions", ApiRequestStatus.START, duration_,image,opts); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_dockerRunWithOptions,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_dockerRunWithOptions,"self:" + ManagementServer.object2ref(this)); try { controller.dockerRunWithOptions(image,opts); } @@ -307,8 +396,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "dockerRunWithOptions", ApiRequestStatus.ERROR, duration_,image,opts); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_dockerRunWithOptions, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_dockerRunWithOptions,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_dockerRunWithOptions, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "dockerRunWithOptions", ApiRequestStatus.OKAY, duration_,image,opts); @@ -321,6 +414,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "containerStats", ApiRequestStatus.START, duration_,name,stream); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_containerStats,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_containerStats,"self:" + ManagementServer.object2ref(this)); try { controller.containerStats(name,stream); } @@ -329,8 +424,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "containerStats", ApiRequestStatus.ERROR, duration_,name,stream); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_containerStats, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_containerStats,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_containerStats, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "containerStats", ApiRequestStatus.OKAY, duration_,name,stream); @@ -343,6 +442,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "containerProcesses", ApiRequestStatus.START, duration_,name); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostOperationEnum.DockerHost_containerProcesses,server,this); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_containerProcesses,"self:" + ManagementServer.object2ref(this)); try { controller.containerProcesses(name); } @@ -351,8 +452,12 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { if (server != null) server.getServer().recordApi(null, this, "containerProcesses", ApiRequestStatus.ERROR, duration_,name); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(DockerHostMessageEnum.REQUEST_FAILED_containerProcesses, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REQUEST_FAILED_containerProcesses,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostMessageEnum.REQUEST_FAILED_containerProcesses, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "containerProcesses", ApiRequestStatus.OKAY, duration_,name); @@ -364,6 +469,8 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { + + @Override public void start() { controller.start(); @@ -372,7 +479,7 @@ public class DockerDockerHost extends DockerHostImpl implements ISiriusPlugin { public static void ecoreSetup() { DockerDockerHostProvider.ecoreSetup(); } - public DockerDockerHostProvider getSomfProvider() { + public DockerDockerHostProvider getSiriusProvider() { return controller; } } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerHostClient.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerHostClient.java index aa468c9..7cf9823 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerHostClient.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerHostClient.java @@ -28,10 +28,18 @@ import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient; import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; + +import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; + import org.openecomp.ncomp.docker.impl.DockerHostImpl; import org.openecomp.ncomp.docker.DockerPackage; +import org.openecomp.ncomp.servers.docker.logging.DockerHostOperationEnum; +import org.openecomp.ncomp.servers.docker.logging.DockerHostMessageEnum; import org.openecomp.ncomp.servers.docker.DockerDockerAdaptor; @@ -42,109 +50,281 @@ import org.openecomp.ncomp.servers.docker.DockerDockerAdaptor; @SuppressWarnings("unchecked") public class DockerDockerHostClient extends DockerHostImpl { public static final Logger logger = Logger.getLogger(DockerDockerHostClient.class); + static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); public AbstractClient client; public DockerDockerHostClient(String file, String name) { DockerDockerAdaptor.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/host", this); + client.setVersion("ONAP-R2"); } public DockerDockerHostClient(String file, String name1, String name2) { HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2); client = client1.all; // requests should be forwarded to all. client.add("/host", this); + client.setVersion("ONAP-R2"); } public DockerDockerHostClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } public void poll(String path) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "poll", null); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_poll,client.getRemote()); + + try { + client.operationPath(path, c, "poll", null); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_poll, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_poll,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_poll,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void startContainer(String path, java.lang.String name) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "startContainer", null, name); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_startContainer,client.getRemote()); + + try { + client.operationPath(path, c, "startContainer", null, name); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_startContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_startContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_startContainer,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void stopContainer(String path, java.lang.String name, int seconds) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "stopContainer", null, name,seconds); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_stopContainer,client.getRemote()); + + try { + client.operationPath(path, c, "stopContainer", null, name,seconds); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_stopContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_stopContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_stopContainer,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void restartContainer(String path, java.lang.String name, int seconds) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "restartContainer", null, name,seconds); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_restartContainer,client.getRemote()); + + try { + client.operationPath(path, c, "restartContainer", null, name,seconds); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_restartContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_restartContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_restartContainer,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void pauseContainer(String path, java.lang.String name) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "pauseContainer", null, name); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_pauseContainer,client.getRemote()); + + try { + client.operationPath(path, c, "pauseContainer", null, name); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_pauseContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_pauseContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_pauseContainer,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void unpauseContainer(String path, java.lang.String name) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "unpauseContainer", null, name); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_unpauseContainer,client.getRemote()); + + try { + client.operationPath(path, c, "unpauseContainer", null, name); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_unpauseContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_unpauseContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_unpauseContainer,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void removeContainer(String path, java.lang.String name, boolean remove, boolean force) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "removeContainer", null, name,remove,force); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_removeContainer,client.getRemote()); + + try { + client.operationPath(path, c, "removeContainer", null, name,remove,force); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_removeContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_removeContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_removeContainer,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void inspectContainer(String path, java.lang.String name) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "inspectContainer", null, name); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_inspectContainer,client.getRemote()); + + try { + client.operationPath(path, c, "inspectContainer", null, name); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_inspectContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_inspectContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_inspectContainer,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void killContainer(String path, java.lang.String name, java.lang.String sigint) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "killContainer", null, name,sigint); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_killContainer,client.getRemote()); + + try { + client.operationPath(path, c, "killContainer", null, name,sigint); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_killContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_killContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_killContainer,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void dockerRun(String path, java.lang.String image) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "dockerRun", null, image); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_dockerRun,client.getRemote()); + + try { + client.operationPath(path, c, "dockerRun", null, image); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_dockerRun, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_dockerRun,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_dockerRun,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void dockerRunWithName(String path, java.lang.String image, java.lang.String name) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "dockerRunWithName", null, image,name); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_dockerRunWithName,client.getRemote()); + + try { + client.operationPath(path, c, "dockerRunWithName", null, image,name); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_dockerRunWithName, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_dockerRunWithName,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_dockerRunWithName,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void dockerRunWithOptions(String path, java.lang.String image, org.openecomp.ncomp.docker.ContainerOptions opts) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "dockerRunWithOptions", null, image,opts); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_dockerRunWithOptions,client.getRemote()); + + try { + client.operationPath(path, c, "dockerRunWithOptions", null, image,opts); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_dockerRunWithOptions, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_dockerRunWithOptions,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_dockerRunWithOptions,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void containerStats(String path, java.lang.String name, boolean stream) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "containerStats", null, name,stream); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_containerStats,client.getRemote()); + + try { + client.operationPath(path, c, "containerStats", null, name,stream); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_containerStats, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_containerStats,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_containerStats,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } public void containerProcesses(String path, java.lang.String name) { - EClass c = DockerPackage.eINSTANCE.getDockerHost(); //foo - client.operationPath(path, c, "containerProcesses", null, name); + EClass c = DockerPackage.eINSTANCE.getDockerHost(); + ecomplogger.recordMetricEventStart(DockerHostOperationEnum.DockerHost_containerProcesses,client.getRemote()); + + try { + client.operationPath(path, c, "containerProcesses", null, name); + } + catch (Exception e) { + ecomplogger.warn(DockerHostMessageEnum.REMOTE_CALL_FAILED_containerProcesses, e.toString()); + EcompException e1 = EcompException.create(DockerHostMessageEnum.REMOTE_CALL_FAILED_containerProcesses,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostMessageEnum.REMOTE_CALL_FAILED_containerProcesses,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + } } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/DockerGuiClientApi.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/DockerGuiClientApi.java index 95966f5..49cae38 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/DockerGuiClientApi.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/DockerGuiClientApi.java @@ -23,18 +23,40 @@ // Do not edit. No need to extend this class. package org.openecomp.ncomp.servers.docker.gui; + + + + import java.io.InputStream; + import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; +import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; + +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; + import java.util.Date; +import org.openecomp.ncomp.servers.docker.gui.logging.GuiClientApiOperationEnum; +import org.openecomp.ncomp.servers.docker.gui.logging.GuiClientApiMessageEnum; + + + + @@ -42,18 +64,26 @@ import org.openecomp.ncomp.sirius.gui.tools.*; + + import org.openecomp.ncomp.gwt.siriusportal.model.*; + + import org.openecomp.ncomp.sirius.manager.Subject; + + import org.openecomp.ncomp.sirius.manager.ManagementServer; + + import org.openecomp.ncomp.sirius.manager.server.AbstractManagementServer; @@ -61,9 +91,10 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl; -public class DockerGuiClientApi extends GuiClientApiImpl { +public class DockerGuiClientApi extends GuiClientApiImpl implements ISiriusProvider { public static final Logger logger = Logger.getLogger(DockerGuiClientApi.class); - DockerGuiClientApiProvider controller; + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); + public DockerGuiClientApiProvider controller; ISiriusServer server; public DockerGuiClientApi(ISiriusServer server) { @@ -77,6 +108,8 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTree(); } @@ -85,8 +118,12 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.OKAY, duration_); @@ -99,6 +136,8 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this)); try { res = controller.getObject(path); } @@ -107,8 +146,12 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.OKAY, duration_,path); @@ -121,6 +164,8 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.START, duration_,path,start,end,duration); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTimeSerie(path,start,end,duration); } @@ -129,8 +174,12 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.OKAY, duration_,path,start,end,duration); @@ -143,6 +192,8 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTable(path,start,end); } @@ -151,8 +202,12 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.OKAY, duration_,path,start,end); @@ -165,6 +220,8 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this)); try { res = controller.getHtml(path,start,end); } @@ -173,8 +230,12 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.OKAY, duration_,path,start,end); @@ -187,6 +248,8 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this)); try { res = controller.getGraph(path,start,end); } @@ -195,8 +258,12 @@ public class DockerGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage()); + throw e1; } + ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.OKAY, duration_,path,start,end); @@ -208,10 +275,12 @@ public class DockerGuiClientApi extends GuiClientApiImpl { + + public static void ecoreSetup() { DockerGuiClientApiProvider.ecoreSetup(); } - public DockerGuiClientApiProvider getSomfProvider() { + public DockerGuiClientApiProvider getSiriusProvider() { return controller; } } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/DockerGuiClientApiClient.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/DockerGuiClientApiClient.java index 1cd8dd1..9aaee81 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/DockerGuiClientApiClient.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/DockerGuiClientApiClient.java @@ -28,10 +28,18 @@ import org.openecomp.ncomp.sirius.manager.HighAvailabilityClient; import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; + +import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; + import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; + import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl; import org.openecomp.ncomp.gwt.siriusportal.model.ModelPackage; +import org.openecomp.ncomp.servers.docker.gui.logging.GuiClientApiOperationEnum; +import org.openecomp.ncomp.servers.docker.gui.logging.GuiClientApiMessageEnum; import org.openecomp.ncomp.servers.docker.DockerDockerAdaptor; @@ -42,61 +50,137 @@ import org.openecomp.ncomp.servers.docker.DockerDockerAdaptor; @SuppressWarnings("unchecked") public class DockerGuiClientApiClient extends GuiClientApiImpl { public static final Logger logger = Logger.getLogger(DockerGuiClientApiClient.class); + static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); public AbstractClient client; public DockerGuiClientApiClient(String file, String name) { DockerDockerAdaptor.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/gui", this); + client.setVersion("ONAP-R2"); } public DockerGuiClientApiClient(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 DockerGuiClientApiClient(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 - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiObject getObject(java.lang.String path) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie getTimeSerie(java.lang.String path, java.lang.String start, java.lang.String end, java.lang.String duration) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTable getTable(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml getHtml(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - return (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote()); + org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res; + try { + res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } @Override public org.openecomp.ncomp.sirius.manager.graph.GuiGraph getGraph(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - return (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote()); + org.openecomp.ncomp.sirius.manager.graph.GuiGraph res; + try { + res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end); + } + catch (Exception e) { + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage()); + throw e1; + } + ecomplogger.recordMetricEventEnd(); + return res; } } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApi.properties b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApi.properties index 8705ab8..3822d29 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApi.properties +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApi.properties @@ -1,78 +1,78 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -getTree=\ - getTree-FAILED-5001W|\ +REQUEST_FAILED_getTree=\ + REQUEST-FAILED-getTree-4001W|\ {0}|\ null|\ Operation Failed with Exception -getObject=\ - getObject-FAILED-5001W|\ +REQUEST_FAILED_getObject=\ + REQUEST-FAILED-getObject-4001W|\ {0}|\ null|\ Operation Failed with Exception -getTimeSerie=\ - getTimeSerie-FAILED-5001W|\ +REQUEST_FAILED_getTimeSerie=\ + REQUEST-FAILED-getTimeSerie-4001W|\ {0}|\ null|\ Operation Failed with Exception -getTable=\ - getTable-FAILED-5001W|\ +REQUEST_FAILED_getTable=\ + REQUEST-FAILED-getTable-4001W|\ {0}|\ null|\ Operation Failed with Exception -getHtml=\ - getHtml-FAILED-5001W|\ +REQUEST_FAILED_getHtml=\ + REQUEST-FAILED-getHtml-4001W|\ {0}|\ null|\ Operation Failed with Exception -getGraph=\ - getGraph-FAILED-5001W|\ +REQUEST_FAILED_getGraph=\ + REQUEST-FAILED-getGraph-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_getTree=\ - REMOTE-getTree-FAILED-5001W|\ +REMOTE_CALL_FAILED_getTree=\ + REMOTE-CALL-FAILED-getTree-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getObject=\ - REMOTE-getObject-FAILED-5001W|\ +REMOTE_CALL_FAILED_getObject=\ + REMOTE-CALL-FAILED-getObject-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getTimeSerie=\ - REMOTE-getTimeSerie-FAILED-5001W|\ +REMOTE_CALL_FAILED_getTimeSerie=\ + REMOTE-CALL-FAILED-getTimeSerie-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getTable=\ - REMOTE-getTable-FAILED-5001W|\ +REMOTE_CALL_FAILED_getTable=\ + REMOTE-CALL-FAILED-getTable-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getHtml=\ - REMOTE-getHtml-FAILED-5001W|\ +REMOTE_CALL_FAILED_getHtml=\ + REMOTE-CALL-FAILED-getHtml-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getGraph=\ - REMOTE-getGraph-FAILED-5001W|\ +REMOTE_CALL_FAILED_getGraph=\ + REMOTE-CALL-FAILED-getGraph-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApiMessageEnum.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApiMessageEnum.java index dfcab12..587ec73 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApiMessageEnum.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApiMessageEnum.java @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.ncomp.servers.docker.gui.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum; public enum GuiClientApiMessageEnum implements EcompMessageEnum { dummy, - getTree, - getObject, - getTimeSerie, - getTable, - getHtml, - getGraph, - REMOTE_getTree, - REMOTE_getObject, - REMOTE_getTimeSerie, - REMOTE_getTable, - REMOTE_getHtml, - REMOTE_getGraph; + REQUEST_FAILED_getTree, + REQUEST_FAILED_getObject, + REQUEST_FAILED_getTimeSerie, + REQUEST_FAILED_getTable, + REQUEST_FAILED_getHtml, + REQUEST_FAILED_getGraph, + REMOTE_CALL_FAILED_getTree, + REMOTE_CALL_FAILED_getObject, + REMOTE_CALL_FAILED_getTimeSerie, + REMOTE_CALL_FAILED_getTable, + REMOTE_CALL_FAILED_getHtml, + REMOTE_CALL_FAILED_getGraph; static { - EELFResourceManager.loadMessageBundle("org.openecomp.ncomp.servers.docker.gui.logging.GuiClientApi"); + EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApi"); } } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApiOperationEnum.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApiOperationEnum.java index d14cf24..8497b5b 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApiOperationEnum.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/gui/logging/GuiClientApiOperationEnum.java @@ -1,41 +1,27 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.ncomp.servers.docker.gui.logging; import org.openecomp.entity.EcompOperationEnum; public enum GuiClientApiOperationEnum implements EcompOperationEnum { - getTree, - getObject, - getTimeSerie, - getTable, - getHtml, - getGraph, - REMOTE_getTree, - REMOTE_getObject, - REMOTE_getTimeSerie, - REMOTE_getTable, - REMOTE_getHtml, - REMOTE_getGraph; + GuiClientApi_getTree("GuiClientApi@getTree"), + GuiClientApi_getObject("GuiClientApi@getObject"), + GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"), + GuiClientApi_getTable("GuiClientApi@getTable"), + GuiClientApi_getHtml("GuiClientApi@getHtml"), + GuiClientApi_getGraph("GuiClientApi@getGraph") ; + + + private String n; + + private GuiClientApiOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptor.properties b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptor.properties index 555c4fc..11f5270 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptor.properties +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptor.properties @@ -1,6 +1,6 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptorMessageEnum.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptorMessageEnum.java index 2efd8de..6bf960c 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptorMessageEnum.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptorMessageEnum.java @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.ncomp.servers.docker.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -30,6 +9,6 @@ public enum DockerAdaptorMessageEnum implements EcompMessageEnum { dummy; static { - EELFResourceManager.loadMessageBundle("org.openecomp.ncomp.servers.docker.logging.DockerAdaptor"); + EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/servers/docker/logging/DockerAdaptor"); } } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptorOperationEnum.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptorOperationEnum.java index 8a36bca..ec29998 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptorOperationEnum.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerAdaptorOperationEnum.java @@ -1,29 +1,21 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.ncomp.servers.docker.logging; import org.openecomp.entity.EcompOperationEnum; public enum DockerAdaptorOperationEnum implements EcompOperationEnum { + ; + + + private String n; + + private DockerAdaptorOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHost.properties b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHost.properties index b815973..588fd0f 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHost.properties +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHost.properties @@ -1,186 +1,174 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -poll=\ - poll-FAILED-5001W|\ - {0}|\ - null|\ - Operation Failed with Exception - -startContainer=\ - startContainer-FAILED-5001W|\ +REQUEST_FAILED_poll=\ + REQUEST-FAILED-poll-4001W|\ {0}|\ null|\ Operation Failed with Exception -stopContainer=\ - stopContainer-FAILED-5001W|\ +REQUEST_FAILED_startContainer=\ + REQUEST-FAILED-startContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -restartContainer=\ - restartContainer-FAILED-5001W|\ +REQUEST_FAILED_stopContainer=\ + REQUEST-FAILED-stopContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -pauseContainer=\ - pauseContainer-FAILED-5001W|\ +REQUEST_FAILED_restartContainer=\ + REQUEST-FAILED-restartContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -unpauseContainer=\ - unpauseContainer-FAILED-5001W|\ +REQUEST_FAILED_pauseContainer=\ + REQUEST-FAILED-pauseContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -removeContainer=\ - removeContainer-FAILED-5001W|\ +REQUEST_FAILED_unpauseContainer=\ + REQUEST-FAILED-unpauseContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -inspectContainer=\ - inspectContainer-FAILED-5001W|\ +REQUEST_FAILED_removeContainer=\ + REQUEST-FAILED-removeContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -killContainer=\ - killContainer-FAILED-5001W|\ +REQUEST_FAILED_inspectContainer=\ + REQUEST-FAILED-inspectContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -dockerRun=\ - dockerRun-FAILED-5001W|\ +REQUEST_FAILED_killContainer=\ + REQUEST-FAILED-killContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -dockerRunWithName=\ - dockerRunWithName-FAILED-5001W|\ +REQUEST_FAILED_dockerRun=\ + REQUEST-FAILED-dockerRun-4001W|\ {0}|\ null|\ Operation Failed with Exception -dockerRunWithOptions=\ - dockerRunWithOptions-FAILED-5001W|\ +REQUEST_FAILED_dockerRunWithName=\ + REQUEST-FAILED-dockerRunWithName-4001W|\ {0}|\ null|\ Operation Failed with Exception -containerStats=\ - containerStats-FAILED-5001W|\ +REQUEST_FAILED_dockerRunWithOptions=\ + REQUEST-FAILED-dockerRunWithOptions-4001W|\ {0}|\ null|\ Operation Failed with Exception -containerProcesses=\ - containerProcesses-FAILED-5001W|\ +REQUEST_FAILED_containerStats=\ + REQUEST-FAILED-containerStats-4001W|\ {0}|\ null|\ Operation Failed with Exception -pullImage=\ - pullImage-FAILED-5001W|\ +REQUEST_FAILED_containerProcesses=\ + REQUEST-FAILED-containerProcesses-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_poll=\ - REMOTE-poll-FAILED-5001W|\ - {0}|\ - null|\ - Remote Operation Failed with Exception - -REMOTE_startContainer=\ - REMOTE-startContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_poll=\ + REMOTE-CALL-FAILED-poll-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_stopContainer=\ - REMOTE-stopContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_startContainer=\ + REMOTE-CALL-FAILED-startContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_restartContainer=\ - REMOTE-restartContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_stopContainer=\ + REMOTE-CALL-FAILED-stopContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_pauseContainer=\ - REMOTE-pauseContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_restartContainer=\ + REMOTE-CALL-FAILED-restartContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_unpauseContainer=\ - REMOTE-unpauseContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_pauseContainer=\ + REMOTE-CALL-FAILED-pauseContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_removeContainer=\ - REMOTE-removeContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_unpauseContainer=\ + REMOTE-CALL-FAILED-unpauseContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_inspectContainer=\ - REMOTE-inspectContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_removeContainer=\ + REMOTE-CALL-FAILED-removeContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_killContainer=\ - REMOTE-killContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_inspectContainer=\ + REMOTE-CALL-FAILED-inspectContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_dockerRun=\ - REMOTE-dockerRun-FAILED-5001W|\ +REMOTE_CALL_FAILED_killContainer=\ + REMOTE-CALL-FAILED-killContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_dockerRunWithName=\ - REMOTE-dockerRunWithName-FAILED-5001W|\ +REMOTE_CALL_FAILED_dockerRun=\ + REMOTE-CALL-FAILED-dockerRun-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_dockerRunWithOptions=\ - REMOTE-dockerRunWithOptions-FAILED-5001W|\ +REMOTE_CALL_FAILED_dockerRunWithName=\ + REMOTE-CALL-FAILED-dockerRunWithName-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_containerStats=\ - REMOTE-containerStats-FAILED-5001W|\ +REMOTE_CALL_FAILED_dockerRunWithOptions=\ + REMOTE-CALL-FAILED-dockerRunWithOptions-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_containerProcesses=\ - REMOTE-containerProcesses-FAILED-5001W|\ +REMOTE_CALL_FAILED_containerStats=\ + REMOTE-CALL-FAILED-containerStats-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_pullImage=\ - REMOTE-pullImage-FAILED-5001W|\ +REMOTE_CALL_FAILED_containerProcesses=\ + REMOTE-CALL-FAILED-containerProcesses-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHostMessageEnum.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHostMessageEnum.java index aa1d5a2..ceb5e8d 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHostMessageEnum.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHostMessageEnum.java @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.ncomp.servers.docker.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,38 +7,36 @@ import org.openecomp.logger.EcompMessageEnum; public enum DockerHostMessageEnum implements EcompMessageEnum { dummy, - poll, - startContainer, - stopContainer, - restartContainer, - pauseContainer, - unpauseContainer, - removeContainer, - inspectContainer, - killContainer, - dockerRun, - dockerRunWithName, - dockerRunWithOptions, - containerStats, - containerProcesses, - pullImage, - REMOTE_poll, - REMOTE_startContainer, - REMOTE_stopContainer, - REMOTE_restartContainer, - REMOTE_pauseContainer, - REMOTE_unpauseContainer, - REMOTE_removeContainer, - REMOTE_inspectContainer, - REMOTE_killContainer, - REMOTE_dockerRun, - REMOTE_dockerRunWithName, - REMOTE_dockerRunWithOptions, - REMOTE_containerStats, - REMOTE_containerProcesses, - REMOTE_pullImage; + REQUEST_FAILED_poll, + REQUEST_FAILED_startContainer, + REQUEST_FAILED_stopContainer, + REQUEST_FAILED_restartContainer, + REQUEST_FAILED_pauseContainer, + REQUEST_FAILED_unpauseContainer, + REQUEST_FAILED_removeContainer, + REQUEST_FAILED_inspectContainer, + REQUEST_FAILED_killContainer, + REQUEST_FAILED_dockerRun, + REQUEST_FAILED_dockerRunWithName, + REQUEST_FAILED_dockerRunWithOptions, + REQUEST_FAILED_containerStats, + REQUEST_FAILED_containerProcesses, + REMOTE_CALL_FAILED_poll, + REMOTE_CALL_FAILED_startContainer, + REMOTE_CALL_FAILED_stopContainer, + REMOTE_CALL_FAILED_restartContainer, + REMOTE_CALL_FAILED_pauseContainer, + REMOTE_CALL_FAILED_unpauseContainer, + REMOTE_CALL_FAILED_removeContainer, + REMOTE_CALL_FAILED_inspectContainer, + REMOTE_CALL_FAILED_killContainer, + REMOTE_CALL_FAILED_dockerRun, + REMOTE_CALL_FAILED_dockerRunWithName, + REMOTE_CALL_FAILED_dockerRunWithOptions, + REMOTE_CALL_FAILED_containerStats, + REMOTE_CALL_FAILED_containerProcesses; static { - EELFResourceManager.loadMessageBundle("org.openecomp.ncomp.servers.docker.logging.DockerHost"); + EELFResourceManager.loadMessageBundle("org/openecomp/ncomp/servers/docker/logging/DockerHost"); } } diff --git a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHostOperationEnum.java b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHostOperationEnum.java index 211c5a7..018c136 100644 --- a/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHostOperationEnum.java +++ b/ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/logging/DockerHostOperationEnum.java @@ -1,59 +1,35 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.ncomp.servers.docker.logging; import org.openecomp.entity.EcompOperationEnum; public enum DockerHostOperationEnum implements EcompOperationEnum { - poll, - startContainer, - stopContainer, - restartContainer, - pauseContainer, - unpauseContainer, - removeContainer, - inspectContainer, - killContainer, - dockerRun, - dockerRunWithName, - dockerRunWithOptions, - containerStats, - containerProcesses, - pullImage, - REMOTE_poll, - REMOTE_startContainer, - REMOTE_stopContainer, - REMOTE_restartContainer, - REMOTE_pauseContainer, - REMOTE_unpauseContainer, - REMOTE_removeContainer, - REMOTE_inspectContainer, - REMOTE_killContainer, - REMOTE_dockerRun, - REMOTE_dockerRunWithName, - REMOTE_dockerRunWithOptions, - REMOTE_containerStats, - REMOTE_containerProcesses, - REMOTE_pullImage; + DockerHost_poll("DockerHost@poll"), + DockerHost_startContainer("DockerHost@startContainer"), + DockerHost_stopContainer("DockerHost@stopContainer"), + DockerHost_restartContainer("DockerHost@restartContainer"), + DockerHost_pauseContainer("DockerHost@pauseContainer"), + DockerHost_unpauseContainer("DockerHost@unpauseContainer"), + DockerHost_removeContainer("DockerHost@removeContainer"), + DockerHost_inspectContainer("DockerHost@inspectContainer"), + DockerHost_killContainer("DockerHost@killContainer"), + DockerHost_dockerRun("DockerHost@dockerRun"), + DockerHost_dockerRunWithName("DockerHost@dockerRunWithName"), + DockerHost_dockerRunWithOptions("DockerHost@dockerRunWithOptions"), + DockerHost_containerStats("DockerHost@containerStats"), + DockerHost_containerProcesses("DockerHost@containerProcesses") ; + + + private String n; + + private DockerHostOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } diff --git a/ncomp-docker-model/META-INF/MANIFEST.MF b/ncomp-docker-model/META-INF/MANIFEST.MF index 22afc4f..49bb0a1 100644 --- a/ncomp-docker-model/META-INF/MANIFEST.MF +++ b/ncomp-docker-model/META-INF/MANIFEST.MF @@ -13,9 +13,5 @@ Export-Package: org.openecomp.ncomp.docker, Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.xtext.xbase.lib, - org.eclipse.emf.ecore.xcore.lib, - ncomp-core-model;bundle-version="0.1.0";visibility:=reexport, - ncomp-sirius-manager-model;bundle-version="0.1.0";visibility:=reexport, - ncomp-core-types;bundle-version="0.1.0", - ncomp-utils-java;bundle-version="0.1.0" + org.eclipse.emf.ecore.xcore.lib Bundle-ActivationPolicy: lazy diff --git a/ncomp-docker-model/pom.xml b/ncomp-docker-model/pom.xml index 31b1c6b..0f9cc12 100644 --- a/ncomp-docker-model/pom.xml +++ b/ncomp-docker-model/pom.xml @@ -5,7 +5,7 @@ org.openecomp.ncomp.maven ncomp-maven-xcore - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../../dcae-org.openecomp.ncomp.maven/ncomp-maven-xcore diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuStats.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuStats.java index fc256cf..d47e00e 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuStats.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuStats.java @@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.ContainerCpuStats#getCpu_usage Cpu usage}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerCpuStats#getSystem_cpu_usage System cpu usage}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getContainerCpuStats() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuUsage.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuUsage.java index e8e7b52..40340a8 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuUsage.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerCpuUsage.java @@ -52,13 +52,13 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.ContainerCpuUsage#getPercpu_usage Percpu usage}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerCpuUsage#getUsage_in_usermode Usage in usermode}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerCpuUsage#getTotal_usage Total usage}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerCpuUsage#getUser_in_kernelmode User in kernelmode}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getContainerCpuUsage() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryStats.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryStats.java index 3a9f4fc..144e09e 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryStats.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryStats.java @@ -72,6 +72,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.ContainerMemoryStats#getTotal_pgmajfault Total pgmajfault}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerMemoryStats#getCache Cache}
    • @@ -103,7 +104,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link org.openecomp.ncomp.docker.ContainerMemoryStats#getInactive_file Inactive file}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerMemoryStats#getTotal_pgpgin Total pgpgin}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getContainerMemoryStats() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryUsage.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryUsage.java index 7687a95..3f5d5b6 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryUsage.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerMemoryUsage.java @@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.ContainerMemoryUsage#getMemstats Memstats}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerMemoryUsage#getMax_usage Max usage}
    • @@ -39,7 +40,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link org.openecomp.ncomp.docker.ContainerMemoryUsage#getFailcnt Failcnt}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerMemoryUsage#getLimit Limit}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getContainerMemoryUsage() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerNetworkStats.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerNetworkStats.java index 175eebd..908aa16 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerNetworkStats.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerNetworkStats.java @@ -57,6 +57,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.ContainerNetworkStats#getIntf Intf}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerNetworkStats#getRx_bytes Rx bytes}
    • @@ -68,7 +69,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link org.openecomp.ncomp.docker.ContainerNetworkStats#getTx_errors Tx errors}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerNetworkStats#getTx_packets Tx packets}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getContainerNetworkStats() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerOptions.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerOptions.java index 53b19d3..a89cb98 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerOptions.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerOptions.java @@ -33,6 +33,7 @@ import org.eclipse.emf.common.util.EList; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.ContainerOptions#getImageNm Image Nm}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerOptions#getEnv Env}
    • @@ -43,7 +44,6 @@ import org.eclipse.emf.common.util.EList; *
  • {@link org.openecomp.ncomp.docker.ContainerOptions#getPortBindings Port Bindings}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerOptions#getAutoRestart Auto Restart}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getContainerOptions() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerPortBindings.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerPortBindings.java index fdc8e1b..99af5b7 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerPortBindings.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerPortBindings.java @@ -32,12 +32,12 @@ import org.openecomp.ncomp.core.NamedEntity; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.ContainerPortBindings#getContainerPort Container Port}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerPortBindings#getProtocol Protocol}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerPortBindings#getVmPort Vm Port}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getContainerPortBindings() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerRestartPolicy.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerRestartPolicy.java index 8f53d04..155c967 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerRestartPolicy.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/ContainerRestartPolicy.java @@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.ContainerRestartPolicy#getNm Nm}
    • *
  • {@link org.openecomp.ncomp.docker.ContainerRestartPolicy#getMaxRetryCnt Max Retry Cnt}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getContainerRestartPolicy() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActor.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActor.java index 9fa100d..9d530d2 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActor.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActor.java @@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerActor#getId Id}
    • *
  • {@link org.openecomp.ncomp.docker.DockerActor#getAttributes Attributes}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerActor() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActorAttributes.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActorAttributes.java index 940940e..f50c7f7 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActorAttributes.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerActorAttributes.java @@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerActorAttributes#getName Name}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerActorAttributes() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerAdaptor.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerAdaptor.java index ade8e11..9bbc893 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerAdaptor.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerAdaptor.java @@ -33,10 +33,10 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerAdaptor#getDockerHosts Docker Hosts}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerAdaptor() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainer.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainer.java index 4b39dab..bf0112b 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainer.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainer.java @@ -34,6 +34,7 @@ import org.eclipse.emf.common.util.EList; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerContainer#getId Id}
    • *
  • {@link org.openecomp.ncomp.docker.DockerContainer#getNames Names}
    • @@ -50,7 +51,6 @@ import org.eclipse.emf.common.util.EList; *
  • {@link org.openecomp.ncomp.docker.DockerContainer#getStats Stats}
    • *
  • {@link org.openecomp.ncomp.docker.DockerContainer#getEvents Events}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerContainer() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainerStats.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainerStats.java index 8b29e89..dd93467 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainerStats.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerContainerStats.java @@ -117,13 +117,13 @@ import org.eclipse.emf.common.util.EList; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerContainerStats#getNetworks Networks}
    • *
  • {@link org.openecomp.ncomp.docker.DockerContainerStats#getMemory Memory}
    • *
  • {@link org.openecomp.ncomp.docker.DockerContainerStats#getCpu Cpu}
    • *
  • {@link org.openecomp.ncomp.docker.DockerContainerStats#getLastRead Last Read}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerContainerStats() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerCreateRequest.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerCreateRequest.java index a52b691..2ce4216 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerCreateRequest.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerCreateRequest.java @@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerCreateRequest#getHostname Hostname}
    • *
  • {@link org.openecomp.ncomp.docker.DockerCreateRequest#getCmd Cmd}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerCreateRequest() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerEvents.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerEvents.java index ab810b1..e2ef275 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerEvents.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerEvents.java @@ -32,6 +32,7 @@ import org.openecomp.ncomp.core.NamedEntity; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerEvents#getStatus Status}
    • *
  • {@link org.openecomp.ncomp.docker.DockerEvents#getId Id}
    • @@ -41,7 +42,6 @@ import org.openecomp.ncomp.core.NamedEntity; *
  • {@link org.openecomp.ncomp.docker.DockerEvents#getTime Time}
    • *
  • {@link org.openecomp.ncomp.docker.DockerEvents#getTimenano Timenano}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerEvents() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerHost.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerHost.java index e18d4ff..efda428 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerHost.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerHost.java @@ -34,6 +34,7 @@ import org.eclipse.emf.common.util.EList; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerHost#getUrl Url}
    • *
  • {@link org.openecomp.ncomp.docker.DockerHost#getPollingFrequency Polling Frequency}
    • @@ -42,7 +43,6 @@ import org.eclipse.emf.common.util.EList; *
  • {@link org.openecomp.ncomp.docker.DockerHost#getContainers Containers}
    • *
  • {@link org.openecomp.ncomp.docker.DockerHost#getNetworks Networks}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerHost() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerImage.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerImage.java index d936a00..4ddf261 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerImage.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerImage.java @@ -36,6 +36,7 @@ import org.eclipse.emf.common.util.EList; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerImage#getId Id}
    • *
  • {@link org.openecomp.ncomp.docker.DockerImage#getParentId Parent Id}
    • @@ -46,7 +47,6 @@ import org.eclipse.emf.common.util.EList; *
  • {@link org.openecomp.ncomp.docker.DockerImage#getVirtualSize Virtual Size}
    • *
  • {@link org.openecomp.ncomp.docker.DockerImage#getLabels Labels}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerImage() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpam.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpam.java index e0ab44e..018633a 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpam.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpam.java @@ -34,11 +34,11 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerIpam#getDriver Driver}
    • *
  • {@link org.openecomp.ncomp.docker.DockerIpam#getConfig Config}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerIpam() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpamConfig.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpamConfig.java index 5083177..00543a5 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpamConfig.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerIpamConfig.java @@ -32,10 +32,10 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerIpamConfig#getSubnet Subnet}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerIpamConfig() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerKeyPair.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerKeyPair.java index 7c94c79..f93b310 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerKeyPair.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerKeyPair.java @@ -32,11 +32,11 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerKeyPair#getName Name}
    • *
  • {@link org.openecomp.ncomp.docker.DockerKeyPair#getValue Value}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerKeyPair() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerMount.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerMount.java index 610465e..6a99aa6 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerMount.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerMount.java @@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerMount#getSource Source}
    • *
  • {@link org.openecomp.ncomp.docker.DockerMount#getDestination Destination}
    • @@ -39,7 +40,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link org.openecomp.ncomp.docker.DockerMount#getRW RW}
    • *
  • {@link org.openecomp.ncomp.docker.DockerMount#getPropagation Propagation}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerMount() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetwork.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetwork.java index 1f0d8ef..8c017be 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetwork.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetwork.java @@ -34,6 +34,7 @@ import org.eclipse.emf.common.util.EList; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerNetwork#getId Id}
    • *
  • {@link org.openecomp.ncomp.docker.DockerNetwork#getScope Scope}
    • @@ -42,7 +43,6 @@ import org.eclipse.emf.common.util.EList; *
  • {@link org.openecomp.ncomp.docker.DockerNetwork#getContainers Containers}
    • *
  • {@link org.openecomp.ncomp.docker.DockerNetwork#getOptions Options}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerNetwork() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetworkContainer.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetworkContainer.java index e61d610..c08786a 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetworkContainer.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerNetworkContainer.java @@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EObject; * *

* The following features are supported: + *

*
    *
  • {@link org.openecomp.ncomp.docker.DockerNetworkContainer#getId Id}
    • *
  • {@link org.openecomp.ncomp.docker.DockerNetworkContainer#getIPv4Address IPv4 Address}
    • @@ -39,7 +40,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link org.openecomp.ncomp.docker.DockerNetworkContainer#getEndpointID Endpoint ID}
    • *
  • {@link org.openecomp.ncomp.docker.DockerNetworkContainer#getMacAddress Mac Address}
    • *
- *

* * @see org.openecomp.ncomp.docker.DockerPackage#getDockerNetworkContainer() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPackage.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPackage.java index 40057f0..57ec282 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPackage.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPackage.java @@ -43,6 +43,24 @@ import org.eclipse.emf.ecore.EReference; *
  • and each data type
    • * * + * + * - + * ============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============================================ + * * @see org.openecomp.ncomp.docker.DockerFactory * @model kind="package" * annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/ncomp-docker-model/src/main/xcore-gen' basePackage='org.openecomp.ncomp'" diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPort.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPort.java index 233b549..5834a21 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPort.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerPort.java @@ -32,12 +32,12 @@ import org.eclipse.emf.ecore.EObject; * *

    * The following features are supported: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.DockerPort#getPrivatePort Private Port}
      • *
    • {@link org.openecomp.ncomp.docker.DockerPort#getPublicPort Public Port}
      • *
    • {@link org.openecomp.ncomp.docker.DockerPort#getType Type}
      • *
    - *

    * * @see org.openecomp.ncomp.docker.DockerPackage#getDockerPort() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerProcess.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerProcess.java index a23711b..194c315 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerProcess.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/DockerProcess.java @@ -51,6 +51,7 @@ import java.util.Date; * *

    * The following features are supported: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.DockerProcess#getUser User}
      • *
    • {@link org.openecomp.ncomp.docker.DockerProcess#getPid Pid}
      • @@ -64,7 +65,6 @@ import java.util.Date; *
    • {@link org.openecomp.ncomp.docker.DockerProcess#getTimeElapsed Time Elapsed}
      • *
    • {@link org.openecomp.ncomp.docker.DockerProcess#getCommand Command}
      • *
    - *

    * * @see org.openecomp.ncomp.docker.DockerPackage#getDockerProcess() * @model diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuStatsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuStatsImpl.java index 0e377c0..d18a771 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuStatsImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuStatsImpl.java @@ -42,11 +42,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.ContainerCpuStatsImpl#getCpu_usage Cpu usage}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerCpuStatsImpl#getSystem_cpu_usage System cpu usage}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuUsageImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuUsageImpl.java index 213843b..e34d9cf 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuUsageImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerCpuUsageImpl.java @@ -45,13 +45,13 @@ import org.eclipse.emf.ecore.util.EDataTypeEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.ContainerCpuUsageImpl#getPercpu_usage Percpu usage}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerCpuUsageImpl#getUsage_in_usermode Usage in usermode}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerCpuUsageImpl#getTotal_usage Total usage}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerCpuUsageImpl#getUser_in_kernelmode User in kernelmode}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryStatsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryStatsImpl.java index 022022f..96e5ac9 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryStatsImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryStatsImpl.java @@ -39,6 +39,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.ContainerMemoryStatsImpl#getTotal_pgmajfault Total pgmajfault}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerMemoryStatsImpl#getCache Cache}
      • @@ -70,7 +71,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; *
    • {@link org.openecomp.ncomp.docker.impl.ContainerMemoryStatsImpl#getInactive_file Inactive file}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerMemoryStatsImpl#getTotal_pgpgin Total pgpgin}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryUsageImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryUsageImpl.java index 37d99af..3814d24 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryUsageImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerMemoryUsageImpl.java @@ -42,6 +42,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.ContainerMemoryUsageImpl#getMemstats Memstats}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerMemoryUsageImpl#getMax_usage Max usage}
      • @@ -49,7 +50,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; *
    • {@link org.openecomp.ncomp.docker.impl.ContainerMemoryUsageImpl#getFailcnt Failcnt}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerMemoryUsageImpl#getLimit Limit}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerNetworkStatsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerNetworkStatsImpl.java index 6d112b7..b2c2e67 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerNetworkStatsImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerNetworkStatsImpl.java @@ -39,6 +39,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.ContainerNetworkStatsImpl#getIntf Intf}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerNetworkStatsImpl#getRx_bytes Rx bytes}
      • @@ -50,7 +51,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; *
    • {@link org.openecomp.ncomp.docker.impl.ContainerNetworkStatsImpl#getTx_errors Tx errors}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerNetworkStatsImpl#getTx_packets Tx packets}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerOptionsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerOptionsImpl.java index f4cac7f..602254b 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerOptionsImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerOptionsImpl.java @@ -45,6 +45,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.ContainerOptionsImpl#getImageNm Image Nm}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerOptionsImpl#getEnv Env}
      • @@ -55,7 +56,6 @@ import org.eclipse.emf.ecore.util.InternalEList; *
    • {@link org.openecomp.ncomp.docker.impl.ContainerOptionsImpl#getPortBindings Port Bindings}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerOptionsImpl#getAutoRestart Auto Restart}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerPortBindingsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerPortBindingsImpl.java index 5e47609..4830157 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerPortBindingsImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerPortBindingsImpl.java @@ -40,12 +40,12 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.ContainerPortBindingsImpl#getContainerPort Container Port}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerPortBindingsImpl#getProtocol Protocol}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerPortBindingsImpl#getVmPort Vm Port}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerRestartPolicyImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerRestartPolicyImpl.java index b52bd31..00fa287 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerRestartPolicyImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/ContainerRestartPolicyImpl.java @@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.ContainerRestartPolicyImpl#getNm Nm}
      • *
    • {@link org.openecomp.ncomp.docker.impl.ContainerRestartPolicyImpl#getMaxRetryCnt Max Retry Cnt}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorAttributesImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorAttributesImpl.java index 57cbae1..051928f 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorAttributesImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorAttributesImpl.java @@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerActorAttributesImpl#getName Name}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorImpl.java index 92f702d..d976403 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerActorImpl.java @@ -42,11 +42,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerActorImpl#getId Id}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerActorImpl#getAttributes Attributes}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerAdaptorImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerAdaptorImpl.java index 4ec07ae..02e88ff 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerAdaptorImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerAdaptorImpl.java @@ -43,10 +43,10 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerAdaptorImpl#getDockerHosts Docker Hosts}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerImpl.java index e053bfc..f77dec0 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerImpl.java @@ -56,6 +56,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerContainerImpl#getId Id}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerContainerImpl#getNames Names}
      • @@ -72,7 +73,6 @@ import org.eclipse.emf.ecore.util.InternalEList; *
    • {@link org.openecomp.ncomp.docker.impl.DockerContainerImpl#getStats Stats}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerContainerImpl#getEvents Events}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerStatsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerStatsImpl.java index 2b67dee..7b9e975 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerStatsImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerContainerStatsImpl.java @@ -53,13 +53,13 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerContainerStatsImpl#getNetworks Networks}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerContainerStatsImpl#getMemory Memory}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerContainerStatsImpl#getCpu Cpu}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerContainerStatsImpl#getLastRead Last Read}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerCreateRequestImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerCreateRequestImpl.java index 32a7ce7..10df325 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerCreateRequestImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerCreateRequestImpl.java @@ -45,11 +45,11 @@ import org.eclipse.emf.ecore.util.EDataTypeEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerCreateRequestImpl#getHostname Hostname}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerCreateRequestImpl#getCmd Cmd}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerEventsImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerEventsImpl.java index 6b4047b..62f5eb8 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerEventsImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerEventsImpl.java @@ -43,6 +43,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerEventsImpl#getStatus Status}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerEventsImpl#getId Id}
      • @@ -52,7 +53,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *
    • {@link org.openecomp.ncomp.docker.impl.DockerEventsImpl#getTime Time}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerEventsImpl#getTimenano Timenano}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerHostImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerHostImpl.java index 7b787ef..7fed336 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerHostImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerHostImpl.java @@ -55,6 +55,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerHostImpl#getUrl Url}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerHostImpl#getPollingFrequency Polling Frequency}
      • @@ -63,7 +64,6 @@ import org.eclipse.emf.ecore.util.InternalEList; *
    • {@link org.openecomp.ncomp.docker.impl.DockerHostImpl#getContainers Containers}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerHostImpl#getNetworks Networks}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerImageImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerImageImpl.java index ad91660..a34d54a 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerImageImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerImageImpl.java @@ -47,6 +47,7 @@ import org.eclipse.emf.ecore.util.EDataTypeEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerImageImpl#getId Id}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerImageImpl#getParentId Parent Id}
      • @@ -57,7 +58,6 @@ import org.eclipse.emf.ecore.util.EDataTypeEList; *
    • {@link org.openecomp.ncomp.docker.impl.DockerImageImpl#getVirtualSize Virtual Size}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerImageImpl#getLabels Labels}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamConfigImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamConfigImpl.java index 532b803..7af11dc 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamConfigImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamConfigImpl.java @@ -39,10 +39,10 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerIpamConfigImpl#getSubnet Subnet}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamImpl.java index fb93731..4d8cd15 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerIpamImpl.java @@ -49,11 +49,11 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerIpamImpl#getDriver Driver}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerIpamImpl#getConfig Config}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerKeyPairImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerKeyPairImpl.java index 83d62ea..607853f 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerKeyPairImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerKeyPairImpl.java @@ -39,11 +39,11 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerKeyPairImpl#getName Name}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerKeyPairImpl#getValue Value}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerMountImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerMountImpl.java index 69c4d0e..30cc932 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerMountImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerMountImpl.java @@ -39,6 +39,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerMountImpl#getSource Source}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerMountImpl#getDestination Destination}
      • @@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; *
    • {@link org.openecomp.ncomp.docker.impl.DockerMountImpl#getRW RW}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerMountImpl#getPropagation Propagation}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkContainerImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkContainerImpl.java index f9c110e..3a6a940 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkContainerImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkContainerImpl.java @@ -39,6 +39,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerNetworkContainerImpl#getId Id}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerNetworkContainerImpl#getIPv4Address IPv4 Address}
      • @@ -46,7 +47,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; *
    • {@link org.openecomp.ncomp.docker.impl.DockerNetworkContainerImpl#getEndpointID Endpoint ID}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerNetworkContainerImpl#getMacAddress Mac Address}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkImpl.java index 4f1be74..5f96514 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerNetworkImpl.java @@ -52,6 +52,7 @@ import org.eclipse.emf.ecore.util.InternalEList; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerNetworkImpl#getId Id}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerNetworkImpl#getScope Scope}
      • @@ -60,7 +61,6 @@ import org.eclipse.emf.ecore.util.InternalEList; *
    • {@link org.openecomp.ncomp.docker.impl.DockerNetworkImpl#getContainers Containers}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerNetworkImpl#getOptions Options}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerPortImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerPortImpl.java index 8b998b7..88aa813 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerPortImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerPortImpl.java @@ -39,12 +39,12 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerPortImpl#getPrivatePort Private Port}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerPortImpl#getPublicPort Public Port}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerPortImpl#getType Type}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerProcessImpl.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerProcessImpl.java index 5402c48..b8e78d2 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerProcessImpl.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/impl/DockerProcessImpl.java @@ -37,6 +37,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * *

    * The following features are implemented: + *

    *
      *
    • {@link org.openecomp.ncomp.docker.impl.DockerProcessImpl#getUser User}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerProcessImpl#getPid Pid}
      • @@ -50,7 +51,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *
    • {@link org.openecomp.ncomp.docker.impl.DockerProcessImpl#getTimeElapsed Time Elapsed}
      • *
    • {@link org.openecomp.ncomp.docker.impl.DockerProcessImpl#getCommand Command}
      • *
    - *

    * * @generated */ diff --git a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/util/DockerSwitch.java b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/util/DockerSwitch.java index ca7f0cf..ca099e4 100644 --- a/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/util/DockerSwitch.java +++ b/ncomp-docker-model/src/main/xcore-gen/org/openecomp/ncomp/docker/util/DockerSwitch.java @@ -69,7 +69,7 @@ public class DockerSwitch extends Switch { * Checks whether this is a switch for the given package. * * - * @parameter ePackage the package in question. + * @param ePackage the package in question. * @return whether this is a switch for the given package. * @generated */ diff --git a/pom.xml b/pom.xml index 6ee774d..acd386c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - + + 4.0.0 org.openecomp.ncomp.docker @@ -9,7 +9,7 @@ UTF-8 - + https://nexus.onap.org @@ -39,7 +39,7 @@ org.openecomp.ncomp.maven ncomp-maven-base - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT ../dcae-org.openecomp.ncomp.maven/ncomp-maven-base diff --git a/version.properties b/version.properties index c0f2742..13f6d31 100644 --- a/version.properties +++ b/version.properties @@ -2,7 +2,7 @@ # Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) # because they are used in Jenkins, whose plug-in doesn't support major=1 -minor=0 +minor=1 patch=0 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins -- cgit 1.2.3-korg