diff options
Diffstat (limited to 'src')
84 files changed, 3065 insertions, 741 deletions
diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java new file mode 100644 index 000000000..10306b433 --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserFilesConfiguration.java @@ -0,0 +1,52 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2018 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============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.config.sdc; + +/** + * This class is used to decode the configuration found in + * application.properties, this is related to the blueprint mapping + * configuration that is used to create data in database, according to the + * blueprint content coming from SDC. + */ +public class BlueprintParserFilesConfiguration { + + private String svgXmlFilePath; + private String bpmnXmlFilePath; + + public String getBpmnXmlFilePath() { + return bpmnXmlFilePath; + } + + public void setBpmnXmlFilePath(String bpmnXmlFilePath) { + this.bpmnXmlFilePath = bpmnXmlFilePath; + } + + public String getSvgXmlFilePath() { + return svgXmlFilePath; + } + + public void setSvgXmlFilePath(String svgXmlFilePath) { + this.svgXmlFilePath = svgXmlFilePath; + } +} diff --git a/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java new file mode 100644 index 000000000..b26310400 --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/config/sdc/BlueprintParserMappingConfiguration.java @@ -0,0 +1,65 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2018 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============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.config.sdc; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.io.IOException; +import java.io.InputStream; +import java.util.List; + +/** + * This class is used to decode the configuration found in + * application.properties, this is related to the blueprint mapping + * configuration that is used to create data in database, according to the + * blueprint content coming from SDC. + */ +public class BlueprintParserMappingConfiguration { + + private String blueprintKey; + private BlueprintParserFilesConfiguration files; + + public String getBlueprintKey() { + return blueprintKey; + } + + public void setBlueprintKey(String blueprintKey) { + this.blueprintKey = blueprintKey; + } + + public BlueprintParserFilesConfiguration getFiles() { + return files; + } + + public void setFiles(BlueprintParserFilesConfiguration filesConfig) { + this.files = filesConfig; + } + + public static List<BlueprintParserMappingConfiguration> createFromJson(InputStream json) throws IOException { + TypeReference<List<BlueprintParserMappingConfiguration>> mapType = new TypeReference<List<BlueprintParserMappingConfiguration>>() { + }; + return new ObjectMapper().readValue(json, mapType); + } +} diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java b/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java new file mode 100644 index 000000000..3c877254e --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java @@ -0,0 +1,310 @@ +/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2018 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============================================
+ * ===================================================================
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ */
+
+package org.onap.clamp.clds.sdc.controller;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+import java.util.Date;
+
+import org.onap.clamp.clds.config.ClampProperties;
+import org.onap.clamp.clds.config.sdc.SdcSingleControllerConfiguration;
+import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException;
+import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException;
+import org.onap.clamp.clds.exception.sdc.controller.SdcControllerException;
+import org.onap.clamp.clds.exception.sdc.controller.SdcDownloadException;
+import org.onap.clamp.clds.exception.sdc.controller.SdcParametersException;
+import org.onap.clamp.clds.sdc.controller.installer.CsarHandler;
+import org.onap.clamp.clds.sdc.controller.installer.CsarInstaller;
+import org.onap.clamp.clds.util.LoggingUtils;
+import org.openecomp.sdc.api.IDistributionClient;
+import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;
+import org.openecomp.sdc.api.consumer.INotificationCallback;
+import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.openecomp.sdc.api.notification.INotificationData;
+import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
+import org.openecomp.sdc.api.results.IDistributionClientResult;
+import org.openecomp.sdc.impl.DistributionClientFactory;
+import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.openecomp.sdc.utils.DistributionActionResultEnum;
+import org.openecomp.sdc.utils.DistributionStatusEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SdcSingleController {
+
+ private static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcSingleController.class);
+ protected boolean isAsdcClientAutoManaged = false;
+ protected CsarInstaller resourceInstaller;
+ @Autowired
+ protected ClampProperties refProp;
+ public static final String CONFIG_SDC_FOLDER = "sdc.csarFolder";
+
+ /**
+ * Inner class for Notification callback
+ */
+ private final class ASDCNotificationCallBack implements INotificationCallback {
+
+ private SdcSingleController asdcController;
+
+ ASDCNotificationCallBack(SdcSingleController controller) {
+ asdcController = controller;
+ }
+
+ /**
+ * This method can be called multiple times at the same moment. The
+ * controller must be thread safe !
+ */
+ @Override
+ public void activateCallback(INotificationData iNotif) {
+ Date startTime = new Date();
+ String event = "Receive a callback notification in ASDC, nb of resources: " + iNotif.getResources().size();
+ logger.debug(event);
+ asdcController.treatNotification(iNotif);
+ LoggingUtils.setTimeContext(startTime, new Date());
+ LoggingUtils.setResponseContext("0", "SDC Notification received and processed successfully",
+ this.getClass().getName());
+ }
+ }
+
+ // ***** Controller STATUS code
+ protected int nbOfNotificationsOngoing = 0;
+
+ public int getNbOfNotificationsOngoing() {
+ return nbOfNotificationsOngoing;
+ }
+
+ private SdcSingleControllerStatus controllerStatus = SdcSingleControllerStatus.STOPPED;
+
+ protected final synchronized void changeControllerStatus(SdcSingleControllerStatus newControllerStatus) {
+ switch (newControllerStatus) {
+ case BUSY:
+ ++this.nbOfNotificationsOngoing;
+ this.controllerStatus = newControllerStatus;
+ break;
+ case IDLE:
+ if (this.nbOfNotificationsOngoing > 1) {
+ --this.nbOfNotificationsOngoing;
+ } else {
+ this.nbOfNotificationsOngoing = 0;
+ this.controllerStatus = newControllerStatus;
+ }
+ break;
+ default:
+ this.controllerStatus = newControllerStatus;
+ break;
+ }
+ }
+
+ public final synchronized SdcSingleControllerStatus getControllerStatus() {
+ return this.controllerStatus;
+ }
+
+ // ***** END of Controller STATUS code
+ protected SdcSingleControllerConfiguration sdcConfig;
+ private IDistributionClient distributionClient;
+
+ /**
+ * This method initializes the SDC Controller and the SDC Client.
+ *
+ * @throws SdcControllerException
+ * It throws an exception if the SDC Client cannot be
+ * instantiated or if an init attempt is done when already
+ * initialized
+ * @throws SdcParametersException
+ * If there is an issue with the parameters provided
+ */
+ public void initSdc() throws SdcControllerException {
+ logger.debug("Attempt to initialize the SDC Controller");
+ if (this.getControllerStatus() != SdcSingleControllerStatus.STOPPED) {
+ throw new SdcControllerException("The controller is already initialized, call the closeSDC method first");
+ }
+ if (this.distributionClient == null) {
+ distributionClient = DistributionClientFactory.createDistributionClient();
+ }
+ IDistributionClientResult result = this.distributionClient.init(sdcConfig, new ASDCNotificationCallBack(this));
+ if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {
+ logger.error("ASDC distribution client init failed with reason:" + result.getDistributionMessageResult());
+ this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);
+ throw new SdcControllerException("Initialization of the SDC Controller failed with reason: "
+ + result.getDistributionMessageResult());
+ }
+ result = this.distributionClient.start();
+ if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {
+ logger.debug("SDC distribution client start failed with reason:" + result.getDistributionMessageResult());
+ this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);
+ throw new SdcControllerException(
+ "Startup of the SDC Controller failed with reason: " + result.getDistributionMessageResult());
+ }
+ this.changeControllerStatus(SdcSingleControllerStatus.IDLE);
+ }
+
+ /**
+ * This method closes the SDC Controller and the SDC Client.
+ *
+ * @throws SdcControllerException
+ * It throws an exception if the SDC Client cannot be closed
+ * because it's currently BUSY in processing notifications.
+ */
+ public void closeSdc() throws SdcControllerException {
+ if (this.getControllerStatus() == SdcSingleControllerStatus.BUSY) {
+ throw new SdcControllerException("Cannot close the ASDC controller as it's currently in BUSY state");
+ }
+ if (this.distributionClient != null) {
+ this.distributionClient.stop();
+ // If auto managed we can set it to Null, SdcController controls it.
+ // In the other case the client of this class has specified it, so
+ // we can't reset it
+ if (isAsdcClientAutoManaged) {
+ // Next init will initialize it with a new Sdc Client
+ this.distributionClient = null;
+ }
+ }
+ this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);
+ }
+
+ /**
+ * This method processes the notification received from Sdc.
+ *
+ * @param iNotif
+ * The INotificationData
+ */
+ public void treatNotification(INotificationData iNotif) {
+ CsarHandler csar = null;
+ try {
+ logger.info("Notification received for service UUID:" + iNotif.getServiceUUID());
+ this.changeControllerStatus(SdcSingleControllerStatus.BUSY);
+ csar = new CsarHandler(iNotif, this.sdcConfig.getSdcControllerName(),
+ refProp.getStringValue(CONFIG_SDC_FOLDER));
+ if (resourceInstaller.isCsarAlreadyDeployed(csar)) {
+ csar.save(downloadTheArtifact(csar.getArtifactElement()));
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_OK, null,
+ System.currentTimeMillis());
+ resourceInstaller.installTheCsar(csar);
+ this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_OK, null,
+ System.currentTimeMillis());
+ } else {
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(),
+ DistributionStatusEnum.ALREADY_DOWNLOADED, null, System.currentTimeMillis());
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.ALREADY_DEPLOYED,
+ null, System.currentTimeMillis());
+ }
+ } catch (SdcArtifactInstallerException e) {
+ logger.error("SdcArtifactInstallerException exception caught during the notification processing", e);
+ this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_ERROR,
+ e.getMessage(), System.currentTimeMillis());
+ } catch (SdcDownloadException e) {
+ logger.error("SdcDownloadException exception caught during the notification processing", e);
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_ERROR,
+ e.getMessage(), System.currentTimeMillis());
+ } catch (CsarHandlerException e) {
+ logger.error("CsarHandlerException exception caught during the notification processing", e);
+ this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_ERROR,
+ e.getMessage(), System.currentTimeMillis());
+ } catch (SdcToscaParserException e) {
+ this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),
+ sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_ERROR,
+ e.getMessage(), System.currentTimeMillis());
+ } catch (RuntimeException e) {
+ logger.error("Unexpected exception caught during the notification processing", e);
+ } finally {
+ this.changeControllerStatus(SdcSingleControllerStatus.IDLE);
+ }
+ }
+
+ private enum NotificationType {
+ DOWNLOAD, DEPLOY
+ }
+
+ private IDistributionClientDownloadResult downloadTheArtifact(IArtifactInfo artifact) throws SdcDownloadException {
+ logger.debug("Trying to download the artifact : " + artifact.getArtifactURL() + " UUID: "
+ + artifact.getArtifactUUID());
+ IDistributionClientDownloadResult downloadResult;
+ try {
+ downloadResult = distributionClient.download(artifact);
+ if (null == downloadResult) {
+ logger.info("downloadResult is Null for: " + artifact.getArtifactUUID());
+ return null;
+ }
+ } catch (RuntimeException e) {
+ throw new SdcDownloadException("Exception caught when downloading the artifact", e);
+ }
+ if (DistributionActionResultEnum.SUCCESS.equals(downloadResult.getDistributionActionResult())) {
+ logger.info("Successfully downloaded the artifact " + artifact.getArtifactURL() + " UUID "
+ + artifact.getArtifactUUID() + "Size of payload " + downloadResult.getArtifactPayload().length);
+ } else {
+ throw new SdcDownloadException("Artifact " + artifact.getArtifactName()
+ + " could not be downloaded from ASDC URL " + artifact.getArtifactURL() + " UUID "
+ + artifact.getArtifactUUID() + ")" + System.lineSeparator() + "Error message is "
+ + downloadResult.getDistributionMessageResult() + System.lineSeparator());
+ }
+ return downloadResult;
+ }
+
+ private void sendASDCNotification(NotificationType notificationType, String artifactURL, String consumerID,
+ String distributionID, DistributionStatusEnum status, String errorReason, long timestamp) {
+ String event = "Sending " + notificationType.name() + "(" + status.name() + ")"
+ + " notification to ASDC for artifact:" + artifactURL;
+ if (errorReason != null) {
+ event = event + "(" + errorReason + ")";
+ }
+ logger.info(event);
+ String action = "";
+ try {
+ IDistributionStatusMessage message = new DistributionStatusMessage(artifactURL, consumerID, distributionID,
+ status, timestamp);
+ switch (notificationType) {
+ case DOWNLOAD:
+ if (errorReason != null) {
+ this.distributionClient.sendDownloadStatus(message, errorReason);
+ } else {
+ this.distributionClient.sendDownloadStatus(message);
+ }
+ action = "sendDownloadStatus";
+ break;
+ case DEPLOY:
+ if (errorReason != null) {
+ this.distributionClient.sendDeploymentStatus(message, errorReason);
+ } else {
+ this.distributionClient.sendDeploymentStatus(message);
+ }
+ action = "sendDeploymentdStatus";
+ break;
+ default:
+ break;
+ }
+ } catch (RuntimeException e) {
+ logger.warn("Unable to send the Sdc Notification (" + action + ") due to an exception", e);
+ }
+ logger.info("Sdc Notification sent successfully(" + action + ")");
+ }
+}
diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java index 270286bcb..940b7cfaf 100644 --- a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java +++ b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandler.java @@ -23,15 +23,21 @@ package org.onap.clamp.clds.sdc.controller.installer; +import com.att.aft.dme2.internal.apache.commons.io.IOUtils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Enumeration; import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException; import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; @@ -43,28 +49,28 @@ import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory; /** - * CsarDescriptor that will be used to deploy in CLAMP. + * CsarDescriptor that will be used to deploy file in CLAMP file system. Some + * methods can also be used to get some data from it. */ public class CsarHandler { private static final EELFLogger logger = EELFManager.getInstance().getLogger(CsarHandler.class); private IArtifactInfo artifactElement; - private String filePath; + private String csarFilePath; private String controllerName; private SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance(); private ISdcCsarHelper sdcCsarHelper; + private String dcaeBlueprint; public static final String CSAR_TYPE = "TOSCA_CSAR"; - private String csarPath; - public CsarHandler(INotificationData iNotif, String controller, String sdcCsarPath) throws CsarHandlerException { - this.csarPath = sdcCsarPath; + public CsarHandler(INotificationData iNotif, String controller, String clampCsarPath) throws CsarHandlerException { this.controllerName = controller; this.artifactElement = searchForUniqueCsar(iNotif); - this.filePath = buildFilePathForCsar(artifactElement); + this.csarFilePath = buildFilePathForCsar(artifactElement, clampCsarPath); } - private String buildFilePathForCsar(IArtifactInfo artifactElement) { - return csarPath + "/" + controllerName + "/" + artifactElement.getArtifactName(); + private String buildFilePathForCsar(IArtifactInfo artifactElement, String clampCsarPath) { + return clampCsarPath + "/" + controllerName + "/" + artifactElement.getArtifactName(); } private IArtifactInfo searchForUniqueCsar(INotificationData iNotif) throws CsarHandlerException { @@ -77,21 +83,41 @@ public class CsarHandler { throw new CsarHandlerException("Unable to find a CSAR in the Sdc Notification"); } - public void save(IDistributionClientDownloadResult resultArtifact) + public synchronized void save(IDistributionClientDownloadResult resultArtifact) throws SdcArtifactInstallerException, SdcToscaParserException { try { logger.info("Writing CSAR file : " + artifactElement.getArtifactURL() + " UUID " + artifactElement.getArtifactUUID() + ")"); - Path path = Paths.get(filePath); + Path path = Paths.get(csarFilePath); Files.createDirectories(path.getParent()); Files.createFile(path); - try (FileOutputStream outFile = new FileOutputStream(filePath)) { + try (FileOutputStream outFile = new FileOutputStream(csarFilePath)) { outFile.write(resultArtifact.getArtifactPayload(), 0, resultArtifact.getArtifactPayload().length); } - sdcCsarHelper = factory.getSdcCsarHelper(filePath); + sdcCsarHelper = factory.getSdcCsarHelper(csarFilePath); + this.loadDcaeBlueprint(); } catch (IOException e) { throw new SdcArtifactInstallerException( - "Exception caught when trying to write the CSAR on the file system to " + filePath, e); + "Exception caught when trying to write the CSAR on the file system to " + csarFilePath, e); + } + } + + private void loadDcaeBlueprint() throws IOException, SdcArtifactInstallerException { + List<ZipEntry> listEntries = new ArrayList<>(); + try (ZipFile zipFile = new ZipFile(csarFilePath)) { + Enumeration<? extends ZipEntry> entries = zipFile.entries(); + while (entries.hasMoreElements()) { + ZipEntry entry = entries.nextElement(); + if (entry.getName().contains("DCAE_INVENTORY_BLUEPRINT")) { + listEntries.add(entry); + } + } + if (listEntries.size() > 1) { + throw new SdcArtifactInstallerException("There are multiple entries in the DCAE inventory"); + } + try (InputStream stream = zipFile.getInputStream(listEntries.get(0))) { + this.dcaeBlueprint = IOUtils.toString(stream); + } } } @@ -100,10 +126,14 @@ public class CsarHandler { } public String getFilePath() { - return filePath; + return csarFilePath; } - public ISdcCsarHelper getSdcCsarHelper() { + public synchronized ISdcCsarHelper getSdcCsarHelper() { return sdcCsarHelper; } + + public synchronized String getDcaeBlueprint() { + return dcaeBlueprint; + } } diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstaller.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstaller.java new file mode 100644 index 000000000..739fc06d0 --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstaller.java @@ -0,0 +1,33 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2018 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============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.sdc.controller.installer; + +import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; + +public interface CsarInstaller { + + boolean isCsarAlreadyDeployed(CsarHandler csar) throws SdcArtifactInstallerException; + + public void installTheCsar(CsarHandler csar) throws SdcArtifactInstallerException; +} diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java new file mode 100644 index 000000000..c56eed517 --- /dev/null +++ b/src/main/java/org/onap/clamp/clds/sdc/controller/installer/CsarInstallerImpl.java @@ -0,0 +1,147 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2018 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============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.sdc.controller.installer; + +import com.att.aft.dme2.internal.apache.commons.io.IOUtils; +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.PostConstruct; + +import org.onap.clamp.clds.config.ClampProperties; +import org.onap.clamp.clds.config.sdc.BlueprintParserFilesConfiguration; +import org.onap.clamp.clds.config.sdc.BlueprintParserMappingConfiguration; +import org.onap.clamp.clds.dao.CldsDao; +import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; +import org.onap.clamp.clds.model.CldsModel; +import org.onap.clamp.clds.model.CldsTemplate; +import org.onap.clamp.clds.service.CldsService; +import org.onap.clamp.clds.service.CldsTemplateService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.ApplicationContext; +import org.springframework.stereotype.Component; +import org.yaml.snakeyaml.Yaml; + +@Component +public class CsarInstallerImpl implements CsarInstaller { + + private static final EELFLogger logger = EELFManager.getInstance().getLogger(CsarInstallerImpl.class); + private Map<String, BlueprintParserFilesConfiguration> bpmnMapping = new HashMap<>(); + public static final String TEMPLATE_NAME_SUFFIX = "-template-dcae-designer"; + public static final String MODEL_NAME_SUFFIX = "-model-dcae-designer"; + /** + * The file name that will be loaded by Spring. + */ + @Value("${clamp.config.sdc.blueprint.parser.mapping:'classpath:/clds/blueprint-parser-mapping.json'}") + protected String blueprintMappingFile; + @Autowired + protected ApplicationContext appContext; + @Autowired + private CldsDao cldsDao; + @Autowired + private ClampProperties refProp; + @Autowired + CldsTemplateService cldsTemplateService; + @Autowired + CldsService cldsService; + + @PostConstruct + public void loadConfiguration() throws IOException { + BlueprintParserMappingConfiguration + .createFromJson(appContext.getResource(blueprintMappingFile).getInputStream()).stream() + .forEach(e -> bpmnMapping.put(e.getBlueprintKey(), e.getFiles())); + } + + @Override + public boolean isCsarAlreadyDeployed(CsarHandler csar) throws SdcArtifactInstallerException { + return false; + } + + @Override + public void installTheCsar(CsarHandler csar) throws SdcArtifactInstallerException { + try { + BlueprintParserFilesConfiguration configFiles = this.searchForRightMapping(csar); + createFakeCldsModel(csar, configFiles, createFakeCldsTemplate(csar, configFiles)); + } catch (IOException e) { + throw new SdcArtifactInstallerException("Exception caught during the Csar installation in database", e); + } + } + + private BlueprintParserFilesConfiguration searchForRightMapping(CsarHandler csar) + throws SdcArtifactInstallerException { + List<BlueprintParserFilesConfiguration> listConfig = new ArrayList<>(); + Yaml yaml = new Yaml(); + Map<String, Object> templateNodes = ((Map<String, Object>) ((Map<String, Object>) yaml + .load(csar.getDcaeBlueprint())).get("node_templates")); + bpmnMapping.entrySet().forEach(e -> { + if (templateNodes.keySet().stream().anyMatch(t -> t.contains(e.getKey()))) { + listConfig.add(e.getValue()); + } + }); + if (listConfig.size() > 1) { + throw new SdcArtifactInstallerException( + "The code does not currently support multiple MicroServices in the blueprint"); + } else if (listConfig.isEmpty()) { + throw new SdcArtifactInstallerException("There is no recognized MicroService found in the blueprint"); + } + return listConfig.get(0); + } + + private String createTemplateName(CsarHandler csar) { + return csar.getSdcCsarHelper().getServiceMetadata().getValue("name") + TEMPLATE_NAME_SUFFIX; + } + + private String createModelName(CsarHandler csar) { + return csar.getSdcCsarHelper().getServiceMetadata().getValue("name") + MODEL_NAME_SUFFIX; + } + + private CldsTemplate createFakeCldsTemplate(CsarHandler csar, BlueprintParserFilesConfiguration configFiles) + throws IOException, SdcArtifactInstallerException { + CldsTemplate template = new CldsTemplate(); + template.setBpmnId("Sdc-Generated"); + template.setBpmnText( + IOUtils.toString(appContext.getResource(configFiles.getBpmnXmlFilePath()).getInputStream())); + // ((ObjectNode)refProp.getJsonTemplate(CldsService.GLOBAL_PROPERTIES_KEY)); + template.setPropText(csar.getDcaeBlueprint()); + template.setImageText( + IOUtils.toString(appContext.getResource(configFiles.getSvgXmlFilePath()).getInputStream())); + return cldsTemplateService.putTemplate(createTemplateName(csar), template); + } + + private CldsModel createFakeCldsModel(CsarHandler csar, BlueprintParserFilesConfiguration configFiles, + CldsTemplate cldsTemplate) { + CldsModel cldsModel = new CldsModel(); + cldsModel.setBlueprintText(csar.getDcaeBlueprint()); + cldsModel.setTemplateName(cldsTemplate.getName()); + // cldsModel.set + return cldsService.putModel(createModelName(csar), cldsModel); + } +} diff --git a/src/main/java/org/onap/clamp/clds/service/CldsService.java b/src/main/java/org/onap/clamp/clds/service/CldsService.java index 675f3cfe5..9d6cb0820 100644 --- a/src/main/java/org/onap/clamp/clds/service/CldsService.java +++ b/src/main/java/org/onap/clamp/clds/service/CldsService.java @@ -68,13 +68,13 @@ import org.onap.clamp.clds.dao.CldsDao; import org.onap.clamp.clds.exception.CldsConfigException; import org.onap.clamp.clds.exception.policy.PolicyClientException; import org.onap.clamp.clds.exception.sdc.SdcCommunicationException; -import org.onap.clamp.clds.model.CldsMonitoringDetails; import org.onap.clamp.clds.model.CldsDbServiceCache; import org.onap.clamp.clds.model.CldsEvent; import org.onap.clamp.clds.model.CldsHealthCheck; import org.onap.clamp.clds.model.CldsInfo; import org.onap.clamp.clds.model.CldsModel; import org.onap.clamp.clds.model.CldsModelProp; +import org.onap.clamp.clds.model.CldsMonitoringDetails; import org.onap.clamp.clds.model.CldsServiceData; import org.onap.clamp.clds.model.CldsTemplate; import org.onap.clamp.clds.model.DcaeEvent; diff --git a/src/main/java/org/onap/clamp/clds/service/CldsTemplateService.java b/src/main/java/org/onap/clamp/clds/service/CldsTemplateService.java index 1b03922d1..7a9ee70e5 100644 --- a/src/main/java/org/onap/clamp/clds/service/CldsTemplateService.java +++ b/src/main/java/org/onap/clamp/clds/service/CldsTemplateService.java @@ -38,7 +38,6 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; -import javax.xml.transform.TransformerException; import org.onap.clamp.clds.dao.CldsDao; import org.onap.clamp.clds.model.CldsTemplate; @@ -156,8 +155,7 @@ public class CldsTemplateService extends SecureServiceBase { @Path("/template/{templateName}") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) - public CldsTemplate putTemplate(@PathParam("templateName") String templateName, CldsTemplate cldsTemplate) - throws TransformerException, IOException { + public CldsTemplate putTemplate(@PathParam("templateName") String templateName, CldsTemplate cldsTemplate) { Date startTime = new Date(); LoggingUtils.setRequestContext("CldsTemplateService: PUT template", getPrincipalName()); isAuthorized(permissionUpdateTemplate); @@ -166,15 +164,6 @@ public class CldsTemplateService extends SecureServiceBase { logger.info("PUT propText=" + cldsTemplate.getPropText()); logger.info("PUT imageText=" + cldsTemplate.getImageText()); cldsTemplate.setName(templateName); - String bpmnText = cldsTemplate.getBpmnText(); - String imageText = cldsTemplate.getImageText(); - String propText = cldsTemplate.getPropText(); - cldsTemplate.setBpmnText(bpmnText); - cldsTemplate.setImageText(imageText); - cldsTemplate.setPropText(propText); - logger.info(" bpmnText : " + cldsTemplate.getBpmnText()); - logger.info(" Image Text : " + cldsTemplate.getImageText()); - logger.info(" Prop Text : " + cldsTemplate.getPropText()); cldsTemplate.save(cldsDao, null); // audit log LoggingUtils.setTimeContext(startTime, new Date()); diff --git a/src/main/resources/META-INF/resources/designer/css/jquery.dataTables_themeroller.css b/src/main/resources/META-INF/resources/designer/css/jquery.dataTables_themeroller.css deleted file mode 100644 index 5a56d9799..000000000 --- a/src/main/resources/META-INF/resources/designer/css/jquery.dataTables_themeroller.css +++ /dev/null @@ -1,330 +0,0 @@ -/* - * Table styles - */ -table.dataTable { - width: 100%; - margin: 0 auto; - clear: both; - border-collapse: separate; - border-spacing: 0; - /* - * Header and footer styles - */ - /* - * Body styles - */ -} -table.dataTable thead th, -table.dataTable thead td, -table.dataTable tfoot th, -table.dataTable tfoot td { - padding: 4px 10px; -} -table.dataTable thead th, -table.dataTable tfoot th { - font-weight: bold; -} -table.dataTable thead th:active, -table.dataTable thead td:active { - outline: none; -} -table.dataTable thead .sorting_asc, -table.dataTable thead .sorting_desc, -table.dataTable thead .sorting { - cursor: pointer; - *cursor: hand; -} -table.dataTable thead th div.DataTables_sort_wrapper { - position: relative; - padding-right: 10px; -} -table.dataTable thead th div.DataTables_sort_wrapper span { - position: absolute; - top: 50%; - margin-top: -8px; - right: -5px; -} -table.dataTable thead th.ui-state-default { - border-right-width: 0; -} -table.dataTable thead th.ui-state-default:last-child { - border-right-width: 1px; -} -table.dataTable tbody tr { - background-color: white; -} -table.dataTable tbody tr.selected { - background-color: #b0bed9; -} -table.dataTable tbody th, -table.dataTable tbody td { - padding: 8px 10px; -} -table.dataTable th.center, -table.dataTable td.center, -table.dataTable td.dataTables_empty { - text-align: center; -} -table.dataTable th.right, -table.dataTable td.right { - text-align: right; -} -table.dataTable.row-border tbody th, table.dataTable.row-border tbody td, table.dataTable.display tbody th, table.dataTable.display tbody td { - border-top: 1px solid #dddddd; -} -table.dataTable.row-border tbody tr:first-child th, -table.dataTable.row-border tbody tr:first-child td, table.dataTable.display tbody tr:first-child th, -table.dataTable.display tbody tr:first-child td { - border-top: none; -} -table.dataTable.cell-border tbody th, table.dataTable.cell-border tbody td { - border-top: 1px solid #dddddd; - border-right: 1px solid #dddddd; -} -table.dataTable.cell-border tbody tr th:first-child, -table.dataTable.cell-border tbody tr td:first-child { - border-left: 1px solid #dddddd; -} -table.dataTable.cell-border tbody tr:first-child th, -table.dataTable.cell-border tbody tr:first-child td { - border-top: none; -} -table.dataTable.stripe tbody tr.odd, table.dataTable.display tbody tr.odd { - background-color: #f9f9f9; -} -table.dataTable.stripe tbody tr.odd.selected, table.dataTable.display tbody tr.odd.selected { - background-color: #abb9d3; -} -table.dataTable.hover tbody tr:hover, -table.dataTable.hover tbody tr.odd:hover, -table.dataTable.hover tbody tr.even:hover, table.dataTable.display tbody tr:hover, -table.dataTable.display tbody tr.odd:hover, -table.dataTable.display tbody tr.even:hover { - background-color: whitesmoke; -} -table.dataTable.hover tbody tr:hover.selected, -table.dataTable.hover tbody tr.odd:hover.selected, -table.dataTable.hover tbody tr.even:hover.selected, table.dataTable.display tbody tr:hover.selected, -table.dataTable.display tbody tr.odd:hover.selected, -table.dataTable.display tbody tr.even:hover.selected { - background-color: #a9b7d1; -} -table.dataTable.order-column tbody tr > .sorting_1, -table.dataTable.order-column tbody tr > .sorting_2, -table.dataTable.order-column tbody tr > .sorting_3, table.dataTable.display tbody tr > .sorting_1, -table.dataTable.display tbody tr > .sorting_2, -table.dataTable.display tbody tr > .sorting_3 { - background-color: #f9f9f9; -} -table.dataTable.order-column tbody tr.selected > .sorting_1, -table.dataTable.order-column tbody tr.selected > .sorting_2, -table.dataTable.order-column tbody tr.selected > .sorting_3, table.dataTable.display tbody tr.selected > .sorting_1, -table.dataTable.display tbody tr.selected > .sorting_2, -table.dataTable.display tbody tr.selected > .sorting_3 { - background-color: #acbad4; -} -table.dataTable.display tbody tr.odd > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd > .sorting_1 { - background-color: #f1f1f1; -} -table.dataTable.display tbody tr.odd > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd > .sorting_2 { - background-color: #f3f3f3; -} -table.dataTable.display tbody tr.odd > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd > .sorting_3 { - background-color: whitesmoke; -} -table.dataTable.display tbody tr.odd.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_1 { - background-color: #a6b3cd; -} -table.dataTable.display tbody tr.odd.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_2 { - background-color: #a7b5ce; -} -table.dataTable.display tbody tr.odd.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.odd.selected > .sorting_3 { - background-color: #a9b6d0; -} -table.dataTable.display tbody tr.even > .sorting_1, table.dataTable.order-column.stripe tbody tr.even > .sorting_1 { - background-color: #f9f9f9; -} -table.dataTable.display tbody tr.even > .sorting_2, table.dataTable.order-column.stripe tbody tr.even > .sorting_2 { - background-color: #fbfbfb; -} -table.dataTable.display tbody tr.even > .sorting_3, table.dataTable.order-column.stripe tbody tr.even > .sorting_3 { - background-color: #fdfdfd; -} -table.dataTable.display tbody tr.even.selected > .sorting_1, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_1 { - background-color: #acbad4; -} -table.dataTable.display tbody tr.even.selected > .sorting_2, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_2 { - background-color: #adbbd6; -} -table.dataTable.display tbody tr.even.selected > .sorting_3, table.dataTable.order-column.stripe tbody tr.even.selected > .sorting_3 { - background-color: #afbdd8; -} -table.dataTable.display tbody tr:hover > .sorting_1, -table.dataTable.display tbody tr.odd:hover > .sorting_1, -table.dataTable.display tbody tr.even:hover > .sorting_1, table.dataTable.order-column.hover tbody tr:hover > .sorting_1, -table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_1, -table.dataTable.order-column.hover tbody tr.even:hover > .sorting_1 { - background-color: #eaeaea; -} -table.dataTable.display tbody tr:hover > .sorting_2, -table.dataTable.display tbody tr.odd:hover > .sorting_2, -table.dataTable.display tbody tr.even:hover > .sorting_2, table.dataTable.order-column.hover tbody tr:hover > .sorting_2, -table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_2, -table.dataTable.order-column.hover tbody tr.even:hover > .sorting_2 { - background-color: #ebebeb; -} -table.dataTable.display tbody tr:hover > .sorting_3, -table.dataTable.display tbody tr.odd:hover > .sorting_3, -table.dataTable.display tbody tr.even:hover > .sorting_3, table.dataTable.order-column.hover tbody tr:hover > .sorting_3, -table.dataTable.order-column.hover tbody tr.odd:hover > .sorting_3, -table.dataTable.order-column.hover tbody tr.even:hover > .sorting_3 { - background-color: #eeeeee; -} -table.dataTable.display tbody tr:hover.selected > .sorting_1, -table.dataTable.display tbody tr.odd:hover.selected > .sorting_1, -table.dataTable.display tbody tr.even:hover.selected > .sorting_1, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_1, -table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_1, -table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_1 { - background-color: #a1aec7; -} -table.dataTable.display tbody tr:hover.selected > .sorting_2, -table.dataTable.display tbody tr.odd:hover.selected > .sorting_2, -table.dataTable.display tbody tr.even:hover.selected > .sorting_2, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_2, -table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_2, -table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_2 { - background-color: #a2afc8; -} -table.dataTable.display tbody tr:hover.selected > .sorting_3, -table.dataTable.display tbody tr.odd:hover.selected > .sorting_3, -table.dataTable.display tbody tr.even:hover.selected > .sorting_3, table.dataTable.order-column.hover tbody tr:hover.selected > .sorting_3, -table.dataTable.order-column.hover tbody tr.odd:hover.selected > .sorting_3, -table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_3 { - background-color: #a4b2cb; -} - -table.dataTable, -table.dataTable th, -table.dataTable td { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -/* - * Control feature layout - */ -.dataTables_wrapper { - position: relative; - clear: both; - *zoom: 1; - zoom: 1; -} -.dataTables_wrapper .dataTables_length { - float: left; -} -.dataTables_wrapper .dataTables_filter { - float: right; - text-align: right; -} -.dataTables_wrapper .dataTables_filter input { - margin-left: 0.5em; -} -.dataTables_wrapper .dataTables_info { - clear: both; - float: left; - padding-top: 0.55em; -} -.dataTables_wrapper .dataTables_paginate { - float: right; - text-align: right; -} -.dataTables_wrapper .dataTables_paginate .fg-button { - box-sizing: border-box; - display: inline-block; - min-width: 1.5em; - padding: 0.5em; - margin-left: 2px; - text-align: center; - text-decoration: none !important; - cursor: pointer; - *cursor: hand; - color: #333333 !important; - border: 1px solid transparent; -} -.dataTables_wrapper .dataTables_paginate .fg-button:active { - outline: none; -} -.dataTables_wrapper .dataTables_paginate .fg-button:first-child { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; -} -.dataTables_wrapper .dataTables_paginate .fg-button:last-child { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; -} -.dataTables_wrapper .dataTables_processing { - position: absolute; - top: 50%; - left: 50%; - width: 100%; - height: 40px; - margin-left: -50%; - margin-top: -25px; - padding-top: 20px; - text-align: center; - font-size: 1.2em; - background-color: white; - background: -webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255, 255, 255, 0)), color-stop(25%, rgba(255, 255, 255, 0.9)), color-stop(75%, rgba(255, 255, 255, 0.9)), color-stop(100%, rgba(255, 255, 255, 0))); - /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* Chrome10+,Safari5.1+ */ - background: -moz-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* FF3.6+ */ - background: -ms-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* IE10+ */ - background: -o-linear-gradient(left, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* Opera 11.10+ */ - background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 0.9) 25%, rgba(255, 255, 255, 0.9) 75%, rgba(255, 255, 255, 0) 100%); - /* W3C */ -} -.dataTables_wrapper .dataTables_length, -.dataTables_wrapper .dataTables_filter, -.dataTables_wrapper .dataTables_info, -.dataTables_wrapper .dataTables_processing, -.dataTables_wrapper .dataTables_paginate { - color: #333333; -} -.dataTables_wrapper .dataTables_scroll { - clear: both; -} -.dataTables_wrapper .dataTables_scrollBody { - *margin-top: -1px; - -webkit-overflow-scrolling: touch; -} -.dataTables_wrapper .ui-widget-header { - font-weight: normal; -} -.dataTables_wrapper .ui-toolbar { - padding: 8px; -} -.dataTables_wrapper:after { - visibility: hidden; - display: block; - content: ""; - clear: both; - height: 0; -} - -@media screen and (max-width: 767px) { - .dataTables_wrapper .dataTables_length, - .dataTables_wrapper .dataTables_filter, - .dataTables_wrapper .dataTables_info, - .dataTables_wrapper .dataTables_paginate { - float: none; - text-align: center; - } - .dataTables_wrapper .dataTables_filter, - .dataTables_wrapper .dataTables_paginate { - margin-top: 0.5em; - } -} diff --git a/src/main/resources/META-INF/resources/designer/css/plugins/dataTables.bootstrap.css b/src/main/resources/META-INF/resources/designer/css/plugins/dataTables.bootstrap.css deleted file mode 100644 index c07dac9a6..000000000 --- a/src/main/resources/META-INF/resources/designer/css/plugins/dataTables.bootstrap.css +++ /dev/null @@ -1,233 +0,0 @@ -div.dataTables_length label { - float: left; - text-align: left; - font-weight: normal; -} - -div.dataTables_length select { - width: 75px; -} - -div.dataTables_filter label { - float: right; - font-weight: normal; -} - -div.dataTables_filter input { - width: 16em; -} - -div.dataTables_info { - padding-top: 8px; -} - -div.dataTables_paginate { - float: right; - margin: 0; -} - -div.dataTables_paginate ul.pagination { - margin: 2px 0; - white-space: nowrap; -} - -table.dataTable, -table.dataTable td, -table.dataTable th { - -webkit-box-sizing: content-box; - -moz-box-sizing: content-box; - box-sizing: content-box; -} - -table.dataTable { - clear: both; - margin-top: 6px !important; - margin-bottom: 6px !important; - max-width: none !important; -} - -table.dataTable thead .sorting, -table.dataTable thead .sorting_asc, -table.dataTable thead .sorting_desc, -table.dataTable thead .sorting_asc_disabled, -table.dataTable thead .sorting_desc_disabled { - cursor: pointer; -} - -table.dataTable thead .sorting { - background: url('../images/sort_both.png') no-repeat center right; -} - -table.dataTable thead .sorting_asc { - background: url('../images/sort_asc.png') no-repeat center right; -} - -table.dataTable thead .sorting_desc { - background: url('../images/sort_desc.png') no-repeat center right; -} - -table.dataTable thead .sorting_asc_disabled { - background: url('../images/sort_asc_disabled.png') no-repeat center right; -} - -table.dataTable thead .sorting_desc_disabled { - background: url('../images/sort_desc_disabled.png') no-repeat center right; -} - -table.dataTable th:active { - outline: none; -} - -/* Scrolling */ - -div.dataTables_scrollHead table { - margin-bottom: 0 !important; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - -div.dataTables_scrollHead table thead tr:last-child th:first-child, -div.dataTables_scrollHead table thead tr:last-child td:first-child { - border-bottom-left-radius: 0 !important; - border-bottom-right-radius: 0 !important; -} - -div.dataTables_scrollBody table { - margin-top: 0 !important; - margin-bottom: 0 !important; - border-top: none; -} - -div.dataTables_scrollBody tbody tr:first-child th, -div.dataTables_scrollBody tbody tr:first-child td { - border-top: none; -} - -div.dataTables_scrollFoot table { - margin-top: 0 !important; - border-top: none; -} - -/* - * TableTools styles - */ - -.table tbody tr.active td, -.table tbody tr.active th { - color: white; - background-color: #08C; -} - -.table tbody tr.active:hover td, -.table tbody tr.active:hover th { - background-color: #0075b0 !important; -} - -.table tbody tr.active a { - color: white; -} - -.table-striped tbody tr.active:nth-child(odd) td, -.table-striped tbody tr.active:nth-child(odd) th { - background-color: #017ebc; -} - -table.DTTT_selectable tbody tr { - cursor: pointer; -} - -div.DTTT .btn { - font-size: 12px; - color: #333 !important; -} - -div.DTTT .btn:hover { - text-decoration: none !important; -} - -ul.DTTT_dropdown.dropdown-menu { - z-index: 2003; -} - -ul.DTTT_dropdown.dropdown-menu a { - color: #333 !important; /* needed only when demo_page.css is included */ -} - -ul.DTTT_dropdown.dropdown-menu li { - position: relative; -} - -ul.DTTT_dropdown.dropdown-menu li:hover a { - color: white !important; - background-color: #0088cc; -} - -div.DTTT_collection_background { - z-index: 2002; -} - -/* TableTools information display */ - -div.DTTT_print_info.modal { - height: 150px; - margin-top: -75px; - text-align: center; -} - -div.DTTT_print_info h6 { - margin: 1em; - font-size: 28px; - font-weight: normal; - line-height: 28px; -} - -div.DTTT_print_info p { - font-size: 14px; - line-height: 20px; -} - -/* - * FixedColumns styles - */ - -div.DTFC_LeftHeadWrapper table, -div.DTFC_LeftFootWrapper table, -div.DTFC_RightHeadWrapper table, -div.DTFC_RightFootWrapper table, -table.DTFC_Cloned tr.even { - background-color: white; -} - -div.DTFC_RightHeadWrapper table, -div.DTFC_LeftHeadWrapper table { - margin-bottom: 0 !important; - border-top-right-radius: 0 !important; - border-bottom-left-radius: 0 !important; - border-bottom-right-radius: 0 !important; -} - -div.DTFC_RightHeadWrapper table thead tr:last-child th:first-child, -div.DTFC_RightHeadWrapper table thead tr:last-child td:first-child, -div.DTFC_LeftHeadWrapper table thead tr:last-child th:first-child, -div.DTFC_LeftHeadWrapper table thead tr:last-child td:first-child { - border-bottom-left-radius: 0 !important; - border-bottom-right-radius: 0 !important; -} - -div.DTFC_RightBodyWrapper table, -div.DTFC_LeftBodyWrapper table { - margin-bottom: 0 !important; - border-top: none; -} - -div.DTFC_RightBodyWrapper tbody tr:first-child th, -div.DTFC_RightBodyWrapper tbody tr:first-child td, -div.DTFC_LeftBodyWrapper tbody tr:first-child th, -div.DTFC_LeftBodyWrapper tbody tr:first-child td { - border-top: none; -} - -div.DTFC_RightFootWrapper table, -div.DTFC_LeftFootWrapper table { - border-top: none; -} diff --git a/src/main/resources/META-INF/resources/designer/index.html b/src/main/resources/META-INF/resources/designer/index.html index 584d2f828..83928a9de 100644 --- a/src/main/resources/META-INF/resources/designer/index.html +++ b/src/main/resources/META-INF/resources/designer/index.html @@ -49,13 +49,8 @@ <!-- DataTables CSS --> -<link href="css/dataTables.bootstrap.css" rel="stylesheet"> <link href="css/jquery.dataTables.css" rel="stylesheet"> -<link href="css/dataTables.tableTools.css" rel="stylesheet"> -<link href="css/dataTables.fixedColumns.css" rel="stylesheet"> - - <link href="css/loading-bar.css" rel="stylesheet"> <link href="css/navmenu.css" rel="stylesheet"> <link href="css/dialogs.css" rel="stylesheet"> diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index f626e1af1..17f85817f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -178,6 +178,7 @@ clamp.config.sdc.InstanceID=X-ECOMP-InstanceID clamp.config.sdc.header.requestId = X-ECOMP-RequestID
#
clamp.config.sdc.csarFolder = /tmp/sdc-controllers
+clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json
#
clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json
clamp.config.ui.alarm.default=classpath:/clds/templates/ui-alarm-default.json
diff --git a/src/main/resources/clds/blueprint-parser-mapping.json b/src/main/resources/clds/blueprint-parser-mapping.json new file mode 100644 index 000000000..a16ef0cbc --- /dev/null +++ b/src/main/resources/clds/blueprint-parser-mapping.json @@ -0,0 +1,16 @@ +[ + { + "blueprintKey": "tca_", + "files": { + "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/tca-template.xml", + "svgXmlFilePath": "classpath:/clds/templates/bpmn/tca-img.xml" + } + }, + { + "blueprintKey": "holmes_", + "files": { + "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/holmes-template.xml", + "svgXmlFilePath": "classpath:/clds/templates/bpmn/holmes-img.xml" + } + } +] diff --git a/src/main/resources/clds/templates/bpmn/holmes-img.xml b/src/main/resources/clds/templates/bpmn/holmes-img.xml new file mode 100644 index 000000000..f84b6a10e --- /dev/null +++ b/src/main/resources/clds/templates/bpmn/holmes-img.xml @@ -0,0 +1,315 @@ +<?xml version="1.0" encoding="utf-8"?> +\n<!-- created with bpmn-js / http://bpmn.io --> +\n<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +\n +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="900" height="92" viewBox="44 134 900 92" version="1.1"> + <defs> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmbu"> + <path d="M 1 5 L 11 10 L 1 15 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="6" refY="6" id="markerSjdype4kmbw"> + <circle cx="6" cy="6" r="3.5" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="8.5" refY="5" id="markerSjdype4kmby"> + <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z" + style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmc0"> + <path d="M 1 5 L 11 10 L 1 15" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-1" refY="10" id="markerSjdype4kmc2"> + <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-5" refY="10" id="markerSjdype4kmc4"> + <path d="M 1 4 L 5 16" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" stroke="#000000" /> + </marker> + </defs> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1" + transform="matrix(1,0,0,1,50,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 2;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1_label" + transform="matrix(1,0,0,1,23,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="Holmes_0bsv00m" + transform="matrix(1,0,0,1,438,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <circle cx="15" cy="15" r="10" style="stroke-width: 1;" + stroke="#000000" fill="#ffffff"></circle> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="11" y="20">H</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="39" y="43.5">Holmes</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="VesCollector_1ljyqg8" + transform="matrix(1,0,0,1,213,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="120,80 120,20 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <polyline points="20,0 20,80 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="14">V</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="26">E</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="38">S</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="25.5" y="43.5">VesCollector</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="Policy_114xo8j" + transform="matrix(1,0,0,1,678,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="0,40 60,0 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="43.5" y="43.5">Policy</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape selected" data-element-id="EndEvent_0b4m6bk" + transform="matrix(1,0,0,1,901,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 4;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="EndEvent_0b4m6bk_label" + transform="matrix(1,0,0,1,874,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1c9hzec" + style="display: block;"> + <rect fill="none" class="djs-outline" x="80" y="174" width="139" + height="12"></rect> + <g class="djs-visual"> + <path d="m 86,180L213,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="86,180 213,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1c9hzec_label" + transform="matrix(1,0,0,1,104.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ig3gix" + style="display: block;"> + <rect fill="none" class="djs-outline" x="327" y="174" width="117" + height="12"></rect> + <g class="djs-visual"> + <path d="m 333,180L438,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="333,180 438,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ig3gix_label" + transform="matrix(1,0,0,1,340.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_0zwbn2r" + style="display: block;"> + <rect fill="none" class="djs-outline" x="552" y="174" width="132" + height="12"></rect> + <g class="djs-visual"> + <path d="m 558,180L678,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="558,180 678,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_0zwbn2r_label" + transform="matrix(1,0,0,1,573,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_0ox6r95" + style="display: block;"> + <rect fill="none" class="djs-outline" x="792" y="174" width="115" + height="12"></rect> + <g class="djs-visual"> + <path d="m 798,180L901,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="798,180 901,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_0ox6r95_label" + transform="matrix(1,0,0,1,804.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/src/main/resources/clds/templates/bpmn/holmes-template.xml b/src/main/resources/clds/templates/bpmn/holmes-template.xml new file mode 100644 index 000000000..0ea1587ce --- /dev/null +++ b/src/main/resources/clds/templates/bpmn/holmes-template.xml @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" + xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn"> + <bpmn:process id="Process_1" isExecutable="false"> + <bpmn:startEvent id="StartEvent_1"> + <bpmn:outgoing>SequenceFlow_1c9hzec</bpmn:outgoing> + </bpmn:startEvent> + <bpmn:holmes id="Holmes_0bsv00m"> + <bpmn:incoming>SequenceFlow_1ig3gix</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0zwbn2r</bpmn:outgoing> + </bpmn:holmes> + <bpmn:vesCollector id="VesCollector_1ljyqg8"> + <bpmn:incoming>SequenceFlow_1c9hzec</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1ig3gix</bpmn:outgoing> + </bpmn:vesCollector> + <bpmn:policy id="Policy_114xo8j"> + <bpmn:incoming>SequenceFlow_0zwbn2r</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0ox6r95</bpmn:outgoing> + </bpmn:policy> + <bpmn:endEvent id="EndEvent_0b4m6bk"> + <bpmn:incoming>SequenceFlow_0ox6r95</bpmn:incoming> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_1c9hzec" + sourceRef="StartEvent_1" targetRef="VesCollector_1ljyqg8" /> + <bpmn:sequenceFlow id="SequenceFlow_1ig3gix" + sourceRef="VesCollector_1ljyqg8" targetRef="Holmes_0bsv00m" /> + <bpmn:sequenceFlow id="SequenceFlow_0zwbn2r" + sourceRef="Holmes_0bsv00m" targetRef="Policy_114xo8j" /> + <bpmn:sequenceFlow id="SequenceFlow_0ox6r95" + sourceRef="Policy_114xo8j" targetRef="EndEvent_0b4m6bk" /> + </bpmn:process> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1"> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" + bpmnElement="StartEvent_1"> + <dc:Bounds x="50" y="162" width="36" height="36" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="Holmes_0bsv00m_di" + bpmnElement="Holmes_0bsv00m"> + <dc:Bounds x="438" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="VesCollector_1ljyqg8_di" + bpmnElement="VesCollector_1ljyqg8"> + <dc:Bounds x="213" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="Policy_114xo8j_di" + bpmnElement="Policy_114xo8j"> + <dc:Bounds x="678" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_0b4m6bk_di" + bpmnElement="EndEvent_0b4m6bk"> + <dc:Bounds x="901" y="162" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="874" y="198" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1c9hzec_di" + bpmnElement="SequenceFlow_1c9hzec"> + <di:waypoint xsi:type="dc:Point" x="86" y="180" /> + <di:waypoint xsi:type="dc:Point" x="213" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="104.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1ig3gix_di" + bpmnElement="SequenceFlow_1ig3gix"> + <di:waypoint xsi:type="dc:Point" x="333" y="180" /> + <di:waypoint xsi:type="dc:Point" x="438" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="340.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0zwbn2r_di" + bpmnElement="SequenceFlow_0zwbn2r"> + <di:waypoint xsi:type="dc:Point" x="558" y="180" /> + <di:waypoint xsi:type="dc:Point" x="678" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="573" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0ox6r95_di" + bpmnElement="SequenceFlow_0ox6r95"> + <di:waypoint xsi:type="dc:Point" x="798" y="180" /> + <di:waypoint xsi:type="dc:Point" x="901" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="804.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</bpmn:definitions>
\ No newline at end of file diff --git a/src/main/resources/clds/templates/bpmn/tca-img.xml b/src/main/resources/clds/templates/bpmn/tca-img.xml new file mode 100644 index 000000000..a2ec5af23 --- /dev/null +++ b/src/main/resources/clds/templates/bpmn/tca-img.xml @@ -0,0 +1,309 @@ +<?xml version="1.0" encoding="utf-8"?><!-- created with bpmn-js / http://bpmn.io --><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="924" height="92" viewBox="44 134 924 92" version="1.1"> + <defs> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmnw"> + <path d="M 1 5 L 11 10 L 1 15 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="6" refY="6" id="markerSjdype4kmny"> + <circle cx="6" cy="6" r="3.5" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="8.5" refY="5" id="markerSjdype4kmo0"> + <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z" + style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmo2"> + <path d="M 1 5 L 11 10 L 1 15" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-1" refY="10" id="markerSjdype4kmo4"> + <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-5" refY="10" id="markerSjdype4kmo6"> + <path d="M 1 4 L 5 16" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" stroke="#000000" /> + </marker> + </defs> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1" + transform="matrix(1,0,0,1,50,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 2;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1_label" + transform="matrix(1,0,0,1,23,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="VesCollector_1g9cmz0" + transform="matrix(1,0,0,1,207,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="120,80 120,20 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <polyline points="20,0 20,80 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="14">V</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="26">E</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="38">S</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="25.5" y="43.5">VesCollector</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="TCA_1d13unw" + transform="matrix(1,0,0,1,453,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="0,60 120,60 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="48" y="43.5">TCA</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="Policy_12lup3h" + transform="matrix(1,0,0,1,687,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="0,40 60,0 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="43.5" y="43.5">Policy</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape selected" data-element-id="EndEvent_16kg9fx" + transform="matrix(1,0,0,1,925,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 4;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="EndEvent_16kg9fx_label" + transform="matrix(1,0,0,1,898,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ahk7jg" + style="display: block;"> + <rect fill="none" class="djs-outline" x="80" y="174" width="133" + height="12"></rect> + <g class="djs-visual"> + <path d="m 86,180L207,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="86,180 207,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ahk7jg_label" + transform="matrix(1,0,0,1,101.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_18ahat1" + style="display: block;"> + <rect fill="none" class="djs-outline" x="321" y="174" width="138" + height="12"></rect> + <g class="djs-visual"> + <path d="m 327,180L453,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="327,180 453,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_18ahat1_label" + transform="matrix(1,0,0,1,345,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1mo9gxb" + style="display: block;"> + <rect fill="none" class="djs-outline" x="567" y="174" width="126" + height="12"></rect> + <g class="djs-visual"> + <path d="m 573,180L687,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="573,180 687,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1mo9gxb_label" + transform="matrix(1,0,0,1,585,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1dgtrrq" + style="display: block;"> + <rect fill="none" class="djs-outline" x="801" y="174" width="130" + height="12"></rect> + <g class="djs-visual"> + <path d="m 807,180L925,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="807,180 925,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1dgtrrq_label" + transform="matrix(1,0,0,1,821,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/src/main/resources/clds/templates/bpmn/tca-template.xml b/src/main/resources/clds/templates/bpmn/tca-template.xml new file mode 100644 index 000000000..cc942ef9d --- /dev/null +++ b/src/main/resources/clds/templates/bpmn/tca-template.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" + xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn"> + <bpmn:process id="Process_1" isExecutable="false"> + <bpmn:startEvent id="StartEvent_1"> + <bpmn:outgoing>SequenceFlow_1ahk7jg</bpmn:outgoing> + </bpmn:startEvent> + <bpmn:vesCollector id="VesCollector_1g9cmz0"> + <bpmn:incoming>SequenceFlow_1ahk7jg</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_18ahat1</bpmn:outgoing> + </bpmn:vesCollector> + <bpmn:tCA id="TCA_1d13unw"> + <bpmn:incoming>SequenceFlow_18ahat1</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1mo9gxb</bpmn:outgoing> + </bpmn:tCA> + <bpmn:policy id="Policy_12lup3h"> + <bpmn:incoming>SequenceFlow_1mo9gxb</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1dgtrrq</bpmn:outgoing> + </bpmn:policy> + <bpmn:endEvent id="EndEvent_16kg9fx"> + <bpmn:incoming>SequenceFlow_1dgtrrq</bpmn:incoming> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_1ahk7jg" + sourceRef="StartEvent_1" targetRef="VesCollector_1g9cmz0" /> + <bpmn:sequenceFlow id="SequenceFlow_18ahat1" + sourceRef="VesCollector_1g9cmz0" targetRef="TCA_1d13unw" /> + <bpmn:sequenceFlow id="SequenceFlow_1mo9gxb" + sourceRef="TCA_1d13unw" targetRef="Policy_12lup3h" /> + <bpmn:sequenceFlow id="SequenceFlow_1dgtrrq" + sourceRef="Policy_12lup3h" targetRef="EndEvent_16kg9fx" /> + </bpmn:process> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1"> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" + bpmnElement="StartEvent_1"> + <dc:Bounds x="50" y="162" width="36" height="36" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="VesCollector_1g9cmz0_di" + bpmnElement="VesCollector_1g9cmz0"> + <dc:Bounds x="207" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="TCA_1d13unw_di" + bpmnElement="TCA_1d13unw"> + <dc:Bounds x="453" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="Policy_12lup3h_di" + bpmnElement="Policy_12lup3h"> + <dc:Bounds x="687" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_16kg9fx_di" + bpmnElement="EndEvent_16kg9fx"> + <dc:Bounds x="925" y="162" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="898" y="198" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1ahk7jg_di" + bpmnElement="SequenceFlow_1ahk7jg"> + <di:waypoint xsi:type="dc:Point" x="86" y="180" /> + <di:waypoint xsi:type="dc:Point" x="207" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="101.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_18ahat1_di" + bpmnElement="SequenceFlow_18ahat1"> + <di:waypoint xsi:type="dc:Point" x="327" y="180" /> + <di:waypoint xsi:type="dc:Point" x="453" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="345" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1mo9gxb_di" + bpmnElement="SequenceFlow_1mo9gxb"> + <di:waypoint xsi:type="dc:Point" x="573" y="180" /> + <di:waypoint xsi:type="dc:Point" x="687" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="585" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1dgtrrq_di" + bpmnElement="SequenceFlow_1dgtrrq"> + <di:waypoint xsi:type="dc:Point" x="807" y="180" /> + <di:waypoint xsi:type="dc:Point" x="925" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="821" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> + +</bpmn:definitions>
\ No newline at end of file diff --git a/src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java b/src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java index 1caa637c5..be2997a31 100644 --- a/src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java +++ b/src/test/java/org/onap/clamp/clds/it/CldsTemplateServiceItCase.java @@ -35,7 +35,6 @@ import java.security.Principal; import java.util.List; import javax.ws.rs.core.SecurityContext; -import javax.xml.transform.TransformerException; import org.junit.Before; import org.junit.Test; @@ -93,13 +92,7 @@ public class CldsTemplateServiceItCase { cldsTemplate.setBpmnText(bpmnText); cldsTemplate.setImageText(imageText); cldsTemplate.setPropText(bpmnPropText); - try { - cldsTemplateService.putTemplate("testModel", cldsTemplate); - } catch (IOException e) { - logger.error("IOException while saving template", e); - } catch (TransformerException ex) { - logger.error("Transforming exception while saving template.", ex); - } + cldsTemplateService.putTemplate("testModel", cldsTemplate); } @Test diff --git a/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java new file mode 100644 index 000000000..94adfafa8 --- /dev/null +++ b/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java @@ -0,0 +1,102 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP CLAMP + * ================================================================================ + * Copyright (C) 2018 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============================================ + * =================================================================== + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ + +package org.onap.clamp.clds.it.sdc.controller.installer; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import com.att.aft.dme2.internal.apache.commons.io.IOUtils; +import com.att.aft.dme2.internal.apache.commons.lang.RandomStringUtils; + +import java.io.IOException; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.onap.clamp.clds.dao.CldsDao; +import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException; +import org.onap.clamp.clds.exception.sdc.controller.SdcArtifactInstallerException; +import org.onap.clamp.clds.model.CldsTemplate; +import org.onap.clamp.clds.sdc.controller.installer.CsarHandler; +import org.onap.clamp.clds.sdc.controller.installer.CsarInstaller; +import org.onap.clamp.clds.sdc.controller.installer.CsarInstallerImpl; +import org.onap.clamp.clds.util.ResourceFileUtil; +import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; +import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; +import org.openecomp.sdc.toscaparser.api.elements.Metadata; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class CsarInstallerItCase { + + private static final String sdcFolder = "/tmp/csar-handler-tests"; + private static final String csarArtifactName = "testArtifact.csar"; + @Autowired + private CsarInstaller csarInstaller; + @Autowired + private CldsDao cldsDao; + + private void loadFile(String fileName) throws IOException { + ReflectionTestUtils.setField(csarInstaller, "blueprintMappingFile", fileName); + ((CsarInstallerImpl) csarInstaller).loadConfiguration(); + } + + @Test(expected = SdcArtifactInstallerException.class) + public void testInstallTheCsarFail() + throws SdcArtifactInstallerException, SdcToscaParserException, CsarHandlerException, IOException { + CsarHandler csarHandler = Mockito.mock(CsarHandler.class); + Mockito.when(csarHandler.getDcaeBlueprint()).thenReturn(IOUtils + .toString(ResourceFileUtil.getResourceAsStream("example/sdc/blueprint-dcae/not-recognized.yaml"))); + csarInstaller.installTheCsar(csarHandler); + fail("Should have raised an SdcArtifactInstallerException"); + } + + @Test() + public void testInstallTheCsarTca() + throws SdcArtifactInstallerException, SdcToscaParserException, CsarHandlerException, IOException { + String generatedName = RandomStringUtils.randomAlphanumeric(5); + CsarHandler csarHandler = Mockito.mock(CsarHandler.class); + Mockito.when(csarHandler.getDcaeBlueprint()).thenReturn( + IOUtils.toString(ResourceFileUtil.getResourceAsStream("example/sdc/blueprint-dcae/tca.yaml"))); + ISdcCsarHelper csarHelper = Mockito.mock(ISdcCsarHelper.class); + Metadata data = Mockito.mock(Metadata.class); + Mockito.when(data.getValue("name")).thenReturn(generatedName); + Mockito.when(csarHelper.getServiceMetadata()).thenReturn(data); + Mockito.when(csarHandler.getSdcCsarHelper()).thenReturn(csarHelper); + csarInstaller.installTheCsar(csarHandler); + // Get it back from DB + CldsTemplate templateFromDB = CldsTemplate.retrieve(cldsDao, + generatedName + CsarInstallerImpl.TEMPLATE_NAME_SUFFIX, false); + assertNotNull(templateFromDB); + assertNotNull(templateFromDB.getBpmnText()); + assertNotNull(templateFromDB.getImageText()); + assertNotNull(templateFromDB.getPropText()); + assertEquals(templateFromDB.getName(), generatedName + CsarInstallerImpl.TEMPLATE_NAME_SUFFIX); + } +} diff --git a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java index d1b177d22..34805d87a 100644 --- a/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java +++ b/src/test/java/org/onap/clamp/clds/sdc/controller/installer/CsarHandlerTest.java @@ -38,7 +38,6 @@ import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import org.junit.AfterClass; import org.junit.Test; import org.mockito.Mockito; import org.onap.clamp.clds.exception.sdc.controller.CsarHandlerException; @@ -54,13 +53,6 @@ public class CsarHandlerTest { private static final String sdcFolder = "/tmp/csar-handler-tests"; private static final String csarArtifactName = "testArtifact.csar"; - @AfterClass - public static void removeAllFiles() throws IOException { - // Do some cleanup - Path path = Paths.get(sdcFolder + "/test-controller/" + csarArtifactName); - Files.deleteIfExists(path); - } - @Test public void testConstructor() throws CsarHandlerException { IArtifactInfo serviceArtifact = Mockito.mock(IArtifactInfo.class); @@ -96,9 +88,18 @@ public class CsarHandlerTest { IDistributionClientDownloadResult resultArtifact = Mockito.mock(IDistributionClientDownloadResult.class); Mockito.when(resultArtifact.getArtifactPayload()).thenReturn( IOUtils.toByteArray(ResourceFileUtil.getResourceAsStream("example/sdc/service-Simsfoimap0112.csar"))); + // Test the save csar.save(resultArtifact); assertTrue((new File(sdcFolder + "/test-controller/" + csarArtifactName)).exists()); assertEquals(csarArtifactName, csar.getArtifactElement().getArtifactName()); assertNotNull(csar.getSdcCsarHelper()); + // Test dcaeBlueprint + String blueprint = csar.getDcaeBlueprint(); + assertNotNull(blueprint); + assertTrue(!blueprint.isEmpty()); + assertTrue(blueprint.contains("DCAE-VES-PM-EVENT-v1")); + // Do some cleanup + Path path = Paths.get(sdcFolder + "/test-controller/" + csarArtifactName); + Files.deleteIfExists(path); } } diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 413cfe7a1..ad0355290 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -178,6 +178,7 @@ clamp.config.sdc.InstanceID=X-ECOMP-InstanceID clamp.config.sdc.header.requestId = X-ECOMP-RequestID
#
clamp.config.sdc.csarFolder = /tmp/sdc-tests
+clamp.config.sdc.blueprint.parser.mapping = classpath:/clds/blueprint-parser-mapping.json
#
clamp.config.ui.location.default=classpath:/clds/templates/ui-location-default.json
clamp.config.ui.alarm.default=classpath:/clds/templates/ui-alarm-default.json
diff --git a/src/test/resources/clds/blueprint-parser-mapping.json b/src/test/resources/clds/blueprint-parser-mapping.json new file mode 100644 index 000000000..a16ef0cbc --- /dev/null +++ b/src/test/resources/clds/blueprint-parser-mapping.json @@ -0,0 +1,16 @@ +[ + { + "blueprintKey": "tca_", + "files": { + "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/tca-template.xml", + "svgXmlFilePath": "classpath:/clds/templates/bpmn/tca-img.xml" + } + }, + { + "blueprintKey": "holmes_", + "files": { + "bpmnXmlFilePath": "classpath:/clds/templates/bpmn/holmes-template.xml", + "svgXmlFilePath": "classpath:/clds/templates/bpmn/holmes-img.xml" + } + } +] diff --git a/src/test/resources/clds/templates/bpmn/holmes-img.xml b/src/test/resources/clds/templates/bpmn/holmes-img.xml new file mode 100644 index 000000000..f84b6a10e --- /dev/null +++ b/src/test/resources/clds/templates/bpmn/holmes-img.xml @@ -0,0 +1,315 @@ +<?xml version="1.0" encoding="utf-8"?> +\n<!-- created with bpmn-js / http://bpmn.io --> +\n<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +\n +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="900" height="92" viewBox="44 134 900 92" version="1.1"> + <defs> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmbu"> + <path d="M 1 5 L 11 10 L 1 15 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="6" refY="6" id="markerSjdype4kmbw"> + <circle cx="6" cy="6" r="3.5" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="8.5" refY="5" id="markerSjdype4kmby"> + <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z" + style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmc0"> + <path d="M 1 5 L 11 10 L 1 15" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-1" refY="10" id="markerSjdype4kmc2"> + <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-5" refY="10" id="markerSjdype4kmc4"> + <path d="M 1 4 L 5 16" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" stroke="#000000" /> + </marker> + </defs> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1" + transform="matrix(1,0,0,1,50,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 2;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1_label" + transform="matrix(1,0,0,1,23,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="Holmes_0bsv00m" + transform="matrix(1,0,0,1,438,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <circle cx="15" cy="15" r="10" style="stroke-width: 1;" + stroke="#000000" fill="#ffffff"></circle> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="11" y="20">H</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="39" y="43.5">Holmes</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="VesCollector_1ljyqg8" + transform="matrix(1,0,0,1,213,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="120,80 120,20 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <polyline points="20,0 20,80 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="14">V</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="26">E</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="38">S</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="25.5" y="43.5">VesCollector</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="Policy_114xo8j" + transform="matrix(1,0,0,1,678,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="0,40 60,0 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="43.5" y="43.5">Policy</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape selected" data-element-id="EndEvent_0b4m6bk" + transform="matrix(1,0,0,1,901,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 4;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="EndEvent_0b4m6bk_label" + transform="matrix(1,0,0,1,874,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1c9hzec" + style="display: block;"> + <rect fill="none" class="djs-outline" x="80" y="174" width="139" + height="12"></rect> + <g class="djs-visual"> + <path d="m 86,180L213,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="86,180 213,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1c9hzec_label" + transform="matrix(1,0,0,1,104.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ig3gix" + style="display: block;"> + <rect fill="none" class="djs-outline" x="327" y="174" width="117" + height="12"></rect> + <g class="djs-visual"> + <path d="m 333,180L438,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="333,180 438,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ig3gix_label" + transform="matrix(1,0,0,1,340.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_0zwbn2r" + style="display: block;"> + <rect fill="none" class="djs-outline" x="552" y="174" width="132" + height="12"></rect> + <g class="djs-visual"> + <path d="m 558,180L678,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="558,180 678,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_0zwbn2r_label" + transform="matrix(1,0,0,1,573,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_0ox6r95" + style="display: block;"> + <rect fill="none" class="djs-outline" x="792" y="174" width="115" + height="12"></rect> + <g class="djs-visual"> + <path d="m 798,180L901,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmbu");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="798,180 901,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_0ox6r95_label" + transform="matrix(1,0,0,1,804.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/src/test/resources/clds/templates/bpmn/holmes-template.xml b/src/test/resources/clds/templates/bpmn/holmes-template.xml new file mode 100644 index 000000000..0ea1587ce --- /dev/null +++ b/src/test/resources/clds/templates/bpmn/holmes-template.xml @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" + xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn"> + <bpmn:process id="Process_1" isExecutable="false"> + <bpmn:startEvent id="StartEvent_1"> + <bpmn:outgoing>SequenceFlow_1c9hzec</bpmn:outgoing> + </bpmn:startEvent> + <bpmn:holmes id="Holmes_0bsv00m"> + <bpmn:incoming>SequenceFlow_1ig3gix</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0zwbn2r</bpmn:outgoing> + </bpmn:holmes> + <bpmn:vesCollector id="VesCollector_1ljyqg8"> + <bpmn:incoming>SequenceFlow_1c9hzec</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1ig3gix</bpmn:outgoing> + </bpmn:vesCollector> + <bpmn:policy id="Policy_114xo8j"> + <bpmn:incoming>SequenceFlow_0zwbn2r</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_0ox6r95</bpmn:outgoing> + </bpmn:policy> + <bpmn:endEvent id="EndEvent_0b4m6bk"> + <bpmn:incoming>SequenceFlow_0ox6r95</bpmn:incoming> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_1c9hzec" + sourceRef="StartEvent_1" targetRef="VesCollector_1ljyqg8" /> + <bpmn:sequenceFlow id="SequenceFlow_1ig3gix" + sourceRef="VesCollector_1ljyqg8" targetRef="Holmes_0bsv00m" /> + <bpmn:sequenceFlow id="SequenceFlow_0zwbn2r" + sourceRef="Holmes_0bsv00m" targetRef="Policy_114xo8j" /> + <bpmn:sequenceFlow id="SequenceFlow_0ox6r95" + sourceRef="Policy_114xo8j" targetRef="EndEvent_0b4m6bk" /> + </bpmn:process> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1"> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" + bpmnElement="StartEvent_1"> + <dc:Bounds x="50" y="162" width="36" height="36" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="Holmes_0bsv00m_di" + bpmnElement="Holmes_0bsv00m"> + <dc:Bounds x="438" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="VesCollector_1ljyqg8_di" + bpmnElement="VesCollector_1ljyqg8"> + <dc:Bounds x="213" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="Policy_114xo8j_di" + bpmnElement="Policy_114xo8j"> + <dc:Bounds x="678" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_0b4m6bk_di" + bpmnElement="EndEvent_0b4m6bk"> + <dc:Bounds x="901" y="162" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="874" y="198" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1c9hzec_di" + bpmnElement="SequenceFlow_1c9hzec"> + <di:waypoint xsi:type="dc:Point" x="86" y="180" /> + <di:waypoint xsi:type="dc:Point" x="213" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="104.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1ig3gix_di" + bpmnElement="SequenceFlow_1ig3gix"> + <di:waypoint xsi:type="dc:Point" x="333" y="180" /> + <di:waypoint xsi:type="dc:Point" x="438" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="340.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0zwbn2r_di" + bpmnElement="SequenceFlow_0zwbn2r"> + <di:waypoint xsi:type="dc:Point" x="558" y="180" /> + <di:waypoint xsi:type="dc:Point" x="678" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="573" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_0ox6r95_di" + bpmnElement="SequenceFlow_0ox6r95"> + <di:waypoint xsi:type="dc:Point" x="798" y="180" /> + <di:waypoint xsi:type="dc:Point" x="901" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="804.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> +</bpmn:definitions>
\ No newline at end of file diff --git a/src/test/resources/clds/templates/bpmn/tca-img.xml b/src/test/resources/clds/templates/bpmn/tca-img.xml new file mode 100644 index 000000000..a2ec5af23 --- /dev/null +++ b/src/test/resources/clds/templates/bpmn/tca-img.xml @@ -0,0 +1,309 @@ +<?xml version="1.0" encoding="utf-8"?><!-- created with bpmn-js / http://bpmn.io --><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" + width="924" height="92" viewBox="44 134 924 92" version="1.1"> + <defs> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmnw"> + <path d="M 1 5 L 11 10 L 1 15 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="6" refY="6" id="markerSjdype4kmny"> + <circle cx="6" cy="6" r="3.5" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="20" markerHeight="20" + orient="auto" refX="8.5" refY="5" id="markerSjdype4kmo0"> + <path d="m 1 5 l 0 -3 l 7 3 l -7 3 z" + style="stroke-width: 1; stroke-linecap: butt; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="11" refY="10" id="markerSjdype4kmo2"> + <path d="M 1 5 L 11 10 L 1 15" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-1" refY="10" id="markerSjdype4kmo4"> + <path d="M 0 10 L 8 6 L 16 10 L 8 14 Z" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#ffffff" stroke="#000000" /> + </marker> + <marker viewBox="0 0 20 20" markerWidth="10" markerHeight="10" + orient="auto" refX="-5" refY="10" id="markerSjdype4kmo6"> + <path d="M 1 4 L 5 16" + style="stroke-width: 1; stroke-linecap: round; stroke-dasharray: 10000, 1;" + fill="#000000" stroke="#000000" /> + </marker> + </defs> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1" + transform="matrix(1,0,0,1,50,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 2;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="StartEvent_1_label" + transform="matrix(1,0,0,1,23,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="VesCollector_1g9cmz0" + transform="matrix(1,0,0,1,207,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="120,80 120,20 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <polyline points="20,0 20,80 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="14">V</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="26">E</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;"> + <tspan x="5" y="38">S</tspan> + </text> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="25.5" y="43.5">VesCollector</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="TCA_1d13unw" + transform="matrix(1,0,0,1,453,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="0,60 120,60 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="48" y="43.5">TCA</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="Policy_12lup3h" + transform="matrix(1,0,0,1,687,140)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="132" + height="92"></rect> + <g class="djs-visual"> + <rect x="0" y="0" width="120" height="80" rx="0" ry="0" + style="stroke-width: 2;" stroke="#000000" fill="#ffffff"></rect> + <polyline points="0,40 60,0 " style="stroke-width: 2;" + fill="none" stroke="#000000"></polyline> + <text style="font-family: Arial,sans-serif; font-size: 12px;" + class=" djs-label"> + <tspan x="43.5" y="43.5">Policy</tspan> + </text> + </g> + <rect x="0" y="0" width="120" height="80" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape selected" data-element-id="EndEvent_16kg9fx" + transform="matrix(1,0,0,1,925,162)" style="display: block;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="48" + height="48"></rect> + <g class="djs-visual"> + <circle cx="18" cy="18" r="18" style="stroke-width: 4;" + stroke="#000000" fill="#ffffff"></circle> + </g> + <rect x="0" y="0" width="36" height="36" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + <g class=" djs-resizer djs-resizer-nw" transform="matrix(1,0,0,1,0,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-ne" transform="matrix(0,1,-1,0,36,0)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-se" transform="matrix(-1,0,0,-1,36,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + <g class=" djs-resizer djs-resizer-sw" transform="matrix(0,-1,1,0,0,36)"> + <rect x="-7" y="-7" width="5" height="5" class=" djs-resizer-visual"></rect> + <rect x="-7" y="-7" width="20" height="20" class=" djs-resizer-hit"></rect> + </g> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="EndEvent_16kg9fx_label" + transform="matrix(1,0,0,1,898,198)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1ahk7jg" + style="display: block;"> + <rect fill="none" class="djs-outline" x="80" y="174" width="133" + height="12"></rect> + <g class="djs-visual"> + <path d="m 86,180L207,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="86,180 207,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1ahk7jg_label" + transform="matrix(1,0,0,1,101.5,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_18ahat1" + style="display: block;"> + <rect fill="none" class="djs-outline" x="321" y="174" width="138" + height="12"></rect> + <g class="djs-visual"> + <path d="m 327,180L453,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="327,180 453,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_18ahat1_label" + transform="matrix(1,0,0,1,345,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1mo9gxb" + style="display: block;"> + <rect fill="none" class="djs-outline" x="567" y="174" width="126" + height="12"></rect> + <g class="djs-visual"> + <path d="m 573,180L687,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="573,180 687,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1mo9gxb_label" + transform="matrix(1,0,0,1,585,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-connection" data-element-id="SequenceFlow_1dgtrrq" + style="display: block;"> + <rect fill="none" class="djs-outline" x="801" y="174" width="130" + height="12"></rect> + <g class="djs-visual"> + <path d="m 807,180L925,180 " + style="stroke-width: 2; stroke-linejoin: round; marker-end: url("#markerSjdype4kmnw");" + fill="none" stroke="#000000"></path> + </g> + <polyline points="807,180 925,180 " style="stroke-opacity: 0; stroke-width: 15;" + fill="none" stroke="#ffffff" class="djs-hit"></polyline> + </g> + </g> + <g class="djs-group" xmlns="http://www.w3.org/2000/svg"> + <g class="djs-element djs-shape" data-element-id="SequenceFlow_1dgtrrq_label" + transform="matrix(1,0,0,1,821,170)" style="display: none;"> + <rect fill="none" class="djs-outline" x="-6" y="-6" width="102" + height="32"></rect> + <g class="djs-visual"> + <text style="font-family: Arial,sans-serif; font-size: 11px;" + class=" djs-label"> + <tspan x="45" y="0"></tspan> + </text> + </g> + <rect x="0" y="0" width="90" height="20" + style="stroke-opacity: 0; stroke-width: 15;" fill="none" stroke="#ffffff" + class="djs-hit"></rect> + </g> + </g> +</svg>
\ No newline at end of file diff --git a/src/test/resources/clds/templates/bpmn/tca-template.xml b/src/test/resources/clds/templates/bpmn/tca-template.xml new file mode 100644 index 000000000..cc942ef9d --- /dev/null +++ b/src/test/resources/clds/templates/bpmn/tca-template.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" + xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" + xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn"> + <bpmn:process id="Process_1" isExecutable="false"> + <bpmn:startEvent id="StartEvent_1"> + <bpmn:outgoing>SequenceFlow_1ahk7jg</bpmn:outgoing> + </bpmn:startEvent> + <bpmn:vesCollector id="VesCollector_1g9cmz0"> + <bpmn:incoming>SequenceFlow_1ahk7jg</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_18ahat1</bpmn:outgoing> + </bpmn:vesCollector> + <bpmn:tCA id="TCA_1d13unw"> + <bpmn:incoming>SequenceFlow_18ahat1</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1mo9gxb</bpmn:outgoing> + </bpmn:tCA> + <bpmn:policy id="Policy_12lup3h"> + <bpmn:incoming>SequenceFlow_1mo9gxb</bpmn:incoming> + <bpmn:outgoing>SequenceFlow_1dgtrrq</bpmn:outgoing> + </bpmn:policy> + <bpmn:endEvent id="EndEvent_16kg9fx"> + <bpmn:incoming>SequenceFlow_1dgtrrq</bpmn:incoming> + </bpmn:endEvent> + <bpmn:sequenceFlow id="SequenceFlow_1ahk7jg" + sourceRef="StartEvent_1" targetRef="VesCollector_1g9cmz0" /> + <bpmn:sequenceFlow id="SequenceFlow_18ahat1" + sourceRef="VesCollector_1g9cmz0" targetRef="TCA_1d13unw" /> + <bpmn:sequenceFlow id="SequenceFlow_1mo9gxb" + sourceRef="TCA_1d13unw" targetRef="Policy_12lup3h" /> + <bpmn:sequenceFlow id="SequenceFlow_1dgtrrq" + sourceRef="Policy_12lup3h" targetRef="EndEvent_16kg9fx" /> + </bpmn:process> + <bpmndi:BPMNDiagram id="BPMNDiagram_1"> + <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_1"> + <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" + bpmnElement="StartEvent_1"> + <dc:Bounds x="50" y="162" width="36" height="36" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="VesCollector_1g9cmz0_di" + bpmnElement="VesCollector_1g9cmz0"> + <dc:Bounds x="207" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="TCA_1d13unw_di" + bpmnElement="TCA_1d13unw"> + <dc:Bounds x="453" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="Policy_12lup3h_di" + bpmnElement="Policy_12lup3h"> + <dc:Bounds x="687" y="140" width="120" height="80" /> + </bpmndi:BPMNShape> + <bpmndi:BPMNShape id="EndEvent_16kg9fx_di" + bpmnElement="EndEvent_16kg9fx"> + <dc:Bounds x="925" y="162" width="36" height="36" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="898" y="198" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNShape> + <bpmndi:BPMNEdge id="SequenceFlow_1ahk7jg_di" + bpmnElement="SequenceFlow_1ahk7jg"> + <di:waypoint xsi:type="dc:Point" x="86" y="180" /> + <di:waypoint xsi:type="dc:Point" x="207" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="101.5" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_18ahat1_di" + bpmnElement="SequenceFlow_18ahat1"> + <di:waypoint xsi:type="dc:Point" x="327" y="180" /> + <di:waypoint xsi:type="dc:Point" x="453" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="345" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1mo9gxb_di" + bpmnElement="SequenceFlow_1mo9gxb"> + <di:waypoint xsi:type="dc:Point" x="573" y="180" /> + <di:waypoint xsi:type="dc:Point" x="687" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="585" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + <bpmndi:BPMNEdge id="SequenceFlow_1dgtrrq_di" + bpmnElement="SequenceFlow_1dgtrrq"> + <di:waypoint xsi:type="dc:Point" x="807" y="180" /> + <di:waypoint xsi:type="dc:Point" x="925" y="180" /> + <bpmndi:BPMNLabel> + <dc:Bounds x="821" y="170" width="90" height="20" /> + </bpmndi:BPMNLabel> + </bpmndi:BPMNEdge> + </bpmndi:BPMNPlane> + </bpmndi:BPMNDiagram> + +</bpmn:definitions>
\ No newline at end of file diff --git a/src/test/resources/example/sdc/blueprint-dcae/holmes.yaml b/src/test/resources/example/sdc/blueprint-dcae/holmes.yaml new file mode 100644 index 000000000..1277a0243 --- /dev/null +++ b/src/test/resources/example/sdc/blueprint-dcae/holmes.yaml @@ -0,0 +1,167 @@ +tosca_definitions_version: cloudify_dsl_1_3 +imports: +- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml +- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/docker/2.3.0+t.0.4/node-type.yaml +- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml +- http://nexus01.research.att.com:8081/repository/solutioning01-mte2-raw/type_files/dmaap/1.2.0/dmaap.yaml +inputs: + dcae_service_location: + type: string + docker_host_override: + type: string + topic0_aaf_password: + type: string + topic0_aaf_username: + type: string + topic0_client_role: + type: string + topic1_aaf_password: + type: string + topic1_aaf_username: + type: string + topic1_client_role: + type: string +node_templates: + docker_host_host: + type: dcae.nodes.SelectedDockerHost + properties: + docker_host_override: + get_input: docker_host_override + location_id: + get_input: dcae_service_location + holmes-rule_homes-rule: + type: dcae.nodes.DockerContainerForComponentsUsingDmaap + properties: + application_config: + holmes.default.rule.volte.scenario1: 'package dcae.ves.test + + import org.onap.some.related.packages; + + rule"SameVNF_Relation_Rule" + + salience 120 + + no-loop true + + when + + $root : VesAlarm( + + $sourceId: sourceId, sourceId != null && !sourceId.equals(""), + + specificProblem in ( "LSS_cpiPCSCFFailReg(121297)", "LSS_cpiSIPRetransmitInvite(120267)" ), + + $eventId: eventId) + + $child : VesAlarm( eventId != $eventId, + + CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId), + + specificProblem in ("LSS_externalLinkDown(4271)","LSS_failedAttachReqsRateExceeded(4272)"), + + this after [-60s, 60s] $root) + + then + + DmaapService.publishResult(...); + + end' + holmes.default.rule.volte.scenario2: 'package dcae.ves.test + + import org.onap.some.related.packages; + + rule"SameVNF_Relation_Rule_1" + + salience 120 + + no-loop true + + when + + $root : VesAlarm( + + $sourceId: sourceId, sourceId != null && !sourceId.equals(""), + + specificProblem in ( "LSS_cpiPCSCFFailReg(121297)", "LSS_cpiSIPRetransmitInvite(120267)" ), + + $eventId: eventId) + + $child : VesAlarm( eventId != $eventId, + + CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId), + + specificProblem in ("LSS_externalLinkDown(4271)","LSS_failedAttachReqsRateExceeded(4272)"), + + this after [-60s, 60s] $root) + + then + + DmaapService.publishResult(...); + + end' + services_calls: + - msb_config: + concat: + - '{{' + - get_property: + - SELF + - msb_config + - node_name + - '}}' + streams_publishes: [] + streams_subscribes: + - sec_measurement_unsecure: + aaf_password: + get_input: topic0_aaf_password + aaf_username: + get_input: topic0_aaf_username + dmaap_info: <<topic0>> + type: message_router + - sec_measurement: + aaf_password: + get_input: topic1_aaf_password + aaf_username: + get_input: topic1_aaf_username + dmaap_info: <<topic1>> + type: message_router + docker_config: + healthcheck: + endpoint: api/holmes-rule-mgmt/v1/healthcheck + interval: 15s + timeout: 1s + type: http + ports: + - 9101:9101 + image: nexus3.onap.org:10001/onap/holmes/rule-manamgement:latest + location_id: + get_input: dcae_service_location + service_component_type: dcae-analytics-holmes-rule-manamgement + streams_publishes: [] + streams_subscribes: + - client_role: + get_input: topic0_client_role + location: + get_input: dcae_service_location + name: topic0 + type: message_router + - client_role: + get_input: topic1_client_role + location: + get_input: dcae_service_location + name: topic1 + type: message_router + relationships: + - target: docker_host_host + type: dcae.relationships.component_contained_in + - target: topic0 + type: dcae.relationships.subscribe_to_events + - target: topic1 + type: dcae.relationships.subscribe_to_events + topic0: + type: dcae.nodes.Topic + properties: + topic_name: '' + topic1: + type: dcae.nodes.Topic + properties: + topic_name: '' diff --git a/src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml b/src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml new file mode 100644 index 000000000..6522885ff --- /dev/null +++ b/src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml @@ -0,0 +1,130 @@ +tosca_definitions_version: cloudify_dsl_1_3 +imports: +- http://dockercentral.it.att.com:8093/nexus/repository/rawcentral/com.att.dcae.controller/type_files/dockerplugin/2.4.0+t.0.8/node-type.yaml +- http://dockercentral.it.att.com:8093/nexus/repository/rawcentral/com.att.dcae.controller/type_files/dmaap/1.2.0+t.0.9/dmaap.yaml +- http://dockercentral.it.att.com:8093/nexus/repository/rawcentral/com.att.dcae.controller/type_files/relationship/1.0.0+t.0.1/relationship-types.yaml +inputs: + commonEventHeader.domain: + type: string + commonEventHeader.version: + type: string + dcae_service_location: + type: string + docker_host_override: + type: string + default: '' + elementType: + type: string + feed_id: + type: string + mappingType: + type: string + measurementsForVfScalingFields.measurementsForVfScalingVersion: + type: string + phases.docker_map.phaseName: + type: string + topic1_aaf_password: + type: string + topic1_aaf_username: + type: string + topic1_client_role: + type: string +node_templates: + DockerMap_n.1519416493392.3_DockerMap: + type: dcae.nodes.DockerContainerForComponentsUsingDmaap + properties: + application_config: + commonEventHeader.domain: + get_input: commonEventHeader.domain + commonEventHeader.version: + get_input: commonEventHeader.version + csvToVesJson: '{"processing":[{"phase":"pmossFoiPhase","filter":{"class":"Contains","string":"${file}","value":"NOKvMRF"},"processors":[{"class":"LogEvent","title":"PM-FOIEvent-Received","logName":"com.att.gfp.dcae.eventProcessor.input","logLevel":"DEBUG"},{"class":"RunPhase","phase":"vFoiNokRunPhase"}]},{"phase":"vFoiNokRunPhase","comments":"generic parsing","processors":[{"replace":",","field":"data","class":"ReplaceText","find":";"},{"replace":",","field":"file","class":"ReplaceText","find":"_"}]},{"phase":"vFoiNokRunPhase","filter":{"class":"Contains","string":"${data[1]}","value":"Begin date"},"processors":[{"class":"ExtractText","field":"event.commonEventHeader.startEpochMicrosec","value":"${data[1]}","regex":".*Begin date,([^,]*),.*"},{"class":"DateFormatter","value":"${event.commonEventHeader.startEpochMicrosec}","fromFormat":"MM/dd/yy HH:mm:ss a","fromTz":"GMT","toField":"event.commonEventHeader.startEpochMicrosec","toFormat":"#ms","toTz":"#ms"}]},{"phase":"vFoiNokRunPhase","filter":{"class":"Contains","string":"${data[2]}","value":"End date"},"processors":[{"class":"ExtractText","field":"event.commonEventHeader.lastEpochMicrosec","value":"${data[2]}","regex":".*End date,([^,]*),.*"},{"class":"DateFormatter","value":"${event.commonEventHeader.lastEpochMicrosec}","fromFormat":"MM/dd/yy HH:mm:ss a","fromTz":"GMT","toField":"event.commonEventHeader.lastEpochMicrosec","toFormat":"#ms","toTz":"#ms"},{"class":"DateFormatter","value":"${event.commonEventHeader.lastEpochMicrosec}","fromFormat":"#ms","fromTz":"#ms","toField":"event.commonEventHeader.internalHeaderFields.DATETIMEUTC","toFormat":"yyyyMMddHHmmss","toTz":"GMT"}]},{"phase":"vFoiNokRunPhase","processors":[{"class":"ExtractText","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[0].value","value":"${data[7]}","regex":".*CpuSys,+(\\d+,){3}.*"},{"class":"ReplaceText","replace":"","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[0].value","find":","},{"class":"ExtractText","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[1].value","value":"${data[5]}","regex":".*CpuUsage,+(\\d+,){3}.*"},{"class":"ReplaceText","replace":"","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[1].value","find":","},{"class":"ExtractText","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[2].value","value":"${data[7]}","regex":".*CpuSys,+(\\d+,){2}.*"},{"class":"ReplaceText","replace":"","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[2].value","find":","},{"class":"ExtractText","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[3].value","value":"${data[5]}","regex":".*CpuUsage,+(\\d+,){2}.*"},{"class":"ReplaceText","replace":"","field":"event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[3].value","find":","}]},{"phase":"vFoiNokRunPhase","processors":[{"class":"ExtractText","field":"event.commonEventHeader.eventName","value":"${file}","regex":"([^,]*),.*"},{"class":"ExtractText","field":"event.commonEventHeader.reportingEntityName","value":"${file}","regex":".*,([^,]*)\\..*"}]},{"phase":"vFoiNokRunPhase","comments":"generic parsing","processors":[{"class":"Set","updates":{"event.commonEventHeader.lastEpochMicrosec":"${event.commonEventHeader.lastEpochMicrosec}000","event.commonEventHeader.startEpochMicrosec":"${event.commonEventHeader.startEpochMicrosec}000","event.commonEventHeader.domain":"measurementsForVfScaling","event.commonEventHeader.eventName":"Mfvs_${event.commonEventHeader.eventName}","event.commonEventHeader.eventType":"csv2ves","event.commonEventHeader.priority":"Normal","event.commonEventHeader.sequence":0,"event.commonEventHeader.sourceName":"${event.commonEventHeader.reportingEntityName}","event.commonEventHeader.version":3.0,"event.commonEventHeader.eventId":"%{now.ms}","event.commonEventHeader.internalHeaderFields.dbTableSuffix":"","event.measurementsForVfScalingFields.measurementInterval":900,"event.measurementsForVfScalingFields.measurementsForVfScalingVersion":2.0,"event.measurementsForVfScalingFields.additionalMeasurements.name":"csv2ves","event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[0].name":"CpuSysMax","event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[1].name":"CpuUsageMax","event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[2].name":"CpuSysAverage","event.measurementsForVfScalingFields.additionalMeasurements.arrayOfFields[3].name":"CpuUsageAverage"}},{"class":"DateFormatter","value":"${event.commonEventHeader.eventId}","fromFormat":"#ms","fromTz":"#ms","toField":"event.commonEventHeader.eventId","toFormat":"yyyyMMddHHmmssSSS","toTz":"GMT"}]},{"phase":"vFoiNokRunPhase","processors":[{"class":"Clear","fields":["data","file"]},{"class":"LogText","logLevel":"INFO","logText":"Finished-PM-FOIEvent-parsing"},{"class":"LogEvent","title":"PM-FOIEvent-Received-Output"},{"class":"RunPhase","phase":"foiEventToDmaapPhase"}]}]}' + elementType: + get_input: elementType + isSelfServeComponent: 'True' + mappingType: + get_input: mappingType + measurementsForVfScalingFields.measurementsForVfScalingVersion: + get_input: measurementsForVfScalingFields.measurementsForVfScalingVersion + phases.docker_map.phaseName: + get_input: phases.docker_map.phaseName + services_calls: {} + streams_publishes: + DCAE-VES-PM-EVENT: + aaf_password: + get_input: topic1_aaf_password + aaf_username: + get_input: topic1_aaf_username + dmaap_info: <<topic1_n.1519416493404.5>> + type: message_router + streams_subscribes: + DCAE_PM_DATA_C_M: + dmaap_info: <<feed_n.1519416394214.2>> + type: data_router + useDtiConfig: 'False' + docker_config: + healthcheck: + interval: 300s + script: /opt/app/vec/bin/common/HealthCheck_DockerMap.sh + timeout: 15s + type: docker + volumes: + - container: + bind: /opt/app/dcae-certificate + host: + path: /opt/app/dcae-certificate + - container: + bind: /opt/app/dmd/log/AGENT + host: + path: /opt/logs/DCAE/dockermap/dmd/AGENT + - container: + bind: /opt/app/dmd/log/WATCHER + host: + path: /opt/logs/DCAE/dockermap/dmd/WATCHER + - container: + bind: /opt/app/vec/logs/DCAE + host: + path: /opt/logs/DCAE/dockermap/dockermap-logs + - container: + bind: /opt/app/vec/archive/data + host: + path: /opt/data/DCAE/dockermap/dockermap-archive + image: dockercentral.it.att.com:5100/com.att.dcae.controller/dcae-controller-dockermap:18.02-004 + location_id: + get_input: dcae_service_location + service_component_type: dcae.collectors.docker.map.pm + streams_publishes: + - client_role: + get_input: topic1_client_role + location: + get_input: dcae_service_location + name: topic1_n.1519416493404.5 + type: message_router + streams_subscribes: + - location: + get_input: dcae_service_location + name: feed_n.1519416394214.2 + type: data_router + relationships: + - target: docker_host_host + type: dcae.relationships.component_contained_in + - target: feed_n.1519416394214.2 + type: dcae.relationships.subscribe_to_files + - target: topic1_n.1519416493404.5 + type: dcae.relationships.publish_events + docker_host_host: + type: dcae.nodes.SelectedDockerHost + properties: + docker_host_override: + get_input: docker_host_override + location_id: + get_input: dcae_service_location + feed_n.1519416394214.2: + type: dcae.nodes.ExistingFeed + properties: + feed_id: + get_input: feed_id + topic1_n.1519416493404.5: + type: dcae.nodes.Topic + properties: + topic_name: DCAE-VES-PM-EVENT-v1 diff --git a/src/test/resources/example/sdc/blueprint-dcae/tca.yaml b/src/test/resources/example/sdc/blueprint-dcae/tca.yaml new file mode 100644 index 000000000..101dc2c0d --- /dev/null +++ b/src/test/resources/example/sdc/blueprint-dcae/tca.yaml @@ -0,0 +1,82 @@ +tosca_definitions_version: cloudify_dsl_1_3 +imports: +- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml +- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/docker/2.2.0/node-type.yaml +- https://onap.org:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml +- http://onap.org:8081/repository/solutioning01-mte2-raw/type_files/dmaap/dmaap_mr.yaml +inputs: + location_id: + type: string + service_id: + type: string +node_templates: + cdap_host_host: + type: dcae.nodes.StreamingAnalytics.SelectedCDAPInfrastructure + properties: + location_id: + get_input: location_id + scn_override: cdap_broker.solutioning-central.dcae.onap.org + interfaces: + cloudify.interfaces.lifecycle: { + } + tca_tca: + type: dcae.nodes.MicroService.cdap + properties: + app_config: + appDescription: DCAE Analytics Threshold Crossing Alert Application + appName: dcae-tca + tcaSubscriberOutputStreamName: TCASubscriberOutputStream + tcaVESAlertsTableName: TCAVESAlertsTable + tcaVESAlertsTableTTLSeconds: '1728000' + tcaVESMessageStatusTableName: TCAVESMessageStatusTable + tcaVESMessageStatusTableTTLSeconds: '86400' + thresholdCalculatorFlowletInstances: '2' + app_preferences: + publisherContentType: application/json + publisherHostName: mrlocal-mtnjftle01.onap.org + publisherHostPort: '3905' + publisherMaxBatchSize: '10' + publisherMaxRecoveryQueueSize: '100000' + publisherPollingInterval: '20000' + publisherProtocol: https + publisherTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESPub + publisherUserName: m00502@tca.af.dcae.onap.org + publisherUserPassword: Te5021abc + subscriberConsumerGroup: OpenDCAE-c12 + subscriberConsumerId: c12 + subscriberContentType: application/json + subscriberHostName: mrlocal-mtnjftle01.onap.org + subscriberHostPort: '3905' + subscriberMessageLimit: '-1' + subscriberPollingInterval: '20000' + subscriberProtocol: https + subscriberTimeoutMS: '-1' + subscriberTopicName: org.onap.dcae.dmaap.mtnje2.DcaeTestVESSub + subscriberUserName: m00502@tca.af.dcae.onap.org + subscriberUserPassword: Te5021abc + tca_policy: null + artifact_name: dcae-analytics-tca + artifact_version: 1.0.0 + connections: + streams_publishes: [ + ] + streams_subscribes: [ + ] + jar_url: http://somejar + location_id: + get_input: location_id + namespace: cdap_tca_hi_lo + programs: + - program_id: TCAVESCollectorFlow + program_type: flows + - program_id: TCADMaaPMRSubscriberWorker + program_type: workers + - program_id: TCADMaaPMRPublisherWorker + program_type: workers + service_component_type: cdap_app_tca + service_id: + get_input: service_id + streamname: TCASubscriberOutputStream + relationships: + - target: cdap_host_host + type: dcae.relationships.component_contained_in
\ No newline at end of file diff --git a/src/test/resources/http-cache/example/pdp/api/getConfig/.file b/src/test/resources/http-cache/example/pdp/api/getConfig/.file new file mode 100644 index 000000000..fb2ad04b4 --- /dev/null +++ b/src/test/resources/http-cache/example/pdp/api/getConfig/.file @@ -0,0 +1,2 @@ +[{"policyConfigMessage":"Config Retrieved! ","policyConfigStatus":"CONFIG_RETRIEVED","type":"JSON","config":"{\"service\":\"tca_policy\",\"location\":\"SampleServiceLocation\",\"uuid\":\"test\",\"policyName\":\"MicroServicevCPE\",\"description\":\"MicroService vCPE Policy\",\"configName\":\"SampleConfigName\",\"templateVersion\":\"OpenSource.version.1\",\"version\":\"1.1.0\",\"priority\":\"1\",\"policyScope\":\"resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"riskType\":\"SampleRiskType\",\"riskLevel\":\"1\",\"guard\":\"False\",\"content\":{\"tca_policy\":{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}}}","policyName":"com.Config_MS_MicroServicevCPE.1.xml","policyVersion":"1","matchingConditions":{"ONAPName":"DCAE","ConfigName":"SampleConfigName","service":"tca_policy","uuid":"test","Location":"SampleServiceLocation"},"responseAttributes":{},"property":null}, +{"policyConfigMessage":"Config Retrieved! ","policyConfigStatus":"CONFIG_RETRIEVED","type":"JSON","config":"{\"service\":\"tca_policy\",\"location\":\"SampleServiceLocation\",\"uuid\":\"test\",\"policyName\":\"MicroServicevCPE\",\"description\":\"MicroService vCPE Policy\",\"configName\":\"SampleConfigName\",\"templateVersion\":\"OpenSource.version.1\",\"version\":\"1.1.0\",\"priority\":\"1\",\"policyScope\":\"resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"riskType\":\"SampleRiskType\",\"riskLevel\":\"1\",\"guard\":\"False\",\"content\":{\"tca_policy\":{\"domain\":\"measurementsForVfScaling\",\"metricsPerEventName\":[{\"eventName\":\"Measurement_vGMUX\",\"controlLoopSchemaType\":\"VNF\",\"policyScope\":\"DCAE\",\"policyName\":\"DCAE.Config_tca-hi-lo\",\"policyVersion\":\"v0.0.1\",\"thresholds\":[{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"EQUAL\",\"severity\":\"MAJOR\",\"closedLoopEventStatus\":\"ABATED\"},{\"closedLoopControlName\":\"ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e\",\"version\":\"1.0.2\",\"fieldPath\":\"$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value\",\"thresholdValue\":0,\"direction\":\"GREATER\",\"severity\":\"CRITICAL\",\"closedLoopEventStatus\":\"ONSET\"}]}]}}}","policyName":"ClHolmes1.Config_ClosedLoop_f142fc95_2601_11e8_89ce_0242ac130002_null","policyVersion":"1","matchingConditions":{"ONAPName":"DCAE","ConfigName":"SampleConfigName","service":"tca_policy","uuid":"test","Location":"SampleServiceLocation"},"responseAttributes":{},"property":null}]
\ No newline at end of file diff --git a/src/test/resources/http-cache/example/pdp/api/getConfig/.header b/src/test/resources/http-cache/example/pdp/api/getConfig/.header new file mode 100644 index 000000000..9958716f2 --- /dev/null +++ b/src/test/resources/http-cache/example/pdp/api/getConfig/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Date": "Mon, 12 Mar 2018 15:03:26 GMT", "Content-Type": "application/json;charset=UTF-8", "Server": "Apache-Coyote/1.1"}
\ No newline at end of file diff --git a/src/test/resources/http-cache/example/pdp/api/pushPolicy/.file b/src/test/resources/http-cache/example/pdp/api/pushPolicy/.file new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/src/test/resources/http-cache/example/pdp/api/pushPolicy/.file @@ -0,0 +1 @@ +[]
\ No newline at end of file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.header b/src/test/resources/http-cache/example/pdp/api/pushPolicy/.header index 6a280d972..6a280d972 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.header +++ b/src/test/resources/http-cache/example/pdp/api/pushPolicy/.header diff --git a/src/test/resources/http-cache/example/pdp/api/updatePolicy/.file b/src/test/resources/http-cache/example/pdp/api/updatePolicy/.file new file mode 100644 index 000000000..0637a088a --- /dev/null +++ b/src/test/resources/http-cache/example/pdp/api/updatePolicy/.file @@ -0,0 +1 @@ +[]
\ No newline at end of file diff --git a/src/test/resources/http-cache/example/pdp/api/updatePolicy/.header b/src/test/resources/http-cache/example/pdp/api/updatePolicy/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/pdp/api/updatePolicy/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=CVFC/.file index 7115df3f9..7115df3f9 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=CVFC/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=CVFC/.header index e7f1e8490..e7f1e8490 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=CVFC/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=CVFC/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=VF/.file index 253046a91..253046a91 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=VF/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=VF/.header index ff1f54a02..ff1f54a02 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VF/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=VF/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=VFC/.file index a99aa44d2..a99aa44d2 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources?resourceType=VFC/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=VFC/.file diff --git a/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=VFC/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=VFC/.header new file mode 100644 index 000000000..6a280d972 --- /dev/null +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources?resourceType=VFC/.header @@ -0,0 +1 @@ +{"Transfer-Encoding": "chunked", "Set-Cookie": "JSESSIONID=158qxkdtdobkd1umr3ikkgrmlx;Path=/", "Expires": "Thu, 01 Jan 1970 00:00:00 GMT", "Server": "Jetty(9.3.21.v20170918)", "Content-Type": "application/json", "X-ECOMP-RequestID": "e2ddb3c8-994f-47df-b4dc-097d4fb55c08"}
\ No newline at end of file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/228aac11-6e48-4412-afbf-327c5c3b04fb/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/228aac11-6e48-4412-afbf-327c5c3b04fb/metadata/.file index 8b9114f19..8b9114f19 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/228aac11-6e48-4412-afbf-327c5c3b04fb/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/228aac11-6e48-4412-afbf-327c5c3b04fb/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/228aac11-6e48-4412-afbf-327c5c3b04fb/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/228aac11-6e48-4412-afbf-327c5c3b04fb/metadata/.header index 439efd9f0..439efd9f0 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/228aac11-6e48-4412-afbf-327c5c3b04fb/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/228aac11-6e48-4412-afbf-327c5c3b04fb/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/2bbcbcce-f9e2-4f5d-b975-1f1122d3226c/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/2bbcbcce-f9e2-4f5d-b975-1f1122d3226c/metadata/.file index da4363f14..da4363f14 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/2bbcbcce-f9e2-4f5d-b975-1f1122d3226c/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/2bbcbcce-f9e2-4f5d-b975-1f1122d3226c/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/2bbcbcce-f9e2-4f5d-b975-1f1122d3226c/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/2bbcbcce-f9e2-4f5d-b975-1f1122d3226c/metadata/.header index 27e67e5ce..27e67e5ce 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/2bbcbcce-f9e2-4f5d-b975-1f1122d3226c/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/2bbcbcce-f9e2-4f5d-b975-1f1122d3226c/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/38b62ebd-276a-48e8-948b-de76c81d6686/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/38b62ebd-276a-48e8-948b-de76c81d6686/metadata/.file index 05f714755..05f714755 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/38b62ebd-276a-48e8-948b-de76c81d6686/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/38b62ebd-276a-48e8-948b-de76c81d6686/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/38b62ebd-276a-48e8-948b-de76c81d6686/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/38b62ebd-276a-48e8-948b-de76c81d6686/metadata/.header index 79b1c5243..79b1c5243 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/38b62ebd-276a-48e8-948b-de76c81d6686/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/38b62ebd-276a-48e8-948b-de76c81d6686/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/68bb176c-8d5f-4d27-8407-fd8d9e5910eb/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/68bb176c-8d5f-4d27-8407-fd8d9e5910eb/metadata/.file index 9985a8be8..9985a8be8 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/68bb176c-8d5f-4d27-8407-fd8d9e5910eb/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/68bb176c-8d5f-4d27-8407-fd8d9e5910eb/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/68bb176c-8d5f-4d27-8407-fd8d9e5910eb/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/68bb176c-8d5f-4d27-8407-fd8d9e5910eb/metadata/.header index 5d3981400..5d3981400 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/68bb176c-8d5f-4d27-8407-fd8d9e5910eb/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/68bb176c-8d5f-4d27-8407-fd8d9e5910eb/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/701bf7b7-ddf1-4658-af5f-66c815348fd3/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/701bf7b7-ddf1-4658-af5f-66c815348fd3/metadata/.file index bbae2420e..bbae2420e 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/701bf7b7-ddf1-4658-af5f-66c815348fd3/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/701bf7b7-ddf1-4658-af5f-66c815348fd3/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/701bf7b7-ddf1-4658-af5f-66c815348fd3/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/701bf7b7-ddf1-4658-af5f-66c815348fd3/metadata/.header index c4e7b6900..c4e7b6900 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/701bf7b7-ddf1-4658-af5f-66c815348fd3/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/701bf7b7-ddf1-4658-af5f-66c815348fd3/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/8fb4db8b-1d1f-4369-8611-0375d86f0051/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/8fb4db8b-1d1f-4369-8611-0375d86f0051/metadata/.file index 940d0ecc4..940d0ecc4 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/8fb4db8b-1d1f-4369-8611-0375d86f0051/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/8fb4db8b-1d1f-4369-8611-0375d86f0051/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/8fb4db8b-1d1f-4369-8611-0375d86f0051/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/8fb4db8b-1d1f-4369-8611-0375d86f0051/metadata/.header index 45800a0af..45800a0af 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/8fb4db8b-1d1f-4369-8611-0375d86f0051/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/8fb4db8b-1d1f-4369-8611-0375d86f0051/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/948da0c9-536e-4688-85eb-d906fe7324b3/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/948da0c9-536e-4688-85eb-d906fe7324b3/metadata/.file index 53fa9e394..53fa9e394 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/948da0c9-536e-4688-85eb-d906fe7324b3/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/948da0c9-536e-4688-85eb-d906fe7324b3/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/948da0c9-536e-4688-85eb-d906fe7324b3/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/948da0c9-536e-4688-85eb-d906fe7324b3/metadata/.header index 86110d468..86110d468 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/948da0c9-536e-4688-85eb-d906fe7324b3/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/948da0c9-536e-4688-85eb-d906fe7324b3/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/98c27d0b-9395-4f8b-87ab-e076cd1f627e/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/98c27d0b-9395-4f8b-87ab-e076cd1f627e/metadata/.file index 2a272ee6f..2a272ee6f 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/98c27d0b-9395-4f8b-87ab-e076cd1f627e/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/98c27d0b-9395-4f8b-87ab-e076cd1f627e/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/98c27d0b-9395-4f8b-87ab-e076cd1f627e/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/98c27d0b-9395-4f8b-87ab-e076cd1f627e/metadata/.header index 56bc0de43..56bc0de43 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/98c27d0b-9395-4f8b-87ab-e076cd1f627e/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/98c27d0b-9395-4f8b-87ab-e076cd1f627e/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/a004b0d8-54bd-4ede-9311-c75dc608e9fd/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/a004b0d8-54bd-4ede-9311-c75dc608e9fd/metadata/.file index ea376775e..ea376775e 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/a004b0d8-54bd-4ede-9311-c75dc608e9fd/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/a004b0d8-54bd-4ede-9311-c75dc608e9fd/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/a004b0d8-54bd-4ede-9311-c75dc608e9fd/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/a004b0d8-54bd-4ede-9311-c75dc608e9fd/metadata/.header index 31ab6c959..31ab6c959 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/a004b0d8-54bd-4ede-9311-c75dc608e9fd/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/a004b0d8-54bd-4ede-9311-c75dc608e9fd/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/a01ebd00-4b64-4607-8422-c3733735800d/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/a01ebd00-4b64-4607-8422-c3733735800d/metadata/.file index b2e0716c0..b2e0716c0 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/a01ebd00-4b64-4607-8422-c3733735800d/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/a01ebd00-4b64-4607-8422-c3733735800d/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/a01ebd00-4b64-4607-8422-c3733735800d/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/a01ebd00-4b64-4607-8422-c3733735800d/metadata/.header index 86df6fd4f..86df6fd4f 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/a01ebd00-4b64-4607-8422-c3733735800d/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/a01ebd00-4b64-4607-8422-c3733735800d/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/b339e576-e433-4be4-8a43-258f629c4e79/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/b339e576-e433-4be4-8a43-258f629c4e79/metadata/.file index 24da339a5..24da339a5 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/b339e576-e433-4be4-8a43-258f629c4e79/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/b339e576-e433-4be4-8a43-258f629c4e79/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/b339e576-e433-4be4-8a43-258f629c4e79/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/b339e576-e433-4be4-8a43-258f629c4e79/metadata/.header index faa4d0bd7..faa4d0bd7 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/b339e576-e433-4be4-8a43-258f629c4e79/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/b339e576-e433-4be4-8a43-258f629c4e79/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/c041f64d-8d8f-4f89-906f-79dccc63e7f5/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/c041f64d-8d8f-4f89-906f-79dccc63e7f5/metadata/.file index 4a23a0ec1..4a23a0ec1 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/c041f64d-8d8f-4f89-906f-79dccc63e7f5/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/c041f64d-8d8f-4f89-906f-79dccc63e7f5/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/c041f64d-8d8f-4f89-906f-79dccc63e7f5/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/c041f64d-8d8f-4f89-906f-79dccc63e7f5/metadata/.header index 84e699260..84e699260 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/c041f64d-8d8f-4f89-906f-79dccc63e7f5/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/c041f64d-8d8f-4f89-906f-79dccc63e7f5/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/c8a01686-2762-483c-98ad-a66606b9947f/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/c8a01686-2762-483c-98ad-a66606b9947f/metadata/.file index ecf6aa73a..ecf6aa73a 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/c8a01686-2762-483c-98ad-a66606b9947f/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/c8a01686-2762-483c-98ad-a66606b9947f/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/c8a01686-2762-483c-98ad-a66606b9947f/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/c8a01686-2762-483c-98ad-a66606b9947f/metadata/.header index 650c2ad49..650c2ad49 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/c8a01686-2762-483c-98ad-a66606b9947f/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/c8a01686-2762-483c-98ad-a66606b9947f/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/cca286e8-5ac0-451c-b874-8cc307181e10/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/cca286e8-5ac0-451c-b874-8cc307181e10/metadata/.file index 58b5d3673..58b5d3673 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/cca286e8-5ac0-451c-b874-8cc307181e10/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/cca286e8-5ac0-451c-b874-8cc307181e10/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/cca286e8-5ac0-451c-b874-8cc307181e10/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/cca286e8-5ac0-451c-b874-8cc307181e10/metadata/.header index 2ae908f02..2ae908f02 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/cca286e8-5ac0-451c-b874-8cc307181e10/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/cca286e8-5ac0-451c-b874-8cc307181e10/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/d6a5add1-162a-4966-80a6-8ba53d83b17f/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/d6a5add1-162a-4966-80a6-8ba53d83b17f/metadata/.file index 8038b8130..8038b8130 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/d6a5add1-162a-4966-80a6-8ba53d83b17f/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/d6a5add1-162a-4966-80a6-8ba53d83b17f/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/d6a5add1-162a-4966-80a6-8ba53d83b17f/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/d6a5add1-162a-4966-80a6-8ba53d83b17f/metadata/.header index ebd872113..ebd872113 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/d6a5add1-162a-4966-80a6-8ba53d83b17f/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/d6a5add1-162a-4966-80a6-8ba53d83b17f/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/f2686c0f-11c5-4cab-83bd-b0f2cc35bf4d/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/f2686c0f-11c5-4cab-83bd-b0f2cc35bf4d/metadata/.file index 777738301..777738301 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/f2686c0f-11c5-4cab-83bd-b0f2cc35bf4d/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/f2686c0f-11c5-4cab-83bd-b0f2cc35bf4d/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/f2686c0f-11c5-4cab-83bd-b0f2cc35bf4d/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/f2686c0f-11c5-4cab-83bd-b0f2cc35bf4d/metadata/.header index 629e7d981..629e7d981 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/resources/f2686c0f-11c5-4cab-83bd-b0f2cc35bf4d/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/resources/f2686c0f-11c5-4cab-83bd-b0f2cc35bf4d/metadata/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/services/.file index 92694fed2..92694fed2 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/services/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/services/.header index 231ae3db2..231ae3db2 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/services/.header diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/metadata/.file index 294d88c54..294d88c54 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/metadata/.header index b68cd5a95..b68cd5a95 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/metadata/.header diff --git a/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/resourceInstances/vpacketgen0/artifacts/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/resourceInstances/vpacketgen0/artifacts/.file new file mode 100644 index 000000000..29d8ab70c --- /dev/null +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/resourceInstances/vpacketgen0/artifacts/.file @@ -0,0 +1 @@ +{"artifactName":"ClosedLoop-2e3d2132-26d4-11e8-826d-0242ac130002.yml","artifactType":"DCAE_INVENTORY_BLUEPRINT","artifactURL":"","artifactDescription":"Description of the Artifact","artifactChecksum":"ZjJlMjVmMWE2M2M1OTM2MDZlODlmNTVmZmYzNjViYzM=","artifactUUID":"13fb13f9-f5d7-4ade-b934-d0da78754a51","artifactVersion":"1"}
\ No newline at end of file diff --git a/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/resourceInstances/vpacketgen0/artifacts/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/resourceInstances/vpacketgen0/artifacts/.header new file mode 100644 index 000000000..125a579ec --- /dev/null +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/services/56441b4b-0467-41dc-9a0e-e68613838219/resourceInstances/vpacketgen0/artifacts/.header @@ -0,0 +1 @@ +{"Content-Length": "323", "Content-Type": "application/json"}
\ No newline at end of file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/aecb6332-e906-4334-9f04-93ba4926f6c2/metadata/.file b/src/test/resources/http-cache/example/sdc/v1/catalog/services/aecb6332-e906-4334-9f04-93ba4926f6c2/metadata/.file index bc8d30ce9..bc8d30ce9 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/aecb6332-e906-4334-9f04-93ba4926f6c2/metadata/.file +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/services/aecb6332-e906-4334-9f04-93ba4926f6c2/metadata/.file diff --git a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/aecb6332-e906-4334-9f04-93ba4926f6c2/metadata/.header b/src/test/resources/http-cache/example/sdc/v1/catalog/services/aecb6332-e906-4334-9f04-93ba4926f6c2/metadata/.header index fba705b1b..fba705b1b 100644 --- a/src/test/resources/http-cache/sdc-example/sdc/v1/catalog/services/aecb6332-e906-4334-9f04-93ba4926f6c2/metadata/.header +++ b/src/test/resources/http-cache/example/sdc/v1/catalog/services/aecb6332-e906-4334-9f04-93ba4926f6c2/metadata/.header diff --git a/src/test/resources/http-cache/sdc_proxy.py b/src/test/resources/http-cache/sdc_proxy.py deleted file mode 100755 index 45dac4133..000000000 --- a/src/test/resources/http-cache/sdc_proxy.py +++ /dev/null @@ -1,127 +0,0 @@ -#!/usr/bin/env python2 -### -# ============LICENSE_START======================================================= -# ONAP CLAMP -# ================================================================================ -# Copyright (C) 2018 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============================================ -# =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -### - -import json -import requests -import os -import sys -import SimpleHTTPServer -import SocketServer -import argparse -import tempfile -import signal - -parser = argparse.ArgumentParser(description="SDC Cache & Replay") -parser.add_argument("--username", "-u", type=str, help="Set the username for contacting SDC") -parser.add_argument("--password", "-p", type=str, help="Set the password for contacting SDC") -parser.add_argument("--root", "-r", default=tempfile.mkdtemp, type=str, help="Root folder for the proxy cache") -parser.add_argument("--proxy" , type=str, help="Url of the Act as a proxy. If not set, this script only uses the cache and will return a 404 if files aren't found") -parser.add_argument("--port", "-P", type=int, default="8081", help="Port on which the proxy should listen to") -parser.add_argument("--verbose", "-v", type=bool, help="Print more information in case of error") -options = parser.parse_args() - - -PORT = options.port -SDC_HOST = options.proxy -SDC_AUTH = (options.username, options.password) -SDC_HEADERS = {'X-ECOMP-InstanceID':'CLAMP'} -CACHE_ROOT = options.root - -def signal_handler(signal_sent, frame): - global httpd - if signal_sent == signal.SIGINT: - print('Got Ctrl-C (SIGINT)') - httpd.socket.close() - httpd.shutdown() - httpd.server_close() - -class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler): - - def print_headers(self): - for header,value in self.headers.items(): - print("%s : %s" % (header, value)) - - def check_credentials(self): - pass - - def _send_content(self, header_file, content_file): - self.send_response(200) - with open(header_file, 'rb') as f: - headers = json.load(f) - for key,value in headers.items(): - if key in ('Transfer-Encoding',): - continue - self.send_header(key, value) - self.end_headers() - with open(content_file,'rb') as f: - fc = f.read() - self.wfile.write(fc) - - def _write_cache(self,cached_file, header_file, content_file, response): - os.makedirs(cached_file, True) - with open(content_file, 'w') as f: - f.write(response.raw.read()) - with open(header_file, 'w') as f: - json.dump(dict(response.raw.headers), f) - # Entry point of the code - def do_GET(self): - - self.print_headers() - self.check_credentials() - - cached_file = '%s/%s' % (CACHE_ROOT, self.path,) - print("Cached file name before escaping : %s" % cached_file) - cached_file = cached_file.replace('<','<').replace('>','>').replace('?','?').replace('*','*').replace('\\','*').replace(':',':').replace('|','|') - print("Cached file name after escaping (used for cache storage) : %s" % cached_file) - cached_file_content = "%s/.file" % (cached_file,) - cached_file_header = "%s/.header" % (cached_file,) - - _file_available = os.path.exists(cached_file_content) - if not _file_available and not SDC_HOST: - self.send_response(404) - return "404 Not found" - - if not _file_available: - print("SDC Request for data currently not present in cache: %s" % (cached_file,)) - url = '%s%s' % (SDC_HOST, self.path) - response = requests.get(url, auth=SDC_AUTH, headers=SDC_HEADERS, stream=True) - - if response.status_code == 200: - self._write_cache(cached_file, cached_file_header, cached_file_content, response) - else: - print('Error when requesting file :') - print('Requested url : %s' % (url,)) - print('Status code : %s' % (response.status_code,)) - print('Content : %s' % (response.content,)) - self.send_response(response.status_code) - return response.content - - self._send_content(cached_file_header, cached_file_content) - -# Main code that start the HTTP server -httpd = SocketServer.ForkingTCPServer(('', PORT), Proxy) -httpd.allow_reuse_address = True -print "Listening on port "+ str(PORT) + " and caching in " + CACHE_ROOT + "(Press Ctrl+C to stop HTTPD Caching script)" -signal.signal(signal.SIGINT, signal_handler) -httpd.serve_forever()
\ No newline at end of file diff --git a/src/test/resources/http-cache/start_http_cache.sh b/src/test/resources/http-cache/start_http_cache.sh index 36829dde6..fe9e9911f 100755 --- a/src/test/resources/http-cache/start_http_cache.sh +++ b/src/test/resources/http-cache/start_http_cache.sh @@ -27,11 +27,11 @@ if [ $# -eq 1 ] echo 'input parameter is set (proxy http)'; export http_proxy=$1 export https_proxy=$1 - else + else echo 'input parameter is not set (proxy http)'; fi echo 'Installing requests packages for Python' pip install requests echo 'Executing the Http proxy in Cache mode only' -python sdc_proxy.py --port 8080 --root /usr/src/http-cache-app/data-cache +python third_party_proxy.py --port 8080 --root /usr/src/http-cache-app/data-cache diff --git a/src/test/resources/http-cache/third_party_proxy.py b/src/test/resources/http-cache/third_party_proxy.py new file mode 100755 index 000000000..72ea49587 --- /dev/null +++ b/src/test/resources/http-cache/third_party_proxy.py @@ -0,0 +1,251 @@ +#!/usr/bin/env python2 +### +# ============LICENSE_START======================================================= +# ONAP CLAMP +# ================================================================================ +# Copyright (C) 2018 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============================================ +# =================================================================== +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +### + +import json +import requests +import os +import sys +import SimpleHTTPServer +import SocketServer +import argparse +import tempfile +import signal +import uuid +import shutil + +parser = argparse.ArgumentParser(description="3rd party Cache & Replay") +parser.add_argument("--username", "-u", type=str, help="Set the username for contacting 3rd party - only used for GET") +parser.add_argument("--password", "-p", type=str, help="Set the password for contacting 3rd party - only used for GET") +parser.add_argument("--root", "-r", default=tempfile.mkdtemp, type=str, help="Root folder for the proxy cache") +parser.add_argument("--proxy" , type=str, help="Url of the Act as a proxy. If not set, this script only uses the cache and will return a 404 if files aren't found") +parser.add_argument("--port", "-P", type=int, default="8081", help="Port on which the proxy should listen to") +parser.add_argument("--verbose", "-v", type=bool, help="Print more information in case of error") +options = parser.parse_args() + + +PORT = options.port +HOST = options.proxy +AUTH = (options.username, options.password) +HEADERS = {'X-ECOMP-InstanceID':'CLAMP'} +CACHE_ROOT = options.root + +def signal_handler(signal_sent, frame): + global httpd + if signal_sent == signal.SIGINT: + print('Got Ctrl-C (SIGINT)') + httpd.socket.close() + httpd.shutdown() + httpd.server_close() + +class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler): + + def print_headers(self): + for header,value in self.headers.items(): + print("header: %s : %s" % (header, value)) + + def check_credentials(self): + pass + + def _send_content(self, header_file, content_file): + self.send_response(200) + with open(header_file, 'rb') as f: + headers = json.load(f) + for key,value in headers.items(): + if key in ('Transfer-Encoding',): + continue + self.send_header(key, value) + self.end_headers() + with open(content_file,'rb') as f: + fc = f.read() + self.wfile.write(fc) + + def _write_cache(self,cached_file, header_file, content_file, response): + os.makedirs(cached_file, True) + with open(content_file, 'w') as f: + f.write(response.raw.read()) + with open(header_file, 'w') as f: + json.dump(dict(response.raw.headers), f) + # Entry point of the code + def do_GET(self): + print("\n\n\nGot a GET request for %s " % self.path) + + self.print_headers() + self.check_credentials() + + cached_file = '%s/%s' % (CACHE_ROOT, self.path,) + print("Cached file name before escaping : %s" % cached_file) + cached_file = cached_file.replace('<','<').replace('>','>').replace('?','?').replace('*','*').replace('\\','*').replace(':',':').replace('|','|') + print("Cached file name after escaping (used for cache storage) : %s" % cached_file) + cached_file_content = "%s/.file" % (cached_file,) + cached_file_header = "%s/.header" % (cached_file,) + + _file_available = os.path.exists(cached_file_content) + + if not _file_available: + print("Request for data currently not present in cache: %s" % (cached_file,)) + + if self.path.startswith("/dcae-service-types?asdcResourceId="): + print "self.path start with /dcae-service-types?asdcResourceId=, generating response json..." + uuidGenerated = str(uuid.uuid4()) + typeId = "typeId-" + uuidGenerated + typeName = "typeName-" + uuidGenerated + print "typeId generated: " + typeName + " and typeName: "+ typeId + jsonGenerated = "{\"totalCount\":1, \"items\":[{\"typeId\":\"" + typeId + "\", \"typeName\":\"" + typeName +"\"}]}" + print "jsonGenerated: " + jsonGenerated + + os.makedirs(cached_file, True) + with open(cached_file_header, 'w') as f: + f.write("{\"Content-Length\": \"144\", \"Content-Type\": \"application/json\"}") + with open(cached_file_content, 'w') as f: + f.write(jsonGenerated) + else: + if not HOST: + self.send_response(404) + return "404 Not found" + + url = '%s%s' % (HOST, self.path) + response = requests.get(url, auth=AUTH, headers=HEADERS, stream=True) + + if response.status_code == 200: + self._write_cache(cached_file, cached_file_header, cached_file_content, response) + else: + print('Error when requesting file :') + print('Requested url : %s' % (url,)) + print('Status code : %s' % (response.status_code,)) + print('Content : %s' % (response.content,)) + self.send_response(response.status_code) + return response.content + else: + print("Request for data currently present in cache: %s" % (cached_file,)) + + self._send_content(cached_file_header, cached_file_content) + + if self.path.startswith("/dcae-service-types?asdcResourceId="): + print "DCAE case deleting folder created " + cached_file + shutil.rmtree(cached_file, ignore_errors=False, onerror=None) + else: + print "NOT in DCAE case deleting folder created " + cached_file + + def do_POST(self): + print("\n\n\nGot a POST for %s" % self.path) + self.check_credentials() + self.data_string = self.rfile.read(int(self.headers['Content-Length'])) + print("data-string:\n %s" % self.data_string) + print("self.headers:\n %s" % self.headers) + + cached_file = '%s/%s' % (CACHE_ROOT, self.path,) + print("Cached file name before escaping : %s" % cached_file) + cached_file = cached_file.replace('<','<').replace('>','>').replace('?','?').replace('*','*').replace('\\','*').replace(':',':').replace('|','|') + print("Cached file name after escaping (used for cache storage) : %s" % cached_file) + cached_file_content = "%s/.file" % (cached_file,) + cached_file_header = "%s/.header" % (cached_file,) + + _file_available = os.path.exists(cached_file_content) + + if not _file_available: + if self.path.startswith("/sdc/v1/catalog/services/"): + print "self.path start with /sdc/v1/catalog/services/, generating response json..." + jsondata = json.loads(self.data_string) + jsonGenerated = "{\"artifactName\":\"" + jsondata['artifactName'] + "\",\"artifactType\":\"" + jsondata['artifactType'] + "\",\"artifactURL\":\"" + self.path + "\",\"artifactDescription\":\"" + jsondata['description'] + "\",\"artifactChecksum\":\"ZjJlMjVmMWE2M2M1OTM2MDZlODlmNTVmZmYzNjViYzM=\",\"artifactUUID\":\"" + str(uuid.uuid4()) + "\",\"artifactVersion\":\"1\"}" + print "jsonGenerated: " + jsonGenerated + + os.makedirs(cached_file, True) + with open(cached_file_header, 'w') as f: + f.write("{\"Content-Length\": \"" + str(len(jsonGenerated)) + "\", \"Content-Type\": \"application/json\"}") + with open(cached_file_content, 'w') as f: + f.write(jsonGenerated) + else: + if not HOST: + self.send_response(404) + return "404 Not found" + + print("Request for data currently not present in cache: %s" % (cached_file,)) + + url = '%s%s' % (HOST, self.path) + print("url: %s" % (url,)) + response = requests.post(url, data=self.data_string, headers=self.headers, stream=True) + + if response.status_code == 200: + self._write_cache(cached_file, cached_file_header, cached_file_content, response) + else: + print('Error when requesting file :') + print('Requested url : %s' % (url,)) + print('Status code : %s' % (response.status_code,)) + print('Content : %s' % (response.content,)) + self.send_response(response.status_code) + return response.content + else: + print("Request for data present in cache: %s" % (cached_file,)) + + self._send_content(cached_file_header, cached_file_content) + + def do_PUT(self): + print("\n\n\nGot a PUT for %s " % self.path) + self.check_credentials() + self.data_string = self.rfile.read(int(self.headers['Content-Length'])) + print("data-string:\n %s" % self.data_string) + print("self.headers:\n %s" % self.headers) + + cached_file = '%s/%s' % (CACHE_ROOT, self.path,) + print("Cached file name before escaping : %s" % cached_file) + cached_file = cached_file.replace('<','<').replace('>','>').replace('?','?').replace('*','*').replace('\\','*').replace(':',':').replace('|','|') + print("Cached file name after escaping (used for cache storage) : %s" % cached_file) + cached_file_content = "%s/.file" % (cached_file,) + cached_file_header = "%s/.header" % (cached_file,) + + _file_available = os.path.exists(cached_file_content) + if not _file_available and not HOST: + print("No file corresponding in cache and no HOST specified: %s" % HOST) + self.send_response(404) + return "404 Not found" + + if not _file_available: + print("Request for data currently not present in cache: %s" % (cached_file,)) + + url = '%s%s' % (HOST, self.path) + print("url: %s" % (url,)) + response = requests.put(url, data=self.data_string, headers=self.headers, stream=True) + + if response.status_code == 200: + self._write_cache(cached_file, cached_file_header, cached_file_content, response) + else: + print('Error when requesting file :') + print('Requested url : %s' % (url,)) + print('Status code : %s' % (response.status_code,)) + print('Content : %s' % (response.content,)) + self.send_response(response.status_code) + return response.content + else: + print("Request for data present in cache: %s" % (cached_file,)) + + self._send_content(cached_file_header, cached_file_content) + + + +# Main code that start the HTTP server +httpd = SocketServer.ForkingTCPServer(('', PORT), Proxy) +httpd.allow_reuse_address = True +print "Listening on port "+ str(PORT) + " and caching in " + CACHE_ROOT + "(Press Ctrl+C to stop HTTPD Caching script)" +signal.signal(signal.SIGINT, signal_handler) +httpd.serve_forever()
\ No newline at end of file |