Simplify NetconfRpcService

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

4 files changed, 25 insertions, 47 deletions

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 b59a7384b..85b69b09d 100644
--- 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
@@ -18,17 +18,29 @@
       "operations": {

         "process": {

           "inputs": {

-            "instance-dependencies": {

+            "script-type": {

+              "description": "Script type, kotlin type is supported",

               "required": true,

-              "description": "Instance Names to Inject to Jython Script.",

-              "type": "list",

-              "entry_schema": {

-                "type": "string"

-              }

+              "type": "string",

+              "default": "internal",

+              "constraints": [

+                {

+                  "valid_values": [

+                    "kotlin",

+                    "jython",

+                    "internal"

+                  ]

+                }

+              ]

             },

-            "artifact-prefix-names": {

-              "required": false,

-              "description": "Template , Resource Assignment Artifact Prefix names",

+            "script-class-reference": {

+              "description": "Kotlin Script class name or jython script name.",

+              "required": true,

+              "type": "string"

+            },

+            "instance-dependencies": {

+              "required": true,

+              "description": "Instance names to inject to Jython or Kotlin Script.",

               "type": "list",

               "entry_schema": {

                 "type": "string"

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 d01660efc..7e3065ae2 100644
--- 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,31 +17,13 @@
       "operations": {
         "process": {
           "inputs": {
-            "template-name": {
-              "description": "Service Template Name.",
-              "required": true,
-              "type": "string"
-            },
-            "template-version": {
-              "description": "Service Template Version.",
-              "required": true,
-              "type": "string"
-            },
             "resource-type": {
               "description": "Request type.",
-              "required": true,
+              "required": false,
               "type": "string"
             },
-            "template-names": {
-              "description": "Name of the artifact Node Templates, to get the template Content.",
-              "required": true,
-              "type": "list",
-              "entry_schema": {
-                "type": "string"
-              }
-            },
             "artifact-prefix-names": {
-              "required": false,
+              "required": true,
               "description": "Template , Resource Assignment Artifact Prefix names",
               "type": "list",
               "entry_schema": {
@@ -50,7 +32,7 @@
             },
             "request-id": {
               "description": "Request Id, Unique Id for the request.",
-              "required": false,
+              "required": true,
               "type": "string"
             },
             "resource-id": {
diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-capability.json b/components/model-catalog/definition-type/starter-type/node_type/source-capability.json
index 2bdd7d574..4d9488cbc 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/source-capability.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-capability.json
@@ -29,22 +29,6 @@
         "type": "string"
       }
     },
-    "input-key-mapping": {
-      "description": "Context name to input parameters name mapping.",
-      "required": false,
-      "type": "map",
-      "entry_schema": {
-        "type": "string"
-      }
-    },
-    "output-key-mapping": {
-      "description": "Context name to output parameters name mapping.",
-      "required": false,
-      "type": "map",
-      "entry_schema": {
-        "type": "string"
-      }
-    },
     "key-dependencies": {
       "description": "Resource Resolution dependency dictionary names.",
       "required": true,
diff --git a/components/model-catalog/definition-type/starter-type/node_type/vnf-netconf-device.json b/components/model-catalog/definition-type/starter-type/node_type/vnf-netconf-device.json
index c6f512dfb..dcc47b362 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/vnf-netconf-device.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/vnf-netconf-device.json
@@ -16,7 +16,7 @@
 					"default": "sdnc-tacacs"

 				},

 				"source": {

-					"required": true,

+					"required": false,

 					"type": "string",

 					"default": "npm"

 				},