From fa94a96fed5fd7af230a90373a04da47370e2eea Mon Sep 17 00:00:00 2001 From: liamfallon Date: Thu, 20 May 2021 15:43:35 +0100 Subject: 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 --- .../resources/clds/templates/tca-policy-template.json | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 src/test/resources/clds/templates/tca-policy-template.json (limited to 'src/test/resources/clds/templates/tca-policy-template.json') diff --git a/src/test/resources/clds/templates/tca-policy-template.json b/src/test/resources/clds/templates/tca-policy-template.json deleted file mode 100644 index 559aacb29..000000000 --- a/src/test/resources/clds/templates/tca-policy-template.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "service": "tca_policy", - "version": "1.1.0", - "location": "SampleServiceLocation", - "configName": "SampleConfigName", - "uuid": "test", - "policyScope": "CLAMP", - "templateVersion": "OpenSource.version.1", - "policyName": "MicroService", - "description": "MicroService Policy", - "priority": "1", - "riskType": "SampleRiskType", - "riskLevel": "1", - "guard": "False", - "content": { - "tca_policy": { - } - } -} -- cgit