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>
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 9009d37..c3ebb5b 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 @@
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 3316297..b76baf2 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 d2c04bf..892fc0d 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": [