Data Dictionary has erroneous resolution source for vnf-name.
Issue-ID: CCSDK-1794
Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I7ef71201d40b712435c9076c52a317b572d63562
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 426b91d..04d3794 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 675b754..7d65119 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"
]
}
},