From: Muthuramalingam, Brinda Santh(bs2796) Date: Fri, 7 Sep 2018 19:20:59 +0000 (+0000) Subject: Controller Blueprints Microservice X-Git-Tag: 0.4.2~163^2~123 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c53090478a32638f99a4e30468663fb3a2606740;p=ccsdk%2Fcds.git 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) --- diff --git a/components/resource-dict/load/resource_dictionary/db-source.json b/components/resource-dict/load/resource_dictionary/db-source.json index 92b16a212..b96dc63f7 100644 --- 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 ", "type": "string" }, - "resource-type": "ONAP", - "resource-path": "vnf/bundle-id", "updated-by": "brindasanth@onap.com", "tags": "bundle-id, brindasanth@onap.com", "sources": { diff --git a/components/resource-dict/load/resource_dictionary/default-source.json b/components/resource-dict/load/resource_dictionary/default-source.json index 1c47f37b2..64bfa0ccd 100644 --- 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" }, "updated-by": "brindasanth@onap.com", - "resource-type": "ONAP", - "resource-path": "vnf/v4-ip-type", "sources": { "default": { "type": "source-default", diff --git a/components/resource-dict/load/resource_dictionary/input-source.json b/components/resource-dict/load/resource_dictionary/input-source.json index 676d92f86..152a5eefc 100644 --- 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 ", "type": "string" }, - "resource-path": "action-name", - "resource-type": "ONAP", "updated-by": "brindasanth@onap.com", "tags": null, "sources": { diff --git a/components/resource-dict/load/resource_dictionary/mdsal-source.json b/components/resource-dict/load/resource_dictionary/mdsal-source.json index b49146a0e..b38986a4b 100644 --- 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" }, "updated-by": "brindasanth@onap.com", - "resource-type": "ATT", - "resource-path": "vnf/oam-local-ipv4-address", "sources": { "mdsal": { "type": "source-rest", 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 0808073f8..ff2608711 100644 --- 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 }