From ef7bc2139e4e3007663d50e6973860fa47cde4ea Mon Sep 17 00:00:00 2001 From: ottero Date: Mon, 8 Apr 2019 14:15:07 +0000 Subject: Fix blueprint data Request parameter nf-id should be: pnf-id ODL key name ODL-private-key should be: ODL_private_key_0 Change-Id: I846112c3bd6a80d21a4b5de0845ce99d06b0515f Issue-ID: CCSDK-1208 Signed-off-by: ottero --- .../Definitions/config-deploy-pnf-mapping.json | 4 ++-- .../capability_restconf/Definitions/data_types.json | 2 +- .../Definitions/resources_definition_types.json | 8 ++++---- .../Scripts/python/RestconfConfigDeploy.py | 4 ++-- .../Templates/config-deploy-restconf-mount-template.vtl | 4 ++-- .../resource-dictionary/starter-dictionary/nf-id.json | 15 --------------- .../resource-dictionary/starter-dictionary/pnf-id.json | 15 +++++++++++++++ 7 files changed, 26 insertions(+), 26 deletions(-) delete mode 100755 components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json create mode 100755 components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json (limited to 'components') diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json index 536295ef7..d87b8d1f1 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json @@ -1,11 +1,11 @@ [ { - "name": "nf-id", + "name": "pnf-id", "input-param": true, "property": { "type": "string" }, - "dictionary-name": "nf-id", + "dictionary-name": "pnf-id", "dictionary-source": "input", "dependencies": [ ] diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json index e94bb0f6b..a0804bb3f 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json @@ -13,7 +13,7 @@ "pnf-ipv4-address" : { "type" : "string" }, - "nf-id" : { + "pnf-id" : { "type" : "string" } }, diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json index 01532769b..114eb1992 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/resources_definition_types.json @@ -1,9 +1,9 @@ { - "nf-id" : { - "tags" : "nf-id", - "name" : "nf-id", + "pnf-id" : { + "tags" : "pnf-id", + "name" : "pnf-id", "property" : { - "description" : "nf-id", + "description" : "pnf-id", "type" : "string" }, "updated-by" : "Rodrigo Ottero ", diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py index 2402c5b1a..d65aefabb 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Scripts/python/RestconfConfigDeploy.py @@ -67,9 +67,9 @@ class RestconfConfigDeploy(RestconfComponentFunction): def retrieve_parameters(self, execution_request): resolution_key = self.getDynamicProperties("resolution-key").asText() self.log.info("resolution_key: {}", resolution_key) - pnf_id = execution_request.payload.get("config-deploy-request").get("config-deploy-properties").get("nf-id") + pnf_id = execution_request.payload.get("config-deploy-request").get("config-deploy-properties").get("pnf-id") pnf_id = str(pnf_id).strip('\"') - self.log.info("nf-id: {}", pnf_id) + self.log.info("pnf-id: {}", pnf_id) return pnf_id, resolution_key def recover(self, runtime_exception, execution_request): diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl index caad02bce..ad03321af 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl +++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Templates/config-deploy-restconf-mount-template.vtl @@ -1,7 +1,7 @@ - $nf-id + $pnf-id - ODL-private-key + ODL_private_key_0 netconf $pnf-ipv4-address diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json deleted file mode 100755 index a140a442f..000000000 --- a/components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name" : "nf-id", - "tags" : "nf-id", - "updated-by" : "Rodrigo Ottero ", - "property" : { - "description" : "nf-id", - "type" : "string" - }, - "sources" : { - "input" : { - "type" : "source-input", - "properties" : { } - } - } -} \ No newline at end of file diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json new file mode 100755 index 000000000..32468533a --- /dev/null +++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json @@ -0,0 +1,15 @@ +{ + "name" : "pnf-id", + "tags" : "pnf-id", + "updated-by" : "Rodrigo Ottero ", + "property" : { + "description" : "pnf-id", + "type" : "string" + }, + "sources" : { + "input" : { + "type" : "source-input", + "properties" : { } + } + } +} \ No newline at end of file -- cgit 1.2.3-korg