From 90c3a2c421b262095ea9684811509fafb8bc9e17 Mon Sep 17 00:00:00 2001
From: Brinda Santh <brindasanth@in.ibm.com>
Date: Mon, 27 Aug 2018 20:08:09 -0400
Subject: Controller Blueprints Microservice

Remove hard coded decrypt rule definition in resource definition and sample JSON.

Change-Id: Iaea93ae34fdd6c440c074f001b80a94578086b1a
Issue-ID: CCSDK-488
Signed-off-by: Brinda Santh <brindasanth@in.ibm.com>
---
 .../load/resource_dictionary/db-source.json        | 12 +---
 .../resource/dict/data/DecryptionRule.java         | 67 ----------------------
 .../resource/dict/ResourceDefinition.kt            |  5 --
 3 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 ms/controllerblueprints/modules/resource-dict/src/main/java/org/onap/ccsdk/apps/controllerblueprints/resource/dict/data/DecryptionRule.java

(limited to 'ms/controllerblueprints/modules/resource-dict')

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 cd4e282b4..c53a6dd3f 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 be435242d..000000000
--- 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 525ed9a42..2287c6c8c 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 {
-- 
cgit 1.2.3-korg