Adding custom headers capability to REST client

For YANG PATCH requests to ODL to work, they need to have a Content-
type header of application/yang.patch+json and should not have Accept
as application/json

Current REST client inserts a default header to the requests with this
content:

  Content-Type: application/json
  Accept: application/json

The solution was to add the possibility of sending custom headers alon-
gside the other parameters.

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

6 files changed, 225 insertions, 57 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 90b2e3ab0..628a7d04d 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
@@ -19,17 +19,20 @@
   }, {
     "file" : "Definitions/policy_types.json"
   } ],
-  "topology_template" : {
-    "inputs" : {
-      "serviceInstanceId" : {
-        "required" : true,
-        "type" : "string"
-      },
-      "identifier" : {
-        "required" : true,
-        "type" : "string"
+  "dsl_definitions" : {
+    "config-assign-properties" : {
+      "resolution-key" : {
+        "get_input" : "resolution-key"
       }
     },
+    "config-deploy-properties" : {
+      "resolution-key" : {
+        "get_input" : "resolution-key"
+      }
+    }
+
+  },
+  "topology_template" : {
     "workflows" : {
       "config-assign" : {
         "steps" : {
@@ -42,6 +45,21 @@
           }
         },
         "inputs" : {
+          "resolution-key" : {
+            "required" : true,
+            "type" : "string"
+          },
+          "artifact-name" : {
+            "required" : true,
+            "type" : "list",
+            "entry_schema" : {
+              "type" : "string"
+            }
+          },
+          "store-result" : {
+            "required" : true,
+            "type" : "boolean"
+          },
           "config-assign-properties" : {
             "description" : "Dynamic PropertyDefinition for workflow(config-assign).",
             "required" : true,
@@ -49,21 +67,25 @@
           }
         }
       },
-      "configure" : {
+      "config-deploy" : {
         "steps" : {
           "activate-process" : {
             "description" : "Send a configlet to the pnf",
-            "target" : "configure-process",
+            "target" : "config-deploy-process",
             "activities" : [ {
               "call_operation" : ""
             } ]
           }
         },
         "inputs" : {
-          "configure-properties" : {
-            "description" : "Dynamic PropertyDefinition for workflow(configure).",
+          "resolution-key" : {
+            "required" : true,
+            "type" : "string"
+          },
+          "config-deploy-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(config-deploy).",
             "required" : true,
-            "type" : "dt-configure-properties"
+            "type" : "dt-config-deploy-properties"
           }
         }
       }
@@ -84,25 +106,24 @@
           }
         }
       },
-
-
       "config-assign" : {
-        "type" : "component-restconf-executor",
+        "type" : "component-resource-resolution",
         "interfaces" : {
-          "ComponentRestconfExecutor" : {
+          "ResourceResolutionComponent" : {
             "operations" : {
               "process" : {
-                "implementation" : {
-                  "primary" : "component-script"
-                },
                 "inputs" : {
-                  "script-type" : "jython",
-                  "script-class-reference" : "Scripts/python/RestconfAssignConfig.py",
-                  "instance-dependencies" : [ ]
+                  "resolution-key" : {
+                    "get_input" : "resolution-key"
+                  },
+                  "store-result" : true,
+                  "artifact-prefix-names" : ["config-assign"]
                 },
                 "outputs" : {
-                  "response-data" : "",
-                  "status" : ""
+                  "resource-assignment-params" : {
+                    "get_attribute" : [ "SELF", "assignment-params" ]
+                  },
+                  "status" : "success"
                 }
               }
             }
@@ -115,33 +136,26 @@
           },
           "config-assign-mapping" : {
             "type" : "artifact-mapping-resource",
-            "file" : "Templates/config-assign-pnf-mapping.json"
-          },
-          "component-script" : {
-            "type" : "artifact-script-jython",
-            "file" : "Scripts/python/RestconfAssignConfig.py"
+            "file" : "Definitions/config-assign-pnf-mapping.json"
           }
         }
       },
-
-
-
-      "configure-process" : {
+      "config-deploy-process" : {
         "type" : "dg-generic",
         "properties" : {
           "content" : {
-            "get_artifact" : [ "SELF", "dg-configure-process" ]
+            "get_artifact" : [ "SELF", "dg-config-deploy-process" ]
           },
-          "dependency-node-templates" : [ "configure" ]
+          "dependency-node-templates" : [ "config-deploy" ]
         },
         "artifacts" : {
           "dg-config-assign-process" : {
             "type" : "artifact-directed-graph",
-            "file" : "Plans/CONFIG_configure.xml"
+            "file" : "Plans/CONFIG_configDeploy.xml"
           }
         }
       },
-      "configure" : {
+      "config-deploy" : {
         "type" : "component-restconf-executor",
         "interfaces" : {
           "ComponentRestconfExecutor" : {
@@ -152,36 +166,33 @@
                 },
                 "inputs" : {
                   "script-type" : "jython",
-                  "script-class-reference" : "Scripts/python/RestconfConfigure.py",
-                  "instance-dependencies" : [ ]
+                  "script-class-reference" : "Scripts/python/RestconfConfigDeploy.py",
+                  "instance-dependencies" : [ ],
+                  "dynamic-properties" : "*config-deploy-properties"
                 },
                 "outputs" : {
                   "response-data" : "",
-                  "status" : ""
+                  "status" : "success"
                 }
               }
             }
           }
         },
         "artifacts" : {
-          "configure-mount-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/configure-restconf-mount-template.vtl"
-          },
-          "configure-unmount-template" : {
+          "config-deploy-template" : {
             "type" : "artifact-template-velocity",
-            "file" : "Templates/configure-restconf-unmount-template.vtl"
+            "file" : "Templates/config-deploy-restconf-mount-template.vtl"
           },
-          "configure-mapping" : {
+          "config-deploy-mapping" : {
             "type" : "artifact-mapping-resource",
-            "file" : "Templates/configure-pnf-mapping.json"
+            "file" : "Definitions/config-deploy-pnf-mapping.json"
           },
           "component-script" : {
             "type" : "artifact-script-jython",
-            "file" : "Scripts/python/RestconfConfigure.py"
+            "file" : "Scripts/python/RestconfConfigDeploy.py"
           }
         }
       }
     }
   }
-}
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..fc8e1bf64
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-assign-pnf-mapping.json
@@ -0,0 +1,13 @@
+[
+  {
+    "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
new file mode 100644
index 000000000..fc8e1bf64
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/config-deploy-pnf-mapping.json
@@ -0,0 +1,13 @@
+[
+  {
+    "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/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/data_types.json
index 9f35eef88..e5aa763ba 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,13 +3,21 @@
     "dt-config-assign-properties" : {
       "description" : "Dynamic DataType definition for workflow(config-assign).",
       "version" : "1.0.0",
-      "properties" : { },
+      "properties" : {
+        "entity" : {
+          "type" : "json"
+        }
+      },
       "derived_from" : "tosca.datatypes.Dynamic"
     },
-    "dt-configure-properties" : {
-      "description" : "Dynamic DataType definition for workflow(configure).",
+    "dt-config-deploy-properties" : {
+      "description" : "Dynamic DataType definition for workflow(config-deploy).",
       "version" : "1.0.0",
-      "properties" : { },
+      "properties" : {
+        "entity" : {
+          "type" : "json"
+        }
+      },
       "derived_from" : "tosca.datatypes.Dynamic"
     }
   }
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 be3bd319a..ed7c580bc 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
@@ -1,5 +1,84 @@
 {
   "node_types" : {
+    "component-resource-resolution" : {
+      "description" : "This is Resource Assignment Component API",
+      "version" : "1.0.0",
+      "attributes" : {
+        "assignment-params" : {
+          "required" : true,
+          "type" : "string"
+        }
+      },
+      "capabilities" : {
+        "component-node" : {
+          "type" : "tosca.capabilities.Node"
+        }
+      },
+      "interfaces" : {
+        "ResourceResolutionComponent" : {
+          "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,
+                  "type" : "string"
+                },
+                "artifact-prefix-names" : {
+                  "description" : "Template , Resource Assignment Artifact Prefix names",
+                  "required" : true,
+                  "type" : "list",
+                  "entry_schema" : {
+                    "type" : "string"
+                  }
+                },
+                "request-id" : {
+                  "description" : "Request Id, Unique Id for the request.",
+                  "required" : true,
+                  "type" : "string"
+                },
+                "resource-id" : {
+                  "description" : "Resource Id.",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "action-name" : {
+                  "description" : "Action Name of the process",
+                  "required" : false,
+                  "type" : "string"
+                },
+                "dynamic-properties" : {
+                  "description" : "Dynamic Json Content or DSL Json reference.",
+                  "required" : false,
+                  "type" : "json"
+                }
+              },
+              "outputs" : {
+                "resource-assignment-params" : {
+                  "required" : true,
+                  "type" : "string"
+                },
+                "status" : {
+                  "required" : true,
+                  "type" : "string"
+                }
+              }
+            }
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.Component"
+    },
     "component-restconf-executor" : {
       "description" : "This is Restconf Transaction Configuration Component API",
       "version" : "1.0.0",
@@ -34,6 +113,11 @@
                   "entry_schema" : {
                     "type" : "string"
                   }
+                },
+                "dynamic-properties" : {
+                  "description" : "Dynamic Json Content or DSL Json reference.",
+                  "required" : false,
+                  "type" : "json"
                 }
               },
               "outputs" : {
@@ -73,6 +157,24 @@
       },
       "derived_from" : "tosca.nodes.DG"
     },
+    "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"
+          }
+        }
+      },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
     "tosca.nodes.Component" : {
       "description" : "This is default Component Node",
       "version" : "1.0.0",
@@ -82,6 +184,11 @@
       "description" : "This is Directed Graph Node Type",
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
+    },
+    "tosca.nodes.ResourceSource" : {
+      "description" : "TOSCA base type for Resource Sources",
+      "version" : "1.0.0",
+      "derived_from" : "tosca.nodes.Root"
     }
   }
 }
\ No newline at end of file
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 6f31cf5a2..98a73b101 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 +1,17 @@
-{ }
\ No newline at end of file
+{
+  "entity" : {
+    "tags" : "entity",
+    "name" : "entity",
+    "property" : {
+      "description" : "entity",
+      "type" : "json"
+    },
+    "updated-by" : "Rodrigo Ottero <rodrigo.ottero@est.tech>",
+    "sources" : {
+      "input" : {
+        "type" : "source-input",
+        "properties" : { }
+      }
+    }
+  }
+}
\ No newline at end of file