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/main/resources/META-INF/resources/designer/partials/portfolios/deploy_parameters.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/deploy_parameters.html
index c0cd6c9..ecb0af4 100644
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/deploy_parameters.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/deploy_parameters.html
@@ -30,7 +30,7 @@
<div style="height: 30px">
Deployment parameters as JSON.
</div>
- <textarea class="form-control" focus="true" name="deployProperties" id="deployProperties" />
+ <textarea class="form-control" focus="true" name="deployProperties" id="deployProperties" ng-init="load_deploy_parameters()"/>
</div>
<div class="modal-footer">
<button ng-click="deploy()" class="btn btn-primary">Deploy</button>
diff --git a/src/main/resources/META-INF/resources/designer/scripts/DeploymentCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/DeploymentCtrl.js
index 04ba83a..4259e66 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/DeploymentCtrl.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/DeploymentCtrl.js
@@ -25,6 +25,16 @@
['$scope','$rootScope','$modalInstance','data','dialogs', 'cldsModelService',
function( $scope, $rootScope, $modalInstance, data, dialogs, cldsModelService) {
+ function validate_and_set_deploy_parameters () {
+ var parameters = $("#deployProperties").val();
+ try {
+ parameters = JSON.parse(parameters);
+ set_deploy_parameters(parameters);
+ } catch (e) {
+ console.error("Couldn't parse deploy parameters json");
+ }
+ }
+
function set_deploy_parameters(parameters) {
if (!'global' in elementMap) {
elementMap["global"] = [];
@@ -38,15 +48,16 @@
}
}
- $scope.deploy = function() {
- var parameters = $("#deployProperties").val();
- try {
- parameters = JSON.parse(parameters);
- set_deploy_parameters(parameters);
- $modalInstance.close();
- } catch (e) {
- console.error("Couldn't parse deploy parameters json");
+ $scope.load_deploy_parameters = function () {
+ var index = elementMap["global"].findIndex(function (e) { return (typeof e == "object" && !(e instanceof Array)) && "deployParameters" == e["name"]; });
+ if (index != -1) {
+ $('#deployProperties').val(JSON.stringify(elementMap["global"][index]["value"]))
}
+ }
+
+ $scope.deploy = function() {
+ validate_and_set_deploy_parameters ();
+ $modalInstance.close();
};
$scope.close = function() {
diff --git a/src/main/resources/clds/templates/dcae-template.json b/src/main/resources/clds/templates/dcae-template.json
index 3316297..b76baf2 100644
--- a/src/main/resources/clds/templates/dcae-template.json
+++ b/src/main/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": {
}