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 <rodrigo.ottero@est.tech>

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 536295e..d87b8d1 100644 (file)
--- 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 e94bb0f..a0804bb 100644 (file)
--- 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 0153276..114eb19 100644 (file)
--- 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 <rodrigo.ottero@est.tech>",

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 2402c5b..d65aefa 100644 (file)
--- 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 caad02b..ad03321 100644 (file)
--- 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 @@
 <node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
-    <node-id>$nf-id</node-id>
+    <node-id>$pnf-id</node-id>
     <key-based xmlns="urn:opendaylight:netconf-node-topology">
-        <key-id xmlns="urn:opendaylight:netconf-node-topology">ODL-private-key</key-id>
+        <key-id xmlns="urn:opendaylight:netconf-node-topology">ODL_private_key_0</key-id>
         <username xmlns="urn:opendaylight:netconf-node-topology">netconf</username>
      </key-based>
     <host xmlns="urn:opendaylight:netconf-node-topology">$pnf-ipv4-address</host>

diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
similarity index 73%
rename from components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json
rename to components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
index a140a44..3246853 100755 (executable)
--- a/components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
@@ -1,9 +1,9 @@
 {
-  "name" : "nf-id",
-  "tags" : "nf-id",
+  "name" : "pnf-id",
+  "tags" : "pnf-id",
   "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
   "property" : {
-    "description" : "nf-id",
+    "description" : "pnf-id",
     "type" : "string"
   },
   "sources" : {