aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gui-editors/gui-editor-apex/pom.xml41
-rw-r--r--gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ApexEditorRestResource.java17
-rw-r--r--gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ModelHandler.java12
-rw-r--r--gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/RestSession.java8
-rw-r--r--gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandler.java28
-rw-r--r--gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/RestSessionTest.java4
-rw-r--r--gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandlerTest.java53
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/converter/APEXgRPCPolicy.json1968
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/converter/ApexConfig-engineServiceParameters-notAnObject.json7
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/converter/ApexConfig.json112
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/converter/ToscaTemplate.json17
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid-engineServiceParameters.json3
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.jsonbad1
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-missing-engineServiceParameters.json6
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig.json37
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid-toscaDefinitions.json4
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.jsonbad1
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-policies.json6
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-properties.json12
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-topologyTemplate.json4
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidPolicy1.json10
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidPolicy2.json8
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-policies.json5
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-policy.json6
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-properties.json15
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-topology-template.json3
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-tosca-definitions-version.json16
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-more-than-one-policy.json20
-rw-r--r--gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate.json17
-rw-r--r--gui-editors/pom.xml7
-rw-r--r--pom.xml21
31 files changed, 88 insertions, 2381 deletions
diff --git a/gui-editors/gui-editor-apex/pom.xml b/gui-editors/gui-editor-apex/pom.xml
index 3a49df7..1095e14 100644
--- a/gui-editors/gui-editor-apex/pom.xml
+++ b/gui-editors/gui-editor-apex/pom.xml
@@ -1,7 +1,7 @@
<!--
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. All rights reserved.
- Modifications Copyright (C) 2019-2021 Nordix Foundation.
+ Modifications Copyright (C) 2019-2022 Nordix Foundation.
Modifications Copyright (C) 2020 Bell Canada.
Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
================================================================================
@@ -35,6 +35,8 @@
<properties>
<policy.apex-pdp.version>2.4.0</policy.apex-pdp.version>
+ <policy.common.version>1.10.1-SNAPSHOT</policy.common.version>
+ <policy.models.version>2.6.1-SNAPSHOT</policy.models.version>
<webapp.dir>src/main/resources/webapp</webapp.dir>
<sonar.nodejs.executable>${project.basedir}/src/main/resources/webapp/node/node</sonar.nodejs.executable>
<sonar.sources>${project.basedir}/src/main/java,${project.basedir}/src/main/resources/webapp/js</sonar.sources>
@@ -44,25 +46,8 @@
<dependencies>
<dependency>
<groupId>org.onap.policy.common</groupId>
- <artifactId>policy-endpoints</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.onap.aaf.authz</groupId>
- <artifactId>aaf-cadi-aaf</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.att.nsa</groupId>
- <artifactId>cambriaClient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.onap.dmaap.messagerouter.dmaapclient</groupId>
- <artifactId>dmaapClient</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.common</groupId>
<artifactId>utils</artifactId>
+ <version>${policy.common.version}</version>
<exclusions>
<exclusion>
<groupId>com.worldturner.medeia</groupId>
@@ -104,19 +89,6 @@
<artifactId>commons-cli</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-text</artifactId>
- <version>1.9</version>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.apex-pdp.client</groupId>
- <artifactId>apex-client-common</artifactId>
- <version>${policy.apex-pdp.version}</version>
- <classifier>resources</classifier>
- <type>zip</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-multipart</artifactId>
</dependency>
@@ -126,11 +98,6 @@
<version>3.10.0</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
</dependencies>
<build>
diff --git a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ApexEditorRestResource.java b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ApexEditorRestResource.java
index 0b777b6..009a570 100644
--- a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ApexEditorRestResource.java
+++ b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ApexEditorRestResource.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2022 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
@@ -34,11 +34,9 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
-import org.apache.commons.lang3.StringUtils;
import org.onap.policy.apex.model.modelapi.ApexApiResult;
import org.onap.policy.apex.model.modelapi.ApexApiResult.Result;
import org.onap.policy.common.utils.resources.TextFileUtils;
-import org.onap.policy.gui.editors.apex.rest.ApexEditorMain;
import org.slf4j.ext.XLogger;
import org.slf4j.ext.XLoggerFactory;
@@ -217,9 +215,10 @@ public class ApexEditorRestResource implements RestCommandHandler {
/**
* Download the model for this session as a String.
*
- * @return the model represented as a JSON string. See {@code AxPolicyModel}
+ * @return the model represented as a YAML string. See {@code AxPolicyModel}
*/
@GET
+ @Produces(MediaType.TEXT_PLAIN)
@Path("Model/Download")
public String downloadModel() {
ApexApiResult result = processRestCommand(RestCommandType.MODEL, RestCommand.DOWNLOAD);
@@ -233,16 +232,14 @@ public class ApexEditorRestResource implements RestCommandHandler {
/**
* Uploads a TOSCA Policy Model to a configured endpoint.
*
- * @param userid the userid to use for upload
+ * @param userId the userId to use for upload. If blank, the commandline
+ * parameter "upload-userid" is used.
* @return an ApexAPIResult that contains the operation status and success/error messages
*/
@GET
@Path("Model/Upload")
- public ApexApiResult uploadModel(@QueryParam("userId") final String userid) {
- if (!StringUtils.isBlank(userid)) {
- ApexEditorMain.getParameters().setUploadUserid(userid);
- }
- return processRestCommand(RestCommandType.MODEL, RestCommand.UPLOAD);
+ public ApexApiResult uploadModel(@QueryParam("userId") final String userId) {
+ return processRestCommand(RestCommandType.MODEL, RestCommand.UPLOAD, userId);
}
/**
diff --git a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ModelHandler.java b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ModelHandler.java
index 38c7fec..18dc227 100644
--- a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ModelHandler.java
+++ b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/ModelHandler.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2019-2020 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2022 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
@@ -76,8 +76,6 @@ public class ModelHandler implements RestCommandHandler {
return listModel(session);
case DOWNLOAD:
return downloadModel(session);
- case UPLOAD:
- return uploadModel(session);
case DELETE:
return deleteModel(session);
default:
@@ -102,6 +100,8 @@ public class ModelHandler implements RestCommandHandler {
return createModel(session, jsonString);
case UPDATE:
return updateModel(session, jsonString);
+ case UPLOAD:
+ return uploadModel(session, jsonString);
default:
return getUnsupportedCommandResultMessage(session, commandType, command);
}
@@ -276,12 +276,14 @@ public class ModelHandler implements RestCommandHandler {
* Upload the model for this session to the configured URL.
*
* @param session the Apex model editing session
+ * @param userId the userId to use for upload. If blank, the commandline
+ * parameter "upload-userid" is used.
* @return a result indicating if the upload was successful or not
*/
- private ApexApiResult uploadModel(final RestSession session) {
+ private ApexApiResult uploadModel(final RestSession session, String userId) {
LOGGER.entry();
- ApexApiResult result = session.uploadModel();
+ ApexApiResult result = session.uploadModel(userId);
LOGGER.exit("Model/Download" + (result != null && result.isOk() ? OK : NOT_OK));
return result;
diff --git a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/RestSession.java b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/RestSession.java
index 662c634..c41513f 100644
--- a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/RestSession.java
+++ b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/RestSession.java
@@ -1,7 +1,7 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2018 Ericsson. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation.
+ * Modifications Copyright (C) 2020-2022 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
@@ -200,9 +200,11 @@ public class RestSession {
/**
* Upload the apex model as a TOSCA service template YAML string to the configured URL.
*
+ * @param userId the userId to use for upload. If blank, the commandline
+ * parameter "upload-userid" is used.
* @return a result indicating if the upload was successful or not
*/
- public ApexApiResult uploadModel() {
+ public ApexApiResult uploadModel(final String userId) {
// Get the model in TOSCA format
ApexApiResult result = downloadModel();
if (result.isNok()) {
@@ -215,7 +217,7 @@ public class RestSession {
var policyModelUUid = apexModelBeingUploaded.getPolicyModel().getKeyInformation().get(policyModelKey)
.getUuid().toString();
- return new PolicyUploadHandler().doUpload(result.getMessage(), policyModelKey, policyModelUUid);
+ return new PolicyUploadHandler().doUpload(result.getMessage(), policyModelKey, policyModelUUid, userId);
}
/**
diff --git a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandler.java b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandler.java
index ebbe3db..1766831 100644
--- a/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandler.java
+++ b/gui-editors/gui-editor-apex/src/main/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandler.java
@@ -1,6 +1,6 @@
/*
* ============LICENSE_START=======================================================
- * Copyright (C) 2020 Nordix Foundation
+ * Copyright (C) 2020-2022 Nordix Foundation
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
* ================================================================================
@@ -49,45 +49,50 @@ public class PolicyUploadHandler {
* @param toscaServiceTemplate the TOSCA service template
* @param policyModelKey the key of the policy model
* @param policyModelUuid the UUID of the policy model
+ * @param uploadUserId the userId to use for upload. If blank, the commandline
+ * parameter "upload-userid" is used.
* @return the result of the upload process
*/
public ApexApiResult doUpload(final String toscaServiceTemplate, final AxArtifactKey policyModelKey,
- final String policyModelUuid) {
+ final String policyModelUuid, String uploadUserId) {
LOGGER.entry();
- if (StringUtils.isBlank(ApexEditorMain.getParameters().getUploadUrl())) {
+ final String uploadUrl = ApexEditorMain.getParameters().getUploadUrl();
+ if (StringUtils.isBlank(uploadUrl)) {
final var apexApiResult = new ApexApiResult(Result.FAILED);
apexApiResult.addMessage("Model upload is disabled, parameter upload-url is not set on server");
LOGGER.exit(MODEL_UPLOAD_NOT_OK);
return apexApiResult;
+ }
+ if (StringUtils.isBlank(uploadUserId)) {
+ uploadUserId = ApexEditorMain.getParameters().getUploadUserid();
}
final var uploadPolicyRequestDto = new UploadPolicyRequestDto();
- uploadPolicyRequestDto.setUserId(ApexEditorMain.getParameters().getUploadUserid());
+ uploadPolicyRequestDto.setUserId(uploadUserId);
uploadPolicyRequestDto
.setFileData(Base64.getEncoder().encodeToString(toscaServiceTemplate.getBytes(StandardCharsets.UTF_8)));
uploadPolicyRequestDto.setFilename(
String.format("%s.%s.%s", policyModelUuid, policyModelKey.getName(), policyModelKey.getVersion()));
try {
- final var response = ClientBuilder.newClient().target(ApexEditorMain.getParameters().getUploadUrl())
+ final var response = ClientBuilder.newClient().target(uploadUrl)
.request(MediaType.APPLICATION_JSON)
.post(Entity.entity(uploadPolicyRequestDto, MediaType.APPLICATION_JSON));
if (response.getStatus() == 201) {
final var apexApiResult = new ApexApiResult(Result.SUCCESS);
- String.format("uploading Policy '%s' to URL '%s' with userId '%s' was successful",
- policyModelKey.getId(), ApexEditorMain.getParameters().getUploadUrl(),
- ApexEditorMain.getParameters().getUploadUserid());
+ apexApiResult.addMessage(
+ String.format("uploading Policy '%s' to URL '%s' with userId '%s' was successful",
+ policyModelKey.getId(), uploadUrl, uploadUserId));
LOGGER.exit("Model/Upload: OK");
return apexApiResult;
} else {
final var apexApiResult = new ApexApiResult(Result.FAILED);
apexApiResult.addMessage(
String.format("uploading Policy '%s' to URL '%s' with userId '%s' failed with status %s",
- policyModelKey.getId(), ApexEditorMain.getParameters().getUploadUrl(),
- ApexEditorMain.getParameters().getUploadUserid(), response.getStatus()));
+ policyModelKey.getId(), uploadUrl, uploadUserId, response.getStatus()));
LOGGER.exit(MODEL_UPLOAD_NOT_OK);
return apexApiResult;
}
@@ -95,8 +100,7 @@ public class PolicyUploadHandler {
final var apexApiResult = new ApexApiResult(Result.FAILED);
apexApiResult
.addMessage(String.format("uploading Policy '%s' to URL '%s' with userId '%s' failed with error %s",
- policyModelKey.getId(), ApexEditorMain.getParameters().getUploadUrl(),
- ApexEditorMain.getParameters().getUploadUserid(), e.getMessage()));
+ policyModelKey.getId(), uploadUrl, uploadUserId, e.getMessage()));
LOGGER.exit(MODEL_UPLOAD_NOT_OK);
return apexApiResult;
}
diff --git a/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/RestSessionTest.java b/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/RestSessionTest.java
index b2158ce..121faa0 100644
--- a/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/RestSessionTest.java
+++ b/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/RestSessionTest.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -139,7 +139,7 @@ public class RestSessionTest {
final var toscaPath = Path.of("src/test/resources/models/PolicyModel.yaml");
final var toscaString = Files.readString(toscaPath);
restSession.loadFromString(toscaString);
- final var apexApiResult = restSession.uploadModel();
+ final var apexApiResult = restSession.uploadModel("");
assertThat(apexApiResult.isNok()).isTrue();
assertThat(apexApiResult.getMessage()).contains("Model upload is disabled");
}
diff --git a/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandlerTest.java b/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandlerTest.java
index 7c97734..4525f42 100644
--- a/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandlerTest.java
+++ b/gui-editors/gui-editor-apex/src/test/java/org/onap/policy/gui/editors/apex/rest/handling/plugin/upload/PolicyUploadHandlerTest.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2021 Nordix Foundation.
+ * Copyright (C) 2021-2022 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import javax.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
import javax.ws.rs.client.Invocation;
import javax.ws.rs.client.ResponseProcessingException;
import javax.ws.rs.client.WebTarget;
@@ -38,6 +39,7 @@ import org.apache.commons.lang3.RandomStringUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.mockito.MockedStatic;
import org.mockito.Mockito;
@@ -46,10 +48,12 @@ import org.onap.policy.gui.editors.apex.rest.ApexEditorMain;
public class PolicyUploadHandlerTest {
+ private static final String CMDLINE_UPLOAD_USERID = "MyUser";
private PolicyUploadHandler uploadHandler;
private AxArtifactKey axArtifactKey;
private String toscaServiceTemplate;
private MockedStatic<ClientBuilder> clientBuilderMockedStatic;
+ private ArgumentCaptor<Entity<UploadPolicyRequestDto>> dtoEntityCaptor;
/**
* Prepares test environment.
@@ -62,7 +66,7 @@ public class PolicyUploadHandlerTest {
final var name = "a" + RandomStringUtils.randomAlphabetic(5);
final var version = "0.0.1";
axArtifactKey = new AxArtifactKey(name, version);
- final var path = Path.of("src/test/resources/converter/", "ToscaTemplate.json");
+ final var path = Path.of("src/test/resources/models/", "PolicyModel.json");
toscaServiceTemplate = Files.readString(path);
}
@@ -78,12 +82,12 @@ public class PolicyUploadHandlerTest {
@Test
public void testDoUploadNoUrl() {
- final String[] args = {"--upload-userid", "MyUser"};
+ final String[] args = {"--upload-userid", CMDLINE_UPLOAD_USERID};
final var outBaStream = new ByteArrayOutputStream();
final var outStream = new PrintStream(outBaStream);
new ApexEditorMain(args, outStream);
- final var result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "");
+ final var result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "", "");
assertThat(result.isNok()).isTrue();
assertThat(result.getMessage()).contains("Model upload is disable");
}
@@ -96,7 +100,7 @@ public class PolicyUploadHandlerTest {
prepareApexEditorMain();
- final var result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "");
+ final var result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "", "");
assertThat(result.isNok()).isTrue();
assertThat(result.getMessage()).contains("failed with error");
@@ -111,7 +115,7 @@ public class PolicyUploadHandlerTest {
prepareApexEditorMain();
- final var result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "");
+ final var result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "", "");
assertThat(result.isOk()).isTrue();
}
@@ -125,12 +129,41 @@ public class PolicyUploadHandlerTest {
prepareApexEditorMain();
- final var result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "");
+ final var result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "", "");
assertThat(result.isNok()).isTrue();
assertThat(result.getMessage()).contains("failed with status 500");
}
+ @Test
+ public void testDoUploadUserId() {
+ final var response = Mockito.mock(Response.class);
+ mockRsHttpClient(response);
+
+ Mockito.doReturn(201).when(response).getStatus();
+
+ prepareApexEditorMain();
+
+ // If uploadUserId is specified, that value should be in DTO.
+ var result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "",
+ "OverrideUser");
+ assertThat(result.isOk()).isTrue();
+ var dto = dtoEntityCaptor.getValue().getEntity();
+ assertThat(dto.getUserId()).isEqualTo("OverrideUser");
+
+ // If uploadUserId is blank, the value from command line parameter 'upload-userid' is used.
+ result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "", "");
+ assertThat(result.isOk()).isTrue();
+ dto = dtoEntityCaptor.getValue().getEntity();
+ assertThat(dto.getUserId()).isEqualTo(CMDLINE_UPLOAD_USERID);
+
+ // If uploadUserId is null, the value from command line parameter 'upload-userid' is used.
+ result = uploadHandler.doUpload(toscaServiceTemplate, axArtifactKey, "", null);
+ assertThat(result.isOk()).isTrue();
+ dto = dtoEntityCaptor.getValue().getEntity();
+ assertThat(dto.getUserId()).isEqualTo(CMDLINE_UPLOAD_USERID);
+ }
+
private void mockRsHttpClient(Response response) {
final var webTarget = Mockito.mock(WebTarget.class);
final var client = Mockito.mock(Client.class);
@@ -139,15 +172,17 @@ public class PolicyUploadHandlerTest {
clientBuilderMockedStatic = Mockito.mockStatic(ClientBuilder.class);
+ dtoEntityCaptor = ArgumentCaptor.forClass(Entity.class);
+
Mockito.when(ClientBuilder.newClient()).thenReturn(client);
Mockito.when(client.target(ArgumentMatchers.anyString())).thenReturn(webTarget);
Mockito.when(webTarget.request(MediaType.APPLICATION_JSON)).thenReturn(invocationBuilder);
Mockito.when(webTarget.request(MediaType.APPLICATION_JSON)).thenReturn(invocationBuilder);
- Mockito.when(invocationBuilder.post(ArgumentMatchers.any())).thenReturn(response);
+ Mockito.when(invocationBuilder.post(dtoEntityCaptor.capture())).thenReturn(response);
}
private void prepareApexEditorMain() {
- final String[] args = {"--upload-userid", "MyUser", "--upload-url", "http://127.0.0.1"};
+ final String[] args = {"--upload-userid", CMDLINE_UPLOAD_USERID, "--upload-url", "http://127.0.0.1"};
final var outBaStream = new ByteArrayOutputStream();
final var outStream = new PrintStream(outBaStream);
new ApexEditorMain(args, outStream);
diff --git a/gui-editors/gui-editor-apex/src/test/resources/converter/APEXgRPCPolicy.json b/gui-editors/gui-editor-apex/src/test/resources/converter/APEXgRPCPolicy.json
deleted file mode 100644
index 25ad71d..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/converter/APEXgRPCPolicy.json
+++ /dev/null
@@ -1,1968 +0,0 @@
-{
- "apexPolicyModel" : {
- "key" : {
- "name" : "APEXgRPCPolicy",
- "version" : "0.0.1"
- },
- "keyInformation" : {
- "key" : {
- "name" : "APEXgRPCPolicy_KeyInfo",
- "version" : "0.0.1"
- },
- "keyInfoMap" : {
- "entry" : [ {
- "key" : {
- "name" : "APEXgRPCPolicy",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "APEXgRPCPolicy",
- "version" : "0.0.1"
- },
- "UUID" : "b8424cdb-29fb-3566-b77a-f4f847d81cc9",
- "description" : "Generated description for concept referred to by key \"APEXgRPCPolicy:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "APEXgRPCPolicy_Albums",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Albums",
- "version" : "0.0.1"
- },
- "UUID" : "9922906c-ccaa-34f7-95e2-bcc36e77821b",
- "description" : "Generated description for concept referred to by key \"APEXgRPCPolicy_Albums:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "APEXgRPCPolicy_Events",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Events",
- "version" : "0.0.1"
- },
- "UUID" : "5bf28afd-787c-3138-a3e1-b33ad94a038a",
- "description" : "Generated description for concept referred to by key \"APEXgRPCPolicy_Events:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "APEXgRPCPolicy_KeyInfo",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "APEXgRPCPolicy_KeyInfo",
- "version" : "0.0.1"
- },
- "UUID" : "68abaa6f-8d03-3a53-9590-007115817d5c",
- "description" : "Generated description for concept referred to by key \"APEXgRPCPolicy_KeyInfo:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "APEXgRPCPolicy_Policies",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Policies",
- "version" : "0.0.1"
- },
- "UUID" : "819d06c3-33c2-3031-aa78-96281aa4270a",
- "description" : "Generated description for concept referred to by key \"APEXgRPCPolicy_Policies:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "APEXgRPCPolicy_Schemas",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Schemas",
- "version" : "0.0.1"
- },
- "UUID" : "8e67d466-f990-3a39-9fd7-4490cac342dc",
- "description" : "Generated description for concept referred to by key \"APEXgRPCPolicy_Schemas:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "APEXgRPCPolicy_Tasks",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Tasks",
- "version" : "0.0.1"
- },
- "UUID" : "4668db3d-6fe2-3885-8e47-f30cd0102f0a",
- "description" : "Generated description for concept referred to by key \"APEXgRPCPolicy_Tasks:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "UUID" : "6e5fa19b-14df-37e3-a4ae-8c537e861a82",
- "description" : "Generated description for concept referred to by key \"CDSActionIdentifiersType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSCreateSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSCreateSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "UUID" : "8350ac5e-c157-38b9-9614-a0f93a830e60",
- "description" : "Generated description for concept referred to by key \"CDSCreateSubscriptionPayloadType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSDeleteSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSDeleteSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "UUID" : "12658406-9147-3c9d-a38c-5ad5e30b092b",
- "description" : "Generated description for concept referred to by key \"CDSDeleteSubscriptionPayloadType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSRequestCommonHeaderType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSRequestCommonHeaderType",
- "version" : "0.0.1"
- },
- "UUID" : "35590ac0-062c-39f1-8786-b4ff716e30b1",
- "description" : "Generated description for concept referred to by key \"CDSRequestCommonHeaderType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSResponseCommonHeaderType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseCommonHeaderType",
- "version" : "0.0.1"
- },
- "UUID" : "dd7e1805-885a-350b-aaf9-ed541321ae3c",
- "description" : "Generated description for concept referred to by key \"CDSResponseCommonHeaderType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSResponseEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseEvent",
- "version" : "0.0.1"
- },
- "UUID" : "15161037-9ac8-3223-820f-4e743562a345",
- "description" : "Generated description for concept referred to by key \"CDSResponseEvent:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSResponsePayloadType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponsePayloadType",
- "version" : "0.0.1"
- },
- "UUID" : "97dc5f58-25bb-3c20-8d53-fdb70d7ca256",
- "description" : "Generated description for concept referred to by key \"CDSResponsePayloadType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSResponsePolicy",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponsePolicy",
- "version" : "0.0.1"
- },
- "UUID" : "c28b05a8-7436-3ac0-82ca-6d5fc18c9584",
- "description" : "Generated description for concept referred to by key \"CDSResponsePolicy:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSResponseStatusEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseStatusEvent",
- "version" : "0.0.1"
- },
- "UUID" : "7986e21b-32f7-302e-9554-31f21b673493",
- "description" : "Generated description for concept referred to by key \"CDSResponseStatusEvent:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSResponseStatusType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseStatusType",
- "version" : "0.0.1"
- },
- "UUID" : "92b8a2cf-344e-3ce1-8cc0-2b7d3cb695fa",
- "description" : "Generated description for concept referred to by key \"CDSResponseStatusType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CDSResponseTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseTask",
- "version" : "0.0.1"
- },
- "UUID" : "d22c78a5-272c-391d-8083-28588280caf9",
- "description" : "Generated description for concept referred to by key \"CDSResponseTask:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CreateSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CreateSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "UUID" : "92162397-1a8e-3a3f-a469-d2af7700af4a",
- "description" : "Generated description for concept referred to by key \"CreateSubscriptionPayloadEvent:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CreateSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CreateSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "UUID" : "bc0c69f0-52ed-38ea-b468-ae4a6fd1730d",
- "description" : "Generated description for concept referred to by key \"CreateSubscriptionPayloadTask:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CreateSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CreateSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "UUID" : "7cfcf843-337e-3f41-b755-5043cb0a08fc",
- "description" : "Generated description for concept referred to by key \"CreateSubscriptionRequestEvent:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "CreateSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CreateSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "UUID" : "89cb75e9-f06c-30d3-b4ff-698d45f63869",
- "description" : "Generated description for concept referred to by key \"CreateSubscriptionRequestTask:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "DeleteSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "DeleteSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "UUID" : "994fa441-04ab-33bb-832d-1cd12ab5d074",
- "description" : "Generated description for concept referred to by key \"DeleteSubscriptionPayloadEvent:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "DeleteSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "DeleteSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "UUID" : "0f519117-5fea-3e4b-941f-8f778100465f",
- "description" : "Generated description for concept referred to by key \"DeleteSubscriptionPayloadTask:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "DeleteSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "DeleteSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "UUID" : "15d618d8-1689-3a05-89a5-05efa9388f65",
- "description" : "Generated description for concept referred to by key \"DeleteSubscriptionRequestEvent:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "DeleteSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "DeleteSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "UUID" : "acb772fe-d442-39e3-98f9-b1080caf4150",
- "description" : "Generated description for concept referred to by key \"DeleteSubscriptionRequestTask:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- },
- "UUID" : "c2bd6f0d-6854-317a-9be2-97c08338428c",
- "description" : "Generated description for concept referred to by key \"PMSubscriptionAlbum:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "PMSubscriptionOutputEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "PMSubscriptionOutputEvent",
- "version" : "0.0.1"
- },
- "UUID" : "992b7819-9f69-3aa0-bb0f-6e45ea15ce05",
- "description" : "Generated description for concept referred to by key \"PMSubscriptionOutputEvent:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "PMSubscriptionType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "PMSubscriptionType",
- "version" : "0.0.1"
- },
- "UUID" : "73c1c397-4fc3-357f-93b6-a8ad707fbaae",
- "description" : "Generated description for concept referred to by key \"PMSubscriptionType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "ReceiveEventPolicy",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "ReceiveEventPolicy",
- "version" : "0.0.1"
- },
- "UUID" : "568b7345-9de1-36d3-b6a3-9b857e6809a1",
- "description" : "Generated description for concept referred to by key \"ReceiveEventPolicy:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "ReceivePMSubscriptionTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "ReceivePMSubscriptionTask",
- "version" : "0.0.1"
- },
- "UUID" : "6c1c6c45-26e0-3591-94bf-679d20e283f4",
- "description" : "Generated description for concept referred to by key \"ReceivePMSubscriptionTask:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "SimpleIntType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "SimpleIntType",
- "version" : "0.0.1"
- },
- "UUID" : "153791fd-ae0a-36a7-88a5-309a7936415d",
- "description" : "Generated description for concept referred to by key \"SimpleIntType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "UUID" : "8a4957cf-9493-3a76-8c22-a208e23259af",
- "description" : "Generated description for concept referred to by key \"SimpleStringType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "SubscriptionStatusType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "SubscriptionStatusType",
- "version" : "0.0.1"
- },
- "UUID" : "597643b1-9db1-31ce-85d0-e1c63c43b30b",
- "description" : "Generated description for concept referred to by key \"SubscriptionStatusType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "SubscriptionType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "SubscriptionType",
- "version" : "0.0.1"
- },
- "UUID" : "184547bb-7d64-3cb2-a273-d7185102c5ce",
- "description" : "Generated description for concept referred to by key \"SubscriptionType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "UUID" : "6a8cc68e-dfc8-3403-9c6d-071c886b319c",
- "description" : "Generated description for concept referred to by key \"UUIDType:0.0.1\""
- }
- }, {
- "key" : {
- "name" : "testPolicyB",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "testPolicyB",
- "version" : "0.0.1"
- },
- "UUID" : "ead590a3-ba2e-3a01-b6e9-9329f5c8fee1",
- "description" : "Generated description for concept referred to by key \"testPolicyB:0.0.1\""
- }
- } ]
- }
- },
- "policies" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Policies",
- "version" : "0.0.1"
- },
- "policyMap" : {
- "entry" : [ {
- "key" : {
- "name" : "CDSResponsePolicy",
- "version" : "0.0.1"
- },
- "value" : {
- "policyKey" : {
- "name" : "CDSResponsePolicy",
- "version" : "0.0.1"
- },
- "template" : "Freestyle",
- "state" : {
- "entry" : [ {
- "key" : "CDSResponseState",
- "value" : {
- "stateKey" : {
- "parentKeyName" : "CDSResponsePolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "NULL",
- "localName" : "CDSResponseState"
- },
- "trigger" : {
- "name" : "CDSResponseEvent",
- "version" : "0.0.1"
- },
- "stateOutputs" : {
- "entry" : [ {
- "key" : "ResponseOutput",
- "value" : {
- "key" : {
- "parentKeyName" : "CDSResponsePolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CDSResponseState",
- "localName" : "ResponseOutput"
- },
- "outgoingEvent" : {
- "name" : "CDSResponseStatusEvent",
- "version" : "0.0.1"
- },
- "nextState" : {
- "parentKeyName" : "NULL",
- "parentKeyVersion" : "0.0.0",
- "parentLocalName" : "NULL",
- "localName" : "NULL"
- }
- }
- } ]
- },
- "contextAlbumReference" : [ ],
- "taskSelectionLogic" : {
- "key" : "NULL",
- "logicFlavour" : "UNDEFINED",
- "logic" : ""
- },
- "stateFinalizerLogicMap" : {
- "entry" : [ ]
- },
- "defaultTask" : {
- "name" : "CDSResponseTask",
- "version" : "0.0.1"
- },
- "taskReferences" : {
- "entry" : [ {
- "key" : {
- "name" : "CDSResponseTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "parentKeyName" : "CDSResponsePolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CDSResponseState",
- "localName" : "CDSResponsePolicy"
- },
- "outputType" : "DIRECT",
- "output" : {
- "parentKeyName" : "CDSResponsePolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CDSResponseState",
- "localName" : "ResponseOutput"
- }
- }
- } ]
- }
- }
- } ]
- },
- "firstState" : "CDSResponseState"
- }
- }, {
- "key" : {
- "name" : "ReceiveEventPolicy",
- "version" : "0.0.1"
- },
- "value" : {
- "policyKey" : {
- "name" : "ReceiveEventPolicy",
- "version" : "0.0.1"
- },
- "template" : "Freestyle",
- "state" : {
- "entry" : [ {
- "key" : "CreateOrDeleteState",
- "value" : {
- "stateKey" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "NULL",
- "localName" : "CreateOrDeleteState"
- },
- "trigger" : {
- "name" : "PMSubscriptionOutputEvent",
- "version" : "0.0.1"
- },
- "stateOutputs" : {
- "entry" : [ {
- "key" : "CreateSubscriptionPayload",
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CreateOrDeleteState",
- "localName" : "CreateSubscriptionPayload"
- },
- "outgoingEvent" : {
- "name" : "CreateSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "nextState" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "NULL",
- "localName" : "CreateSubscription"
- }
- }
- }, {
- "key" : "DeleteSubscriptionPayload",
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CreateOrDeleteState",
- "localName" : "DeleteSubscriptionPayload"
- },
- "outgoingEvent" : {
- "name" : "DeleteSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "nextState" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "NULL",
- "localName" : "DeleteSubscription"
- }
- }
- } ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskSelectionLogic" : {
- "key" : "TaskSelectionLogic",
- "logicFlavour" : "JAVASCRIPT",
- "logic" : "/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2020 Nordix Foundation.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.info(executor.subject.id);\n\nvar pmSubscriptionInfo = executor.getContextAlbum(\"PMSubscriptionAlbum\").get(executor.inFields.get(\"albumID\").toString())\nvar changeType = pmSubscriptionInfo.get(\"changeType\").toString()\n\nif (\"CREATE\".equals(changeType)) {\n executor.subject.getTaskKey(\"CreateSubscriptionPayloadTask\").copyTo(executor.selectedTask);\n}\nelse if (\"DELETE\".equals(changeType)) {\n executor.subject.getTaskKey(\"DeleteSubscriptionPayloadTask\").copyTo(executor.selectedTask);\n}\n\ntrue;"
- },
- "stateFinalizerLogicMap" : {
- "entry" : [ ]
- },
- "defaultTask" : {
- "name" : "CreateSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "taskReferences" : {
- "entry" : [ {
- "key" : {
- "name" : "CreateSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CreateOrDeleteState",
- "localName" : "ReceiveEventPolicy"
- },
- "outputType" : "DIRECT",
- "output" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CreateOrDeleteState",
- "localName" : "CreateSubscriptionPayload"
- }
- }
- }, {
- "key" : {
- "name" : "DeleteSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CreateOrDeleteState",
- "localName" : "ReceiveEventPolicy"
- },
- "outputType" : "DIRECT",
- "output" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CreateOrDeleteState",
- "localName" : "DeleteSubscriptionPayload"
- }
- }
- } ]
- }
- }
- }, {
- "key" : "CreateSubscription",
- "value" : {
- "stateKey" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "NULL",
- "localName" : "CreateSubscription"
- },
- "trigger" : {
- "name" : "CreateSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "stateOutputs" : {
- "entry" : [ {
- "key" : "IssueCreateSubscriptionRequestOutput",
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CreateSubscription",
- "localName" : "IssueCreateSubscriptionRequestOutput"
- },
- "outgoingEvent" : {
- "name" : "CreateSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "nextState" : {
- "parentKeyName" : "NULL",
- "parentKeyVersion" : "0.0.0",
- "parentLocalName" : "NULL",
- "localName" : "NULL"
- }
- }
- } ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskSelectionLogic" : {
- "key" : "NULL",
- "logicFlavour" : "UNDEFINED",
- "logic" : ""
- },
- "stateFinalizerLogicMap" : {
- "entry" : [ ]
- },
- "defaultTask" : {
- "name" : "CreateSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "taskReferences" : {
- "entry" : [ {
- "key" : {
- "name" : "CreateSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CreateSubscription",
- "localName" : "ReceiveEventPolicy"
- },
- "outputType" : "DIRECT",
- "output" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "CreateSubscription",
- "localName" : "IssueCreateSubscriptionRequestOutput"
- }
- }
- } ]
- }
- }
- }, {
- "key" : "DeleteSubscription",
- "value" : {
- "stateKey" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "NULL",
- "localName" : "DeleteSubscription"
- },
- "trigger" : {
- "name" : "DeleteSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "stateOutputs" : {
- "entry" : [ {
- "key" : "IssueDeleteSubscriptionRequestOutput",
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "DeleteSubscription",
- "localName" : "IssueDeleteSubscriptionRequestOutput"
- },
- "outgoingEvent" : {
- "name" : "DeleteSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "nextState" : {
- "parentKeyName" : "NULL",
- "parentKeyVersion" : "0.0.0",
- "parentLocalName" : "NULL",
- "localName" : "NULL"
- }
- }
- } ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskSelectionLogic" : {
- "key" : "NULL",
- "logicFlavour" : "UNDEFINED",
- "logic" : ""
- },
- "stateFinalizerLogicMap" : {
- "entry" : [ ]
- },
- "defaultTask" : {
- "name" : "DeleteSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "taskReferences" : {
- "entry" : [ {
- "key" : {
- "name" : "DeleteSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "DeleteSubscription",
- "localName" : "ReceiveEventPolicy"
- },
- "outputType" : "DIRECT",
- "output" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "DeleteSubscription",
- "localName" : "IssueDeleteSubscriptionRequestOutput"
- }
- }
- } ]
- }
- }
- }, {
- "key" : "ReceiveSubscriptionState",
- "value" : {
- "stateKey" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "NULL",
- "localName" : "ReceiveSubscriptionState"
- },
- "trigger" : {
- "name" : "testPolicyB",
- "version" : "0.0.1"
- },
- "stateOutputs" : {
- "entry" : [ {
- "key" : "ReceivePMSubscriptionOutput",
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "ReceiveSubscriptionState",
- "localName" : "ReceivePMSubscriptionOutput"
- },
- "outgoingEvent" : {
- "name" : "PMSubscriptionOutputEvent",
- "version" : "0.0.1"
- },
- "nextState" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "NULL",
- "localName" : "CreateOrDeleteState"
- }
- }
- } ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskSelectionLogic" : {
- "key" : "NULL",
- "logicFlavour" : "UNDEFINED",
- "logic" : ""
- },
- "stateFinalizerLogicMap" : {
- "entry" : [ ]
- },
- "defaultTask" : {
- "name" : "ReceivePMSubscriptionTask",
- "version" : "0.0.1"
- },
- "taskReferences" : {
- "entry" : [ {
- "key" : {
- "name" : "ReceivePMSubscriptionTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "ReceiveSubscriptionState",
- "localName" : "ReceiveEventPolicy"
- },
- "outputType" : "DIRECT",
- "output" : {
- "parentKeyName" : "ReceiveEventPolicy",
- "parentKeyVersion" : "0.0.1",
- "parentLocalName" : "ReceiveSubscriptionState",
- "localName" : "ReceivePMSubscriptionOutput"
- }
- }
- } ]
- }
- }
- } ]
- },
- "firstState" : "ReceiveSubscriptionState"
- }
- } ]
- }
- },
- "tasks" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Tasks",
- "version" : "0.0.1"
- },
- "taskMap" : {
- "entry" : [ {
- "key" : {
- "name" : "CDSResponseTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseTask",
- "version" : "0.0.1"
- },
- "inputFields" : {
- "entry" : [ {
- "key" : "actionIdentifiers",
- "value" : {
- "key" : "actionIdentifiers",
- "fieldSchemaKey" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "commonHeader",
- "value" : {
- "key" : "commonHeader",
- "fieldSchemaKey" : {
- "name" : "CDSResponseCommonHeaderType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSResponsePayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "status",
- "value" : {
- "key" : "status",
- "fieldSchemaKey" : {
- "name" : "CDSResponseStatusType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "outputFields" : {
- "entry" : [ {
- "key" : "status",
- "value" : {
- "key" : "status",
- "fieldSchemaKey" : {
- "name" : "SubscriptionStatusType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "taskParameters" : {
- "entry" : [ ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskLogic" : {
- "key" : "TaskLogic",
- "logicFlavour" : "JAVASCRIPT",
- "logic" : "/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2020 Nordix. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\n\nvar uuidType = java.util.UUID;\n\nvar albumID = uuidType.fromString(\"d0050623-18e5-46c9-9298-9a567990cd7c\");\n\nvar pmSubscriptionInfo = executor.getContextAlbum(\"PMSubscriptionAlbum\").get(albumID.toString());\n\nvar responseStatus = executor.subject.getOutFieldSchemaHelper(\"status\").createNewInstance();\n\nresponseStatus.put(\"subscriptionName\", pmSubscriptionInfo.get(\"subscription\").get(\"subscriptionName\"))\nresponseStatus.put(\"nfName\", pmSubscriptionInfo.get(\"nfName\"))\nresponseStatus.put(\"changeType\", pmSubscriptionInfo.get(\"changeType\"))\n\nvar response = executor.inFields.get(\"payload\")\n\nif (\"failure\".equals(response.get(\"create_DasH_subscription_DasH_response\").get(\"odl_DasH_response\").get(\"status\"))) {\n responseStatus.put(\"message\", \"failed\")\n} else {\n responseStatus.put(\"message\", \"success\")\n}\n\nexecutor.outFields.put(\"status\", responseStatus)\n\ntrue;"
- }
- }
- }, {
- "key" : {
- "name" : "CreateSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CreateSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "inputFields" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "outputFields" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSCreateSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "taskParameters" : {
- "entry" : [ ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskLogic" : {
- "key" : "TaskLogic",
- "logicFlavour" : "JAVASCRIPT",
- "logic" : "/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2020 Nordix. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.info(executor.subject.id);\n\nvar pmSubscriptionInfo = executor.getContextAlbum(\"PMSubscriptionAlbum\").get(executor.inFields.get(\"albumID\").toString())\n\nvar payloadProperties = executor.subject.getOutFieldSchemaHelper(\"payload\").createNewSubInstance(\"create_DasH_subscription_DasH_properties_record\");\n\npayloadProperties.put(\"nfName\", pmSubscriptionInfo.get(\"nfName\"))\npayloadProperties.put(\"subscriptionName\", pmSubscriptionInfo.get(\"subscription\").get(\"subscriptionName\"))\npayloadProperties.put(\"administrativeState\", pmSubscriptionInfo.get(\"subscription\").get(\"administrativeState\"))\npayloadProperties.put(\"fileBasedGP\", pmSubscriptionInfo.get(\"subscription\").get(\"fileBasedGP\").toString())\npayloadProperties.put(\"fileLocation\", pmSubscriptionInfo.get(\"subscription\").get(\"fileLocation\"))\npayloadProperties.put(\"measurementGroups\", pmSubscriptionInfo.get(\"subscription\").get(\"measurementGroups\"))\n\nvar payloadEntry = executor.subject.getOutFieldSchemaHelper(\"payload\").createNewSubInstance(\"CDSRequestPayloadEntry\");\npayloadEntry.put(\"create_DasH_subscription_DasH_properties\", payloadProperties)\n\nvar payload = executor.subject.getOutFieldSchemaHelper(\"payload\").createNewInstance();\npayload.put(\"create_DasH_subscription_DasH_request\", payloadEntry);\n\nexecutor.outFields.put(\"albumID\", executor.inFields.get(\"albumID\"))\nexecutor.outFields.put(\"payload\", payload);\n\nexecutor.logger.info(\"Sending Create Subscription Event to CDS\")\n\ntrue;"
- }
- }
- }, {
- "key" : {
- "name" : "CreateSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CreateSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "inputFields" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSCreateSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "outputFields" : {
- "entry" : [ {
- "key" : "actionIdentifiers",
- "value" : {
- "key" : "actionIdentifiers",
- "fieldSchemaKey" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "commonHeader",
- "value" : {
- "key" : "commonHeader",
- "fieldSchemaKey" : {
- "name" : "CDSRequestCommonHeaderType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSCreateSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "taskParameters" : {
- "entry" : [ ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskLogic" : {
- "key" : "TaskLogic",
- "logicFlavour" : "JAVASCRIPT",
- "logic" : "/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2020 Nordix. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.info(executor.subject.id);\n\nvar pmSubscriptionInfo = executor.getContextAlbum(\"PMSubscriptionAlbum\").get(executor.inFields.get(\"albumID\").toString())\nvar payload = executor.inFields.get(\"payload\")\nvar actionName = \"create-subscription\"\n\nvar commonHeader = executor.subject.getOutFieldSchemaHelper(\"commonHeader\").createNewInstance();\ncommonHeader.put(\"originatorId\", \"sdnc\");\ncommonHeader.put(\"requestId\", \"123456-1000\");\ncommonHeader.put(\"subRequestId\", \"sub-123456-1000\");\n\nvar actionIdentifiers = executor.subject.getOutFieldSchemaHelper(\"actionIdentifiers\").createNewInstance();\nactionIdentifiers.put(\"actionName\", actionName);\nactionIdentifiers.put(\"blueprintName\", \"pm_control\");\nactionIdentifiers.put(\"blueprintVersion\", \"1.0.0\");\nactionIdentifiers.put(\"mode\", \"sync\");\n\nexecutor.outFields.put(\"commonHeader\", commonHeader);\nexecutor.outFields.put(\"actionIdentifiers\", actionIdentifiers);\nexecutor.outFields.put(\"payload\", payload);\n\nexecutor.logger.info(\"Sending Activate Subscription Event to CDS\")\n\ntrue;"
- }
- }
- }, {
- "key" : {
- "name" : "DeleteSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "DeleteSubscriptionPayloadTask",
- "version" : "0.0.1"
- },
- "inputFields" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "outputFields" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSDeleteSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "taskParameters" : {
- "entry" : [ ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskLogic" : {
- "key" : "TaskLogic",
- "logicFlavour" : "JAVASCRIPT",
- "logic" : "/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2020 Nordix. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.info(executor.subject.id);\n\nvar pmSubscriptionInfo = executor.getContextAlbum(\"PMSubscriptionAlbum\").get(executor.inFields.get(\"albumID\").toString())\n\nvar payloadProperties = executor.subject.getOutFieldSchemaHelper(\"payload\").createNewSubInstance(\"delete_DasH_subscription_DasH_properties_record\");\n\npayloadProperties.put(\"nfName\", pmSubscriptionInfo.get(\"nfName\"))\npayloadProperties.put(\"subscriptionName\", pmSubscriptionInfo.get(\"subscription\").get(\"subscriptionName\"))\npayloadProperties.put(\"administrativeState\", pmSubscriptionInfo.get(\"subscription\").get(\"administrativeState\"))\npayloadProperties.put(\"fileBasedGP\", pmSubscriptionInfo.get(\"subscription\").get(\"fileBasedGP\").toString())\npayloadProperties.put(\"fileLocation\", pmSubscriptionInfo.get(\"subscription\").get(\"fileLocation\"))\npayloadProperties.put(\"measurementGroups\", pmSubscriptionInfo.get(\"subscription\").get(\"measurementGroups\"))\n\nvar payloadEntry = executor.subject.getOutFieldSchemaHelper(\"payload\").createNewSubInstance(\"CDSRequestPayloadEntry\");\npayloadEntry.put(\"delete_DasH_subscription_DasH_properties\", payloadProperties)\n\nvar payload = executor.subject.getOutFieldSchemaHelper(\"payload\").createNewInstance();\npayload.put(\"delete_DasH_subscription_DasH_request\", payloadEntry);\n\nexecutor.outFields.put(\"albumID\", executor.inFields.get(\"albumID\"))\nexecutor.outFields.put(\"payload\", payload);\n\nexecutor.logger.info(\"Sending delete Subscription Event to CDS\")\n\ntrue;"
- }
- }
- }, {
- "key" : {
- "name" : "DeleteSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "DeleteSubscriptionRequestTask",
- "version" : "0.0.1"
- },
- "inputFields" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSDeleteSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "outputFields" : {
- "entry" : [ {
- "key" : "actionIdentifiers",
- "value" : {
- "key" : "actionIdentifiers",
- "fieldSchemaKey" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "commonHeader",
- "value" : {
- "key" : "commonHeader",
- "fieldSchemaKey" : {
- "name" : "CDSRequestCommonHeaderType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSDeleteSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "taskParameters" : {
- "entry" : [ ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskLogic" : {
- "key" : "TaskLogic",
- "logicFlavour" : "JAVASCRIPT",
- "logic" : "/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2020 Nordix. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\n\nexecutor.logger.info(executor.subject.id);\n\nvar pmSubscriptionInfo = executor.getContextAlbum(\"PMSubscriptionAlbum\").get(executor.inFields.get(\"albumID\").toString())\nvar payload = executor.inFields.get(\"payload\")\nvar actionName = \"delete-subscription\"\n\nvar commonHeader = executor.subject.getOutFieldSchemaHelper(\"commonHeader\").createNewInstance();\ncommonHeader.put(\"originatorId\", \"sdnc\");\ncommonHeader.put(\"requestId\", \"123456-1000\");\ncommonHeader.put(\"subRequestId\", \"sub-123456-1000\");\n\nvar actionIdentifiers = executor.subject.getOutFieldSchemaHelper(\"actionIdentifiers\").createNewInstance();\nactionIdentifiers.put(\"actionName\", actionName);\nactionIdentifiers.put(\"blueprintName\", \"pm_control\");\nactionIdentifiers.put(\"blueprintVersion\", \"1.0.0\");\nactionIdentifiers.put(\"mode\", \"sync\");\n\nexecutor.outFields.put(\"commonHeader\", commonHeader);\nexecutor.outFields.put(\"actionIdentifiers\", actionIdentifiers);\nexecutor.outFields.put(\"payload\", payload);\n\nexecutor.logger.info(\"Sending Deactivate Subscription Event to CDS\")\n\ntrue;"
- }
- }
- }, {
- "key" : {
- "name" : "ReceivePMSubscriptionTask",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "ReceivePMSubscriptionTask",
- "version" : "0.0.1"
- },
- "inputFields" : {
- "entry" : [ {
- "key" : "changeType",
- "value" : {
- "key" : "changeType",
- "fieldSchemaKey" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "closedLoopControlName",
- "value" : {
- "key" : "closedLoopControlName",
- "fieldSchemaKey" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "nfName",
- "value" : {
- "key" : "nfName",
- "fieldSchemaKey" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "policyName",
- "value" : {
- "key" : "policyName",
- "fieldSchemaKey" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "subscription",
- "value" : {
- "key" : "subscription",
- "fieldSchemaKey" : {
- "name" : "SubscriptionType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "outputFields" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- },
- "taskParameters" : {
- "entry" : [ ]
- },
- "contextAlbumReference" : [ {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- } ],
- "taskLogic" : {
- "key" : "TaskLogic",
- "logicFlavour" : "JAVASCRIPT",
- "logic" : "/*\n * ============LICENSE_START=======================================================\n * Copyright (C) 2020 Nordix. All rights reserved.\n * ================================================================================\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n *\n * SPDX-License-Identifier: Apache-2.0\n * ============LICENSE_END=========================================================\n */\nvar uuidType = java.util.UUID;\n\n\n//albumID will be used to fetch info from our album later\nvar albumID = uuidType.fromString(\"d0050623-18e5-46c9-9298-9a567990cd7c\");\nvar pmSubscriptionInfo = executor.getContextAlbum(\"PMSubscriptionAlbum\").getSchemaHelper().createNewInstance();\nvar returnValue = true;;\n\nif(executor.inFields.get(\"policyName\") != null) {\n var changeType = executor.inFields.get(\"changeType\")\n var nfName = executor.inFields.get(\"nfName\")\n var policyName = executor.inFields.get(\"policyName\")\n var closedLoopControlName = executor.inFields.get(\"closedLoopControlName\")\n var subscription = executor.inFields.get(\"subscription\")\n\n pmSubscriptionInfo.put(\"nfName\", executor.inFields.get(\"nfName\"));\n pmSubscriptionInfo.put(\"changeType\", executor.inFields.get(\"changeType\"))\n pmSubscriptionInfo.put(\"policyName\", executor.inFields.get(\"policyName\"))\n pmSubscriptionInfo.put(\"closedLoopControlName\", executor.inFields.get(\"closedLoopControlName\"))\n pmSubscriptionInfo.put(\"subscription\", subscription)\n\n executor.getContextAlbum(\"PMSubscriptionAlbum\").put(albumID.toString(), pmSubscriptionInfo);\n\n executor.outFields.put(\"albumID\", albumID)\n} else {\n executor.message = \"Received invalid event\"\n returnValue = false;\n}\nreturnValue;"
- }
- }
- } ]
- }
- },
- "events" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Events",
- "version" : "0.0.1"
- },
- "eventMap" : {
- "entry" : [ {
- "key" : {
- "name" : "CDSResponseEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseEvent",
- "version" : "0.0.1"
- },
- "nameSpace" : "org.onap.policy.apex.onap.pmcontrol",
- "source" : "CDS",
- "target" : "APEX",
- "parameter" : {
- "entry" : [ {
- "key" : "actionIdentifiers",
- "value" : {
- "key" : "actionIdentifiers",
- "fieldSchemaKey" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "commonHeader",
- "value" : {
- "key" : "commonHeader",
- "fieldSchemaKey" : {
- "name" : "CDSResponseCommonHeaderType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSResponsePayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "status",
- "value" : {
- "key" : "status",
- "fieldSchemaKey" : {
- "name" : "CDSResponseStatusType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- }
- }
- }, {
- "key" : {
- "name" : "CDSResponseStatusEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseStatusEvent",
- "version" : "0.0.1"
- },
- "nameSpace" : "org.onap.policy.apex.onap.pmcontrol",
- "source" : "APEX",
- "target" : "DCAE",
- "parameter" : {
- "entry" : [ {
- "key" : "status",
- "value" : {
- "key" : "status",
- "fieldSchemaKey" : {
- "name" : "SubscriptionStatusType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- }
- }
- }, {
- "key" : {
- "name" : "CreateSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CreateSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "nameSpace" : "org.onap.policy.apex.onap.pmcontrol",
- "source" : "APEX",
- "target" : "APEX",
- "parameter" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSCreateSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- }
- }
- }, {
- "key" : {
- "name" : "CreateSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CreateSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "nameSpace" : "org.onap.policy.apex.onap.pmcontrol",
- "source" : "APEX",
- "target" : "APEX",
- "parameter" : {
- "entry" : [ {
- "key" : "actionIdentifiers",
- "value" : {
- "key" : "actionIdentifiers",
- "fieldSchemaKey" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "commonHeader",
- "value" : {
- "key" : "commonHeader",
- "fieldSchemaKey" : {
- "name" : "CDSRequestCommonHeaderType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSCreateSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- }
- }
- }, {
- "key" : {
- "name" : "DeleteSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "DeleteSubscriptionPayloadEvent",
- "version" : "0.0.1"
- },
- "nameSpace" : "org.onap.policy.apex.onap.pmcontrol",
- "source" : "APEX",
- "target" : "APEX",
- "parameter" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSDeleteSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- }
- }
- }, {
- "key" : {
- "name" : "DeleteSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "DeleteSubscriptionRequestEvent",
- "version" : "0.0.1"
- },
- "nameSpace" : "org.onap.policy.apex.onap.pmcontrol",
- "source" : "APEX",
- "target" : "APEX",
- "parameter" : {
- "entry" : [ {
- "key" : "actionIdentifiers",
- "value" : {
- "key" : "actionIdentifiers",
- "fieldSchemaKey" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "commonHeader",
- "value" : {
- "key" : "commonHeader",
- "fieldSchemaKey" : {
- "name" : "CDSRequestCommonHeaderType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "payload",
- "value" : {
- "key" : "payload",
- "fieldSchemaKey" : {
- "name" : "CDSDeleteSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- }
- }
- }, {
- "key" : {
- "name" : "PMSubscriptionOutputEvent",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "PMSubscriptionOutputEvent",
- "version" : "0.0.1"
- },
- "nameSpace" : "org.onap.policy.apex.onap.pmcontrol",
- "source" : "APEX",
- "target" : "APEX",
- "parameter" : {
- "entry" : [ {
- "key" : "albumID",
- "value" : {
- "key" : "albumID",
- "fieldSchemaKey" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- }
- }
- }, {
- "key" : {
- "name" : "testPolicyB",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "testPolicyB",
- "version" : "0.0.1"
- },
- "nameSpace" : "org.onap.policy.apex.onap.pmcontrol",
- "source" : "DCAE",
- "target" : "APEX",
- "parameter" : {
- "entry" : [ {
- "key" : "changeType",
- "value" : {
- "key" : "changeType",
- "fieldSchemaKey" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "closedLoopControlName",
- "value" : {
- "key" : "closedLoopControlName",
- "fieldSchemaKey" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "nfName",
- "value" : {
- "key" : "nfName",
- "fieldSchemaKey" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "policyName",
- "value" : {
- "key" : "policyName",
- "fieldSchemaKey" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- }, {
- "key" : "subscription",
- "value" : {
- "key" : "subscription",
- "fieldSchemaKey" : {
- "name" : "SubscriptionType",
- "version" : "0.0.1"
- },
- "optional" : false
- }
- } ]
- }
- }
- } ]
- }
- },
- "albums" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Albums",
- "version" : "0.0.1"
- },
- "albums" : {
- "entry" : [ {
- "key" : {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "PMSubscriptionAlbum",
- "version" : "0.0.1"
- },
- "scope" : "policy",
- "isWritable" : true,
- "itemSchema" : {
- "name" : "PMSubscriptionType",
- "version" : "0.0.1"
- }
- }
- } ]
- }
- },
- "schemas" : {
- "key" : {
- "name" : "APEXgRPCPolicy_Schemas",
- "version" : "0.0.1"
- },
- "schemas" : {
- "entry" : [ {
- "key" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSActionIdentifiersType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"type\": \"record\",\n \"name\": \"CDSActionIdentifiers_Type\",\n \"namespace\": \"org.onap.policy.apex.onap.helloworld\",\n \"fields\": [\n {\n \"name\": \"actionName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"blueprintName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"blueprintVersion\",\n \"type\": \"string\"\n },\n {\n \"name\": \"mode\",\n \"type\": \"string\"\n }\n ]\n}"
- }
- }, {
- "key" : {
- "name" : "CDSCreateSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSCreateSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"type\": \"map\",\n \"values\": {\n \"type\": \"record\",\n \"name\": \"CDSRequestPayloadEntry\",\n \"fields\": [\n {\n \"name\": \"create_DasH_subscription_DasH_properties\",\n \"type\": {\n \"name\": \"create_DasH_subscription_DasH_properties_record\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"nfName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"subscriptionName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"administrativeState\",\n \"type\": \"string\"\n },\n {\n \"name\": \"fileBasedGP\",\n \"type\": \"string\"\n },\n {\n \"name\": \"fileLocation\",\n \"type\": \"string\"\n },\n {\n \"name\": \"measurementGroups\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"measurementGroups_record\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementGroup\",\n \"type\": {\n \"name\": \"measurementGroup\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementTypes\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"measurementTypes_record\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementType\",\n \"type\": \"string\"\n }\n ]\n }\n }\n },\n {\n \"name\": \"managedObjectDNsBasic\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"managedObjectDNsBasic_record\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"DN\",\n \"type\": \"string\"\n }\n ]\n }\n }\n }\n ]\n }\n }\n ]\n }\n }\n }\n ]\n }\n }\n ]\n }\n}"
- }
- }, {
- "key" : {
- "name" : "CDSDeleteSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSDeleteSubscriptionPayloadType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"type\": \"map\",\n \"values\": {\n \"type\": \"record\",\n \"name\": \"CDSRequestPayloadEntry\",\n \"fields\": [\n {\n \"name\": \"delete_DasH_subscription_DasH_properties\",\n \"type\": {\n \"name\": \"delete_DasH_subscription_DasH_properties_record\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"nfName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"subscriptionName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"administrativeState\",\n \"type\": \"string\"\n },\n {\n \"name\": \"fileBasedGP\",\n \"type\": \"string\"\n },\n {\n \"name\": \"fileLocation\",\n \"type\": \"string\"\n },\n {\n \"name\": \"measurementGroups\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"measurementGroups_record\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementGroup\",\n \"type\": {\n \"name\": \"measurementGroup\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementTypes\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"measurementTypes_record\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementType\",\n \"type\": \"string\"\n }\n ]\n }\n }\n },\n {\n \"name\": \"managedObjectDNsBasic\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"managedObjectDNsBasic_record\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"DN\",\n \"type\": \"string\"\n }\n ]\n }\n }\n }\n ]\n }\n }\n ]\n }\n }\n }\n ]\n }\n }\n ]\n }\n}"
- }
- }, {
- "key" : {
- "name" : "CDSRequestCommonHeaderType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSRequestCommonHeaderType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"type\": \"record\",\n \"name\": \"CDSRequestCommonHeader_Type\",\n \"namespace\": \"org.onap.policy.apex.onap.helloworld\",\n \"fields\": [\n {\n \"name\": \"originatorId\",\n \"type\": \"string\"\n },\n {\n \"name\": \"requestId\",\n \"type\": \"string\"\n },\n {\n \"name\": \"subRequestId\",\n \"type\": \"string\"\n }\n ]\n}"
- }
- }, {
- "key" : {
- "name" : "CDSResponseCommonHeaderType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseCommonHeaderType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"type\": \"record\",\n \"name\": \"CDSResponseCommonHeader_Type\",\n \"namespace\": \"org.onap.policy.apex.onap.helloworld\",\n \"fields\": [\n {\n \"name\": \"originatorId\",\n \"type\": \"string\"\n },\n {\n \"name\": \"requestId\",\n \"type\": \"string\"\n },\n {\n \"name\": \"subRequestId\",\n \"type\": \"string\"\n },\n {\n \"name\": \"timestamp\",\n \"type\": \"string\"\n }\n ]\n}"
- }
- }, {
- "key" : {
- "name" : "CDSResponsePayloadType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponsePayloadType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"name\": \"CDSResponsePayloadEntry\",\n \"type\": \"record\",\n \"namespace\": \"com.acme.avro\",\n \"fields\": [\n {\n \"name\": \"create_DasH_subscription_DasH_response\",\n \"type\": {\n \"name\": \"create_DasH_subscription_DasH_response\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"odl_DasH_response\",\n \"type\": {\n \"name\": \"odl_DasH_response\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"status\",\n \"type\": \"string\"\n }\n ]\n }\n }\n ]\n }\n }\n ]\n}"
- }
- }, {
- "key" : {
- "name" : "CDSResponseStatusType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "CDSResponseStatusType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"type\": \"record\",\n \"name\": \"CDSResponseStatus_Type\",\n \"namespace\": \"org.onap.policy.apex.onap.helloworld\",\n \"fields\": [\n {\n \"name\": \"code\",\n \"type\": \"int\"\n },\n {\n \"name\": \"eventType\",\n \"type\": \"string\"\n },\n {\n \"name\": \"timestamp\",\n \"type\": \"string\"\n },\n {\n \"name\": \"message\",\n \"type\": \"string\"\n }\n ]\n}"
- }
- }, {
- "key" : {
- "name" : "PMSubscriptionType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "PMSubscriptionType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"name\": \"PMSubscription\",\n \"type\": \"record\",\n \"namespace\": \"org.onap.policy.apex.onap.pmcontrol\",\n \"fields\": [\n {\n \"name\": \"nfName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"changeType\",\n \"type\": \"string\"\n },\n {\n \"name\": \"closedLoopControlName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"policyName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"subscription\",\n \"type\": {\n \"name\": \"subscription\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"subscriptionName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"administrativeState\",\n \"type\": \"string\"\n },\n {\n \"name\": \"fileBasedGP\",\n \"type\": \"int\"\n },\n {\n \"name\": \"fileLocation\",\n \"type\": \"string\"\n },\n {\n \"name\": \"measurementGroups\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"Measurement_Groups_Type\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementGroup\",\n \"type\": {\n \"name\": \"Measurement_Group_Type\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementTypes\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"Measurement_Types_Type\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementType\",\n \"type\": \"string\"\n }\n ]\n }\n }\n },\n {\n \"name\": \"managedObjectDNsBasic\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"Managed_Object_Dns_Basic_Type\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"DN\",\n \"type\": \"string\"\n }\n ]\n }\n }\n }\n ]\n }\n }\n ]\n }\n }\n }\n ]\n }\n }\n ]\n}"
- }
- }, {
- "key" : {
- "name" : "SimpleIntType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "SimpleIntType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Java",
- "schemaDefinition" : "java.lang.Integer"
- }
- }, {
- "key" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "SimpleStringType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Java",
- "schemaDefinition" : "java.lang.String"
- }
- }, {
- "key" : {
- "name" : "SubscriptionStatusType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "SubscriptionStatusType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"type\": \"record\",\n \"name\": \"ActivateSubscriptionStatus_Type\",\n \"namespace\": \"org.onap.policy.apex.onap.helloworld\",\n \"fields\": [\n {\n \"name\": \"subscriptionName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"nfName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"changeType\",\n \"type\": \"string\"\n },\n {\n \"name\": \"message\",\n \"type\": \"string\"\n }\n ]\n}"
- }
- }, {
- "key" : {
- "name" : "SubscriptionType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "SubscriptionType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Avro",
- "schemaDefinition" : "{\n \"name\": \"subscription\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"subscriptionName\",\n \"type\": \"string\"\n },\n {\n \"name\": \"administrativeState\",\n \"type\": \"string\"\n },\n {\n \"name\": \"fileBasedGP\",\n \"type\": \"int\"\n },\n {\n \"name\": \"fileLocation\",\n \"type\": \"string\"\n },\n {\n \"name\": \"measurementGroups\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"Measurement_Groups_Type\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementGroup\",\n \"type\": {\n \"name\": \"Measurement_Group_Type\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementTypes\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"Measurement_Types_Type\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"measurementType\",\n \"type\": \"string\"\n }\n ]\n }\n }\n },\n {\n \"name\": \"managedObjectDNsBasic\",\n \"type\": {\n \"type\": \"array\",\n \"items\": {\n \"name\": \"Managed_Object_Dns_Basic_Type\",\n \"type\": \"record\",\n \"fields\": [\n {\n \"name\": \"DN\",\n \"type\": \"string\"\n }\n ]\n }\n }\n }\n ]\n }\n }\n ]\n }\n }\n }\n ]\n}"
- }
- }, {
- "key" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "value" : {
- "key" : {
- "name" : "UUIDType",
- "version" : "0.0.1"
- },
- "schemaFlavour" : "Java",
- "schemaDefinition" : "java.util.UUID"
- }
- } ]
- }
- }
- }
-}
diff --git a/gui-editors/gui-editor-apex/src/test/resources/converter/ApexConfig-engineServiceParameters-notAnObject.json b/gui-editors/gui-editor-apex/src/test/resources/converter/ApexConfig-engineServiceParameters-notAnObject.json
deleted file mode 100644
index cbad28f..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/converter/ApexConfig-engineServiceParameters-notAnObject.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "engineServiceParameters": [],
- "eventInputParameters": {
- },
- "eventOutputParameters": {
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/converter/ApexConfig.json b/gui-editors/gui-editor-apex/src/test/resources/converter/ApexConfig.json
deleted file mode 100644
index 34ec305..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/converter/ApexConfig.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
- "engineServiceParameters": {
- "name": "MyApexEngine",
- "version": "0.0.1",
- "id": 45,
- "instanceCount": 2,
- "deploymentPort": 12561,
- "engineParameters": {
- "executorParameters": {
- "JAVASCRIPT": {
- "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
- }
- },
- "contextParameters": {
- "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters",
- "schemaParameters": {
- "Avro": {
- "parameterClassName": "org.onap.policy.apex.plugins.context.schema.avro.AvroSchemaHelperParameters"
- },
- "Java": {
- "parameterClassName": "org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters",
- "jsonAdapters": {
- "Instant": {
- "adaptedClass": "java.time.Instant",
- "adaptorClass": "org.onap.policy.controlloop.util.Serialization$GsonInstantAdapter"
- }
- }
- }
- }
- }
- }
- },
- "eventInputParameters": {
- "DCAEConsumer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTCLIENT",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
- "parameters": {
- "url": "http://localhost:54321/GrpcTestRestSim/sim/events/unauthenticated.DCAE_CL_OUTPUT/APEX/1?timeout=30000"
- }
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON",
- "parameters": {
- "nameAlias": "testPolicyB"
- }
- },
- "eventName": "testPolicyB",
- "eventNameFilter": "testPolicyB"
- },
- "CDSRequestConsumer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "GRPC",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.grpc.GrpcCarrierTechnologyParameters"
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON"
- },
- "eventName": "CDSResponseEvent",
- "eventNameFilter": "CDSResponseEvent",
- "requestorMode": true,
- "requestorPeer": "CDSRequestProducer",
- "requestorTimeout": 500
- }
- },
- "eventOutputParameters": {
- "logOutputter": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "FILE",
- "parameters": {
- "fileName": "outputevents.log"
- }
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON"
- }
- },
- "CDSRequestProducer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "GRPC",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.grpc.GrpcCarrierTechnologyParameters",
- "parameters": {
- "host": "localhost",
- "port": 54322,
- "username": "ccsdkapps",
- "password": "ccsdkapps",
- "timeout": 10
- }
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON"
- },
- "eventNameFilter": "(Create|Delete)SubscriptionRequestEvent",
- "requestorMode": true,
- "requestorPeer": "CDSRequestConsumer",
- "requestorTimeout": 500
- },
- "CDSReplyProducer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTCLIENT",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
- "parameters": {
- "url": "http://localhost:54321/GrpcTestRestSim/sim/events/POLICY_CL_MGT"
- }
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON"
- },
- "eventNameFilter": "CDSResponseStatusEvent"
- }
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/converter/ToscaTemplate.json b/gui-editors/gui-editor-apex/src/test/resources/converter/ToscaTemplate.json
deleted file mode 100644
index 140205c..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/converter/ToscaTemplate.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- "policies": [
- {
- "onap.policies.native.apex.Grpc": {
- "type": "onap.policies.native.Apex",
- "type_version": "1.0.0",
- "name": "onap.policies.native.apex.Grpc",
- "version": "1.0.0",
- "properties": {
- }
- }
- }
- ]
- }
-}
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid-engineServiceParameters.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid-engineServiceParameters.json
deleted file mode 100644
index 2f23055..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid-engineServiceParameters.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "engineServiceParameters": ""
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.jsonbad b/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.jsonbad
deleted file mode 100644
index 2517d8b..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-invalid.jsonbad
+++ /dev/null
@@ -1 +0,0 @@
-- this is an invalid JSON \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-missing-engineServiceParameters.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-missing-engineServiceParameters.json
deleted file mode 100644
index 3fe89d0..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig-missing-engineServiceParameters.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "eventInputParameters": {
- },
- "eventOutputParameters": {
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig.json
deleted file mode 100644
index 5cd1a46..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ApexConfig.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
- "engineServiceParameters": {
- "name": "MyApexEngine",
- "version": "0.0.1",
- "id": 45,
- "instanceCount": 2,
- "deploymentPort": 12561,
- "engineParameters": {
- "executorParameters": {
- "JAVASCRIPT": {
- "parameterClassName": "org.onap.policy.apex.plugins.executor.javascript.JavascriptExecutorParameters"
- }
- },
- "contextParameters": {
- "parameterClassName": "org.onap.policy.apex.context.parameters.ContextParameters",
- "schemaParameters": {
- "Avro": {
- "parameterClassName": "org.onap.policy.apex.plugins.context.schema.avro.AvroSchemaHelperParameters"
- },
- "Java": {
- "parameterClassName": "org.onap.policy.apex.context.impl.schema.java.JavaSchemaHelperParameters",
- "jsonAdapters": {
- "Instant": {
- "adaptedClass": "java.time.Instant",
- "adaptorClass": "org.onap.policy.controlloop.util.Serialization$GsonInstantAdapter"
- }
- }
- }
- }
- }
- }
- },
- "eventInputParameters": {
- },
- "eventOutputParameters": {
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid-toscaDefinitions.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid-toscaDefinitions.json
deleted file mode 100644
index e0323b8..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid-toscaDefinitions.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "tosca_definitions_version": {
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.jsonbad b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.jsonbad
deleted file mode 100644
index 0705d6b..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalid.jsonbad
+++ /dev/null
@@ -1 +0,0 @@
-- this is a invalid json \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-policies.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-policies.json
deleted file mode 100644
index a9bb4e7..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-policies.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- "policies": {}
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-properties.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-properties.json
deleted file mode 100644
index fd06d2a..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-properties.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- "policies": [
- {
- "onap.policies.native.apex.Grpc": {
- "properties": []
- }
- }
- ]
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-topologyTemplate.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-topologyTemplate.json
deleted file mode 100644
index 94a8148..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidEntry-topologyTemplate.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": ""
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidPolicy1.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidPolicy1.json
deleted file mode 100644
index 194b2fd..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidPolicy1.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- "policies": [
- {
- "onap.policies.native.apex.Grpc": ""
- }
- ]
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidPolicy2.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidPolicy2.json
deleted file mode 100644
index a8741fd..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-invalidPolicy2.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- "policies": [
- {}
- ]
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-policies.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-policies.json
deleted file mode 100644
index 0d95fab..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-policies.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-policy.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-policy.json
deleted file mode 100644
index 88bbb6c..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-policy.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- "policies": []
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-properties.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-properties.json
deleted file mode 100644
index 7bcac74..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-properties.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- "policies": [
- {
- "onap.policies.native.apex.Grpc": {
- "type": "onap.policies.native.Apex",
- "type_version": "1.0.0",
- "name": "onap.policies.native.apex.Grpc",
- "version": "1.0.0"
- }
- }
- ]
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-topology-template.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-topology-template.json
deleted file mode 100644
index bf8e032..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-topology-template.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0"
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-tosca-definitions-version.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-tosca-definitions-version.json
deleted file mode 100644
index 1e0d5b8..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-missing-tosca-definitions-version.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "topology_template": {
- "policies": [
- {
- "onap.policies.native.apex.Grpc": {
- "type": "onap.policies.native.Apex",
- "type_version": "1.0.0",
- "name": "onap.policies.native.apex.Grpc",
- "version": "1.0.0",
- "properties": {
- }
- }
- }
- ]
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-more-than-one-policy.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-more-than-one-policy.json
deleted file mode 100644
index d5801b9..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate-more-than-one-policy.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- "policies": [
- {
- "onap.policies.native.apex.Grpc": {
- "type": "onap.policies.native.Apex",
- "type_version": "1.0.0",
- "name": "onap.policies.native.apex.Grpc",
- "version": "1.0.0",
- "properties": {
- }
- }
- },
- {
- "onap.policies.native.apex.AnotherPolicy": {}
- }
- ]
- }
-} \ No newline at end of file
diff --git a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate.json b/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate.json
deleted file mode 100644
index 86ea2cf..0000000
--- a/gui-editors/gui-editor-apex/src/test/resources/processor/ToscaTemplate.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
- "topology_template": {
- "policies": [
- {
- "onap.policies.native.apex.Grpc": {
- "type": "onap.policies.native.Apex",
- "type_version": "1.0.0",
- "name": "onap.policies.native.apex.Grpc",
- "version": "1.0.0",
- "properties": {
- }
- }
- }
- ]
- }
-} \ No newline at end of file
diff --git a/gui-editors/pom.xml b/gui-editors/pom.xml
index 7deee2d..3810af5 100644
--- a/gui-editors/pom.xml
+++ b/gui-editors/pom.xml
@@ -1,6 +1,6 @@
<!--
============LICENSE_START=======================================================
- Copyright (C) 2020 Nordix Foundation.
+ Copyright (C) 2020-2022 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -32,11 +32,6 @@
<name>${project.artifactId}</name>
<description>Web Client editors for PDP policies</description>
- <properties>
- <sonar.sources>${project.basedir}/src/main</sonar.sources>
- <sonar.exclusions>src/main/resources/webapp/js/edit_area/**/*,src/main/resources/webapp/js/jquery/**/*,src/main/resources/webapp/js/jquery-ui-1.12.1/**/*,src/main/resources/webapp/js/lib/**/*</sonar.exclusions>
- </properties>
-
<modules>
<module>gui-editor-apex</module>
</modules>
diff --git a/pom.xml b/pom.xml
index 4be0a92..d1f833c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
ONAP Policy GUI
================================================================================
Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved.
- Modifications Copyright (C) 2020-2021 Nordix Foundation.
+ Modifications Copyright (C) 2020-2022 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -40,8 +40,6 @@
<description>Code for all the Policy GUI's.</description>
<properties>
- <policy.common.version>1.10.1-SNAPSHOT</policy.common.version>
- <policy.models.version>2.6.1-SNAPSHOT</policy.models.version>
<jacoco.dataFile>${project.basedir}/../../target/code-coverage/jacoco-ut.exec</jacoco.dataFile>
<sonar.javascript.lcov.reportPaths>${project.basedir}/target/code-coverage/lcov.info</sonar.javascript.lcov.reportPaths>
</properties>
@@ -78,21 +76,6 @@
</site>
</distributionManagement>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.onap.policy.common</groupId>
- <artifactId>utils</artifactId>
- <version>${policy.common.version}</version>
- </dependency>
- <dependency>
- <groupId>org.onap.policy.common</groupId>
- <artifactId>policy-endpoints</artifactId>
- <version>${policy.common.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<profiles>
<profile>
<!--This profile is used to store Eclipse m2e settings only. It has no