aboutsummaryrefslogtreecommitdiffstats
path: root/POLICY-SDK-APP/src/main
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-07-25 14:12:20 +0000
committerGerrit Code Review <gerrit@onap.org>2018-07-25 14:12:20 +0000
commit7957dd169d09ff5fcfdfc0384e8ed7d3534d3dc0 (patch)
treea4fe47a1cbb37860bcef5d90d6bfc3cada04287b /POLICY-SDK-APP/src/main
parenta5ccc101707216e8ffc07773c17799c60360863f (diff)
parent95524c8ef8be0d41de8bb2b918f320e464ebb897 (diff)
Merge "Decision BlackList Guard Enhancements"
Diffstat (limited to 'POLICY-SDK-APP/src/main')
-rw-r--r--POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntries.java380
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DecisionPolicyController.js121
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DecisionPolicyTemplate.html516
3 files changed, 792 insertions, 225 deletions
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntries.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntries.java
new file mode 100644
index 000000000..8a37e9ddc
--- /dev/null
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntries.java
@@ -0,0 +1,380 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.controller;
+
+import com.google.gson.Gson;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.json.JSONObject;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
+import org.onap.policy.rest.adapter.PolicyRestAdapter;
+import org.onap.policy.rest.adapter.ReturnBlackList;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.onap.portalsdk.core.web.support.JsonMessage;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+
+
+/**
+ * This class is used to import and export the black list entries which were used in the Decision Blacklist Guard YAML
+ * Policy.
+ *
+ */
+@Controller
+@RequestMapping("/")
+public class ExportAndImportDecisionBlackListEntries extends RestrictedBaseController {
+
+ private static final Logger policyLogger = FlexLogger.getLogger(ExportAndImportDecisionBlackListEntries.class);
+ private static final String BLACKLISTENTRIESDATA = "blackListEntries";
+ private static final String ACTION = "Action";
+ private static final String BLACKLISTENTRY = "BlackListEntry";
+
+ /**
+ * This method is used to Export the Black List entries data from Decision BlackList Guard YAML Policy. So, user can
+ * update the file on adding or removing the entries, for updating the policies or using in other Environments.
+ *
+ * @param request the request contains the policy data. So, based on that we can populate and read and write the
+ * entries.
+ * @param response after reading and writing the blacklist list entries to file, the file is copied to tmp directory
+ * and making available to user to download from GUI.
+ * @throws IOException exception throws if anything goes wrong in the process.
+ */
+ @RequestMapping(value = {"/policycreation/exportDecisionBlackListEntries"}, method = {RequestMethod.POST})
+ public void exportBlackList(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ try (HSSFWorkbook workBook = new HSSFWorkbook()) {
+ String requestData = request.getReader().lines().collect(Collectors.joining());
+ JSONObject root = new JSONObject(requestData);
+ PolicyRestAdapter adapter = new Gson().fromJson(root.get("policyData").toString(), PolicyRestAdapter.class);
+ DecisionPolicyController controller = new DecisionPolicyController();
+ controller.prePopulateDecisionPolicyData(adapter, null);
+ List<String> blackLists = adapter.getYamlparams().getBlackList();
+ HSSFSheet sheet = workBook.createSheet("BlackList");
+ HSSFRow headingRow = sheet.createRow(0);
+ headingRow.createCell(0).setCellValue("Action");
+ headingRow.createCell(1).setCellValue("BlackListEntry");
+
+ short rowNo = 1;
+ for (Object object : blackLists) {
+ HSSFRow row = sheet.createRow(rowNo);
+ row.createCell(0).setCellValue(1);
+ row.createCell(1).setCellValue(object.toString());
+ rowNo++;
+ }
+
+ String tmpFile = System.getProperty("catalina.base") + File.separator + "webapps" + File.separator + "temp";
+
+ /*
+ * Export FileName is the combination of BlacList+Scope+PolicyName+Version+PolicyCreatedDate.
+ *
+ */
+
+ SimpleDateFormat parseFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = parseFormat.parse(root.get("date").toString().replaceAll("\"", ""));
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd_HHmmss");
+ String formatedDate = dateFormat.format(date);
+
+ String fileName = "BlackList_Scope_" + adapter.getDomainDir() + "_Name_" + adapter.getPolicyName()
+ + "_Version_" + root.get("version").toString() + "_Date_" + formatedDate + ".xls";
+
+ String deleteCheckPath = tmpFile + File.separator + fileName;
+ File deleteCheck = new File(deleteCheckPath);
+ if (deleteCheck.exists() && deleteCheck.delete()) {
+ policyLogger.info("Deleted the file from system before exporting a new file.");
+ }
+
+ File temPath = new File(tmpFile);
+ if (!temPath.exists()) {
+ temPath.mkdir();
+ }
+
+ String file = temPath + File.separator + fileName;
+ File filepath = new File(file);
+ FileOutputStream fos = new FileOutputStream(filepath);
+ workBook.write(fos);
+ fos.flush();
+
+ response.setCharacterEncoding("UTF-8");
+ response.setContentType("application / json");
+ request.setCharacterEncoding("UTF-8");
+
+ PrintWriter out = response.getWriter();
+ String successMap = file.substring(file.lastIndexOf("webapps") + 8);
+ String responseString = new Gson().toJson(successMap);
+ JSONObject jsonResposne = new JSONObject("{data: " + responseString + "}");
+ out.write(jsonResposne.toString());
+ } catch (Exception e) {
+ policyLogger.error(
+ XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Exception Occured while Exporting BlackList Entries" , e);
+ }
+ }
+
+ /**
+ * This method is used to import the BlackList excel file into the system. Which is used to create Decision
+ * Blacklist Guard YAML Policy.
+ *
+ * @param request the HTTP request contains file upload stream form GUI.
+ * @param response the response is send to the GUI after reading the file input stream.
+ * @throws FileUploadException throws fileUpload Exception.
+ * @throws IOException throws IO Exceptions.
+ */
+ @RequestMapping(value = {"/policycreation/importBlackListForDecisionPolicy"}, method = {RequestMethod.POST})
+ public void importBlackListFile(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ List<FileItem> items = new ServletFileUpload(new DiskFileItemFactory()).parseRequest(request);
+ List<String> errorLogs = new ArrayList<>();
+ Gson mapper = new Gson();
+ errorLogs.add("error");
+ Map<String, Object> model = new HashMap<>();
+ if (items.isEmpty()) {
+ errorLogs.add("The File doesn't have any content and it is invalid.");
+ model.put(BLACKLISTENTRIESDATA, errorLogs);
+ } else {
+ readItems(items, errorLogs, model);
+ }
+ JsonMessage msg = new JsonMessage(mapper.toJson(model));
+ JSONObject jsonResposne = new JSONObject(msg);
+ response.getWriter().write(jsonResposne.toString());
+ }
+
+ /**
+ * This method is used to read the first item, as we expect only one entry in the file upload.
+ *
+ * @param items The file entries which were uploaded from GUI.
+ * @param errorLogs on adding all incorrect entries, we can let user know what need to fixed.
+ * @param model Map which stores key value (blacklist and append list data)
+ * @throws Exception throws exception if it is not .xls format
+ */
+ private void readItems(List<FileItem> items, List<String> errorLogs, Map<String, Object> model) throws Exception {
+ Map<String, InputStream> files = new HashMap<>();
+
+ FileItem item = items.get(0);
+ files.put(item.getName(), item.getInputStream());
+ File file = new File(item.getName());
+ String fileName = file.getName();
+ try (OutputStream outputStream = new FileOutputStream(file);) {
+ IOUtils.copy(item.getInputStream(), outputStream);
+ if (fileName.startsWith("BlackList") && fileName.endsWith(".xls")) {
+ readWorkBook(fileName, errorLogs, model);
+ } else {
+ errorLogs.add("The File Name should start with BlackList and must be .xls format.");
+ model.put(BLACKLISTENTRIESDATA, errorLogs);
+ }
+ }
+ Files.delete(file.toPath());
+ }
+
+ /**
+ * This method is used to read the workbook in xls file item.
+ *
+ * @param fileName fileName as input parameter
+ * @param errorLogs on adding all incorrect entries, we can let user know what need to fixed.
+ * @param model Map which stores key value (blacklist and append list data)
+ */
+ private void readWorkBook(String fileName, List<String> errorLogs, Map<String, Object> model) {
+ Set<String> blackListEntries = new HashSet<>();
+ Set<String> appendBlackListEntries = new HashSet<>();
+ try (Workbook workbook = WorkbookFactory.create(new File(fileName))) {
+ Sheet datatypeSheet = workbook.getSheetAt(0);
+ Iterator<Row> rowIterator = datatypeSheet.iterator();
+ readExcelRows(rowIterator, blackListEntries, appendBlackListEntries, errorLogs);
+ if (errorLogs.size() == 1) {
+ model.put(BLACKLISTENTRIESDATA, blackListEntries);
+ model.put("appendBlackListEntries", appendBlackListEntries);
+ } else {
+ model.put(BLACKLISTENTRIESDATA, errorLogs);
+ }
+ } catch (Exception e) {
+ String error = "Error Occured While Reading File. Please check the format of the file.";
+ errorLogs.add(error);
+ model.put(BLACKLISTENTRIESDATA, errorLogs);
+ policyLogger.error(error , e);
+ }
+ }
+
+ /**
+ * This method is used to read all the rows from imported Excel sheet and set to respective objects.
+ *
+ * @param rowIterator Excel Sheet rows are passed as input parameters.
+ * @param blackListEntries the data is set to this object, which is going to be added.
+ * @param appendBlackListEntries the data is set to this object which is going to be removed.
+ * @param errorLogs on adding all incorrect entries, we can let user know what need to fixed.
+ */
+ private void readExcelRows(Iterator<Row> rowIterator, Set<String> blackListEntries,
+ Set<String> appendBlackListEntries, List<String> errorLogs) {
+ while (rowIterator.hasNext()) {
+ Row currentRow = rowIterator.next();
+ if (currentRow.getRowNum() == 0) {
+ continue;
+ }
+ Iterator<Cell> cellIterator = currentRow.cellIterator();
+ readExcelCells(cellIterator, blackListEntries, appendBlackListEntries, errorLogs);
+ }
+ }
+
+ /**
+ * This method is used to read all the cells in the row.
+ *
+ * @param cellIterator iterating the cells and will parse based on the cell type.
+ * @param blackListEntries the data is set to this object, which is going to be added.
+ * @param appendBlackListEntries the data is set to this object which is going to be removed.
+ * @param errorLogs on adding all incorrect entries, we can let user know what need to fixed.
+ */
+ private void readExcelCells(Iterator<Cell> cellIterator, Set<String> blackListEntries,
+ Set<String> appendBlackListEntries, List<String> errorLogs) {
+ boolean actionCheck = false;
+ boolean blackListCheck = false;
+ String blEntry = "";
+ int actionEntry = 0;
+ int lineNo = 1;
+ while (cellIterator.hasNext()) {
+ Cell cell = cellIterator.next();
+ if (ACTION.equalsIgnoreCase(getCellHeaderName(cell))) {
+ ReturnBlackList returnList = readActionCell(cell, lineNo, errorLogs);
+ actionEntry = returnList.getActionValue();
+ actionCheck = returnList.isEntryCheck();
+ }
+ if (BLACKLISTENTRY.equalsIgnoreCase(getCellHeaderName(cell))) {
+ ReturnBlackList returnList = readBlackListCell(cell, lineNo, errorLogs);
+ blEntry = returnList.getEntryValue();
+ blackListCheck = returnList.isEntryCheck();
+ actionEntry = returnList.getActionValue();
+ }
+ lineNo++;
+ }
+ if (actionCheck && blackListCheck) {
+ addBlackListEntries(actionEntry, blackListEntries, appendBlackListEntries, blEntry);
+ }
+ }
+
+ /**
+ * This method is used to read the Action cell entry.
+ *
+ * @param cell reading the action entry cell.
+ * @param lineNo counts the number of the cell.
+ * @param errorLogs on adding all incorrect entries, we can let user know what need to fixed.
+ * @return returns the response on setting to ReturnBlackList class.
+ */
+ private ReturnBlackList readActionCell(Cell cell, int lineNo, List<String> errorLogs) {
+ ReturnBlackList returnValues = new ReturnBlackList();
+ String error = "Entry at row " + lineNo + " not added, the value in the " + ACTION
+ + "column is neither \"0\" nor \"1\"";
+ int actionEntry = 0;
+ try {
+ actionEntry = (int) cell.getNumericCellValue();
+ returnValues.setEntryCheck(true);
+ if (actionEntry != 1 && actionEntry != 0) {
+ errorLogs.add(error);
+ }
+ } catch (Exception e) {
+ errorLogs.add(error);
+ policyLogger.error(error, e);
+ actionEntry = 0;
+ }
+ returnValues.setActionValue(actionEntry);
+ return returnValues;
+ }
+
+ /**
+ *
+ * This method is used to read the BlackList cell entry.
+ *
+ * @param cell reading the blacklist entry cell.
+ * @param lineNo counts the number of the cell.
+ * @param errorLogs on adding all incorrect entries, we can let user know what need to fixed.
+ * @return returns the response on setting to ReturnBlackList class.
+ */
+ private ReturnBlackList readBlackListCell(Cell cell, int lineNo, List<String> errorLogs) {
+ ReturnBlackList returnValues = new ReturnBlackList();
+ String blEntry = "";
+ try {
+ blEntry = cell.getStringCellValue();
+ returnValues.setEntryCheck(true);
+ } catch (Exception e) {
+ String error = "Entry at row " + lineNo + " not added, the value in the " + BLACKLISTENTRY
+ + " column is not a valid string";
+ errorLogs.add(error);
+ policyLogger.error(error, e);
+ returnValues.setActionValue(0);
+ }
+ returnValues.setEntryValue(blEntry);
+ return returnValues;
+ }
+
+ /**
+ * This method is used to add the data to blacklist and append list after parsing each and every row.
+ *
+ * @param actionEntry it has the input to add or not and holds either 0 or 1.
+ * @param blackListEntries list to add blacklist entries based on action entry = 1.
+ * @param appendBlackListEntries list to add append list entries based on action entry = 0.
+ * @param blEntry the value added to both entries based on action entry.
+ */
+ private void addBlackListEntries(int actionEntry, Set<String> blackListEntries, Set<String> appendBlackListEntries,
+ String blEntry) {
+ if (actionEntry == 1) {
+ blackListEntries.add(blEntry);
+ } else {
+ appendBlackListEntries.add(blEntry);
+ }
+ }
+
+ /**
+ * This method is used to identify the header of the cell.
+ *
+ * @param cell Excel sheet cell is passed as input parameter.
+ * @return the column header name value
+ */
+ private String getCellHeaderName(Cell cell) {
+ return cell.getSheet().getRow(0).getCell(cell.getColumnIndex()).getRichStringCellValue().toString();
+ }
+}
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DecisionPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DecisionPolicyController.js
index 5b2bdb2b2..f560f4d58 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DecisionPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DecisionPolicyController.js
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP Policy Engine
* ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,14 +17,16 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
-angular.module('abs').controller('decisionPolicyController', ['$scope', 'PolicyAppService', 'policyNavigator', 'modalService', '$modal', 'Notification', function ($scope, PolicyAppService, PolicyNavigator, modalService, $modal, Notification) {
+angular.module('abs').controller('decisionPolicyController', ['$scope', 'PolicyAppService', 'policyNavigator', 'modalService', '$modal', 'Notification', '$http', function ($scope, PolicyAppService, PolicyNavigator, modalService, $modal, Notification, $http) {
$("#dialog").hide();
$scope.policyNavigator;
$scope.savebutton = true;
$scope.refreshCheck = false;
+ $scope.disableOnCreate = false;
if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
+ $scope.disableOnCreate = true;
$scope.temp.policy = {
policyType : "Decision"
}
@@ -45,7 +47,11 @@ angular.module('abs').controller('decisionPolicyController', ['$scope', 'PolicyA
if($scope.temp.policy.ruleProvider==undefined){
$scope.temp.policy.ruleProvider="Custom";
}
-
+
+ if($scope.temp.policy.blackListEntryType==undefined){
+ $scope.temp.policy.blackListEntryType="Use Manual Entry";
+ }
+
PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
var j = data;
$scope.data = JSON.parse(j.data);
@@ -216,9 +222,15 @@ angular.module('abs').controller('decisionPolicyController', ['$scope', 'PolicyA
$scope.temp.policy.ruleAlgorithmschoices = [];
}
}else if($scope.temp.policy.ruleProvider=="GUARD_BL_YAML"){
- if($scope.temp.policy.yamlparams.blackList.length==0){
- $scope.temp.policy.yamlparams.blackList = [];
- }
+ if($scope.temp.policy.yamlparams.blackList == null || $scope.temp.policy.yamlparams.blackList.length==0){
+ $scope.temp.policy.yamlparams.blackList = [];
+ }
+ if($scope.temp.policy.blackListEntries == null || $scope.temp.policy.blackListEntries.length==0){
+ $scope.temp.policy.blackListEntries = [];
+ }
+ $scope.blackListEntries = [];
+ $scope.temp.policy.appendBlackListEntries = [];
+ $scope.blackListEntries = arrayUnique($scope.temp.policy.blackListEntries.concat($scope.temp.policy.yamlparams.blackList));
}else if($scope.temp.policy.ruleProvider=="GUARD_YAML"){
if($scope.temp.policy.yamlparams.targets.length==0){
$scope.temp.policy.yamlparams.targets = [];
@@ -259,9 +271,11 @@ angular.module('abs').controller('decisionPolicyController', ['$scope', 'PolicyA
$scope.addNewBL = function() {
$scope.temp.policy.yamlparams.blackList.push('');
};
- $scope.removeBL = function() {
- var lastItem = $scope.temp.policy.yamlparams.blackList.length-1;
- $scope.temp.policy.yamlparams.blackList.splice(lastItem);
+
+ $scope.removeBL = function(id) {
+ $scope.temp.policy.yamlparams.blackList = $scope.temp.policy.yamlparams.blackList.filter(function (obj){
+ return obj !== id;
+ });
};
$scope.treatmentDatas = [{"treatmentValues" : $scope.temp.policy.rainyday.treatmentTableChoices}];
@@ -324,4 +338,93 @@ angular.module('abs').controller('decisionPolicyController', ['$scope', 'PolicyA
$scope.temp.policy.attributes = [];
}
};
+
+ $scope.importButton = true;
+ var fd;
+ $scope.uploadBLFile = function(files) {
+ fd = new FormData();
+ fd.append("file", files[0]);
+ var fileExtension = files[0].name.split(".")[1];
+ if(fileExtension == "xls"){
+ $scope.importButton = false;
+ $scope.$apply();
+ }else{
+ Notification.error("Upload the BlackList file which extends with .xls format.");
+ }
+ };
+
+ function arrayUnique(array) {
+ var a = array.concat();
+ for(var i=0; i<a.length; ++i) {
+ for(var j=i+1; j<a.length; ++j) {
+ if(a[i] === a[j])
+ a.splice(j--, 1);
+ }
+ }
+ return a;
+ }
+
+ $scope.submitUpload = function(){
+ $http.post("policycreation/importBlackListForDecisionPolicy", fd, {
+ withCredentials: false,
+ headers: {'Content-Type': undefined},
+ transformRequest: angular.identity
+ }).success(function(data){
+ $scope.data = JSON.parse(data.data);
+ $scope.temp.policy.blackListEntries = $scope.data.blackListEntries;
+ if($scope.temp.policy.blackListEntries[0] !== "error"){
+ $scope.blackListEntries = arrayUnique($scope.temp.policy.blackListEntries.concat($scope.temp.policy.yamlparams.blackList));
+ $scope.temp.policy.appendBlackListEntries = $scope.data.appendBlackListEntries;
+ $scope.blackListEntries = $scope.blackListEntries.filter(function (obj){
+ return !$scope.temp.policy.appendBlackListEntries.includes(obj);
+ });
+ if($scope.blackListEntries.length == 0){
+ $scope.validateButton = true;
+ Notification.error("Black Lists are empty. Minimum one entry required.");
+ }else{
+ $scope.temp.policy.blackListEntries = $scope.blackListEntries;
+ Notification.success("Blacklist File Uploaded Successfully.");
+ $scope.validateButton = false;
+ $scope.importButton = true;
+ }
+ }else{
+ Notification.error("Blacklist File Upload Failed." + $scope.temp.policy.blackListEntries[1]);
+ }
+ }).error(function(data){
+ Notification.error("Blacklist File Upload Failed.");
+ });
+ };
+
+ $scope.initializeBlackList = function(){
+ if($scope.temp.policy.blackListEntryType === "Use File Upload"){
+ $scope.validateButton = true;
+ } else {
+ $scope.validateButton = false;
+ }
+ $("#importFile").val('');
+ };
+
+ $scope.exportBlackListEntries = function(){
+ var uuu = "policycreation/exportDecisionBlackListEntries";
+ var postData={policyData: $scope.temp.policy, date : $scope.temp.model.modifiedDate, version : $scope.temp.model.version};
+ $.ajax({
+ type : 'POST',
+ url : uuu,
+ dataType: 'json',
+ contentType: 'application/json',
+ data: JSON.stringify(postData),
+ success : function(data){
+ $scope.$apply(function(){
+ $scope.data=data.data;
+ var url = '../' + $scope.data;
+ window.location = url;
+ Notification.success("BlackList Entries Exported Successfully.");
+ });
+ console.log($scope.data);
+ },
+ error : function(data){
+ Notification.error("Error Occured while Exporting BlackList Entries.");
+ }
+ });
+ };
}]); \ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DecisionPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DecisionPolicyTemplate.html
index 27b62870e..151af152d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DecisionPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DecisionPolicyTemplate.html
@@ -31,8 +31,8 @@
<div class="form-group col-sm-6">
<label>Description:</label> <input type="text" class="form-control"
ng-disabled="temp.policy.readOnly"
- ng-model="temp.policy.policyDescription"
- title="Description field will accept any type of data."/>
+ ng-model="temp.policy.policyDescription"
+ title="Description field will accept any type of data." />
</div>
</div>
<div class="form-group row">
@@ -41,7 +41,8 @@
class="form-control" ng-disabled="temp.policy.readOnly"
ng-model="temp.policy.onapName"
ng-options="option for option in onapNameDictionaryDatas track by option"
- required pattern="\S+" title="Select the dropdown value driven from OnapName (common)Dictionary."></select>
+ required pattern="\S+"
+ title="Select the dropdown value driven from OnapName (common)Dictionary."></select>
</div>
<div class="form-group col-sm-6">
<label>Rule Provider:<sup><b>*</b></sup></label><select
@@ -53,7 +54,7 @@
<option>AAF</option>
<option>Rainy_Day</option>
<option>GUARD_YAML</option>
- <option>GUARD_BL_YAML<option>
+ <option>GUARD_BL_YAML</option>
</select>
</div>
</div>
@@ -67,39 +68,40 @@
</div>
<div class="form-group col-sm-2">
<input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.rainyday.serviceType"
- placeholder="Service Type" title="Enter Service Type value."/>
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.rainyday.serviceType"
+ placeholder="Service Type" title="Enter Service Type value." />
</div>
<div class="form-group col-sm-1">
<label>VNF Type:<sup><b>*</b></sup></label>
</div>
<div class="form-group col-sm-2">
<input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.rainyday.vnfType"
- placeholder="VNF Type" title="Enter VNF Type value."/>
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.rainyday.vnfType" placeholder="VNF Type"
+ title="Enter VNF Type value." />
</div>
<div class="form-group col-sm-1">
<label>Building Block ID:<sup><b>*</b></sup></label>
</div>
<div class="form-group col-sm-2">
- <select
- class="form-control" ng-disabled="temp.policy.readOnly"
- ng-model="temp.policy.rainyday.bbid"
- ng-options="option for option in rainyDayDictionaryDatas track by option"
- ng-change="getWorkstepValues(temp.policy.rainyday.bbid)" title="Select the dropdown value driven from Rainday Allowed Treatments (Decision)Dictionary.">
- <option value="">{{temp.policy.rainyday.bbid}}</option>
- </select>
+ <select class="form-control" ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.rainyday.bbid"
+ ng-options="option for option in rainyDayDictionaryDatas track by option"
+ ng-change="getWorkstepValues(temp.policy.rainyday.bbid)"
+ title="Select the dropdown value driven from Rainday Allowed Treatments (Decision)Dictionary.">
+ <option value="">{{temp.policy.rainyday.bbid}}</option>
+ </select>
</div>
<div class="form-group col-sm-1">
<label>Work Step:<sup><b>*</b></sup></label>
</div>
<div class="form-group col-sm-2">
- <select
- class="form-control" ng-disabled="temp.policy.readOnly"
- ng-model="temp.policy.rainyday.workstep"
- ng-options="option for option in workstepDictionaryDatas track by option"
- ng-change="getTreatmentValues(temp.policy.rainyday.bbid, temp.policy.rainyday.workstep)">
- <option value="">{{temp.policy.rainyday.workstep}}</option>
+ <select class="form-control" ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.rainyday.workstep"
+ ng-options="option for option in workstepDictionaryDatas track by option"
+ ng-change="getTreatmentValues(temp.policy.rainyday.bbid, temp.policy.rainyday.workstep)">
+ <option value="">{{temp.policy.rainyday.workstep}}</option>
</select>
</div>
</div>
@@ -107,46 +109,44 @@
<div class="form-group col-sm-3">
<label>Desired Automated Treatments:</label>
<button type="button" class="btn btn-default"
- ng-disabled="temp.policy.readOnly"
- ng-click="addNewTreatment()">
+ ng-disabled="temp.policy.readOnly" ng-click="addNewTreatment()">
<i class="fa fa-plus"></i>
</button>
</div>
</div>
<div class="form-group row">
- <div data-ng-repeat="treatmentTableChoice in temp.policy.rainyday.treatmentTableChoices">
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-1">
- <label>Error Code:<sup><b>*</b></sup></label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly"
- ng-model="treatmentTableChoice.errorcode"
- placeholder="Error Code" />
- </div>
- <div class="form-group col-sm-1">
- <label>Desired Treatment:<sup><b>*</b></sup></label>
- </div>
- <div class="form-group col-sm-3">
- <select
- class="form-control"
- ng-disabled="temp.policy.readOnly"
- ng-model="treatmentTableChoice.treatment"
- ng-options="option for option in allowedTreatmentsDatas track by option">
- <option value="">{{treatmentTableChoice.treatment}}</option>
- </select>
- </div>
- <div class="form-group col-sm-1">
- <button type="button" class="btn btn-default"
- ng-disabled="temp.policy.readOnly"
- ng-click="removeTreatment()">
- <i class="fa fa-minus"></i>
- </button>
+ <div
+ data-ng-repeat="treatmentTableChoice in temp.policy.rainyday.treatmentTableChoices">
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-1">
+ <label>Error Code:<sup><b>*</b></sup></label>
+ </div>
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="treatmentTableChoice.errorcode"
+ placeholder="Error Code" />
+ </div>
+ <div class="form-group col-sm-1">
+ <label>Desired Treatment:<sup><b>*</b></sup></label>
+ </div>
+ <div class="form-group col-sm-3">
+ <select class="form-control" ng-disabled="temp.policy.readOnly"
+ ng-model="treatmentTableChoice.treatment"
+ ng-options="option for option in allowedTreatmentsDatas track by option">
+ <option value="">{{treatmentTableChoice.treatment}}</option>
+ </select>
+ </div>
+ <div class="form-group col-sm-1">
+ <button type="button" class="btn btn-default"
+ ng-disabled="temp.policy.readOnly"
+ ng-click="removeTreatment()">
+ <i class="fa fa-minus"></i>
+ </button>
+ </div>
</div>
</div>
</div>
- </div>
</div>
</div>
</div>
@@ -158,86 +158,145 @@
</div>
</div>
<div class="form-group row">
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> actor: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.actor"
- placeholder="Actor" />
- </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> actor: </label>
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> recipe: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.recipe"
- placeholder="Recipe" />
- </div>
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.actor" placeholder="Actor" />
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> CLName: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.clname"
- placeholder="CLName" />
- </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> recipe: </label>
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> guardActiveStart: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.guardActiveStart"
- placeholder="00:00:00-05:00" />
- </div>
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.recipe" placeholder="Recipe" />
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> guardActiveEnd: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.guardActiveEnd"
- placeholder="00:00:00-05:00" />
- </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> CLName: </label>
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> BlackList: </label>
- <button type="button" class="btn btn-default"
- ng-disabled="temp.policy.readOnly" ng-click="addNewBL()">
- <i class="fa fa-plus"></i>
- </button>
- </div>
- <div class="form-group col-sm-4">
- <div data-ng-repeat="choice in temp.policy.yamlparams.blackList track by $index">
- <div class="form-group row">
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.clname" placeholder="CLName" />
+ </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> guardActiveStart: </label>
+ </div>
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.guardActiveStart"
+ placeholder="00:00:00-05:00" />
+ </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> guardActiveEnd: </label>
+ </div>
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.guardActiveEnd"
+ placeholder="00:00:00-05:00" />
+ </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> BlackList Entry Type: </label>
+ </div>
+ <div class="form-group col-sm-3">
+ <select class="form-control"
+ ng-model="temp.policy.blackListEntryType"
+ ng-disabled="temp.policy.readOnly"
+ ng-change="initializeBlackList(temp.policy.blackListEntryType)">
+ <option>Use Manual Entry</option>
+ <option>Use File Upload</option>
+ </select>
+ </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label>Export BlackList Entries:</label>
+ </div>
+ <div class="form-group col-sm-3">
+ <button type="button" class="btn btn-default"
+ ng-disabled="disableOnCreate"
+ ng-click="exportBlackListEntries()">Export BlackList</button>
+ </div>
+ </div>
+ <div ng-if="temp.policy.blackListEntryType == 'Use File Upload'"
+ class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label>Upload BlackList: </label>
+ </div>
+ <div class="form-group col-sm-4">
+ <input type="file" name="file" class="form-control"
+ id="importFile"
+ onchange="angular.element(this).scope().uploadBLFile(this.files)" />
+ </div>
+ <div class="form-group col-sm-2">
+ <button class="btn btn-primary" ng-disabled="importButton"
+ ng-click="submitUpload()">Upload</button>
+ </div>
+ </div>
+ <div ng-if="temp.policy.blackListEntryType == 'Use File Upload'"
+ class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label>Search BlackList: </label>
+ </div>
+ <div class="form-group col-sm-4">
+ <input type="text" class="form-control" class="search"
+ placeholder="{{'search'}}..." ng-model="search"> <select
+ class="form-control" multiple ng-disabled="true"
+ style="height: 400px;"
+ ng-model="temp.policy.blackListSearchEntry"
+ ng-options="option for option in blackListEntries | filter:search"></select>
+ </div>
+ </div>
+ <div ng-if="temp.policy.blackListEntryType == 'Use Manual Entry'"
+ class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> BlackList: </label>
+ <button type="button" class="btn btn-default"
+ ng-disabled="temp.policy.readOnly" ng-click="addNewBL()">
+ <i class="fa fa-plus"></i>
+ </button>
+ </div>
+ <div class="form-group col-sm-4">
+ <div
+ data-ng-repeat="choice in temp.policy.yamlparams.blackList track by $index">
+ <div class="form-group row">
<div class="form-group col-sm-9">
<input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly"
- ng-model="temp.policy.yamlparams.blackList[$index]" placeholder="BlackList" />
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.blackList[$index]"
+ placeholder="BlackList" />
</div>
<div class="form-group col-sm-1">
- <button type="button" class="btn btn-default" ng-show="$last"
- ng-disabled="temp.policy.readOnly" ng-click="removeBL()">
- <i class="fa fa-minus"></i>
+ <button type="button" class="btn btn-default"
+ ng-disabled="temp.policy.readOnly"
+ ng-click="removeBL(temp.policy.yamlparams.blackList[$index])">
+ <i class="fa fa-minus"></i>
</button>
</div>
- </div>
</div>
</div>
</div>
+ </div>
</div>
</div>
</div>
-
+
<div ng-if="temp.policy.ruleProvider == 'GUARD_YAML'">
<div class="well">
<div class="form-group row">
@@ -246,113 +305,122 @@
</div>
</div>
<div class="form-group row">
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> actor: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.actor"
- placeholder="Actor" />
- </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> actor: </label>
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> recipe: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.recipe"
- placeholder="Recipe" />
- </div>
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.actor" placeholder="Actor" />
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> CLName: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.clname"
- placeholder="CLName" />
- </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> recipe: </label>
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> Targets: </label>
- <button type="button" class="btn btn-default"
- ng-disabled="temp.policy.readOnly" ng-click="addNewTarget()">
- <i class="fa fa-plus"></i>
- </button>
- </div>
- <div class="form-group col-sm-4">
- <div data-ng-repeat="choice in temp.policy.yamlparams.targets track by $index">
- <div class="form-group row">
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.recipe" placeholder="Recipe" />
+ </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> CLName: </label>
+ </div>
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.clname" placeholder="CLName" />
+ </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> Targets: </label>
+ <button type="button" class="btn btn-default"
+ ng-disabled="temp.policy.readOnly" ng-click="addNewTarget()">
+ <i class="fa fa-plus"></i>
+ </button>
+ </div>
+ <div class="form-group col-sm-4">
+ <div
+ data-ng-repeat="choice in temp.policy.yamlparams.targets track by $index">
+ <div class="form-group row">
<div class="form-group col-sm-9">
<input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly"
- ng-model="temp.policy.yamlparams.targets[$index]" placeholder="Target" />
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.targets[$index]"
+ placeholder="Target" />
</div>
<div class="form-group col-sm-1">
<button type="button" class="btn btn-default" ng-show="$last"
- ng-disabled="temp.policy.readOnly" ng-click="removeTarget()">
- <i class="fa fa-minus"></i>
+ ng-disabled="temp.policy.readOnly" ng-click="removeTarget()">
+ <i class="fa fa-minus"></i>
</button>
</div>
- </div>
</div>
</div>
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> limit: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.limit"
- placeholder="Limit" title="Enter time limit value."/>
- </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> limit: </label>
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> timeWindow: </label>
- </div>
- <div class="form-group col-sm-2">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.timeWindow"
- placeholder="Time Window" title="Enter time window value."/>
- </div>
- <div class="form-group col-sm-1">
- <select class="form-control" ng-disabled="temp.policy.readOnly"
- ng-model="temp.policy.yamlparams.timeUnits" title="Select the Time Units value from dropdown options.">
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.limit" placeholder="Limit"
+ title="Enter time limit value." />
+ </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> timeWindow: </label>
+ </div>
+ <div class="form-group col-sm-2">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.timeWindow"
+ placeholder="Time Window" title="Enter time window value." />
+ </div>
+ <div class="form-group col-sm-1">
+ <select class="form-control" ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.timeUnits"
+ title="Select the Time Units value from dropdown options.">
<option>minute</option>
<option>hour</option>
<option>day</option>
<option>week</option>
<option>month</option>
<option>year</option>
- </select>
- </div>
+ </select>
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> guardActiveStart: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.guardActiveStart" title="Enter Guard Active Start value in following patren '00:00:00-05:00'."
- placeholder="00:00:00-05:00" />
- </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> guardActiveStart: </label>
</div>
- <div class="form-group row" style="margin-left: 2%">
- <div class="form-group col-sm-3">
- <label> guardActiveEnd: </label>
- </div>
- <div class="form-group col-sm-3">
- <input type="text" class="form-control"
- ng-disabled="temp.policy.readOnly" ng-model="temp.policy.yamlparams.guardActiveEnd" title="Enter Guard Active End value in following patren '00:00:00-05:00'."
- placeholder="00:00:00-05:00" />
- </div>
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.guardActiveStart"
+ title="Enter Guard Active Start value in following patren '00:00:00-05:00'."
+ placeholder="00:00:00-05:00" />
+ </div>
+ </div>
+ <div class="form-group row" style="margin-left: 2%">
+ <div class="form-group col-sm-3">
+ <label> guardActiveEnd: </label>
</div>
+ <div class="form-group col-sm-3">
+ <input type="text" class="form-control"
+ ng-disabled="temp.policy.readOnly"
+ ng-model="temp.policy.yamlparams.guardActiveEnd"
+ title="Enter Guard Active End value in following patren '00:00:00-05:00'."
+ placeholder="00:00:00-05:00" />
+ </div>
+ </div>
</div>
</div>
</div>
@@ -364,7 +432,8 @@
<div class="form-group col-sm-1">
<label>Component Attributes:</label><br>
<button type="button" class="btn btn-default"
- ng-disabled="temp.policy.readOnly" ng-click="addNewChoice()" title="onClick Component Attribute row is added.">
+ ng-disabled="temp.policy.readOnly" ng-click="addNewChoice()"
+ title="onClick Component Attribute row is added.">
<i class="fa fa-plus"></i>
</button>
</div>
@@ -375,18 +444,21 @@
<div class="form-group col-sm-3">
<select class="form-control" ng-disabled="temp.policy.readOnly"
ng-model="choice.key"
- ng-options="option for option in attributeDictionaryDatas track by option" title="Select the dropdown value driven from Attribute (common)Dictionary.">
+ ng-options="option for option in attributeDictionaryDatas track by option"
+ title="Select the dropdown value driven from Attribute (common)Dictionary.">
<option value="">{{choice.key}}</option>
</select>
</div>
<div class="form-group col-sm-3">
<input type="text" class="form-control"
ng-disabled="temp.policy.readOnly" ng-model="choice.value"
- placeholder="Attribute Value" title="Enter the Attribute Value without any spaces and special characters"/>
+ placeholder="Attribute Value"
+ title="Enter the Attribute Value without any spaces and special characters" />
</div>
<div class="form-group col-sm-1">
<button type="button" class="btn btn-default" ng-show="$last"
- ng-disabled="temp.policy.readOnly" ng-click="removeChoice()" title="onClick will remove the last row">
+ ng-disabled="temp.policy.readOnly" ng-click="removeChoice()"
+ title="onClick will remove the last row">
<i class="fa fa-minus"></i>
</button>
</div>
@@ -403,7 +475,8 @@
<label>Settings Attributes:</label><br>
<button type="button" class="btn btn-default"
ng-disabled="temp.policy.readOnly"
- ng-click="addNewSettingsChoice()" title="onClick Settings Attribute row is added.">
+ ng-click="addNewSettingsChoice()"
+ title="onClick Settings Attribute row is added.">
<i class="fa fa-plus"></i>
</button>
</div>
@@ -414,19 +487,22 @@
<div class="form-group col-sm-3">
<select class="form-control" ng-disabled="temp.policy.readOnly"
ng-model="settingschoice.key"
- ng-options="option for option in settingsDictionaryDatas track by option" title="Select the dropdown value driven from Settings (Decision)Dictionary.">
+ ng-options="option for option in settingsDictionaryDatas track by option"
+ title="Select the dropdown value driven from Settings (Decision)Dictionary.">
<option value="">{{settingschoice.key}}</option>
</select>
</div>
<div class="form-group col-sm-3">
<input type="text" class="form-control"
ng-disabled="temp.policy.readOnly"
- ng-model="settingschoice.value" placeholder="Settings Value" title="Enter the Settings Attribute Value without any spaces and special characters"/>
+ ng-model="settingschoice.value" placeholder="Settings Value"
+ title="Enter the Settings Attribute Value without any spaces and special characters" />
</div>
<div class="form-group col-sm-1">
<button type="button" class="btn btn-default" ng-show="$last"
ng-disabled="temp.policy.readOnly"
- ng-click="removeSettingsChoice()" title="onClick will remove the last row">
+ ng-click="removeSettingsChoice()"
+ title="onClick will remove the last row">
<i class="fa fa-minus"></i>
</button>
</div>
@@ -443,7 +519,8 @@
<div class="form-group col-sm-1">
<button type="button" class="btn btn-default"
ng-disabled="temp.policy.readOnly"
- ng-click="addNewRuleAlgorithm()" title="onClick Rule Algorithms row is added.">
+ ng-click="addNewRuleAlgorithm()"
+ title="onClick Rule Algorithms row is added.">
<i class="fa fa-plus"></i>
</button>
</div>
@@ -462,7 +539,8 @@
ng-disabled="temp.policy.readOnly"
ng-model="ruleAlgorithmschoice.dynamicRuleAlgorithmField1"
ng-options="option for option in attributeDictionaryDatas track by option"
- name="dynamicRuleAlgorithmField1" title="Select the dropdown value driven from Attribute (common)Dictionary or Settings (Decision)Dictionary.">
+ name="dynamicRuleAlgorithmField1"
+ title="Select the dropdown value driven from Attribute (common)Dictionary or Settings (Decision)Dictionary.">
<option value="">{{ruleAlgorithmschoice.dynamicRuleAlgorithmField1}}</option>
</select>
</div>
@@ -471,18 +549,21 @@
ng-disabled="temp.policy.readOnly"
ng-model="ruleAlgorithmschoice.dynamicRuleAlgorithmCombo"
ng-options="option for option in functionDefinitionDatas track by option"
- name="dynamicRuleAlgorithmCombo" title="Select the dropdown value driven from FunctionDataType."></select>
+ name="dynamicRuleAlgorithmCombo"
+ title="Select the dropdown value driven from FunctionDataType."></select>
</div>
<div class="form-group col-sm-3">
<input type="text" class="form-control"
ng-disabled="temp.policy.readOnly"
ng-model="ruleAlgorithmschoice.dynamicRuleAlgorithmField2"
- name="dynamicRuleAlgorithmField2" title="Enter the Value without any spaces and special characters and for rule formation use A1, A2,..etc., based on above Rules."/>
+ name="dynamicRuleAlgorithmField2"
+ title="Enter the Value without any spaces and special characters and for rule formation use A1, A2,..etc., based on above Rules." />
</div>
<div class="form-group col-sm-1">
<button type="button" class="btn btn-default"
ng-disabled="temp.policy.readOnly"
- ng-click="removeRuleAlgorithm()" title="onClick will remove the last row">
+ ng-click="removeRuleAlgorithm()"
+ title="onClick will remove the last row">
<i class="fa fa-minus"></i>
</button>
</div>
@@ -497,11 +578,14 @@
<div class="modal-footer">
<button class="btn btn-primary" herf="javascript:void(0)"
ng-disabled="temp.policy.readOnly"
- ng-click="validatePolicy(temp.policy);" title="Validate the data entered in the Policy fields.">Validate</button>
+ ng-click="validatePolicy(temp.policy);"
+ title="Validate the data entered in the Policy fields.">Validate</button>
<button class="btn btn-success" herf="javascript:void(0)"
ng-disabled="savebutton" ng-disabled="temp.policy.readOnly"
- ng-click="saveDecisionPolicy(temp);" title="Save the Policy with validated data.">Save</button>
- <button type="button" class="btn btn-default" ng-click="refresh();" title="Close the template.">Close</button>
+ ng-click="saveDecisionPolicy(temp);"
+ title="Save the Policy with validated data.">Save</button>
+ <button type="button" class="btn btn-default" ng-click="refresh();"
+ title="Close the template.">Close</button>
</div>
</form>
</div> \ No newline at end of file