diff options
| author |   Sébastien Determe <sd378r@intl.att.com> | 2018-04-19 16:39:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-19 16:39:56 +0000 |
| commit | e803fb7f42efb66cb2fb05cc568c80ab818798f4 (patch) | |
| tree | 89fbfb2b89e26bf2c53f4ec93b9db38f40c44362 /src/test | |
| parent | 1ed00c10c10e743348fae994743821e3413c19c1 (diff) | |
| parent | ab284ec6e60c48eb9550c8fae16cc34ec9c3aeae (diff) | |
Merge "Fix CsarInstaller"
Diffstat (limited to 'src/test')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java b/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java index 9009d372f..c3ebb5b4a 100644 --- a/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java +++ b/src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java @@ -155,6 +155,6 @@ public class CsarInstallerItCase { assertNotNull(modelFromDb.getImageText()); assertNotNull(modelFromDb.getPropText()); assertEquals(CsarInstallerImpl.buildModelName(csar), modelFromDb.getName()); - assertEquals(CsarInstallerImpl.MODEL_NAME_PREFIX, modelFromDb.getControlNamePrefix()); + assertEquals(CsarInstallerImpl.CONTROL_NAME_PREFIX, modelFromDb.getControlNamePrefix()); } } diff --git a/src/test/resources/clds/templates/dcae-template.json b/src/test/resources/clds/templates/dcae-template.json index 33162971d..b76baf2d4 100644 --- a/src/test/resources/clds/templates/dcae-template.json +++ b/src/test/resources/clds/templates/dcae-template.json @@ -16,7 +16,7 @@ "closedLoopControlName": "", "closedLoopEventClient": "configuration.dcae.microservice.tca.xml", "policyName": "", - "policyScope": "CLAMP", + "policyScope": "DCAE", "policyVersion": "v0.0.1", "serviceConfigurations": { } diff --git a/src/test/resources/clds/templates/tca-template.json b/src/test/resources/clds/templates/tca-template.json index d2c04bf11..892fc0d62 100644 --- a/src/test/resources/clds/templates/tca-template.json +++ b/src/test/resources/clds/templates/tca-template.json @@ -4,7 +4,7 @@ { "eventName": "???", "controlLoopSchemaType": "VNF", - "policyScope": "CLAMP", + "policyScope": "DCAE", "policyName": "???", "policyVersion": "v0.0.1", "thresholds": [ |