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 --- .../ncomp/servers/docker/DockerDockerAdaptor.java | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'ncomp-docker-adaptor/src/main/sirius-gen/org/openecomp/ncomp/servers/docker/DockerDockerAdaptor.java') 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; } } -- cgit 1.2.3-korg