Merge master into tosca-poc branch

This review was created with the commands:
git co master
git pull
git co tosca-poc
git pull
git merge -X theirs master

With this merge, the CLAMP master branch is merged into tosca-poc, and,
apart from the tosca-controlloop directory, they are identical

Issue-ID: POLICY-3215
Change-Id: Iaa1c4894b33508f8bb75b7d1c0dd414964497625
Signed-off-by: liamfallon <liam.fallon@est.tech>

1 files changed, 0 insertions, 96 deletions

diff --git a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file b/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file
deleted file mode 100644
index 9e616dfea..000000000
--- a/src/test/resources/http-cache/example/api/v1/blueprint-model/workflow-spec/.file
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "blueprintName": "baseconfiguration",
-    "version": "1.0.0",
-    "workFlowData": {
-        "workFlowName": "resource-assignment",
-        "inputs": {
-            "resource-assignment-properties": {
-                "required": true,
-                "type": "dt-resource-assignment-properties"
-            }
-        },
-        "outputs": {
-            "response-property": {
-                "type": "string",
-                "value": "executed"
-            },
-            "template-properties": {
-                "type": "json",
-                "value": {
-                    "get_attribute": [
-                        "resource-assignment",
-                        "assignment-params"
-                    ]
-                }
-            }
-        }
-    },
-    "dataTypes": {
-        "dt-resource-assignment-properties": {
-            "description": "This is Dynamically generated data type for workflow activate",
-            "version": "1.0.0",
-            "metadata": null,
-            "attributes": null,
-            "properties": {
-                "request-id": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                },
-                "service-instance-id": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                },
-                "vnf-id": {
-                    "required": true,
-                    "type": "string"
-                },
-                "action-name": {
-                    "required": true,
-                    "type": "string"
-                },
-                "scope-type": {
-                    "required": true,
-                    "type": "string"
-                },
-                "hostname": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                },
-                "request-info": {
-                    "required": true,
-                    "type": "dt-request-info-properties",
-                    "input-param": true
-                },
-                "vnf_name": {
-                    "required": true,
-                    "type": "string"
-                }
-            },
-            "constraints": null,
-            "derived_from": "tosca.datatypes.Dynamic"
-        },
-        "dt-request-info-properties": {
-            "description": "This is Dynamically generated data type for workflow activate",
-            "version": "1.0.0",
-            "metadata": null,
-            "attributes": null,
-            "properties": {
-                "prop1": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                },
-                "prop2": {
-                    "required": true,
-                    "type": "string",
-                    "input-param": true
-                }
-            },
-            "constraints": null,
-            "derived_from": "tosca.datatypes.Dynamic"
-        }
-    }
-}
\ No newline at end of file