From c2a62b0884e64c5dae3da64c034807cd2b98bccb Mon Sep 17 00:00:00 2001 From: Michael Mokry Date: Mon, 2 Apr 2018 00:34:56 -0500 Subject: Support CSIT tests for OOF Policy I added an INSERT to the sql upgrade file and some sonar fixes and Junits Change-Id: I37139d5a8ad78d9d46ee01f81c2edd052672712e Issue-ID: POLICY-639 Signed-off-by: Michael Mokry --- .../controller/CreateOptimizationController.java | 10 ++-- .../OptimizationPolicyController.js | 2 +- .../CreateOptimizationControllerTest.java | 8 ++- .../src/test/resources/policy_tosca_tca-v1707.yml | 65 ++++++++++++++++++++++ .../src/test/resources/policy_tosca_tca_v1707.yml | 65 ---------------------- 5 files changed, 77 insertions(+), 73 deletions(-) create mode 100644 POLICY-SDK-APP/src/test/resources/policy_tosca_tca-v1707.yml delete mode 100644 POLICY-SDK-APP/src/test/resources/policy_tosca_tca_v1707.yml (limited to 'POLICY-SDK-APP/src') diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java index 4ae13443d..a45bfed57 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java @@ -97,10 +97,6 @@ public class CreateOptimizationController extends RestrictedBaseController { return commonClassDao; } - public static void setCommonClassDao(CommonClassDao commonClassDao) { - CreateOptimizationController.commonClassDao = commonClassDao; - } - private OptimizationModels newModel; private String newFile; private String directory; @@ -130,6 +126,10 @@ public class CreateOptimizationController extends RestrictedBaseController { @Autowired private CreateOptimizationController(CommonClassDao commonClassDao){ + setCommonClassDao(commonClassDao); + } + + public static void setCommonClassDao(CommonClassDao commonClassDao) { CreateOptimizationController.commonClassDao = commonClassDao; } @@ -595,7 +595,7 @@ public class CreateOptimizationController extends RestrictedBaseController { } @RequestMapping(value={"/oof_dictionary/set_ModelData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST}) - public void SetModelData(HttpServletRequest request, HttpServletResponse response) throws IOException, FileUploadException{ + public void setModelData(HttpServletRequest request, HttpServletResponse response) throws IOException, FileUploadException{ modelList = new ArrayList<>(); dirDependencyList = new ArrayList<>(); classMap = new LinkedHashMap<>(); diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js index e499c9ff5..cbd011f2e 100644 --- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js +++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js @@ -73,7 +73,7 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window', console.log("failed"); }); - PolicyAppService.getData('get_PriorityValues').then(function (data) { + PolicyAppService.getData('get_DCAEPriorityValues').then(function (data) { var j = data; $scope.data = JSON.parse(j.data); console.log($scope.data); diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateOptimizationControllerTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateOptimizationControllerTest.java index af573c616..35395a859 100644 --- a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateOptimizationControllerTest.java +++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/CreateOptimizationControllerTest.java @@ -386,8 +386,10 @@ public class CreateOptimizationControllerTest { public void testSetModelData() { logger.debug("testSetModelData: enter"); - + + CreateOptimizationController controller = new CreateOptimizationController(); HttpServletRequest request = createMock(HttpServletRequest.class); + MockHttpServletResponse response = new MockHttpServletResponse(); expect(request.getContentType()).andReturn("multipart/form-data; boundary=----WebKitFormBoundaryWcRUaIbC8kXgjr3p"); expect(request.getMethod()).andReturn("post"); expect(request.getHeader("Content-length")).andReturn("7809"); @@ -407,12 +409,14 @@ public class CreateOptimizationControllerTest { expect(request.getCharacterEncoding()).andReturn("UTF-8"); expect(request.getContentLength()).andReturn(1024); replay(request); - + controller.setModelData(request, response); + } catch (Exception e) { logger.error("testSetModelData" + e); e.printStackTrace(); } + logger.debug("testSetModelData: exit"); } diff --git a/POLICY-SDK-APP/src/test/resources/policy_tosca_tca-v1707.yml b/POLICY-SDK-APP/src/test/resources/policy_tosca_tca-v1707.yml new file mode 100644 index 000000000..0c30ceea0 --- /dev/null +++ b/POLICY-SDK-APP/src/test/resources/policy_tosca_tca-v1707.yml @@ -0,0 +1,65 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 + +node_types: + # policy root node + policy.nodes.Root: + derived_from: tosca.nodes.Root + properties: + policyName: + type: string + required: true + policyVersion: + type: string + required: true + policyScope: + type: string + required: true + policyDescription: + type: string + required: false + + # virtual policy node for string matcher + policy.nodes.tca: + derived_from: policy.nodes.Root + properties: + functionalRole: + type: string + required: true + default: "ClosedLoop_F5-d925ed73-8231-4d02-9545-db4e101f88f8" + policyName: + type: string + required: true + default: "configuration.dcae.microservice.tca.xml" + policyVersion: + type: string + required: true + default: "v0.0.1" + threshholds: + type: list + entry_schema: + - type:policy.data.Threshold + +data_types: + policy.data.Threshold: + derived_from: tosca.nodes.Root + properties: + closedLoopControlName: + type: string + required: true + version: + type: string + required: true + default: "1.0.2" + fieldPath: + type: string + required: true + thresholdValue: + type: integer + required: true + direction: + type: string + required: true + severity: + type: string + required: true + diff --git a/POLICY-SDK-APP/src/test/resources/policy_tosca_tca_v1707.yml b/POLICY-SDK-APP/src/test/resources/policy_tosca_tca_v1707.yml deleted file mode 100644 index 0c30ceea0..000000000 --- a/POLICY-SDK-APP/src/test/resources/policy_tosca_tca_v1707.yml +++ /dev/null @@ -1,65 +0,0 @@ -tosca_definitions_version: tosca_simple_yaml_1_0_0 - -node_types: - # policy root node - policy.nodes.Root: - derived_from: tosca.nodes.Root - properties: - policyName: - type: string - required: true - policyVersion: - type: string - required: true - policyScope: - type: string - required: true - policyDescription: - type: string - required: false - - # virtual policy node for string matcher - policy.nodes.tca: - derived_from: policy.nodes.Root - properties: - functionalRole: - type: string - required: true - default: "ClosedLoop_F5-d925ed73-8231-4d02-9545-db4e101f88f8" - policyName: - type: string - required: true - default: "configuration.dcae.microservice.tca.xml" - policyVersion: - type: string - required: true - default: "v0.0.1" - threshholds: - type: list - entry_schema: - - type:policy.data.Threshold - -data_types: - policy.data.Threshold: - derived_from: tosca.nodes.Root - properties: - closedLoopControlName: - type: string - required: true - version: - type: string - required: true - default: "1.0.2" - fieldPath: - type: string - required: true - thresholdValue: - type: integer - required: true - direction: - type: string - required: true - severity: - type: string - required: true - -- cgit 1.2.3-korg