X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fresources%2FMETA-INF%2Fresources%2Fdesigner%2Fscripts%2FCldsModelService.js;h=972676b618ac39b1122531facf96d627583e292b;hb=7fc8fd594dddbd079fcb8419f658e08620eb38c7;hp=62ab5ab2f909138f9c0c6cf9967c0f272070cf44;hpb=ddf63ba49cddcca5e8780148bfed067b59a18c24;p=clamp.git
diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
index 62ab5ab2..972676b6 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
@@ -38,7 +38,7 @@ app
}else if (name.toLowerCase().indexOf("policy") >= 0){
PolicyWindow();
} else {
- $rootScope.selectedBoxName = name.toLowerCase();
+ $rootScope.selectedBoxName = name;
ToscaModelWindow();
}
}
@@ -102,12 +102,14 @@ app
return def.promise;
};
this.getModel = function(modelName) {
-
var def = $q.defer();
var sets = [];
- var svcUrl = "/restservices/clds/v1/clds/model/" + modelName;
+ var svcUrl = "/restservices/clds/v2/loop/" + modelName;
+ //var svcUrl = "/restservices/clds/v1/clds/model/" + modelName;
$http.get(svcUrl).success(function(data) {
-
+ //var clModel = '{"name": "ClosedLoopTest","lastComputedState":"DESIGN","svgRepresentation": "representation","globalPropertiesJson": [{"name":"service","value":["4cc5b45a-1f63-4194-8100-cd8e14248c92"]},{"name":"vf","value":["07e266fc-49ab-4cd7-8378-ca4676f1b9ec"]},{"name":"actionSet","value":["vnfRecipe"]},{"name":"location","value":["DC1"]},{"name":"deployParameters","value":{"location_id":"","service_id":"","policy_id":"AUTO_GENERATED_POLICY_ID_AT_SUBMIT"}}], "blueprint": "yaml","lastComputedState": "DESIGN","operationalPolicies": [ {"name": "OpPolicyTest", "configurationsJson": { "policy1": [{"name": "pname","value": "policy1"},{"name": "pid","value": "0"},{"name": "timeout","value": "345"},{"policyConfigurations": [[{"name": "recipe","value": ["restart"]},{"name": "maxRetries","value": ["3"]},{"name": "retryTimeLimit","value": ["180"]},{"name": "_id","value": ["6TtHGPq"]},{"name": "parentPolicy","value": [""]},{"name": "actor","value": ["APPC"]},{"name": "recipeInput","value": [""]},{"name": "recipeLevel","value": ["VM"]},{"name": "targetResourceId","value": ["07e266fc-49ab-4cd7-8378-ca4676f1b9ec"]},{"name": "targetResourceIdOther","value": [""]},{"name": "enableGuardPolicy","value": ["on"]},{"name": "guardPolicyType","value": ["GUARD_YAML"]},{"name": "guardTargets","value": [".*"]},{"name": "minGuard","value": ["1"]},{"name": "maxGuard","value": ["1"]},{"name": "limitGuard","value": ["1"]},{"name": "timeUnitsGuard","value": ["minute"]},{"name": "timeWindowGuard","value": ["10"]},{"name": "guardActiveStart","value": ["00:00:01-05:00"]},{"name": "guardActiveEnd","value": ["00:00:00-05:00"]}]]}]} }],"microServicePolicies": [{"name": "tca","properties": "", "shared": true,"policyTosca": "tosca","jsonRepresentation": {"schema":{"title":"DCAE TCA Config","type":"object","required":["name","eventName"],"properties":{"name":{"propertyOrder":101,"title":"Name","type":"string","default":"New_Set"},"eventName":{"propertyOrder":102,"title":"EventName","type":"string","enum":["event1","event2"]},"clSchemaType":{"propertyOrder":103,"title":"Control Loop Schema Type","type":"string","enum":["","type1","type2"]},"threshold":{"propertyOrder":104,"title":"Threshold","format":"tabs","type":"array","items":{"type":"object","title":"Threshold","required":["metric","operator"],"properties":{"metric":{"propertyOrder":1001,"title":"Metric","type":"string","enum":["metric1","metric2"]},"operator":{"propertyOrder":1003,"default":">","title":"Operator","type":"string","enum":[">","<","=","<=",">="]}, "clEventStatus":{"propertyOrder":1004,"title":"Closed Loop Event Status","type":"string","enum":["","ONSET","ABATED"]}}}}}}}}],"loopLogs": [{ } ] }';
+ //cl_props = JSON.parse(clModel);
+ cl_props = data;
def.resolve(data);
}).error(function(data) {
@@ -119,7 +121,8 @@ app
var def = $q.defer();
var sets = [];
- var svcUrl = "/restservices/clds/v1/clds/model-names";
+ //var svcUrl = "/restservices/clds/v1/clds/model-names";
+ var svcUrl = "/restservices/clds/v2/loop/getAllNames";
$http.get(svcUrl).success(function(data) {
def.resolve(data);
@@ -201,35 +204,13 @@ app
});
return def.promise;
};
- this.checkPermittedActionCd = function(permittedActionCd, menuText,
- actionCd) {
-
- if (permittedActionCd.indexOf(actionCd) > -1) {
- document.getElementById(menuText).classList.remove('ThisLink');
- } else {
- document.getElementById(menuText).classList.add('ThisLink');
- }
- };
- this.processActionResponse = function(modelName, pars) {
+ this.processActionResponse = function(modelName) {
// populate control name (prefix and uuid here)
- var controlNamePrefix = pars.controlNamePrefix;
- var controlNameUuid = pars.controlNameUuid;
- deploymentId = pars.deploymentId;
- var modelEventService = pars.modelEventService;
- typeID = pars.typeId;
var headerText = "Closed Loop Modeler - " + modelName;
- if (controlNameUuid != null) {
- var actionCd = pars.event.actionCd;
- var actionStateCd = pars.event.actionStateCd;
- headerText = headerText + " [" + controlNamePrefix
- + controlNameUuid + "]";
- }
- document.getElementById("modeler_name").textContent = headerText;
- document.getElementById("templa_name").textContent = ("Template Used - " + selected_template);
- setStatus(pars)
- disableBPMNAddSVG(pars);
- this.enableDisableMenuOptions(pars);
+ setStatus();
+ manageCLImage(modelName);
+ enableDisableMenuOptions();
};
this.processRefresh = function(pars) {
@@ -239,13 +220,12 @@ app
}
typeID = newPars.typeId;
deploymentId = newPars.deploymentId;
- setStatus(newPars);
- this.enableDisableMenuOptions(newPars);
- elementMap = JSON.parse(newPars.propText);
+ setStatus();
+ enableDisableMenuOptions();
}
- function setStatus(pars) {
+ function setStatus() {
- var status = pars.status;
+ var status = getStatus();
// apply color to status
var statusColor = 'white';
if (status.trim() === "DESIGN") {
@@ -277,73 +257,39 @@ app
'Status: '
+ statusMsg + '');
}
- function disableBPMNAddSVG(pars) {
-
- var svg = pars.imageText.substring(pars.imageText.indexOf(" 0)
- $("#svgContainer").remove();
- $("#js-canvas").append(
- "" + svg + "");
- /* added code for height width viewBox */
- $("#svgContainer svg").removeAttr("height");
- $("#svgContainer svg").removeAttr('viewBox');
- $("#svgContainer svg").removeAttr('width');
- $("#svgContainer svg").attr('width', '100%');
- $("#svgContainer svg").attr('height', '100%');
- $("#svgContainer").click(
- function(event) {
-
- // console.log($(event.target).parent().html())
- // console.log($($(event.target).parent()).attr("data-element-id"))
- var name = $($(event.target).parent()).attr("data-element-id")
- lastElementSelected = $($(event.target).parent()).attr(
- "data-element-id")
- checkIfElementType(name)
- });
+ function manageCLImage(modelName) {
+ getModelImage(modelName).then(function(pars) {
+ //var svg='';
+ var svg = pars;
+ if ($("#svgContainer").length > 0)
+ $("#svgContainer").remove();
+ $("#js-canvas").append(
+ "" + svg + "");
+ $("#svgContainer svg").attr('width', '100%');
+ $("#svgContainer svg").attr('height', '100%');
+ $("#svgContainer").click(
+ function(event) {
+ var name = $($($($(event.target).parent()).parent()).parent()).attr("data-element-id")
+ checkIfElementType(name)
+ });
+ }, function(data) {
+ });
}
- this.enableDisableMenuOptions = function(pars) {
-
- var permittedActionCd = pars.permittedActionCd;
- // dropdown options - always true
- document.getElementById('Open CL').classList.remove('ThisLink');
- if (readMOnly) {
- // enable model options
- document.getElementById('Properties CL').classList
- .remove('ThisLink');
- document.getElementById('Close Model').classList
- .remove('ThisLink');
- // disable models options
- document.getElementById('Save CL').classList.add('ThisLink');
- document.getElementById('Revert Model Changes').classList
- .add('ThisLink');
- } else {
- // enable menu options
- document.getElementById('Save CL').classList.remove('ThisLink');
- document.getElementById('Properties CL').classList
- .remove('ThisLink');
- document.getElementById('Revert Model Changes').classList
- .remove('ThisLink');
- document.getElementById('Close Model').classList
- .remove('ThisLink');
- document.getElementById('Validation Test').classList
- .remove('ThisLink');
- document.getElementById('Refresh Status').classList
- .remove('ThisLink');
- }
- // enable/disable menu options based on permittedActionCd
- // list
- this.checkPermittedActionCd(permittedActionCd, 'Validation Test',
- 'TEST');
- this.checkPermittedActionCd(permittedActionCd, 'Submit', 'SUBMIT');
- this.checkPermittedActionCd(permittedActionCd, 'Resubmit',
- 'RESUBMIT');
- this.checkPermittedActionCd(permittedActionCd, 'Update', 'UPDATE');
- this.checkPermittedActionCd(permittedActionCd, 'Stop', 'STOP');
- this
- .checkPermittedActionCd(permittedActionCd, 'Restart', 'RESTART');
- this.checkPermittedActionCd(permittedActionCd, 'Delete', 'DELETE');
- this.checkPermittedActionCd(permittedActionCd, 'Deploy', 'DEPLOY');
- this.checkPermittedActionCd(permittedActionCd, 'UnDeploy',
- 'UNDEPLOY');
+ enableDisableMenuOptions = function() {
+ enableDefaultMenu();
+ //var status = getStatus();
+ //enableActionMenu(status);
+ enableAllActionMenu();
}
+ getModelImage = function(modelName) {
+ var def = $q.defer();
+ var sets = [];
+ var svcUrl = "/restservices/clds/v2/loop/svgRepresentation/" + modelName;
+ $http.get(svcUrl).success(function(data) {
+ def.resolve(data);
+ }).error(function(data) {
+ def.reject("Not able to get the model image");
+ });
+ return def.promise;
+ };
} ]);