Merge "Retrieving PNF IP address from payload"

9 files changed, 42 insertions, 39 deletions

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 2a866c9b5..536295ef7 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,22 +1,22 @@
 [
   {
-    "name": "pnf-id",
+    "name": "nf-id",
     "input-param": true,
     "property": {
       "type": "string"
     },
-    "dictionary-name": "pnf-id",
+    "dictionary-name": "nf-id",
     "dictionary-source": "input",
     "dependencies": [
     ]
   },
   {
-    "name": "pnf-name",
+    "name": "pnf-ipv4-address",
     "input-param": true,
     "property": {
       "type": "string"
     },
-    "dictionary-name": "pnf-name",
+    "dictionary-name": "pnf-ipv4-address",
     "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 9e9350c81..e94bb0f6b 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
@@ -10,10 +10,10 @@
       "description" : "Dynamic DataType definition for workflow(config-deploy).",
       "version" : "1.0.0",
       "properties" : {
-        "pnf-id" : {
+        "pnf-ipv4-address" : {
           "type" : "string"
         },
-        "pnf-name" : {
+        "nf-id" : {
           "type" : "string"
         }
       },
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json
index 4a0041773..d6f702a9f 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json
@@ -160,19 +160,7 @@
     "source-input" : {
       "description" : "This is Input Resource Source Node Type",
       "version" : "1.0.0",
-      "properties" : {
-        "key" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
+      "properties" : { },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
     "tosca.nodes.Component" : {
@@ -180,13 +168,13 @@
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
     },
-    "tosca.nodes.Workflow" : {
-      "description" : "This is Directed Graph Node Type",
+    "tosca.nodes.ResourceSource" : {
+      "description" : "TOSCA base type for Resource Sources",
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
     },
-    "tosca.nodes.ResourceSource" : {
-      "description" : "TOSCA base type for Resource Sources",
+    "tosca.nodes.Workflow" : {
+      "description" : "This is Directed Graph Node Type",
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
     }
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 189cbf86f..01532769b 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 @@
 {
-  "pnf-id" : {
-    "tags" : "pnf-id",
-    "name" : "pnf-id",
+  "nf-id" : {
+    "tags" : "nf-id",
+    "name" : "nf-id",
     "property" : {
-      "description" : "pnf-id",
+      "description" : "nf-id",
       "type" : "string"
     },
     "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
@@ -14,11 +14,11 @@
       }
     }
   },
-  "pnf-name" : {
-    "tags" : "pnf-name",
-    "name" : "pnf-name",
+  "pnf-ipv4-address" : {
+    "tags" : "pnf-ipv4-address",
+    "name" : "pnf-ipv4-address",
     "property" : {
-      "description" : "pnf-name",
+      "description" : "pnf-ipv4-address",
       "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 d65aefabb..2402c5b1a 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("pnf-id")
+        pnf_id = execution_request.payload.get("config-deploy-request").get("config-deploy-properties").get("nf-id")
         pnf_id = str(pnf_id).strip('\"')
-        self.log.info("pnf-id: {}", pnf_id)
+        self.log.info("nf-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 1f3f94d4e..caad02bce 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,10 +1,10 @@
 <node xmlns="urn:TBD:params:xml:ns:yang:network-topology">
-    <node-id>$pnf-id</node-id>
+    <node-id>$nf-id</node-id>
     <key-based xmlns="urn:opendaylight:netconf-node-topology">
         <key-id xmlns="urn:opendaylight:netconf-node-topology">ODL-private-key</key-id>
         <username xmlns="urn:opendaylight:netconf-node-topology">netconf</username>
      </key-based>
-    <host xmlns="urn:opendaylight:netconf-node-topology">$pnf-name</host>
+    <host xmlns="urn:opendaylight:netconf-node-topology">$pnf-ipv4-address</host>
     <port xmlns="urn:opendaylight:netconf-node-topology">6513</port>
     <tcp-only xmlns="urn:opendaylight:netconf-node-topology">false</tcp-only>
     <protocol xmlns="urn:opendaylight:netconf-node-topology">
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json b/components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json
index 32468533a..a140a442f 100755
--- a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-id.json
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/nf-id.json
@@ -1,9 +1,9 @@
 {
-  "name" : "pnf-id",
-  "tags" : "pnf-id",
+  "name" : "nf-id",
+  "tags" : "nf-id",
   "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
   "property" : {
-    "description" : "pnf-id",
+    "description" : "nf-id",
     "type" : "string"
   },
   "sources" : {
diff --git a/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipv4-address.json b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipv4-address.json
new file mode 100755
index 000000000..ce96d5296
--- /dev/null
+++ b/components/model-catalog/resource-dictionary/starter-dictionary/pnf-ipv4-address.json
@@ -0,0 +1,15 @@
+{
+  "name" : "pnf-ipv4-address",
+  "tags" : "pnf-ipv4-address",
+  "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
+  "property" : {
+    "description" : "pnf-ipv4-address",
+    "type" : "string"
+  },
+  "sources" : {
+    "input" : {
+      "type" : "source-input",
+      "properties" : { }
+    }
+  }
+}
\ No newline at end of file
diff --git a/ms/blueprintsprocessor/application/src/main/resources/logback.xml b/ms/blueprintsprocessor/application/src/main/resources/logback.xml
index e0bd7ca80..1c3c7dc4b 100644
--- a/ms/blueprintsprocessor/application/src/main/resources/logback.xml
+++ b/ms/blueprintsprocessor/application/src/main/resources/logback.xml
@@ -29,7 +29,7 @@
     <logger name="org.hibernate" level="error"/>

     <logger name="org.onap.ccsdk.cds" level="info"/>

 

-    <root level="warn">

+    <root level="info">

         <appender-ref ref="STDOUT"/>

     </root>