Implementing the requested improvements

Addressing comments done in https://gerrit.onap.org/r/#/c/82315/ and in the subsequent CDS weekly call.

(Resubmitting patch done on previous repo, https://gerrit.onap.org/r/#/c/83063/)

Change-Id: I6f948dedf972c33ea6fe0f65884f23cd48adcfba
Issue-ID: CCSDK-926
Signed-off-by: ottero <rodrigo.ottero@est.tech>

5 files changed, 41 insertions, 41 deletions

diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json
index 628a7d04d..b3f5272b8 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/activation-blueprint.json
@@ -20,17 +20,11 @@
     "file" : "Definitions/policy_types.json"
   } ],
   "dsl_definitions" : {
-    "config-assign-properties" : {
-      "resolution-key" : {
-        "get_input" : "resolution-key"
-      }
-    },
     "config-deploy-properties" : {
       "resolution-key" : {
         "get_input" : "resolution-key"
       }
     }
-
   },
   "topology_template" : {
     "workflows" : {
@@ -49,13 +43,6 @@
             "required" : true,
             "type" : "string"
           },
-          "artifact-name" : {
-            "required" : true,
-            "type" : "list",
-            "entry_schema" : {
-              "type" : "string"
-            }
-          },
           "store-result" : {
             "required" : true,
             "type" : "boolean"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json
index fc8e1bf64..fe51488c7 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json
@@ -1,13 +1 @@
-[
-  {
-    "name": "entity",
-    "input-param": true,
-    "property": {
-      "type": "json"
-    },
-    "dictionary-name": "entity",
-    "dictionary-source": "input",
-    "dependencies": [
-    ]
-  }
-]
+[]
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 fc8e1bf64..2a866c9b5 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,22 @@
 [
   {
-    "name": "entity",
+    "name": "pnf-id",
     "input-param": true,
     "property": {
-      "type": "json"
+      "type": "string"
     },
-    "dictionary-name": "entity",
+    "dictionary-name": "pnf-id",
+    "dictionary-source": "input",
+    "dependencies": [
+    ]
+  },
+  {
+    "name": "pnf-name",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "pnf-name",
     "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 e5aa763ba..9e9350c81 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
@@ -3,19 +3,18 @@
     "dt-config-assign-properties" : {
       "description" : "Dynamic DataType definition for workflow(config-assign).",
       "version" : "1.0.0",
-      "properties" : {
-        "entity" : {
-          "type" : "json"
-        }
-      },
+      "properties" : { },
       "derived_from" : "tosca.datatypes.Dynamic"
     },
     "dt-config-deploy-properties" : {
       "description" : "Dynamic DataType definition for workflow(config-deploy).",
       "version" : "1.0.0",
       "properties" : {
-        "entity" : {
-          "type" : "json"
+        "pnf-id" : {
+          "type" : "string"
+        },
+        "pnf-name" : {
+          "type" : "string"
         }
       },
       "derived_from" : "tosca.datatypes.Dynamic"
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 98a73b101..189cbf86f 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,10 +1,25 @@
 {
-  "entity" : {
-    "tags" : "entity",
-    "name" : "entity",
+  "pnf-id" : {
+    "tags" : "pnf-id",
+    "name" : "pnf-id",
     "property" : {
-      "description" : "entity",
-      "type" : "json"
+      "description" : "pnf-id",
+      "type" : "string"
+    },
+    "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  },
+  "pnf-name" : {
+    "tags" : "pnf-name",
+    "name" : "pnf-name",
+    "property" : {
+      "description" : "pnf-name",
+      "type" : "string"
     },
     "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
     "sources" : {