summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-04-19 14:21:24 +0200
committerDeterme, Sebastien (sd378r) <sd378r@intl.att.com>2018-04-19 14:21:24 +0200
commitab284ec6e60c48eb9550c8fae16cc34ec9c3aeae (patch)
tree66788a41eff9226e235284907e8d128ad40a7145 /src/test
parent4ce8842b960445dfbde390b60ee78732a2c67c92 (diff)
Fix CsarInstaller
Fix the CsarInstaller for policy input when deploying to DCAE, and fix UI so that default value is well displayed Issue-ID: CLAMP-153 Change-Id: I307d24782e6482590e709affe59bff84fb8a8526 Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/org/onap/clamp/clds/it/sdc/controller/installer/CsarInstallerItCase.java2
-rw-r--r--src/test/resources/clds/templates/dcae-template.json2
-rw-r--r--src/test/resources/clds/templates/tca-template.json2
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 9009d372..c3ebb5b4 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 33162971..b76baf2d 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 d2c04bf1..892fc0d6 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": [