summaryrefslogtreecommitdiffstats
path: root/ms
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-09-04 14:49:08 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-04 14:49:08 +0000
commitb79c738377b562b059c2926256c8b499444f1c1e (patch)
treecc2316ee136e11122d37635b0cc8742f120935b1 /ms
parent06d1fdfb5ea08e2a45c4c1ba37a22d6332e84fea (diff)
parente2f01ca57072a4685c957ce9aec0ab3cf51c7a4e (diff)
Merge "Controller Blueprints Microservice"
Diffstat (limited to 'ms')
-rw-r--r--ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json12
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DecryptionRule.java67
-rw-r--r--ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt5
-rw-r--r--ms/controllerblueprints/modules/service/load/resource_dictionary/db-source.json12
-rw-r--r--ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java2
5 files changed, 2 insertions, 96 deletions
diff --git a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
index cd4e282b..c53a6dd3 100644
--- a/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
+++ b/ms/controllerblueprints/modules/resource-dict/load/resource_dictionary/db-source.json
@@ -22,15 +22,5 @@
}
}
}
- },
- "decryption-rules": [
- {
- "sources": [
- "input"
- ],
- "path": "/.",
- "rule": "LOCAL-Decrypt",
- "decrypt-type": "AES128"
- }
- ]
+ }
} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DecryptionRule.java b/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DecryptionRule.java
deleted file mode 100644
index be435242..00000000
--- a/ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DecryptionRule.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright © 2017-2018 AT&T Intellectual Property.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.onap.ccsdk.apps.controllerblueprints.resource.dict.data;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import java.util.List;
-/**
- *
- * DecryptionRule.java Purpose:
- * @author Brinda Santh
- */
-public class DecryptionRule {
-
- private List<String> sources = null;
- private String path;
- private String rule;
- @JsonProperty("decrypt-type")
- private String decryptType;
-
- public List<String> getSources() {
- return sources;
- }
-
- public void setSources(List<String> sources) {
- this.sources = sources;
- }
-
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- public String getRule() {
- return rule;
- }
-
- public void setRule(String rule) {
- this.rule = rule;
- }
-
- public String getDecryptType() {
- return decryptType;
- }
-
- public void setDecryptType(String decryptType) {
- this.decryptType = decryptType;
- }
-
-}
diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
index 525ed9a4..2287c6c8 100644
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
@@ -20,7 +20,6 @@ import com.fasterxml.jackson.annotation.JsonFormat
import com.fasterxml.jackson.annotation.JsonProperty
import org.onap.ccsdk.apps.controllerblueprints.core.data.NodeTemplate
import org.onap.ccsdk.apps.controllerblueprints.core.data.PropertyDefinition
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.data.DecryptionRule
import java.io.Serializable
import java.util.*
@@ -45,10 +44,6 @@ open class ResourceDefinition{
@JsonProperty(value = "sources", required = true)
lateinit var sources: MutableMap<String, NodeTemplate>
-
- @JsonProperty("decryption-rules")
- var decryptionRules: MutableList<DecryptionRule>? = null
-
}
open class ResourceAssignment {
diff --git a/ms/controllerblueprints/modules/service/load/resource_dictionary/db-source.json b/ms/controllerblueprints/modules/service/load/resource_dictionary/db-source.json
index cd4e282b..c53a6dd3 100644
--- a/ms/controllerblueprints/modules/service/load/resource_dictionary/db-source.json
+++ b/ms/controllerblueprints/modules/service/load/resource_dictionary/db-source.json
@@ -22,15 +22,5 @@
}
}
}
- },
- "decryption-rules": [
- {
- "sources": [
- "input"
- ],
- "path": "/.",
- "rule": "LOCAL-Decrypt",
- "decrypt-type": "AES128"
- }
- ]
+ }
} \ No newline at end of file
diff --git a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
index 8257dc36..ec036eef 100644
--- a/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
+++ b/ms/controllerblueprints/modules/service/src/test/java/org/onap/ccsdk/apps/controllerblueprints/service/rs/ResourceDictionaryRestTest.java
@@ -19,13 +19,11 @@ package org.onap.ccsdk.apps.controllerblueprints.service.rs;
import org.apache.commons.io.IOUtils;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.MethodSorters;
import org.onap.ccsdk.apps.controllerblueprints.TestApplication;
-import org.onap.ccsdk.apps.controllerblueprints.resource.dict.data.*;
import org.onap.ccsdk.apps.controllerblueprints.service.domain.ResourceDictionary;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;