diff options
| author |   Samuli Silvius <s.silvius@partner.samsung.com> | 2020-05-06 08:08:51 +0300 |
|---|---|---|
| committer |   Konrad Bańka <k.banka@samsung.com> | 2020-05-29 07:32:44 +0200 |
| commit | 8fb013099c9091c5f9b17920f0cb7eee857fe7f4 (patch) | |
| tree | ed5285f2f8ec6a21ad1f40d85659e4582476813a | |
| parent | 1389192a547b108a5492460e6e1bad672935f3bc (diff) | |
Remove endpoint-selector from Data Dictionary
According to cds bug fixed by https://gerrit.onap.org/r/c/ccsdk/cds/+/106128
Issue-ID: INT-1581
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I58727f7ac114e26c38f44cc33f35e9a54b0f0017
3 files changed, 6 insertions, 30 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba-dd.json b/heat/vFW_CNF_CDS/templates/cba-dd.json index 4afa6a42..f4ba0829 100644 --- a/heat/vFW_CNF_CDS/templates/cba-dd.json +++ b/heat/vFW_CNF_CDS/templates/cba-dd.json @@ -239,7 +239,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"", "input-key-mapping": {}, "output-key-mapping": { @@ -278,7 +277,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"", "output-key-mapping": { "int_private2_net_cidr": "prefix" @@ -451,7 +449,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"", "input-key-mapping": {}, "output-key-mapping": { @@ -490,7 +487,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"", "input-key-mapping": {}, "output-key-mapping": { @@ -569,7 +565,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"", "input-key-mapping": {}, "output-key-mapping": { @@ -628,7 +623,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"", "input-key-mapping": {}, "output-key-mapping": { @@ -839,8 +833,7 @@ }, "key-dependencies": [ "vf-module-model-customization-uuid" - ], - "endpoint-selector": "dynamic-db-source" + ] } } } @@ -910,8 +903,7 @@ }, "key-dependencies": [ "vf-module-model-customization-uuid" - ], - "endpoint-selector": "dynamic-db-source" + ] } } } @@ -954,8 +946,7 @@ }, "key-dependencies": [ "vf-module-model-customization-uuid" - ], - "endpoint-selector": "dynamic-db-source" + ] } } } diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json index cb5aaeb4..4c7aa47b 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json @@ -192,7 +192,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"", "input-key-mapping": {}, "output-key-mapping": { @@ -223,7 +222,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"", "output-key-mapping": { "int_private2_net_cidr": "prefix" @@ -372,7 +370,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"", "input-key-mapping": {}, "output-key-mapping": { @@ -403,7 +400,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"", "input-key-mapping": {}, "output-key-mapping": { @@ -474,7 +470,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"", "input-key-mapping": {}, "output-key-mapping": { @@ -525,7 +520,6 @@ "type": "source-db", "properties": { "type": "SQL", - "endpoint-selector": "dynamic-db-source", "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"", "input-key-mapping": {}, "output-key-mapping": { @@ -704,8 +698,7 @@ }, "key-dependencies": [ "vf-module-model-customization-uuid" - ], - "endpoint-selector": "dynamic-db-source" + ] } } } @@ -759,8 +752,7 @@ }, "key-dependencies": [ "vf-module-model-customization-uuid" - ], - "endpoint-selector": "dynamic-db-source" + ] } } } @@ -795,8 +787,7 @@ }, "key-dependencies": [ "vf-module-model-customization-uuid" - ], - "endpoint-selector": "dynamic-db-source" + ] } } } diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json index 01e14b55..077bbc8e 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json @@ -61,12 +61,6 @@ "resolution-key": { "get_input": "resolution-key" } - }, - "dynamic-db-source": { - "type": "maria-db", - "url": "jdbc:mysql://mariadb-galera:3306/sdnctl", - "username": "root", - "password": "TepsMavaFota9+" } }, "topology_template": { |