diff options
Diffstat (limited to 'dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager')
30 files changed, 1086 insertions, 1354 deletions
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/.classpath b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/.classpath index d2d34b3..0d82fb7 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/.classpath +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/.classpath @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="config"/> <classpathentry kind="src" output="target/classes" path="src/main/java"> <attributes> <attribute name="optional" value="true"/> @@ -21,7 +20,6 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/> <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/META-INF/MANIFEST.MF b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/META-INF/MANIFEST.MF index bc87351..df7681a 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/META-INF/MANIFEST.MF +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/META-INF/MANIFEST.MF @@ -6,11 +6,3 @@ Bundle-Version: 0.1.0.qualifier Export-Package: org.openecomp.dcae.controller.service.docker.host.manager.tools, org.openecomp.dcae.controller.service.docker.host.servers.manager, org.openecomp.dcae.controller.service.docker.host.servers.service -Require-Bundle: ncomp-core-types, - ncomp-sirius-manager-model, - ncomp-sirius-manager-server, - ncomp-sirius-manager-console, - ncomp-sirius-manager-generator, - dcae-controller-service-docker-host-model;bundle-version="0.1.0", - ncomp-utils-java;bundle-version="0.1.0", - ncomp-docker-adaptor;bundle-version="0.1.0" diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/assembly/assemble_zip.xml b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/assembly/assemble_zip.xml index 3d7bbc7..6501609 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/assembly/assemble_zip.xml +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/assembly/assemble_zip.xml @@ -38,6 +38,7 @@ <directory>src/main/server-gen/bin</directory> <outputDirectory>bin</outputDirectory> <fileMode>0744</fileMode> + <lineEnding>unix</lineEnding> <excludes> </excludes> </fileSet> @@ -45,16 +46,19 @@ <directory>src/main/server/bin</directory> <outputDirectory>bin</outputDirectory> <fileMode>0744</fileMode> + <lineEnding>unix</lineEnding> <excludes> </excludes> </fileSet> <fileSet> <directory>src/main/server-gen/scripts</directory> <outputDirectory>scripts</outputDirectory> + <lineEnding>unix</lineEnding> </fileSet> <fileSet> <directory>src/main/server/scripts</directory> <outputDirectory>scripts</outputDirectory> + <lineEnding>unix</lineEnding> </fileSet> </fileSets> diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/manager/tools/Generator.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/manager/tools/Generator.java index 2f5d097..3545006 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/manager/tools/Generator.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/manager/tools/Generator.java @@ -53,12 +53,13 @@ public class Generator { String dir = p.getNsURI().replaceAll(p.getNsPrefix()+'$',"") + "servers." + p.getNsPrefix();
dir = "src/main/sirius-gen/" + dir.replace('.', '/');
ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
- m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
+ m.setTemplateDirectory("../../../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
m.setPrefix("Dcae");
m.setPluginName(p.getNsURI());
m.setName("ControllerServiceDockerHostManager");
m.setTitle("ControllerServiceDockerHostManager");
ControllerGenerator g = new ControllerGenerator(o, m);
+ g.setVersion("ONAP-R2"); g.setEnableIRequestHandler(false);
g.setEnableISiriusPlugin(false);
g.addFactory("org.openecomp.ncomp.servers.docker.DockerDockerFactory");
@@ -80,12 +81,13 @@ public class Generator { String dir = p.getNsURI().replaceAll(p.getNsPrefix()+"$", "") + "servers." + p.getNsPrefix();
dir = "src/main/sirius-gen/" + dir.replace('.', '/');
ControllerModel m = ControllermodelFactory.eINSTANCE.createControllerModel();
- m.setTemplateDirectory("../../dcae-org.openecomp.ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
+ m.setTemplateDirectory("../../../../ncomp.sirius.manager/ncomp-sirius-manager-generator/src/main/templates");
m.setPrefix("Dcae");
m.setPluginName(p.getNsURI());
m.setName("ControllerServiceDockerHostService");
m.setTitle("ControllerServiceDockerHostService");
ControllerGenerator g = new ControllerGenerator(o, m);
+ g.setVersion("ONAP-R2"); g.setEnableIRequestHandler(false);
g.setEnableISiriusPlugin(true);
g.setProvider(VmFactory.eINSTANCE.createVirtualMachineService(),"Dcae");
diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerProvider.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerProvider.java index 560f0c8..59a07d3 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerProvider.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/java/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerProvider.java @@ -39,8 +39,6 @@ import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; import org.openecomp.dcae.controller.core.service.HealthTestResponse; -import org.openecomp.dcae.controller.core.service.HealthTestStatus; -import org.openecomp.dcae.controller.core.service.ServiceFactory; import org.openecomp.dcae.controller.core.stream.DcaeStream; import org.openecomp.dcae.controller.service.servers.vmmanager.DcaeVirtualMachineManagerProvider; import org.openecomp.dcae.controller.service.docker.host.manager.DockerHostManager; @@ -118,16 +116,5 @@ public class DcaeDockerHostManagerProvider extends DcaeVirtualMachineManagerProv } } - - @Override - public HealthTestResponse test() { - HealthTestResponse res = ServiceFactory.eINSTANCE.createHealthTestResponse(); - res.setStatus(HealthTestStatus.GREEN); - if (o.getDockerHost() == null || o.getDockerHost().getNetworks().size() == 0) { - res.setMessageCode("Docker Engine not working"); - res.setStatus(HealthTestStatus.RED); - } - return res; - } } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/common.funcs b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/common.funcs deleted file mode 100644 index 1386d92..0000000 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/common.funcs +++ /dev/null @@ -1,32 +0,0 @@ -# -# common shell functions -# - -_die() { - printf "$(date):FATAL:$1\n" - exit 2; -} - -_fail() { - _die $1; -} - -_fail_with_rc() { - rc=$1 - shift; - printf "$(date):ERROR:$@\n"; - exit $rc; -} - -_warn() { - printf "$(date):WARN:$1\n"; -} - -_info() { - printf "$(date):INFO:$1\n"; -} - -_print() { - _info $1; -} - diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/generate-certs.sh b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/generate-certs.sh deleted file mode 100644 index 88cf23d..0000000 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/generate-certs.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -x - -# -# this was (mostly) shamelessly cribbed from the io.docker:docker -# install_postproc script. run as root -# -DOCKER_DIR=/opt/app/docker -DOCKER_ETC_DIR=${DOCKER_DIR}/etc -DOCKER_BIN_DIR=${DOCKER_DIR}/bin -DOCKER_DATA_DIR=${DOCKER_DIR}/data -DOCKER_LOG_DIR=${DOCKER_DIR}/logs - -DOCKER_CA_CERT=${DOCKER_ETC_DIR}/docker_ca_cert.pem -DOCKER_CA_KEY=${DOCKER_ETC_DIR}/docker_ca_key.pem -CLIENT_P12_PWD=f22723cffdbd2fff1cb3c558677a7684 - -HOSTNAME=$(hostname -f) - -# Generate certificates for SSL encryption -# Generate a private key for the docker engine - -openssl genrsa -out ${DOCKER_ETC_DIR}/server_key.pem 2048 || - _fail_with_rc 20 "Server private key generation failed" - -# Generate a certificate signing request for the server using the private key. -openssl req -new -key ${DOCKER_ETC_DIR}/server_key.pem -out ${DOCKER_ETC_DIR}/server.csr -batch -subj "/countryName=US/stateOrProvinceName=Michigan/localityName=Southfield/organizationName=AT&T Services, Inc./commonName=${HOSTNAME}" || - _fail_with_rc 21 "Server certificate signing request generation failed." - -# Generate a certificate for the server and sign it with the CA certificate. -openssl x509 -req -days 3650 -in ${DOCKER_ETC_DIR}/server.csr -CA ${DOCKER_CA_CERT} -CAkey ${DOCKER_CA_KEY} -CAcreateserial -out ${DOCKER_ETC_DIR}/server_cert.pem || - _fail_with_rc 22 "Server certificate signing failed." - -# Generate a private key for client authentication -openssl genrsa -out ${DOCKER_ETC_DIR}/client_key.pem 2048 || - _fail_with_rc 20 "Client private key generation failed." - -# Generate a certificate signing request for the client using the private key. -openssl req -new -key ${DOCKER_ETC_DIR}/client_key.pem -out ${DOCKER_ETC_DIR}/client.csr -batch -subj "/countryName=US/stateOrProvinceName=Michigan/localityName=Southfield/organizationName=AT&T Services, Inc./commonName=Client" || - _fail_with_rc 21 "Clienterver certificate signing request generation failed." - -# To make the key suitable for client authentication, -# create an extensions config file -echo extendedKeyUsage = clientAuth > ${DOCKER_ETC_DIR}/client_cert_extfile.cnf - -# Generate a certificate for the client and sign it with the CA certificate -openssl x509 -req -days 3650 -in ${DOCKER_ETC_DIR}/client.csr -CA ${DOCKER_CA_CERT} -CAkey ${DOCKER_CA_KEY} -CAcreateserial -out ${DOCKER_ETC_DIR}/client_cert.pem -extfile ${DOCKER_ETC_DIR}/client_cert_extfile.cnf || - _fail_with_rc 22 "Client certificate signing failed." - -# Protect the keys -chmod 0600 ${DOCKER_ETC_DIR}/server_key.pem ${DOCKER_ETC_DIR}/client_key.pem ${DOCKER_CA_KEY} - -# Make the client key readable by the docker group so people who can access the docker cli can also -# access docker engine via the rest api -chgrp docker ${DOCKER_ETC_DIR}/client_key.pem -# But make the public keys readable -chmod 0644 ${DOCKER_ETC_DIR}/server_cert.pem ${DOCKER_ETC_DIR}/client_cert.pem ${DOCKER_CA_CERT} - -# Remove the password from the client key -openssl rsa -in ${DOCKER_ETC_DIR}/client_key.pem -out ${DOCKER_ETC_DIR}/client_key.pem - -# Convert the client key from pem to pksc12 format so we can add it to the keystore - -openssl pkcs12 -export -inkey ${DOCKER_ETC_DIR}/client_key.pem -in ${DOCKER_ETC_DIR}/client_cert.pem -out ${DOCKER_ETC_DIR}/client_cert.p12 -name client_p12 -CAfile ${DOCKER_CA_CERT} -caname root -chain -passout pass:${CLIENT_P12_PWD} || - _fail_with_rc 6 "CA key not converted to pksc12 format" - -# update the docker opts in /etc/default/docker -DOCKER_OPTS="--debug --graph /opt/app/docker/data --host tcp://0.0.0.0:4243 --host unix:///var/run/docker.sock --tls=true --tlscert=/opt/app/docker/etc/server_cert.pem --tlskey=/opt/app/docker/etc/server_key.pem --tlscacert=/opt/app/docker/etc/docker_ca_cert.pem" - -echo "DOCKER_OPTS=${DOCKER_OPTS}" >> /etc/default/docker - diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/get-ecomp-nexus-cert.sh b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/get-ecomp-nexus-cert.sh deleted file mode 100644 index dbf49e0..0000000 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/get-ecomp-nexus-cert.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# assumes 10.208.197.75 ecomp-nexus is in /etc/hosts and -# we have a route to it -# -# run as root - -_die() { - printf "$(date):FATAL:$1\n" - exit 2; -} - -_print() { - printf "$(date):INFO:$1\n"; -} - - -DOCKER_ETC_DIR="/opt/app/docker/etc" -NEXUS_CERT=${DOCKER_ETC_DIR}/nexus.crt - -_print "Getting ecomp-nexus certificate ..." - -keytool -printcert -rfc -sslserver ecomp-nexus:8443 > ${NEXUS_CERT} - -grep "BEGIN CERTIFICATE" ${NEXUS_CERT} || - _die "Could not retrieve certificated" - -_print "Adding certificate ..." -cp -p ${NEXUS_CERT} /usr/local/share/ca-certificates || - _die "Could not copy certficate into place" - -_print "Updating CA certificates ..." -update-ca-certficates - -# -# restart docker -# - -_print "Restarting docker ..." -service docker restart diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/install-docker.sh b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/install-docker.sh deleted file mode 100644 index 66ff6de..0000000 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/install-docker.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -. common.funcs - -TRUSTY_REPO="deb https://apt.dockerproject.org/repo ubuntu-trusty main" - -# -# install docker-engine on ubuntu 14.04 -# -REL=$(uname -r) - -sudo apt-get update - -# -# Add GPG key -# -sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - -echo "${TRUSTY_REPO}" | sudo tee /etc/apt/sources.list.d/docker.list - -# update apt package index -sudo apt-get update - - -# -# install apparmor -# -sudo app-get install -q -y apparmor || - _fail "apparmor installation failed" - -# -# get certificates -# -sudo apt-get install -q -y apt-transport-http ca-certificates || - _fail "apt-transport-http ca-certificates installation failed" - -# -# makes the aufs storage driver available -# -sudo apt-get install -q -y linux-image-extra-${REL} linux-image-extra-virtual || - _fail "linux-image-extra-${REL} or linux-image-extra-virtual installation failed" - -sudo apt-get install -q -y docker-engine || - _fail "docker-engine installation failed" - -# -# Generate certifcates for TLS -# -sudo -uroot generate-certs.sh - -sudo service docker start -sudo usermod -aG docker ubuntu -sudo usermod -aG docker dcae - -# -# END -# diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/manager.sh b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/manager.sh index 671a029..99e8d07 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/manager.sh +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/server/bin/manager.sh @@ -19,10 +19,14 @@ VMTYPE=vm-docker-host case $CMD1 in start) - mkdir -p data/resources + mkdir -p data/resources/configuration if [ ! -e data/resources/dockerHost.json ]; then echo '{}' > data/resources/dockerHost.json fi + if [ -e config/version.json ]; then + rm -rf data/resources/configuration/version* + cp config/version.json data/resources/configuration/ + fi sed -i s/FQDN/$(hostname -f)/ config/docker.properties find /opt/app/dcae-controller-service-*/lib -name \*.jar | grep -v docker-host-manager | xargs -I X cp X lib/ JVMARGS=$(cat config/manager.properties | grep JVMARGS | sed 's/[^=]*=//') diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostManager.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostManager.yaml index dfaced2..0e78115 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostManager.yaml +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostManager.yaml @@ -1,234 +1,192 @@ operations: - test: {} - suspend: {} - resume: {} - publicKey: {} - configurationChanged: {} - updateStreams: {} - logs: {} - metrics: {} - properties: {} - uploadInfo: {} - getValues: {} - getValuesAll: {} - getMessages: {} - getRequestLogger: {} - evaluate: {} - update: {} - updateContainerConfiguration: {} - suspendContainer: {} - resumeContainer: {} - testContainer: {} - setupConfiguration: {} - REMOTE_test: - decription: Remote call test - REMOTE_suspend: - decription: Remote call suspend - REMOTE_resume: - decription: Remote call resume - REMOTE_publicKey: - decription: Remote call publicKey - REMOTE_configurationChanged: - decription: Remote call configurationChanged - REMOTE_updateStreams: - decription: Remote call updateStreams - REMOTE_logs: - decription: Remote call logs - REMOTE_metrics: - decription: Remote call metrics - REMOTE_properties: - decription: Remote call properties - REMOTE_uploadInfo: - decription: Remote call uploadInfo - REMOTE_getValues: - decription: Remote call getValues - REMOTE_getValuesAll: - decription: Remote call getValuesAll - REMOTE_getMessages: - decription: Remote call getMessages - REMOTE_getRequestLogger: - decription: Remote call getRequestLogger - REMOTE_evaluate: - decription: Remote call evaluate - REMOTE_update: - decription: Remote call update - REMOTE_updateContainerConfiguration: - decription: Remote call updateContainerConfiguration - REMOTE_suspendContainer: - decription: Remote call suspendContainer - REMOTE_resumeContainer: - decription: Remote call resumeContainer - REMOTE_testContainer: - decription: Remote call testContainer - REMOTE_setupConfiguration: - decription: Remote call setupConfiguration + DockerHostManager@test: {} + DockerHostManager@suspend: {} + DockerHostManager@resume: {} + DockerHostManager@publicKey: {} + DockerHostManager@configurationChanged: {} + DockerHostManager@updateStreams: {} + DockerHostManager@logs: {} + DockerHostManager@metrics: {} + DockerHostManager@properties: {} + DockerHostManager@uploadInfo: {} + DockerHostManager@getValues: {} + DockerHostManager@getValuesAll: {} + DockerHostManager@getMessages: {} + DockerHostManager@getRequestLogger: {} + DockerHostManager@evaluate: {} + DockerHostManager@update: {} + DockerHostManager@updateContainerConfiguration: {} + DockerHostManager@suspendContainer: {} + DockerHostManager@resumeContainer: {} + DockerHostManager@testContainer: {} + DockerHostManager@setupConfiguration: {} messages: dummy: {} - test: - errorCode: test-FAILED-5001W + REQUEST-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - suspend: - errorCode: suspend-FAILED-5001W + REQUEST-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - resume: - errorCode: resume-FAILED-5001W + REQUEST-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - publicKey: - errorCode: publicKey-FAILED-5001W + REQUEST-FAILED-publicKey: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - configurationChanged: - errorCode: configurationChanged-FAILED-5001W + REQUEST-FAILED-configurationChanged: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - updateStreams: - errorCode: updateStreams-FAILED-5001W + REQUEST-FAILED-updateStreams: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - logs: - errorCode: logs-FAILED-5001W + REQUEST-FAILED-logs: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - metrics: - errorCode: metrics-FAILED-5001W + REQUEST-FAILED-metrics: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - properties: - errorCode: properties-FAILED-5001W + REQUEST-FAILED-properties: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - uploadInfo: - errorCode: uploadInfo-FAILED-5001W + REQUEST-FAILED-uploadInfo: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getValues: - errorCode: getValues-FAILED-5001W + REQUEST-FAILED-getValues: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getValuesAll: - errorCode: getValuesAll-FAILED-5001W + REQUEST-FAILED-getValuesAll: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getMessages: - errorCode: getMessages-FAILED-5001W + REQUEST-FAILED-getMessages: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getRequestLogger: - errorCode: getRequestLogger-FAILED-5001W + REQUEST-FAILED-getRequestLogger: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - evaluate: - errorCode: evaluate-FAILED-5001W + REQUEST-FAILED-evaluate: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - update: - errorCode: update-FAILED-5001W + REQUEST-FAILED-update: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - updateContainerConfiguration: - errorCode: updateContainerConfiguration-FAILED-5001W + REQUEST-FAILED-updateContainerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - suspendContainer: - errorCode: suspendContainer-FAILED-5001W + REQUEST-FAILED-suspendContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - resumeContainer: - errorCode: resumeContainer-FAILED-5001W + REQUEST-FAILED-resumeContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - testContainer: - errorCode: testContainer-FAILED-5001W + REQUEST-FAILED-testContainer: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - setupConfiguration: - errorCode: setupConfiguration-FAILED-5001W + REQUEST-FAILED-setupConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - REMOTE_test: - errorCode: REMOTE-test-FAILED-5001W + REMOTE-CALL-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_suspend: - errorCode: REMOTE-suspend-FAILED-5001W + REMOTE-CALL-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_resume: - errorCode: REMOTE-resume-FAILED-5001W + REMOTE-CALL-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_publicKey: - errorCode: REMOTE-publicKey-FAILED-5001W + REMOTE-CALL-FAILED-publicKey: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_configurationChanged: - errorCode: REMOTE-configurationChanged-FAILED-5001W + REMOTE-CALL-FAILED-configurationChanged: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_updateStreams: - errorCode: REMOTE-updateStreams-FAILED-5001W + REMOTE-CALL-FAILED-updateStreams: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_logs: - errorCode: REMOTE-logs-FAILED-5001W + REMOTE-CALL-FAILED-logs: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_metrics: - errorCode: REMOTE-metrics-FAILED-5001W + REMOTE-CALL-FAILED-metrics: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_properties: - errorCode: REMOTE-properties-FAILED-5001W + REMOTE-CALL-FAILED-properties: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_uploadInfo: - errorCode: REMOTE-uploadInfo-FAILED-5001W + REMOTE-CALL-FAILED-uploadInfo: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getValues: - errorCode: REMOTE-getValues-FAILED-5001W + REMOTE-CALL-FAILED-getValues: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getValuesAll: - errorCode: REMOTE-getValuesAll-FAILED-5001W + REMOTE-CALL-FAILED-getValuesAll: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getMessages: - errorCode: REMOTE-getMessages-FAILED-5001W + REMOTE-CALL-FAILED-getMessages: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getRequestLogger: - errorCode: REMOTE-getRequestLogger-FAILED-5001W + REMOTE-CALL-FAILED-getRequestLogger: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_evaluate: - errorCode: REMOTE-evaluate-FAILED-5001W + REMOTE-CALL-FAILED-evaluate: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_update: - errorCode: REMOTE-update-FAILED-5001W + REMOTE-CALL-FAILED-update: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_updateContainerConfiguration: - errorCode: REMOTE-updateContainerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-updateContainerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_suspendContainer: - errorCode: REMOTE-suspendContainer-FAILED-5001W + REMOTE-CALL-FAILED-suspendContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_resumeContainer: - errorCode: REMOTE-resumeContainer-FAILED-5001W + REMOTE-CALL-FAILED-resumeContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_testContainer: - errorCode: REMOTE-testContainer-FAILED-5001W + REMOTE-CALL-FAILED-testContainer: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_setupConfiguration: - errorCode: REMOTE-setupConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-setupConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostService.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostService.yaml index 6ac8c34..7722813 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostService.yaml +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/DockerHostService.yaml @@ -1,135 +1,111 @@ operations: - deploy: {} - undeploy: {} - test: {} - suspend: {} - resume: {} - pushManagerConfiguration: {} - pollManagerConfiguration: {} - managerConfiguration: {} - managerOperation: {} - updateConfigurationFromPolicy: {} - runHealthTests: {} - updateDeploymentStatus: {} - REMOTE_deploy: - decription: Remote call deploy - REMOTE_undeploy: - decription: Remote call undeploy - REMOTE_test: - decription: Remote call test - REMOTE_suspend: - decription: Remote call suspend - REMOTE_resume: - decription: Remote call resume - REMOTE_pushManagerConfiguration: - decription: Remote call pushManagerConfiguration - REMOTE_pollManagerConfiguration: - decription: Remote call pollManagerConfiguration - REMOTE_managerConfiguration: - decription: Remote call managerConfiguration - REMOTE_managerOperation: - decription: Remote call managerOperation - REMOTE_updateConfigurationFromPolicy: - decription: Remote call updateConfigurationFromPolicy - REMOTE_runHealthTests: - decription: Remote call runHealthTests - REMOTE_updateDeploymentStatus: - decription: Remote call updateDeploymentStatus + DockerHostService@deploy: {} + DockerHostService@undeploy: {} + DockerHostService@test: {} + DockerHostService@suspend: {} + DockerHostService@resume: {} + DockerHostService@pushManagerConfiguration: {} + DockerHostService@pollManagerConfiguration: {} + DockerHostService@managerConfiguration: {} + DockerHostService@managerOperation: {} + DockerHostService@updateConfigurationFromPolicy: {} + DockerHostService@runHealthTests: {} + DockerHostService@updateDeploymentStatus: {} messages: dummy: {} - deploy: - errorCode: deploy-FAILED-5001W + REQUEST-FAILED-deploy: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - undeploy: - errorCode: undeploy-FAILED-5001W + REQUEST-FAILED-undeploy: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - test: - errorCode: test-FAILED-5001W + REQUEST-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - suspend: - errorCode: suspend-FAILED-5001W + REQUEST-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - resume: - errorCode: resume-FAILED-5001W + REQUEST-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - pushManagerConfiguration: - errorCode: pushManagerConfiguration-FAILED-5001W + REQUEST-FAILED-pushManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - pollManagerConfiguration: - errorCode: pollManagerConfiguration-FAILED-5001W + REQUEST-FAILED-pollManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - managerConfiguration: - errorCode: managerConfiguration-FAILED-5001W + REQUEST-FAILED-managerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - managerOperation: - errorCode: managerOperation-FAILED-5001W + REQUEST-FAILED-managerOperation: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - updateConfigurationFromPolicy: - errorCode: updateConfigurationFromPolicy-FAILED-5001W + REQUEST-FAILED-updateConfigurationFromPolicy: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - runHealthTests: - errorCode: runHealthTests-FAILED-5001W + REQUEST-FAILED-runHealthTests: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - updateDeploymentStatus: - errorCode: updateDeploymentStatus-FAILED-5001W + REQUEST-FAILED-updateDeploymentStatus: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - REMOTE_deploy: - errorCode: REMOTE-deploy-FAILED-5001W + REMOTE-CALL-FAILED-deploy: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_undeploy: - errorCode: REMOTE-undeploy-FAILED-5001W + REMOTE-CALL-FAILED-undeploy: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_test: - errorCode: REMOTE-test-FAILED-5001W + REMOTE-CALL-FAILED-test: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_suspend: - errorCode: REMOTE-suspend-FAILED-5001W + REMOTE-CALL-FAILED-suspend: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_resume: - errorCode: REMOTE-resume-FAILED-5001W + REMOTE-CALL-FAILED-resume: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_pushManagerConfiguration: - errorCode: REMOTE-pushManagerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-pushManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_pollManagerConfiguration: - errorCode: REMOTE-pollManagerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-pollManagerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_managerConfiguration: - errorCode: REMOTE-managerConfiguration-FAILED-5001W + REMOTE-CALL-FAILED-managerConfiguration: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_managerOperation: - errorCode: REMOTE-managerOperation-FAILED-5001W + REMOTE-CALL-FAILED-managerOperation: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_updateConfigurationFromPolicy: - errorCode: REMOTE-updateConfigurationFromPolicy-FAILED-5001W + REMOTE-CALL-FAILED-updateConfigurationFromPolicy: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_runHealthTests: - errorCode: REMOTE-runHealthTests-FAILED-5001W + REMOTE-CALL-FAILED-runHealthTests: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_updateDeploymentStatus: - errorCode: REMOTE-updateDeploymentStatus-FAILED-5001W + REMOTE-CALL-FAILED-updateDeploymentStatus: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/GuiClientApi.yaml b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/GuiClientApi.yaml index bf3d69d..1489339 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/GuiClientApi.yaml +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/GuiClientApi.yaml @@ -1,69 +1,57 @@ operations: - getTree: {} - getObject: {} - getTimeSerie: {} - getTable: {} - getHtml: {} - getGraph: {} - REMOTE_getTree: - decription: Remote call getTree - REMOTE_getObject: - decription: Remote call getObject - REMOTE_getTimeSerie: - decription: Remote call getTimeSerie - REMOTE_getTable: - decription: Remote call getTable - REMOTE_getHtml: - decription: Remote call getHtml - REMOTE_getGraph: - decription: Remote call getGraph + GuiClientApi@getTree: {} + GuiClientApi@getObject: {} + GuiClientApi@getTimeSerie: {} + GuiClientApi@getTable: {} + GuiClientApi@getHtml: {} + GuiClientApi@getGraph: {} messages: dummy: {} - getTree: - errorCode: getTree-FAILED-5001W + REQUEST-FAILED-getTree: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getObject: - errorCode: getObject-FAILED-5001W + REQUEST-FAILED-getObject: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getTimeSerie: - errorCode: getTimeSerie-FAILED-5001W + REQUEST-FAILED-getTimeSerie: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getTable: - errorCode: getTable-FAILED-5001W + REQUEST-FAILED-getTable: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getHtml: - errorCode: getHtml-FAILED-5001W + REQUEST-FAILED-getHtml: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - getGraph: - errorCode: getGraph-FAILED-5001W + REQUEST-FAILED-getGraph: + errorCode: 4001W messageFormat: '{0}' description: Operation Failed with Exception - REMOTE_getTree: - errorCode: REMOTE-getTree-FAILED-5001W + REMOTE-CALL-FAILED-getTree: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getObject: - errorCode: REMOTE-getObject-FAILED-5001W + REMOTE-CALL-FAILED-getObject: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getTimeSerie: - errorCode: REMOTE-getTimeSerie-FAILED-5001W + REMOTE-CALL-FAILED-getTimeSerie: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getTable: - errorCode: REMOTE-getTable-FAILED-5001W + REMOTE-CALL-FAILED-getTable: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getHtml: - errorCode: REMOTE-getHtml-FAILED-5001W + REMOTE-CALL-FAILED-getHtml: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception - REMOTE_getGraph: - errorCode: REMOTE-getGraph-FAILED-5001W + REMOTE-CALL-FAILED-getGraph: + errorCode: 4001W messageFormat: '{0}' description: Remote Operation Failed with Exception diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManager.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManager.java index 3bdb693..e76ee79 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManager.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManager.java @@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.docker.host.servers.manager; + import java.io.InputStream; import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; -import org.openecomp.logger.EcompLogger; +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; import java.util.Date; @@ -72,9 +79,9 @@ import org.openecomp.dcae.controller.service.docker.host.manager.impl.DockerHost -public class DcaeDockerHostManager extends DockerHostManagerImpl { +public class DcaeDockerHostManager extends DockerHostManagerImpl implements ISiriusProvider { public static final Logger logger = Logger.getLogger(DcaeDockerHostManager.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); public DcaeDockerHostManagerProvider controller; ISiriusServer server; @@ -89,9 +96,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "updateContainerConfiguration", ApiRequestStatus.START, duration_,name,o,inputStreams,outputStreams); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.updateContainerConfiguration); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_updateContainerConfiguration,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_updateContainerConfiguration,"self:" + ManagementServer.object2ref(this)); try { controller.updateContainerConfiguration(name,o,inputStreams,outputStreams); } @@ -100,8 +106,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "updateContainerConfiguration", ApiRequestStatus.ERROR, duration_,name,o,inputStreams,outputStreams); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.updateContainerConfiguration, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_updateContainerConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_updateContainerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_updateContainerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -116,9 +124,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "suspendContainer", ApiRequestStatus.START, duration_,name); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.suspendContainer); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_suspendContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_suspendContainer,"self:" + ManagementServer.object2ref(this)); try { controller.suspendContainer(name); } @@ -127,8 +134,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "suspendContainer", ApiRequestStatus.ERROR, duration_,name); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.suspendContainer, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_suspendContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_suspendContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_suspendContainer, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -143,9 +152,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "resumeContainer", ApiRequestStatus.START, duration_,name); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.resumeContainer); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_resumeContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_resumeContainer,"self:" + ManagementServer.object2ref(this)); try { controller.resumeContainer(name); } @@ -154,8 +162,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "resumeContainer", ApiRequestStatus.ERROR, duration_,name); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.resumeContainer, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_resumeContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_resumeContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_resumeContainer, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -170,9 +180,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "testContainer", ApiRequestStatus.START, duration_,name); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.testContainer); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_testContainer,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_testContainer,"self:" + ManagementServer.object2ref(this)); try { res = controller.testContainer(name); } @@ -181,8 +190,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "testContainer", ApiRequestStatus.ERROR, duration_,name); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.testContainer, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_testContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_testContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_testContainer, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -197,9 +208,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "setupConfiguration", ApiRequestStatus.START, duration_,service,instance); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.setupConfiguration); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_setupConfiguration,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_setupConfiguration,"self:" + ManagementServer.object2ref(this)); try { controller.setupConfiguration(service,instance); } @@ -208,8 +218,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "setupConfiguration", ApiRequestStatus.ERROR, duration_,service,instance); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.setupConfiguration, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_setupConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_setupConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_setupConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -224,9 +236,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.test); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_test,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_test,"self:" + ManagementServer.object2ref(this)); try { res = controller.test(); } @@ -235,8 +246,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.test, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_test, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -251,9 +264,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.suspend); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_suspend,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_suspend,"self:" + ManagementServer.object2ref(this)); try { controller.suspend(); } @@ -262,8 +274,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.suspend, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_suspend, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -278,9 +292,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.resume); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_resume,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_resume,"self:" + ManagementServer.object2ref(this)); try { controller.resume(); } @@ -289,8 +302,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.resume, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_resume, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -305,9 +320,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.publicKey); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_publicKey,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_publicKey,"self:" + ManagementServer.object2ref(this)); try { res = controller.publicKey(); } @@ -316,8 +330,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "publicKey", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.publicKey, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_publicKey, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_publicKey,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_publicKey, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -332,9 +348,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.configurationChanged); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_configurationChanged,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_configurationChanged,"self:" + ManagementServer.object2ref(this)); try { controller.configurationChanged(); } @@ -343,8 +358,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "configurationChanged", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.configurationChanged, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_configurationChanged,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_configurationChanged, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -359,9 +376,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.START, duration_,inputStreams,outputStreams); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.updateStreams); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_updateStreams,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_updateStreams,"self:" + ManagementServer.object2ref(this)); try { controller.updateStreams(inputStreams,outputStreams); } @@ -370,8 +386,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "updateStreams", ApiRequestStatus.ERROR, duration_,inputStreams,outputStreams); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.updateStreams, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_updateStreams, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_updateStreams,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_updateStreams, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -386,9 +404,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "logs", ApiRequestStatus.START, duration_,cx,logs); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.logs); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_logs,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_logs,"self:" + ManagementServer.object2ref(this)); try { controller.logs(cx,logs); } @@ -397,8 +414,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "logs", ApiRequestStatus.ERROR, duration_,cx,logs); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.logs, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_logs, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_logs,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_logs, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -413,9 +432,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.START, duration_,cx,metrics); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.metrics); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_metrics,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_metrics,"self:" + ManagementServer.object2ref(this)); try { controller.metrics(cx,metrics); } @@ -424,8 +442,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "metrics", ApiRequestStatus.ERROR, duration_,cx,metrics); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.metrics, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_metrics, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_metrics,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_metrics, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -440,9 +460,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "properties", ApiRequestStatus.START, duration_,cx,l); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.properties); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_properties,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_properties,"self:" + ManagementServer.object2ref(this)); try { controller.properties(cx,l); } @@ -451,8 +470,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "properties", ApiRequestStatus.ERROR, duration_,cx,l); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.properties, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_properties, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_properties,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_properties, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -467,9 +488,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.START, duration_,cx,info); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.uploadInfo); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_uploadInfo,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_uploadInfo,"self:" + ManagementServer.object2ref(this)); try { controller.uploadInfo(cx,info); } @@ -478,8 +498,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "uploadInfo", ApiRequestStatus.ERROR, duration_,cx,info); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.uploadInfo, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_uploadInfo,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_uploadInfo, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -494,9 +516,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.START, duration_,cx,path,start,end,option,relativeInterval); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.getValues); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_getValues,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getValues,"self:" + ManagementServer.object2ref(this)); try { res = controller.getValues(cx,path,start,end,option,relativeInterval); } @@ -505,8 +526,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "getValues", ApiRequestStatus.ERROR, duration_,cx,path,start,end,option,relativeInterval); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.getValues, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_getValues, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_getValues,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_getValues, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -521,9 +544,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.START, duration_,cx,path,metrics,start,end,option,relativeInterval); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.getValuesAll); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_getValuesAll,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getValuesAll,"self:" + ManagementServer.object2ref(this)); try { res = controller.getValuesAll(cx,path,metrics,start,end,option,relativeInterval); } @@ -532,8 +554,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "getValuesAll", ApiRequestStatus.ERROR, duration_,cx,path,metrics,start,end,option,relativeInterval); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.getValuesAll, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_getValuesAll,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_getValuesAll, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -548,9 +572,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.START, duration_,cx,path,start,end); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.getMessages); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_getMessages,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getMessages,"self:" + ManagementServer.object2ref(this)); try { res = controller.getMessages(cx,path,start,end); } @@ -559,8 +582,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "getMessages", ApiRequestStatus.ERROR, duration_,cx,path,start,end); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.getMessages, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_getMessages, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_getMessages,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_getMessages, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -575,9 +600,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.START, duration_,userName,action,resourcePath,context); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.getRequestLogger); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_getRequestLogger,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getRequestLogger,"self:" + ManagementServer.object2ref(this)); try { res = controller.getRequestLogger(userName,action,resourcePath,context); } @@ -586,8 +610,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "getRequestLogger", ApiRequestStatus.ERROR, duration_,userName,action,resourcePath,context); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.getRequestLogger, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_getRequestLogger,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_getRequestLogger, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -602,9 +628,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.START, duration_,path,function); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.evaluate); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_evaluate,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_evaluate,"self:" + ManagementServer.object2ref(this)); try { res = controller.evaluate(path,function); } @@ -613,8 +638,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "evaluate", ApiRequestStatus.ERROR, duration_,path,function); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.evaluate, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_evaluate, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_evaluate,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_evaluate, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -629,9 +656,8 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "update", ApiRequestStatus.START, duration_,path,function); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.update); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostManagerOperationEnum.DockerHostManager_update,server,this); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_update,"self:" + ManagementServer.object2ref(this)); try { controller.update(path,function); } @@ -640,8 +666,10 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { if (server != null) server.getServer().recordApi(null, this, "update", ApiRequestStatus.ERROR, duration_,path,function); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostManagerMessageEnum.update, e.toString()); - throw e; + ecomplogger.warn(DockerHostManagerMessageEnum.REQUEST_FAILED_update, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REQUEST_FAILED_update,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostManagerMessageEnum.REQUEST_FAILED_update, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -655,10 +683,12 @@ public class DcaeDockerHostManager extends DockerHostManagerImpl { + + public static void ecoreSetup() { DcaeDockerHostManagerProvider.ecoreSetup(); } - public DcaeDockerHostManagerProvider getSomfProvider() { + public DcaeDockerHostManagerProvider getSiriusProvider() { return controller; } } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerClient.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerClient.java index 34fd247..dddd49b 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerClient.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerClient.java @@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -54,33 +56,37 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { DcaeDockerHostManager.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/resources", this); + client.setVersion("ONAP-R2"); } public DcaeDockerHostManagerClient(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 DcaeDockerHostManagerClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } @Override public void updateContainerConfiguration(java.lang.String name, org.eclipse.emf.ecore.EObject o, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_updateContainerConfiguration); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_updateContainerConfiguration,client.getRemote()); try { client.operationPath("/resources", c, "updateContainerConfiguration", null, name,o,inputStreams,outputStreams); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_updateContainerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateContainerConfiguration: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateContainerConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateContainerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateContainerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -88,16 +94,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void suspendContainer(java.lang.String name) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_suspendContainer); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_suspendContainer,client.getRemote()); try { client.operationPath("/resources", c, "suspendContainer", null, name); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_suspendContainer, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspendContainer: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspendContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspendContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspendContainer,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -105,16 +112,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void resumeContainer(java.lang.String name) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_resumeContainer); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_resumeContainer,client.getRemote()); try { client.operationPath("/resources", c, "resumeContainer", null, name); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_resumeContainer, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@resumeContainer: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resumeContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resumeContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resumeContainer,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -122,16 +130,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public org.openecomp.dcae.controller.core.service.HealthTestResponse testContainer(java.lang.String name) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_testContainer); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_testContainer,client.getRemote()); org.openecomp.dcae.controller.core.service.HealthTestResponse res; try { res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "testContainer", null, name); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_testContainer, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@testContainer: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_testContainer, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_testContainer,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_testContainer,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -139,16 +148,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void setupConfiguration(java.lang.String service, java.lang.String instance) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_setupConfiguration); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_setupConfiguration,client.getRemote()); try { client.operationPath("/resources", c, "setupConfiguration", null, service,instance); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_setupConfiguration, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@setupConfiguration: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_setupConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_setupConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_setupConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -156,16 +166,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public org.openecomp.dcae.controller.core.service.HealthTestResponse test() { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_test); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_test,client.getRemote()); org.openecomp.dcae.controller.core.service.HealthTestResponse res; try { res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_test, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -173,16 +184,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void suspend() { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_suspend); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_suspend,client.getRemote()); try { client.operationPath("/resources", c, "suspend", null); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_suspend, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -190,16 +202,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void resume() { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_resume); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_resume,client.getRemote()); try { client.operationPath("/resources", c, "resume", null); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_resume, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -207,16 +220,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public java.lang.String publicKey() { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_publicKey); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_publicKey,client.getRemote()); java.lang.String res; try { res = (java.lang.String) client.operationPath("/resources", c, "publicKey", null); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_publicKey, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@publicKey: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_publicKey, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_publicKey,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -224,16 +238,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void configurationChanged() { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_configurationChanged); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_configurationChanged,client.getRemote()); try { client.operationPath("/resources", c, "configurationChanged", null); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_configurationChanged, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@configurationChanged: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_configurationChanged,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -241,16 +256,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void updateStreams(EList<org.openecomp.dcae.controller.core.stream.DcaeStream> inputStreams, EList<org.openecomp.dcae.controller.core.stream.DcaeStream> outputStreams) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_updateStreams); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_updateStreams,client.getRemote()); try { client.operationPath("/resources", c, "updateStreams", null, inputStreams,outputStreams); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_updateStreams, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateStreams: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_updateStreams,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -258,16 +274,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void logs(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.logs.LogMessage> logs) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_logs); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_logs,client.getRemote()); try { client.operationPath("/resources", c, "logs", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,logs); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_logs, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@logs: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_logs, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_logs,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_logs,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -275,16 +292,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void metrics(org.json.JSONObject cx, EList<org.openecomp.ncomp.core.metrics.Metric> metrics) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_metrics); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_metrics,client.getRemote()); try { client.operationPath("/resources", c, "metrics", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,metrics); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_metrics, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@metrics: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_metrics, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_metrics,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -292,16 +310,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void properties(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.properties.AbstractProperty> l) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_properties); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_properties,client.getRemote()); try { client.operationPath("/resources", c, "properties", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,l); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_properties, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@properties: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_properties, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_properties,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_properties,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -309,16 +328,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void uploadInfo(org.json.JSONObject cx, EList<org.openecomp.ncomp.sirius.manager.server.ManagementInfo> info) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_uploadInfo); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_uploadInfo,client.getRemote()); try { client.operationPath("/resources", c, "uploadInfo", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,info); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_uploadInfo, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@uploadInfo: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_uploadInfo,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -326,16 +346,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValues(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_getValues); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getValues,client.getRemote()); EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res; try { res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValues", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end,option,relativeInterval); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_getValues, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getValues: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValues, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValues,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -343,16 +364,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public EList<org.openecomp.ncomp.core.metrics.DoubleMetric> getValuesAll(org.json.JSONObject cx, java.lang.String path, EList<java.lang.String> metrics, java.lang.Long start, java.lang.Long end, org.openecomp.ncomp.core.metrics.MetricValueOption option, boolean relativeInterval) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_getValuesAll); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getValuesAll,client.getRemote()); EList<org.openecomp.ncomp.core.metrics.DoubleMetric> res; try { res = (EList<org.openecomp.ncomp.core.metrics.DoubleMetric>) client.operationPath("/resources", c, "getValuesAll", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,metrics,start,end,option,relativeInterval); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_getValuesAll, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getValuesAll: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getValuesAll,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -360,16 +382,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public EList<org.openecomp.ncomp.core.logs.LogMessage> getMessages(org.json.JSONObject cx, java.lang.String path, java.lang.Long start, java.lang.Long end) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_getMessages); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getMessages,client.getRemote()); EList<org.openecomp.ncomp.core.logs.LogMessage> res; try { res = (EList<org.openecomp.ncomp.core.logs.LogMessage>) client.operationPath("/resources", c, "getMessages", cx != null && cx.has("timeout") ? cx.getLong("timeout") : null, cx,path,start,end); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_getMessages, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getMessages: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getMessages, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getMessages,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -377,16 +400,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public org.openecomp.ncomp.sirius.manager.server.LoggerInfo getRequestLogger(java.lang.String userName, java.lang.String action, java.lang.String resourcePath, org.json.JSONObject context) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_getRequestLogger); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_getRequestLogger,client.getRemote()); org.openecomp.ncomp.sirius.manager.server.LoggerInfo res; try { res = (org.openecomp.ncomp.sirius.manager.server.LoggerInfo) client.operationPath("/resources", c, "getRequestLogger", null, userName,action,resourcePath,context); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_getRequestLogger, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getRequestLogger: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_getRequestLogger,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -394,16 +418,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public EList<org.openecomp.ncomp.core.function.ValuePair> evaluate(java.lang.String path, org.openecomp.ncomp.core.function.Function function) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_evaluate); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_evaluate,client.getRemote()); EList<org.openecomp.ncomp.core.function.ValuePair> res; try { res = (EList<org.openecomp.ncomp.core.function.ValuePair>) client.operationPath("/resources", c, "evaluate", null, path,function); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_evaluate, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@evaluate: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_evaluate, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_evaluate,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -411,16 +436,17 @@ public class DcaeDockerHostManagerClient extends DockerHostManagerImpl { @Override public void update(java.lang.String path, org.openecomp.ncomp.core.function.Function function) { - EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostManagerOperationEnum.REMOTE_update); + EClass c = ManagerPackage.eINSTANCE.getDockerHostManager(); + ecomplogger.recordMetricEventStart(DockerHostManagerOperationEnum.DockerHostManager_update,client.getRemote()); try { client.operationPath("/resources", c, "update", null, path,function); } catch (Exception e) { - ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_update, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@update: " + e); + ecomplogger.warn(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_update, e.toString()); + EcompException e1 = EcompException.create(DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_update,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostManagerMessageEnum.REMOTE_CALL_FAILED_update,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerServer.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerServer.java index 8bd963b..dc19ac8 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerServer.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/DcaeDockerHostManagerServer.java @@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.docker.host.servers.manager; import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath; import java.io.IOException; +import java.io.InputStream; import java.util.Properties; import java.util.TimeZone; import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EFactory; - -import org.openecomp.entity.EcompComponent; -import org.openecomp.entity.EcompSubComponent; -import org.openecomp.entity.EcompSubComponentInstance; +import org.json.JSONObject; import org.openecomp.ncomp.sirius.manager.Jetty8Server; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.IRequestHandler; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.dcae.controller.service.docker.host.manager.DockerHostManager; @@ -48,7 +47,7 @@ import org.openecomp.dcae.controller.service.docker.host.servers.manager.gui.Dca -public class DcaeDockerHostManagerServer implements ISiriusServer { +public class DcaeDockerHostManagerServer implements ISiriusServer, IRequestHandler { public static final Logger logger = Logger.getLogger(DcaeDockerHostManagerServer.class); String serverPath; ManagementServer server; @@ -69,6 +68,7 @@ public class DcaeDockerHostManagerServer implements ISiriusServer { props = getPropertiesFromClasspath(filename); serverPath = (String) props.get("server.dir"); server = new ManagementServer(f, "DockerHostManager", serverPath, filename); + ManagementServer.setBuildVersion("ONAP-R2"); server.addFactory(f); server.addFactory(new org.openecomp.ncomp.servers.docker.DockerDockerFactory(this)); @@ -84,6 +84,7 @@ public class DcaeDockerHostManagerServer implements ISiriusServer { controller = (DcaeDockerHostManager) server.find("/").o; webServer = new Jetty8Server("manager.properties"); webServer.add("/resources",server); + webServer.add("/api",this); @@ -112,4 +113,17 @@ public class DcaeDockerHostManagerServer implements ISiriusServer { public ManagementServer getServer() { return server; } + public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, + String clientVersion) { + switch ((String) context.get("path")) { + case "/api/versions": + return server.supportedVersions(); + } + logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2)); + throw new RuntimeException("Unknown request"); + } + public Object handleBinary(String userName, String action, String resourcePath, InputStream in) { + return null; + } + } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApi.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApi.java index 9b99753..dd18103 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApi.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApi.java @@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.docker.host.servers.manager.gui; + import java.io.InputStream; import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; -import org.openecomp.logger.EcompLogger; +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; import java.util.Date; @@ -84,9 +91,9 @@ import org.openecomp.ncomp.gwt.siriusportal.model.impl.GuiClientApiImpl; -public class DcaeGuiClientApi extends GuiClientApiImpl { +public class DcaeGuiClientApi extends GuiClientApiImpl implements ISiriusProvider { public static final Logger logger = Logger.getLogger(DcaeGuiClientApi.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); public DcaeGuiClientApiProvider controller; ISiriusServer server; @@ -101,9 +108,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getTree); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTree,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTree(); } @@ -112,8 +118,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTree", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getTree, e.toString()); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTree,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTree, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -128,9 +136,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.START, duration_,path); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getObject); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getObject,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,"self:" + ManagementServer.object2ref(this)); try { res = controller.getObject(path); } @@ -139,8 +146,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getObject", ApiRequestStatus.ERROR, duration_,path); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getObject, e.toString()); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getObject,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getObject, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -155,9 +164,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.START, duration_,path,start,end,duration); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getTimeSerie); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTimeSerie(path,start,end,duration); } @@ -166,8 +174,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTimeSerie", ApiRequestStatus.ERROR, duration_,path,start,end,duration); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getTimeSerie, e.toString()); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTimeSerie, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -182,9 +192,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getTable); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getTable,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,"self:" + ManagementServer.object2ref(this)); try { res = controller.getTable(path,start,end); } @@ -193,8 +202,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getTable", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getTable, e.toString()); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getTable,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getTable, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -209,9 +220,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getHtml); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getHtml,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,"self:" + ManagementServer.object2ref(this)); try { res = controller.getHtml(path,start,end); } @@ -220,8 +230,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getHtml", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getHtml, e.toString()); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getHtml,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getHtml, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -236,9 +248,8 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.START, duration_,path,start,end); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.getGraph); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(GuiClientApiOperationEnum.GuiClientApi_getGraph,server,this); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,"self:" + ManagementServer.object2ref(this)); try { res = controller.getGraph(path,start,end); } @@ -247,8 +258,10 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { if (server != null) server.getServer().recordApi(null, this, "getGraph", ApiRequestStatus.ERROR, duration_,path,start,end); System.err.println("ERROR: " + e); - ecomplogger.warn(GuiClientApiMessageEnum.getGraph, e.toString()); - throw e; + ecomplogger.warn(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REQUEST_FAILED_getGraph,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, GuiClientApiMessageEnum.REQUEST_FAILED_getGraph, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -262,10 +275,12 @@ public class DcaeGuiClientApi extends GuiClientApiImpl { + + public static void ecoreSetup() { DcaeGuiClientApiProvider.ecoreSetup(); } - public DcaeGuiClientApiProvider getSomfProvider() { + public DcaeGuiClientApiProvider getSiriusProvider() { return controller; } } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApiClient.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApiClient.java index 0ce3ec5..46eaebe 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApiClient.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/DcaeGuiClientApiClient.java @@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -55,33 +57,37 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { DcaeDockerHostManager.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/gui", this); + client.setVersion("ONAP-R2"); } public DcaeGuiClientApiClient(String file, String name1, String name2) { HighAvailabilityClient client1 = new HighAvailabilityClient(file,name1,name2); client = client1.all; // requests should be forwarded to all. client.add("/gui", this); + client.setVersion("ONAP-R2"); } public DcaeGuiClientApiClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTree getTree() { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTree); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTree,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiTree res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTree) client.operationPath("/gui", c, "getTree", null); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTree, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getTree: " + e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTree,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -89,16 +95,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiObject getObject(java.lang.String path) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getObject); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getObject,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiObject res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiObject) client.operationPath("/gui", c, "getObject", null, path); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getObject, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getObject: " + e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getObject,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -106,16 +113,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie getTimeSerie(java.lang.String path, java.lang.String start, java.lang.String end, java.lang.String duration) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTimeSerie); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTimeSerie,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTimeSerie) client.operationPath("/gui", c, "getTimeSerie", null, path,start,end,duration); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTimeSerie, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getTimeSerie: " + e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTimeSerie,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -123,16 +131,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiTable getTable(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getTable); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getTable,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiTable res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiTable) client.operationPath("/gui", c, "getTable", null, path,start,end); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getTable, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getTable: " + e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getTable,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -140,16 +149,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml getHtml(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getHtml); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getHtml,client.getRemote()); org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml res; try { res = (org.openecomp.ncomp.gwt.siriusportal.model.GuiHtml) client.operationPath("/gui", c, "getHtml", null, path,start,end); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getHtml, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getHtml: " + e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getHtml,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -157,16 +167,17 @@ public class DcaeGuiClientApiClient extends GuiClientApiImpl { @Override public org.openecomp.ncomp.sirius.manager.graph.GuiGraph getGraph(java.lang.String path, java.lang.String start, java.lang.String end) { - EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(GuiClientApiOperationEnum.REMOTE_getGraph); + EClass c = ModelPackage.eINSTANCE.getGuiClientApi(); + ecomplogger.recordMetricEventStart(GuiClientApiOperationEnum.GuiClientApi_getGraph,client.getRemote()); org.openecomp.ncomp.sirius.manager.graph.GuiGraph res; try { res = (org.openecomp.ncomp.sirius.manager.graph.GuiGraph) client.operationPath("/gui", c, "getGraph", null, path,start,end); } catch (Exception e) { - ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_getGraph, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@getGraph: " + e); + ecomplogger.warn(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph, e.toString()); + EcompException e1 = EcompException.create(GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,GuiClientApiMessageEnum.REMOTE_CALL_FAILED_getGraph,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi.properties b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi.properties index 8705ab8..3822d29 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi.properties +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi.properties @@ -1,78 +1,78 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -getTree=\ - getTree-FAILED-5001W|\ +REQUEST_FAILED_getTree=\ + REQUEST-FAILED-getTree-4001W|\ {0}|\ null|\ Operation Failed with Exception -getObject=\ - getObject-FAILED-5001W|\ +REQUEST_FAILED_getObject=\ + REQUEST-FAILED-getObject-4001W|\ {0}|\ null|\ Operation Failed with Exception -getTimeSerie=\ - getTimeSerie-FAILED-5001W|\ +REQUEST_FAILED_getTimeSerie=\ + REQUEST-FAILED-getTimeSerie-4001W|\ {0}|\ null|\ Operation Failed with Exception -getTable=\ - getTable-FAILED-5001W|\ +REQUEST_FAILED_getTable=\ + REQUEST-FAILED-getTable-4001W|\ {0}|\ null|\ Operation Failed with Exception -getHtml=\ - getHtml-FAILED-5001W|\ +REQUEST_FAILED_getHtml=\ + REQUEST-FAILED-getHtml-4001W|\ {0}|\ null|\ Operation Failed with Exception -getGraph=\ - getGraph-FAILED-5001W|\ +REQUEST_FAILED_getGraph=\ + REQUEST-FAILED-getGraph-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_getTree=\ - REMOTE-getTree-FAILED-5001W|\ +REMOTE_CALL_FAILED_getTree=\ + REMOTE-CALL-FAILED-getTree-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getObject=\ - REMOTE-getObject-FAILED-5001W|\ +REMOTE_CALL_FAILED_getObject=\ + REMOTE-CALL-FAILED-getObject-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getTimeSerie=\ - REMOTE-getTimeSerie-FAILED-5001W|\ +REMOTE_CALL_FAILED_getTimeSerie=\ + REMOTE-CALL-FAILED-getTimeSerie-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getTable=\ - REMOTE-getTable-FAILED-5001W|\ +REMOTE_CALL_FAILED_getTable=\ + REMOTE-CALL-FAILED-getTable-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getHtml=\ - REMOTE-getHtml-FAILED-5001W|\ +REMOTE_CALL_FAILED_getHtml=\ + REMOTE-CALL-FAILED-getHtml-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getGraph=\ - REMOTE-getGraph-FAILED-5001W|\ +REMOTE_CALL_FAILED_getGraph=\ + REMOTE-CALL-FAILED-getGraph-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiMessageEnum.java index 64b8fa9..dd60420 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiMessageEnum.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiMessageEnum.java @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.dcae.controller.service.docker.host.servers.manager.gui.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,20 +7,20 @@ import org.openecomp.logger.EcompMessageEnum; public enum GuiClientApiMessageEnum implements EcompMessageEnum { dummy, - getTree, - getObject, - getTimeSerie, - getTable, - getHtml, - getGraph, - REMOTE_getTree, - REMOTE_getObject, - REMOTE_getTimeSerie, - REMOTE_getTable, - REMOTE_getHtml, - REMOTE_getGraph; + REQUEST_FAILED_getTree, + REQUEST_FAILED_getObject, + REQUEST_FAILED_getTimeSerie, + REQUEST_FAILED_getTable, + REQUEST_FAILED_getHtml, + REQUEST_FAILED_getGraph, + REMOTE_CALL_FAILED_getTree, + REMOTE_CALL_FAILED_getObject, + REMOTE_CALL_FAILED_getTimeSerie, + REMOTE_CALL_FAILED_getTable, + REMOTE_CALL_FAILED_getHtml, + REMOTE_CALL_FAILED_getGraph; static { - EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.docker.host.servers.manager.gui.logging.GuiClientApi"); + EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApi"); } } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiOperationEnum.java index 6bf7447..0813615 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiOperationEnum.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/gui/logging/GuiClientApiOperationEnum.java @@ -1,41 +1,27 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.dcae.controller.service.docker.host.servers.manager.gui.logging; import org.openecomp.entity.EcompOperationEnum; public enum GuiClientApiOperationEnum implements EcompOperationEnum { - getTree, - getObject, - getTimeSerie, - getTable, - getHtml, - getGraph, - REMOTE_getTree, - REMOTE_getObject, - REMOTE_getTimeSerie, - REMOTE_getTable, - REMOTE_getHtml, - REMOTE_getGraph; + GuiClientApi_getTree("GuiClientApi@getTree"), + GuiClientApi_getObject("GuiClientApi@getObject"), + GuiClientApi_getTimeSerie("GuiClientApi@getTimeSerie"), + GuiClientApi_getTable("GuiClientApi@getTable"), + GuiClientApi_getHtml("GuiClientApi@getHtml"), + GuiClientApi_getGraph("GuiClientApi@getGraph") ; + + + private String n; + + private GuiClientApiOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager.properties b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager.properties index 8c5a5fa..e2ab9a1 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager.properties +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager.properties @@ -1,258 +1,258 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -test=\ - test-FAILED-5001W|\ +REQUEST_FAILED_test=\ + REQUEST-FAILED-test-4001W|\ {0}|\ null|\ Operation Failed with Exception -suspend=\ - suspend-FAILED-5001W|\ +REQUEST_FAILED_suspend=\ + REQUEST-FAILED-suspend-4001W|\ {0}|\ null|\ Operation Failed with Exception -resume=\ - resume-FAILED-5001W|\ +REQUEST_FAILED_resume=\ + REQUEST-FAILED-resume-4001W|\ {0}|\ null|\ Operation Failed with Exception -publicKey=\ - publicKey-FAILED-5001W|\ +REQUEST_FAILED_publicKey=\ + REQUEST-FAILED-publicKey-4001W|\ {0}|\ null|\ Operation Failed with Exception -configurationChanged=\ - configurationChanged-FAILED-5001W|\ +REQUEST_FAILED_configurationChanged=\ + REQUEST-FAILED-configurationChanged-4001W|\ {0}|\ null|\ Operation Failed with Exception -updateStreams=\ - updateStreams-FAILED-5001W|\ +REQUEST_FAILED_updateStreams=\ + REQUEST-FAILED-updateStreams-4001W|\ {0}|\ null|\ Operation Failed with Exception -logs=\ - logs-FAILED-5001W|\ +REQUEST_FAILED_logs=\ + REQUEST-FAILED-logs-4001W|\ {0}|\ null|\ Operation Failed with Exception -metrics=\ - metrics-FAILED-5001W|\ +REQUEST_FAILED_metrics=\ + REQUEST-FAILED-metrics-4001W|\ {0}|\ null|\ Operation Failed with Exception -properties=\ - properties-FAILED-5001W|\ +REQUEST_FAILED_properties=\ + REQUEST-FAILED-properties-4001W|\ {0}|\ null|\ Operation Failed with Exception -uploadInfo=\ - uploadInfo-FAILED-5001W|\ +REQUEST_FAILED_uploadInfo=\ + REQUEST-FAILED-uploadInfo-4001W|\ {0}|\ null|\ Operation Failed with Exception -getValues=\ - getValues-FAILED-5001W|\ +REQUEST_FAILED_getValues=\ + REQUEST-FAILED-getValues-4001W|\ {0}|\ null|\ Operation Failed with Exception -getValuesAll=\ - getValuesAll-FAILED-5001W|\ +REQUEST_FAILED_getValuesAll=\ + REQUEST-FAILED-getValuesAll-4001W|\ {0}|\ null|\ Operation Failed with Exception -getMessages=\ - getMessages-FAILED-5001W|\ +REQUEST_FAILED_getMessages=\ + REQUEST-FAILED-getMessages-4001W|\ {0}|\ null|\ Operation Failed with Exception -getRequestLogger=\ - getRequestLogger-FAILED-5001W|\ +REQUEST_FAILED_getRequestLogger=\ + REQUEST-FAILED-getRequestLogger-4001W|\ {0}|\ null|\ Operation Failed with Exception -evaluate=\ - evaluate-FAILED-5001W|\ +REQUEST_FAILED_evaluate=\ + REQUEST-FAILED-evaluate-4001W|\ {0}|\ null|\ Operation Failed with Exception -update=\ - update-FAILED-5001W|\ +REQUEST_FAILED_update=\ + REQUEST-FAILED-update-4001W|\ {0}|\ null|\ Operation Failed with Exception -updateContainerConfiguration=\ - updateContainerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_updateContainerConfiguration=\ + REQUEST-FAILED-updateContainerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -suspendContainer=\ - suspendContainer-FAILED-5001W|\ +REQUEST_FAILED_suspendContainer=\ + REQUEST-FAILED-suspendContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -resumeContainer=\ - resumeContainer-FAILED-5001W|\ +REQUEST_FAILED_resumeContainer=\ + REQUEST-FAILED-resumeContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -testContainer=\ - testContainer-FAILED-5001W|\ +REQUEST_FAILED_testContainer=\ + REQUEST-FAILED-testContainer-4001W|\ {0}|\ null|\ Operation Failed with Exception -setupConfiguration=\ - setupConfiguration-FAILED-5001W|\ +REQUEST_FAILED_setupConfiguration=\ + REQUEST-FAILED-setupConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_test=\ - REMOTE-test-FAILED-5001W|\ +REMOTE_CALL_FAILED_test=\ + REMOTE-CALL-FAILED-test-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_suspend=\ - REMOTE-suspend-FAILED-5001W|\ +REMOTE_CALL_FAILED_suspend=\ + REMOTE-CALL-FAILED-suspend-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_resume=\ - REMOTE-resume-FAILED-5001W|\ +REMOTE_CALL_FAILED_resume=\ + REMOTE-CALL-FAILED-resume-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_publicKey=\ - REMOTE-publicKey-FAILED-5001W|\ +REMOTE_CALL_FAILED_publicKey=\ + REMOTE-CALL-FAILED-publicKey-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_configurationChanged=\ - REMOTE-configurationChanged-FAILED-5001W|\ +REMOTE_CALL_FAILED_configurationChanged=\ + REMOTE-CALL-FAILED-configurationChanged-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_updateStreams=\ - REMOTE-updateStreams-FAILED-5001W|\ +REMOTE_CALL_FAILED_updateStreams=\ + REMOTE-CALL-FAILED-updateStreams-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_logs=\ - REMOTE-logs-FAILED-5001W|\ +REMOTE_CALL_FAILED_logs=\ + REMOTE-CALL-FAILED-logs-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_metrics=\ - REMOTE-metrics-FAILED-5001W|\ +REMOTE_CALL_FAILED_metrics=\ + REMOTE-CALL-FAILED-metrics-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_properties=\ - REMOTE-properties-FAILED-5001W|\ +REMOTE_CALL_FAILED_properties=\ + REMOTE-CALL-FAILED-properties-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_uploadInfo=\ - REMOTE-uploadInfo-FAILED-5001W|\ +REMOTE_CALL_FAILED_uploadInfo=\ + REMOTE-CALL-FAILED-uploadInfo-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getValues=\ - REMOTE-getValues-FAILED-5001W|\ +REMOTE_CALL_FAILED_getValues=\ + REMOTE-CALL-FAILED-getValues-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getValuesAll=\ - REMOTE-getValuesAll-FAILED-5001W|\ +REMOTE_CALL_FAILED_getValuesAll=\ + REMOTE-CALL-FAILED-getValuesAll-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getMessages=\ - REMOTE-getMessages-FAILED-5001W|\ +REMOTE_CALL_FAILED_getMessages=\ + REMOTE-CALL-FAILED-getMessages-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_getRequestLogger=\ - REMOTE-getRequestLogger-FAILED-5001W|\ +REMOTE_CALL_FAILED_getRequestLogger=\ + REMOTE-CALL-FAILED-getRequestLogger-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_evaluate=\ - REMOTE-evaluate-FAILED-5001W|\ +REMOTE_CALL_FAILED_evaluate=\ + REMOTE-CALL-FAILED-evaluate-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_update=\ - REMOTE-update-FAILED-5001W|\ +REMOTE_CALL_FAILED_update=\ + REMOTE-CALL-FAILED-update-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_updateContainerConfiguration=\ - REMOTE-updateContainerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_updateContainerConfiguration=\ + REMOTE-CALL-FAILED-updateContainerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_suspendContainer=\ - REMOTE-suspendContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_suspendContainer=\ + REMOTE-CALL-FAILED-suspendContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_resumeContainer=\ - REMOTE-resumeContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_resumeContainer=\ + REMOTE-CALL-FAILED-resumeContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_testContainer=\ - REMOTE-testContainer-FAILED-5001W|\ +REMOTE_CALL_FAILED_testContainer=\ + REMOTE-CALL-FAILED-testContainer-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_setupConfiguration=\ - REMOTE-setupConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_setupConfiguration=\ + REMOTE-CALL-FAILED-setupConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerMessageEnum.java index 3d6fd36..addc911 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerMessageEnum.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerMessageEnum.java @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.dcae.controller.service.docker.host.servers.manager.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,50 +7,50 @@ import org.openecomp.logger.EcompMessageEnum; public enum DockerHostManagerMessageEnum implements EcompMessageEnum { dummy, - test, - suspend, - resume, - publicKey, - configurationChanged, - updateStreams, - logs, - metrics, - properties, - uploadInfo, - getValues, - getValuesAll, - getMessages, - getRequestLogger, - evaluate, - update, - updateContainerConfiguration, - suspendContainer, - resumeContainer, - testContainer, - setupConfiguration, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_publicKey, - REMOTE_configurationChanged, - REMOTE_updateStreams, - REMOTE_logs, - REMOTE_metrics, - REMOTE_properties, - REMOTE_uploadInfo, - REMOTE_getValues, - REMOTE_getValuesAll, - REMOTE_getMessages, - REMOTE_getRequestLogger, - REMOTE_evaluate, - REMOTE_update, - REMOTE_updateContainerConfiguration, - REMOTE_suspendContainer, - REMOTE_resumeContainer, - REMOTE_testContainer, - REMOTE_setupConfiguration; + REQUEST_FAILED_test, + REQUEST_FAILED_suspend, + REQUEST_FAILED_resume, + REQUEST_FAILED_publicKey, + REQUEST_FAILED_configurationChanged, + REQUEST_FAILED_updateStreams, + REQUEST_FAILED_logs, + REQUEST_FAILED_metrics, + REQUEST_FAILED_properties, + REQUEST_FAILED_uploadInfo, + REQUEST_FAILED_getValues, + REQUEST_FAILED_getValuesAll, + REQUEST_FAILED_getMessages, + REQUEST_FAILED_getRequestLogger, + REQUEST_FAILED_evaluate, + REQUEST_FAILED_update, + REQUEST_FAILED_updateContainerConfiguration, + REQUEST_FAILED_suspendContainer, + REQUEST_FAILED_resumeContainer, + REQUEST_FAILED_testContainer, + REQUEST_FAILED_setupConfiguration, + REMOTE_CALL_FAILED_test, + REMOTE_CALL_FAILED_suspend, + REMOTE_CALL_FAILED_resume, + REMOTE_CALL_FAILED_publicKey, + REMOTE_CALL_FAILED_configurationChanged, + REMOTE_CALL_FAILED_updateStreams, + REMOTE_CALL_FAILED_logs, + REMOTE_CALL_FAILED_metrics, + REMOTE_CALL_FAILED_properties, + REMOTE_CALL_FAILED_uploadInfo, + REMOTE_CALL_FAILED_getValues, + REMOTE_CALL_FAILED_getValuesAll, + REMOTE_CALL_FAILED_getMessages, + REMOTE_CALL_FAILED_getRequestLogger, + REMOTE_CALL_FAILED_evaluate, + REMOTE_CALL_FAILED_update, + REMOTE_CALL_FAILED_updateContainerConfiguration, + REMOTE_CALL_FAILED_suspendContainer, + REMOTE_CALL_FAILED_resumeContainer, + REMOTE_CALL_FAILED_testContainer, + REMOTE_CALL_FAILED_setupConfiguration; static { - EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.docker.host.servers.manager.logging.DockerHostManager"); + EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManager"); } } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerOperationEnum.java index 5f78870..8413539 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerOperationEnum.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/manager/logging/DockerHostManagerOperationEnum.java @@ -1,71 +1,42 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.dcae.controller.service.docker.host.servers.manager.logging; import org.openecomp.entity.EcompOperationEnum; public enum DockerHostManagerOperationEnum implements EcompOperationEnum { - test, - suspend, - resume, - publicKey, - configurationChanged, - updateStreams, - logs, - metrics, - properties, - uploadInfo, - getValues, - getValuesAll, - getMessages, - getRequestLogger, - evaluate, - update, - updateContainerConfiguration, - suspendContainer, - resumeContainer, - testContainer, - setupConfiguration, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_publicKey, - REMOTE_configurationChanged, - REMOTE_updateStreams, - REMOTE_logs, - REMOTE_metrics, - REMOTE_properties, - REMOTE_uploadInfo, - REMOTE_getValues, - REMOTE_getValuesAll, - REMOTE_getMessages, - REMOTE_getRequestLogger, - REMOTE_evaluate, - REMOTE_update, - REMOTE_updateContainerConfiguration, - REMOTE_suspendContainer, - REMOTE_resumeContainer, - REMOTE_testContainer, - REMOTE_setupConfiguration; + DockerHostManager_test("DockerHostManager@test"), + DockerHostManager_suspend("DockerHostManager@suspend"), + DockerHostManager_resume("DockerHostManager@resume"), + DockerHostManager_publicKey("DockerHostManager@publicKey"), + DockerHostManager_configurationChanged("DockerHostManager@configurationChanged"), + DockerHostManager_updateStreams("DockerHostManager@updateStreams"), + DockerHostManager_logs("DockerHostManager@logs"), + DockerHostManager_metrics("DockerHostManager@metrics"), + DockerHostManager_properties("DockerHostManager@properties"), + DockerHostManager_uploadInfo("DockerHostManager@uploadInfo"), + DockerHostManager_getValues("DockerHostManager@getValues"), + DockerHostManager_getValuesAll("DockerHostManager@getValuesAll"), + DockerHostManager_getMessages("DockerHostManager@getMessages"), + DockerHostManager_getRequestLogger("DockerHostManager@getRequestLogger"), + DockerHostManager_evaluate("DockerHostManager@evaluate"), + DockerHostManager_update("DockerHostManager@update"), + DockerHostManager_updateContainerConfiguration("DockerHostManager@updateContainerConfiguration"), + DockerHostManager_suspendContainer("DockerHostManager@suspendContainer"), + DockerHostManager_resumeContainer("DockerHostManager@resumeContainer"), + DockerHostManager_testContainer("DockerHostManager@testContainer"), + DockerHostManager_setupConfiguration("DockerHostManager@setupConfiguration") ; + + + private String n; + + private DockerHostManagerOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostService.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostService.java index f1faaf4..7de0097 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostService.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostService.java @@ -26,20 +26,27 @@ package org.openecomp.dcae.controller.service.docker.host.servers.service; + import java.io.InputStream; import org.openecomp.ncomp.sirius.manager.IRequestHandler; +import org.openecomp.ncomp.sirius.manager.ISwaggerHandler; import org.openecomp.ncomp.sirius.manager.ISiriusPlugin; import org.openecomp.ncomp.sirius.manager.ISiriusServer; +import org.openecomp.ncomp.sirius.manager.ISiriusProvider; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.SwaggerUtils; import org.openecomp.ncomp.sirius.function.FunctionUtils; import org.openecomp.ncomp.component.ApiRequestStatus; import org.apache.log4j.Logger; -import org.openecomp.logger.EcompLogger; +import org.openecomp.ncomp.sirius.manager.logging.NcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.ecore.EObject; import org.json.JSONObject; import java.util.Date; @@ -54,9 +61,9 @@ import org.openecomp.dcae.controller.service.docker.host.service.impl.DockerHost -public class DcaeDockerHostService extends DockerHostServiceImpl implements ISiriusPlugin { +public class DcaeDockerHostService extends DockerHostServiceImpl implements ISiriusProvider, ISiriusPlugin { public static final Logger logger = Logger.getLogger(DcaeDockerHostService.class); - static final EcompLogger ecomplogger = EcompLogger.getEcompLogger(); + static final NcompLogger ecomplogger = NcompLogger.getNcompLogger(); public DcaeDockerHostServiceProvider controller; ISiriusServer server; @@ -71,9 +78,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.START, duration_,instanceName,containerPath); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.deploy); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_deploy,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_deploy,"self:" + ManagementServer.object2ref(this)); try { controller.deploy(instanceName,containerPath); } @@ -82,8 +88,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "deploy", ApiRequestStatus.ERROR, duration_,instanceName,containerPath); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.deploy, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_deploy, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_deploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_deploy, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -98,9 +106,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.undeploy); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_undeploy,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_undeploy,"self:" + ManagementServer.object2ref(this)); try { controller.undeploy(instanceName); } @@ -109,8 +116,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "undeploy", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.undeploy, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_undeploy, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_undeploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_undeploy, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -125,9 +134,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.test); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_test,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_test,"self:" + ManagementServer.object2ref(this)); try { res = controller.test(instanceName); } @@ -136,8 +144,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "test", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.test, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_test, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -152,9 +162,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.suspend); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_suspend,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_suspend,"self:" + ManagementServer.object2ref(this)); try { controller.suspend(instanceName); } @@ -163,8 +172,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "suspend", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.suspend, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_suspend, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -179,9 +190,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.resume); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_resume,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_resume,"self:" + ManagementServer.object2ref(this)); try { controller.resume(instanceName); } @@ -190,8 +200,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "resume", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.resume, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_resume, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -206,9 +218,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.pushManagerConfiguration); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_pushManagerConfiguration,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_pushManagerConfiguration,"self:" + ManagementServer.object2ref(this)); try { controller.pushManagerConfiguration(instanceName); } @@ -217,8 +228,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "pushManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.pushManagerConfiguration, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_pushManagerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -233,9 +246,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.pollManagerConfiguration); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_pollManagerConfiguration,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_pollManagerConfiguration,"self:" + ManagementServer.object2ref(this)); try { controller.pollManagerConfiguration(instanceName); } @@ -244,8 +256,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "pollManagerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.pollManagerConfiguration, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_pollManagerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -260,9 +274,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.managerConfiguration); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_managerConfiguration,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_managerConfiguration,"self:" + ManagementServer.object2ref(this)); try { res = controller.managerConfiguration(instanceName); } @@ -271,8 +284,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "managerConfiguration", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.managerConfiguration, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_managerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_managerConfiguration, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -287,9 +302,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.START, duration_,instanceName,operation,parameters); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.managerOperation); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_managerOperation,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_managerOperation,"self:" + ManagementServer.object2ref(this)); try { res = controller.managerOperation(instanceName,operation,parameters); } @@ -298,8 +312,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "managerOperation", ApiRequestStatus.ERROR, duration_,instanceName,operation,parameters); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.managerOperation, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_managerOperation, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_managerOperation,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_managerOperation, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -314,9 +330,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.START, duration_,instanceName); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.updateConfigurationFromPolicy); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_updateConfigurationFromPolicy,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_updateConfigurationFromPolicy,"self:" + ManagementServer.object2ref(this)); try { controller.updateConfigurationFromPolicy(instanceName); } @@ -325,8 +340,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "updateConfigurationFromPolicy", ApiRequestStatus.ERROR, duration_,instanceName); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.updateConfigurationFromPolicy, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_updateConfigurationFromPolicy, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -341,9 +358,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.runHealthTests); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_runHealthTests,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_runHealthTests,"self:" + ManagementServer.object2ref(this)); try { controller.runHealthTests(); } @@ -352,8 +368,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "runHealthTests", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.runHealthTests, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_runHealthTests,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_runHealthTests, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -368,9 +386,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.START, duration_); Date now_ = new Date(); - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.updateDeploymentStatus); - ecomplogger.setInstanceId(ManagementServer.object2ref(this)); + ecomplogger.recordAuditEventStartIfNeeded(DockerHostServiceOperationEnum.DockerHostService_updateDeploymentStatus,server,this); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_updateDeploymentStatus,"self:" + ManagementServer.object2ref(this)); try { controller.updateDeploymentStatus(); } @@ -379,8 +396,10 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir if (server != null) server.getServer().recordApi(null, this, "updateDeploymentStatus", ApiRequestStatus.ERROR, duration_); System.err.println("ERROR: " + e); - ecomplogger.warn(DockerHostServiceMessageEnum.updateDeploymentStatus, e.toString()); - throw e; + ecomplogger.warn(DockerHostServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR, DockerHostServiceMessageEnum.REQUEST_FAILED_updateDeploymentStatus, e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); duration_ = new Date().getTime()-now_.getTime(); @@ -394,6 +413,8 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir + + @Override public void start() { controller.start(); @@ -402,7 +423,7 @@ public class DcaeDockerHostService extends DockerHostServiceImpl implements ISir public static void ecoreSetup() { DcaeDockerHostServiceProvider.ecoreSetup(); } - public DcaeDockerHostServiceProvider getSomfProvider() { + public DcaeDockerHostServiceProvider getSiriusProvider() { return controller; } } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceClient.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceClient.java index 74caf0f..a8684e9 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceClient.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceClient.java @@ -30,6 +30,8 @@ import org.openecomp.ncomp.sirius.manager.GenericHttpClient; import org.apache.log4j.Logger; import org.openecomp.logger.EcompLogger; +import org.openecomp.logger.StatusCodeEnum; +import org.openecomp.logger.EcompException; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; @@ -54,33 +56,37 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { DcaeDockerHostService.ecoreSetup(); client = new GenericHttpClient(file,name); client.add("/resources", this); + client.setVersion("ONAP-R2"); } public DcaeDockerHostServiceClient(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 DcaeDockerHostServiceClient(AbstractClient c) { client = c; client.add("/resources", this); + client.setVersion("ONAP-R2"); } @Override public void deploy(java.lang.String instanceName, java.lang.String containerPath) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_deploy); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_deploy,client.getRemote()); try { client.operationPath("/resources", c, "deploy", null, instanceName,containerPath); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_deploy, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@deploy: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_deploy, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_deploy,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -88,16 +94,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public void undeploy(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_undeploy); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_undeploy,client.getRemote()); try { client.operationPath("/resources", c, "undeploy", null, instanceName); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_undeploy, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@undeploy: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_undeploy, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_undeploy,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -105,16 +112,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public org.openecomp.dcae.controller.core.service.HealthTestResponse test(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_test); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_test,client.getRemote()); org.openecomp.dcae.controller.core.service.HealthTestResponse res; try { res = (org.openecomp.dcae.controller.core.service.HealthTestResponse) client.operationPath("/resources", c, "test", null, instanceName); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_test, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@test: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_test, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_test,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_test,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -122,16 +130,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public void suspend(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_suspend); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_suspend,client.getRemote()); try { client.operationPath("/resources", c, "suspend", null, instanceName); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_suspend, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@suspend: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_suspend, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_suspend,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -139,16 +148,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public void resume(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_resume); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_resume,client.getRemote()); try { client.operationPath("/resources", c, "resume", null, instanceName); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_resume, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@resume: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_resume, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_resume,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_resume,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -156,16 +166,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public void pushManagerConfiguration(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_pushManagerConfiguration); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_pushManagerConfiguration,client.getRemote()); try { client.operationPath("/resources", c, "pushManagerConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_pushManagerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@pushManagerConfiguration: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pushManagerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -173,16 +184,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public void pollManagerConfiguration(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_pollManagerConfiguration); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_pollManagerConfiguration,client.getRemote()); try { client.operationPath("/resources", c, "pollManagerConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_pollManagerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@pollManagerConfiguration: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_pollManagerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -190,16 +202,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public org.eclipse.emf.ecore.EObject managerConfiguration(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_managerConfiguration); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_managerConfiguration,client.getRemote()); org.eclipse.emf.ecore.EObject res; try { res = (org.eclipse.emf.ecore.EObject) client.operationPath("/resources", c, "managerConfiguration", null, instanceName); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_managerConfiguration, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerConfiguration: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerConfiguration,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -207,16 +220,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public org.json.JSONObject managerOperation(java.lang.String instanceName, java.lang.String operation, org.json.JSONObject parameters) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_managerOperation); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_managerOperation,client.getRemote()); org.json.JSONObject res; try { res = (org.json.JSONObject) client.operationPath("/resources", c, "managerOperation", null, instanceName,operation,parameters); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_managerOperation, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@managerOperation: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_managerOperation,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); return res; @@ -224,16 +238,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public void updateConfigurationFromPolicy(java.lang.String instanceName) { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_updateConfigurationFromPolicy); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_updateConfigurationFromPolicy,client.getRemote()); try { client.operationPath("/resources", c, "updateConfigurationFromPolicy", null, instanceName); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_updateConfigurationFromPolicy, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateConfigurationFromPolicy: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateConfigurationFromPolicy,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -241,16 +256,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public void runHealthTests() { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_runHealthTests); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_runHealthTests,client.getRemote()); try { client.operationPath("/resources", c, "runHealthTests", null); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_runHealthTests, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@runHealthTests: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_runHealthTests,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); @@ -258,16 +274,17 @@ public class DcaeDockerHostServiceClient extends DockerHostServiceImpl { @Override public void updateDeploymentStatus() { - EClass c = ServicePackage.eINSTANCE.getDockerHostService(); //foo - ecomplogger.recordMetricEventStart(); - ecomplogger.setOperation(DockerHostServiceOperationEnum.REMOTE_updateDeploymentStatus); + EClass c = ServicePackage.eINSTANCE.getDockerHostService(); + ecomplogger.recordMetricEventStart(DockerHostServiceOperationEnum.DockerHostService_updateDeploymentStatus,client.getRemote()); try { client.operationPath("/resources", c, "updateDeploymentStatus", null); } catch (Exception e) { - ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_updateDeploymentStatus, e.toString()); - throw new RuntimeException("remote call failed: " + client.getRemote() + "@updateDeploymentStatus: " + e); + ecomplogger.warn(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus, e.toString()); + EcompException e1 = EcompException.create(DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e,e.getMessage()); + ecomplogger.recordMetricEventEnd(StatusCodeEnum.ERROR,DockerHostServiceMessageEnum.REMOTE_CALL_FAILED_updateDeploymentStatus,e.getMessage()); + throw e1; } ecomplogger.recordMetricEventEnd(); diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceServer.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceServer.java index 74e8d0d..d62ca44 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceServer.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/DcaeDockerHostServiceServer.java @@ -26,17 +26,16 @@ package org.openecomp.dcae.controller.service.docker.host.servers.service; import static org.openecomp.ncomp.utils.PropertyUtil.getPropertiesFromClasspath; import java.io.IOException; +import java.io.InputStream; import java.util.Properties; import java.util.TimeZone; import org.apache.log4j.Logger; import org.eclipse.emf.ecore.EFactory; - -import org.openecomp.entity.EcompComponent; -import org.openecomp.entity.EcompSubComponent; -import org.openecomp.entity.EcompSubComponentInstance; +import org.json.JSONObject; import org.openecomp.ncomp.sirius.manager.Jetty8Server; import org.openecomp.ncomp.sirius.manager.ManagementServer; +import org.openecomp.ncomp.sirius.manager.IRequestHandler; import org.openecomp.ncomp.sirius.manager.ISiriusServer; import org.openecomp.dcae.controller.service.docker.host.service.DockerHostService; @@ -46,7 +45,7 @@ import org.openecomp.dcae.controller.service.docker.host.service.DockerHostServi -public class DcaeDockerHostServiceServer implements ISiriusServer { +public class DcaeDockerHostServiceServer implements ISiriusServer, IRequestHandler { public static final Logger logger = Logger.getLogger(DcaeDockerHostServiceServer.class); String serverPath; ManagementServer server; @@ -64,6 +63,7 @@ public class DcaeDockerHostServiceServer implements ISiriusServer { props = getPropertiesFromClasspath(filename); serverPath = (String) props.get("server.dir"); server = new ManagementServer(f, "DockerHostService", serverPath, filename); + ManagementServer.setBuildVersion("ONAP-R2"); server.addFactory(f); server.addRuntimeFactories(this); @@ -73,6 +73,7 @@ public class DcaeDockerHostServiceServer implements ISiriusServer { controller = (DcaeDockerHostService) server.find("/").o; webServer = new Jetty8Server("service.properties"); webServer.add("/resources",server); + webServer.add("/api",this); @@ -95,4 +96,17 @@ public class DcaeDockerHostServiceServer implements ISiriusServer { public ManagementServer getServer() { return server; } + public Object handleJson(String userName, String action, String resourcePath, JSONObject json, JSONObject context, + String clientVersion) { + switch ((String) context.get("path")) { + case "/api/versions": + return server.supportedVersions(); + } + logger.warn("Unknown request action=" + action + " path=" + resourcePath + " context=" + context.toString(2)); + throw new RuntimeException("Unknown request"); + } + public Object handleBinary(String userName, String action, String resourcePath, InputStream in) { + return null; + } + } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService.properties b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService.properties index d32cf07..1218d2a 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService.properties +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService.properties @@ -1,150 +1,150 @@ dummy=\ - null|\ + dummy-null|\ null|\ null|\ null -deploy=\ - deploy-FAILED-5001W|\ +REQUEST_FAILED_deploy=\ + REQUEST-FAILED-deploy-4001W|\ {0}|\ null|\ Operation Failed with Exception -undeploy=\ - undeploy-FAILED-5001W|\ +REQUEST_FAILED_undeploy=\ + REQUEST-FAILED-undeploy-4001W|\ {0}|\ null|\ Operation Failed with Exception -test=\ - test-FAILED-5001W|\ +REQUEST_FAILED_test=\ + REQUEST-FAILED-test-4001W|\ {0}|\ null|\ Operation Failed with Exception -suspend=\ - suspend-FAILED-5001W|\ +REQUEST_FAILED_suspend=\ + REQUEST-FAILED-suspend-4001W|\ {0}|\ null|\ Operation Failed with Exception -resume=\ - resume-FAILED-5001W|\ +REQUEST_FAILED_resume=\ + REQUEST-FAILED-resume-4001W|\ {0}|\ null|\ Operation Failed with Exception -pushManagerConfiguration=\ - pushManagerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_pushManagerConfiguration=\ + REQUEST-FAILED-pushManagerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -pollManagerConfiguration=\ - pollManagerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_pollManagerConfiguration=\ + REQUEST-FAILED-pollManagerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -managerConfiguration=\ - managerConfiguration-FAILED-5001W|\ +REQUEST_FAILED_managerConfiguration=\ + REQUEST-FAILED-managerConfiguration-4001W|\ {0}|\ null|\ Operation Failed with Exception -managerOperation=\ - managerOperation-FAILED-5001W|\ +REQUEST_FAILED_managerOperation=\ + REQUEST-FAILED-managerOperation-4001W|\ {0}|\ null|\ Operation Failed with Exception -updateConfigurationFromPolicy=\ - updateConfigurationFromPolicy-FAILED-5001W|\ +REQUEST_FAILED_updateConfigurationFromPolicy=\ + REQUEST-FAILED-updateConfigurationFromPolicy-4001W|\ {0}|\ null|\ Operation Failed with Exception -runHealthTests=\ - runHealthTests-FAILED-5001W|\ +REQUEST_FAILED_runHealthTests=\ + REQUEST-FAILED-runHealthTests-4001W|\ {0}|\ null|\ Operation Failed with Exception -updateDeploymentStatus=\ - updateDeploymentStatus-FAILED-5001W|\ +REQUEST_FAILED_updateDeploymentStatus=\ + REQUEST-FAILED-updateDeploymentStatus-4001W|\ {0}|\ null|\ Operation Failed with Exception -REMOTE_deploy=\ - REMOTE-deploy-FAILED-5001W|\ +REMOTE_CALL_FAILED_deploy=\ + REMOTE-CALL-FAILED-deploy-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_undeploy=\ - REMOTE-undeploy-FAILED-5001W|\ +REMOTE_CALL_FAILED_undeploy=\ + REMOTE-CALL-FAILED-undeploy-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_test=\ - REMOTE-test-FAILED-5001W|\ +REMOTE_CALL_FAILED_test=\ + REMOTE-CALL-FAILED-test-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_suspend=\ - REMOTE-suspend-FAILED-5001W|\ +REMOTE_CALL_FAILED_suspend=\ + REMOTE-CALL-FAILED-suspend-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_resume=\ - REMOTE-resume-FAILED-5001W|\ +REMOTE_CALL_FAILED_resume=\ + REMOTE-CALL-FAILED-resume-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_pushManagerConfiguration=\ - REMOTE-pushManagerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_pushManagerConfiguration=\ + REMOTE-CALL-FAILED-pushManagerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_pollManagerConfiguration=\ - REMOTE-pollManagerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_pollManagerConfiguration=\ + REMOTE-CALL-FAILED-pollManagerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_managerConfiguration=\ - REMOTE-managerConfiguration-FAILED-5001W|\ +REMOTE_CALL_FAILED_managerConfiguration=\ + REMOTE-CALL-FAILED-managerConfiguration-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_managerOperation=\ - REMOTE-managerOperation-FAILED-5001W|\ +REMOTE_CALL_FAILED_managerOperation=\ + REMOTE-CALL-FAILED-managerOperation-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_updateConfigurationFromPolicy=\ - REMOTE-updateConfigurationFromPolicy-FAILED-5001W|\ +REMOTE_CALL_FAILED_updateConfigurationFromPolicy=\ + REMOTE-CALL-FAILED-updateConfigurationFromPolicy-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_runHealthTests=\ - REMOTE-runHealthTests-FAILED-5001W|\ +REMOTE_CALL_FAILED_runHealthTests=\ + REMOTE-CALL-FAILED-runHealthTests-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception -REMOTE_updateDeploymentStatus=\ - REMOTE-updateDeploymentStatus-FAILED-5001W|\ +REMOTE_CALL_FAILED_updateDeploymentStatus=\ + REMOTE-CALL-FAILED-updateDeploymentStatus-4001W|\ {0}|\ null|\ Remote Operation Failed with Exception diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceMessageEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceMessageEnum.java index 1987966..f75f4db 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceMessageEnum.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceMessageEnum.java @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.dcae.controller.service.docker.host.servers.service.logging; import com.att.eelf.i18n.EELFResourceManager; @@ -28,32 +7,32 @@ import org.openecomp.logger.EcompMessageEnum; public enum DockerHostServiceMessageEnum implements EcompMessageEnum { dummy, - deploy, - undeploy, - test, - suspend, - resume, - pushManagerConfiguration, - pollManagerConfiguration, - managerConfiguration, - managerOperation, - updateConfigurationFromPolicy, - runHealthTests, - updateDeploymentStatus, - REMOTE_deploy, - REMOTE_undeploy, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_pushManagerConfiguration, - REMOTE_pollManagerConfiguration, - REMOTE_managerConfiguration, - REMOTE_managerOperation, - REMOTE_updateConfigurationFromPolicy, - REMOTE_runHealthTests, - REMOTE_updateDeploymentStatus; + REQUEST_FAILED_deploy, + REQUEST_FAILED_undeploy, + REQUEST_FAILED_test, + REQUEST_FAILED_suspend, + REQUEST_FAILED_resume, + REQUEST_FAILED_pushManagerConfiguration, + REQUEST_FAILED_pollManagerConfiguration, + REQUEST_FAILED_managerConfiguration, + REQUEST_FAILED_managerOperation, + REQUEST_FAILED_updateConfigurationFromPolicy, + REQUEST_FAILED_runHealthTests, + REQUEST_FAILED_updateDeploymentStatus, + REMOTE_CALL_FAILED_deploy, + REMOTE_CALL_FAILED_undeploy, + REMOTE_CALL_FAILED_test, + REMOTE_CALL_FAILED_suspend, + REMOTE_CALL_FAILED_resume, + REMOTE_CALL_FAILED_pushManagerConfiguration, + REMOTE_CALL_FAILED_pollManagerConfiguration, + REMOTE_CALL_FAILED_managerConfiguration, + REMOTE_CALL_FAILED_managerOperation, + REMOTE_CALL_FAILED_updateConfigurationFromPolicy, + REMOTE_CALL_FAILED_runHealthTests, + REMOTE_CALL_FAILED_updateDeploymentStatus; static { - EELFResourceManager.loadMessageBundle("org.openecomp.dcae.controller.service.docker.host.servers.service.logging.DockerHostService"); + EELFResourceManager.loadMessageBundle("org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostService"); } } diff --git a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceOperationEnum.java b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceOperationEnum.java index 1efe437..b3c4d7f 100644 --- a/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceOperationEnum.java +++ b/dcae-controller-service-docker/dcae-controller-service-docker-host/dcae-controller-service-docker-host-manager/src/main/sirius-gen/org/openecomp/dcae/controller/service/docker/host/servers/service/logging/DockerHostServiceOperationEnum.java @@ -1,53 +1,33 @@ -/*- - * ============LICENSE_START========================================== - * OPENECOMP - DCAE - * =================================================================== - * Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - */ - - package org.openecomp.dcae.controller.service.docker.host.servers.service.logging; import org.openecomp.entity.EcompOperationEnum; public enum DockerHostServiceOperationEnum implements EcompOperationEnum { - deploy, - undeploy, - test, - suspend, - resume, - pushManagerConfiguration, - pollManagerConfiguration, - managerConfiguration, - managerOperation, - updateConfigurationFromPolicy, - runHealthTests, - updateDeploymentStatus, - REMOTE_deploy, - REMOTE_undeploy, - REMOTE_test, - REMOTE_suspend, - REMOTE_resume, - REMOTE_pushManagerConfiguration, - REMOTE_pollManagerConfiguration, - REMOTE_managerConfiguration, - REMOTE_managerOperation, - REMOTE_updateConfigurationFromPolicy, - REMOTE_runHealthTests, - REMOTE_updateDeploymentStatus; + DockerHostService_deploy("DockerHostService@deploy"), + DockerHostService_undeploy("DockerHostService@undeploy"), + DockerHostService_test("DockerHostService@test"), + DockerHostService_suspend("DockerHostService@suspend"), + DockerHostService_resume("DockerHostService@resume"), + DockerHostService_pushManagerConfiguration("DockerHostService@pushManagerConfiguration"), + DockerHostService_pollManagerConfiguration("DockerHostService@pollManagerConfiguration"), + DockerHostService_managerConfiguration("DockerHostService@managerConfiguration"), + DockerHostService_managerOperation("DockerHostService@managerOperation"), + DockerHostService_updateConfigurationFromPolicy("DockerHostService@updateConfigurationFromPolicy"), + DockerHostService_runHealthTests("DockerHostService@runHealthTests"), + DockerHostService_updateDeploymentStatus("DockerHostService@updateDeploymentStatus") ; + + + private String n; + + private DockerHostServiceOperationEnum(String n) { + this.n = n; + } + + @Override + public String toString() { + return n; + } + } |