From 8d3834a1674f2f7957baed7fc204c458a48149e7 Mon Sep 17 00:00:00 2001 From: Steve Siani Date: Wed, 13 Nov 2019 01:59:53 -0500 Subject: Input source doesn't support dynamic values or properties Issue-ID: CCSDK-1890 Change-Id: I7958174bd0c0a7354ddefd2595723fdb4b4d0485 Signed-off-by: Steve Siani --- .../starter-dictionary/pnf-id.json | 23 ++++++++ .../starter-dictionary/service-instance-id.json | 16 ++++++ .../starter-dictionary/vf-module-id.json | 22 +++++++ .../starter-dictionary/vnf-id.json | 67 +++++++++++----------- 4 files changed, 95 insertions(+), 33 deletions(-) (limited to 'components/model-catalog/resource-dictionary/starter-dictionary') diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json index 32468533a..adafc2997 100755 --- a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json +++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json @@ -10,6 +10,29 @@ "input" : { "type" : "source-input", "properties" : { } + }, + "aai-data": { + "type": "source-rest", + "properties": { + "verb": "GET", + "type": "JSON", + "url-path": "/aai/v14/network/pnfs/pnf/$pnf-id", + "path": "/pnf-name", + "headers" : { + "Accept": "application/json", + "X-TransactionId": "AAI-Temp-Tool", + "X-FromAppId": "AAI-Temp-Tool" + }, + "input-key-mapping": { + "pnf-id": "pnf.pnf-id" + }, + "output-key-mapping": { + "pnf-id": "pnf-name" + }, + "key-dependencies": [ + "pnf.pnf-id" + ] + } } } } \ No newline at end of file diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json index 533b8042a..fdebe5503 100644 --- a/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json +++ b/components/model-catalog/resource-dictionary/starter-dictionary/service-instance-id.json @@ -38,6 +38,22 @@ "script-class-reference": "SampleRAProcessor", "instance-dependencies": [] } + }, + "sdnc": { + "type": "source-rest", + "properties": { + "verb": "GET", + "type": "JSON", + "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id", + "path": "/service/0/service-instance-id", + "input-key-mapping": { + "service-instance-id": "service-instance.service-instance-id" + }, + "output-key-mapping": { + "service-instance-id": "service-instance-id" + }, + "key-dependencies": ["service-instance.service-instance-id"] + } } } } \ No newline at end of file diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json index 74f9310e3..91aba6369 100755 --- a/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json +++ b/components/model-catalog/resource-dictionary/starter-dictionary/vf-module-id.json @@ -10,6 +10,28 @@ "input" : { "type" : "source-input", "properties" : { } + }, + "sdnc": { + "type": "source-rest", + "properties": { + "verb": "GET", + "type": "JSON", + "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id", + "path": "/vf-module/0/vf-module-id", + "input-key-mapping": { + "service-instance-id": "service-instance-id", + "vnf-id": "vnf-id", + "vf-module-id": "vf-module.vf-module-id" + }, + "output-key-mapping": { + "vf-module-id": "vf-module-id" + }, + "key-dependencies": [ + "service-instance-id", + "vnf-id", + "vf-module.vf-module-id" + ] + } } } } \ No newline at end of file diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json index 7b170a622..97d6b011e 100644 --- a/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json +++ b/components/model-catalog/resource-dictionary/starter-dictionary/vnf-id.json @@ -1,38 +1,39 @@ - { - "tags": "vnf-id", - "name": "vnf-id", - "property": { - "description": "vnf-id", - "type": "string" +{ + "tags": "vnf-id", + "name": "vnf-id", + "property": { + "description": "vnf-id", + "type": "string" + }, + "updated-by": "MALAKOV, YURIY ", + "sources": { + "input": { + "type": "source-input" }, - "updated-by": "MALAKOV, YURIY ", - "sources": { - "input": { - "type": "source-input" - }, - "default": { - "type": "source-default", - "properties": {} - }, - "sdnc": { - "type": "source-rest", - "properties": { - "verb": "GET", "type": "JSON", - "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf-id", - "path": "/param/0/value", - "input-key-mapping": { - "service-instance-id": "service-instance-id", - "vnf-id": "vnf-id" - }, - "output-key-mapping": { - "vnf-id": "value" - }, - "key-dependencies": [ - "service-instance-id", - "vnf-id" - ] - } + "default": { + "type": "source-default", + "properties": {} + }, + "sdnc": { + "type": "source-rest", + "properties": { + "verb": "GET", + "type": "JSON", + "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/", + "path": "/vnf/0/vnf-id", + "input-key-mapping": { + "service-instance-id": "service-instance-id", + "vnf-id": "generic-vnf.vnf-id" + }, + "output-key-mapping": { + "vnf-id": "vnf-id" + }, + "key-dependencies": [ + "service-instance-id", + "generic-vnf.vnf-id" + ] } } } +} -- cgit 1.2.3-korg