Controller Blueprints Microservice

Remove Resource Dictionary resource_type, resource_path, sample_values and valid_values parameters.

Change-Id: I7ec899e30aaef64130f35eb754a79f9dfc54f71f
Issue-ID: CCSDK-488
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

diff --git a/components/resource-dict/load/resource_dictionary/db-source.json b/components/resource-dict/load/resource_dictionary/db-source.json
index 92b16a2..b96dc63 100644 (file)
--- a/components/resource-dict/load/resource_dictionary/db-source.json
+++ b/components/resource-dict/load/resource_dictionary/db-source.json
@@ -4,8 +4,6 @@
     "description": "name of the ",\r
     "type": "string"\r
   },\r
-  "resource-type": "ONAP",\r
-  "resource-path": "vnf/bundle-id",\r
   "updated-by": "brindasanth@onap.com",\r
   "tags": "bundle-id, brindasanth@onap.com",\r
   "sources": {\r

diff --git a/components/resource-dict/load/resource_dictionary/default-source.json b/components/resource-dict/load/resource_dictionary/default-source.json
index 1c47f37..64bfa0c 100644 (file)
--- a/components/resource-dict/load/resource_dictionary/default-source.json
+++ b/components/resource-dict/load/resource_dictionary/default-source.json
@@ -6,8 +6,6 @@
     "type": "string"\r
   },\r
   "updated-by": "brindasanth@onap.com",\r
-  "resource-type": "ONAP",\r
-  "resource-path": "vnf/v4-ip-type",\r
   "sources": {\r
     "default": {\r
       "type": "source-default",\r

diff --git a/components/resource-dict/load/resource_dictionary/input-source.json b/components/resource-dict/load/resource_dictionary/input-source.json
index 676d92f..152a5ee 100644 (file)
--- a/components/resource-dict/load/resource_dictionary/input-source.json
+++ b/components/resource-dict/load/resource_dictionary/input-source.json
@@ -4,8 +4,6 @@
                "description": "name of the ",\r
                "type": "string"\r
        },\r
-       "resource-path": "action-name",\r
-       "resource-type": "ONAP",\r
        "updated-by": "brindasanth@onap.com",\r
        "tags": null,\r
        "sources": {\r

diff --git a/components/resource-dict/load/resource_dictionary/mdsal-source.json b/components/resource-dict/load/resource_dictionary/mdsal-source.json
index b49146a..b38986a 100644 (file)
--- a/components/resource-dict/load/resource_dictionary/mdsal-source.json
+++ b/components/resource-dict/load/resource_dictionary/mdsal-source.json
@@ -6,8 +6,6 @@
     "type": "string"\r
   },\r
   "updated-by": "brindasanth@onap.com",\r
-  "resource-type": "ATT",\r
-  "resource-path": "vnf/oam-local-ipv4-address",\r
   "sources": {\r
     "mdsal": {\r
       "type": "source-rest",\r

diff --git a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
index 0808073..ff26087 100644 (file)
--- a/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
+++ b/components/resource-dict/src/main/kotlin/org/onap/ccsdk/apps/controllerblueprints/resource/dict/ResourceDefinition.kt
@@ -36,12 +36,6 @@ open class ResourceDefinition {
     @JsonProperty(value = "updated-by")
     lateinit var updatedBy: String
 
-    @JsonProperty(value = "resource-type", required = true)
-    lateinit var resourceType: String
-
-    @JsonProperty(value = "resource-path", required = true)
-    lateinit var resourcePath: String
-
     @JsonProperty(value = "sources", required = true)
     lateinit var sources: MutableMap<String, NodeTemplate>
 }