diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-10-22 17:43:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-10-22 17:43:53 +0000 |
| commit | 9295d375fa57487fbc2bf522b137cce04e458cf9 (patch) | |
| tree | 370bc70cd327a0e9ba3af4aacc59133123ef7e4c /components/model-catalog | |
| parent | 10454269d97b7888f90e8147f8aa6b301039b5f9 (diff) | |
| parent | 724a2904fdfb0c5070ab35ff44438f313eb30e9e (diff) | |
Merge "Data Dictionary has erroneous resolution source for vnf-name."
Diffstat (limited to 'components/model-catalog')
2 files changed, 7 insertions, 7 deletions
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json index 426b91d34..04d37947b 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/resources_definition_types.json @@ -930,16 +930,16 @@ "type" : "source-rest", "properties" : { "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-name/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name", + "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name", "path" : "/param/0/value", "input-key-mapping" : { "service-instance-id" : "service-instance-id", - "vnf-name" : "vnf-name" + "vnf-id" : "vnf-id" }, "output-key-mapping" : { "vnf-name" : "value" }, - "key-dependencies" : [ "service-instance-id", "vnf-name" ] + "key-dependencies" : [ "service-instance-id", "vnf-id" ] } }, "aai-data" : { @@ -1184,4 +1184,4 @@ } } } -}
\ No newline at end of file +} diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json index 675b754ee..7d6511935 100755 --- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json +++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-name.json @@ -18,18 +18,18 @@ "type": "source-rest", "properties": { "type": "JSON", - "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-name/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name", + "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-name", "path": "/param/0/value", "input-key-mapping": { "service-instance-id": "service-instance-id", - "vnf-name": "vnf-name" + "vnf-id": "vnf-id" }, "output-key-mapping": { "vnf-name": "value" }, "key-dependencies": [ "service-instance-id", - "vnf-name" + "vnf-id" ] } }, |