Add support for resource-resolution storage

Change-Id: I0113191075804f6b77ce54c741bf0a1ccd356c77
Issue-ID: CCSDK-338
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
index 85b69b0..e5cb4cb 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-netconf-executor.json
@@ -33,6 +33,11 @@
                 }\r
               ]\r
             },\r
+            "dynamic-properties": {
+              "description": "Resolvable dynamic property.",
+              "required": false,
+              "type": "string"
+            },
             "script-class-reference": {\r
               "description": "Kotlin Script class name or jython script name.",\r
               "required": true,\r

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
index 7e3065a..5dbef4d 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
@@ -17,6 +17,16 @@
       "operations": {
         "process": {
           "inputs": {
+            "resolution-key": {
+              "description": "Key for service instance related correlation.",
+              "required": false,
+              "type": "string"
+            },
+            "store-result": {
+              "description": "Whether or not to store the output.",
+              "required": false,
+              "type": "boolean"
+            },
             "resource-type": {
               "description": "Request type.",
               "required": false,

diff --git a/components/scripts/python/ccsdk_netconf/common.py b/components/scripts/python/ccsdk_netconf/common.py
index 25244b1..f161e29 100644 (file)
--- a/components/scripts/python/ccsdk_netconf/common.py
+++ b/components/scripts/python/ccsdk_netconf/common.py
@@ -23,3 +23,6 @@ class ResolutionHelper:
   def resolve_and_generate_message(self, artifact_mapping, artifact_template):
     return self.component_function.resolveAndGenerateMessage(artifact_mapping,
                                                              artifact_template)
+
+  def retrieve_resolved_template_from_database(self, key, artifact_template):
+    return self.component_function.resolveFromDatabase(key, artifact_template)