aboutsummaryrefslogtreecommitdiffstats
path: root/integrity-monitor/src/test
AgeCommit message (Collapse)AuthorFilesLines
2019-07-15Combine lines in IM state transition tableJim Hahn1-2/+2
Rewrote the code to generate the Integrity Monitor state transition table, eliminating duplicate lines. Output the table, before and after the change, and verified that they were identical, with one exception: there were two places where the original code had "StandbyStateException", while all of the others had "StandbyStatusException". Guessing that the original code was incorrect in these two cases, I changed the new code to always use "StandbyStatusException" instead. Change-Id: Ibe3044eb1ac398a0bc8f328f4e14305d4bdeb380 Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-05Fix sonar issues in Integrity MonitorJim Hahn2-3/+3
Fixed most sonar issues, except for code coverage. Change-Id: I473635d896797b2290920da86c6770848bc2e883 Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-06-24Fix more sonar issues in Integrity Audit & MonitorJim Hahn1-0/+48
Removed duplicate code in DbDao by refactoring common code into a new updateIae() method. Removed duplicate code in IntegrityMonitor by refactoring common code into a new withinTransaction() method. Removed duplicate code in StateManagementEntity, StateElement by replacing with lombok Getter & Setter annotations. Removed duplicate code in StateManagement by refactoring common code into new setState() and getState() methods. Also removed logger.isDebugEnabled() tests. Added coverage for StateChangeNotifier. Change-Id: I2e29b836dafc5de569a2267206a6a34105e44021 Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-06-21Fix sonar issues in integrity monitorJim Hahn8-1939/+1861
Used Eclipse Refactor->Extract Method to reduce cyclomatic complexity. Flattened nested FpManager class into IntegrityMonitor class. Changed some strings to StringBuilder, where lots of concatenation was being done. Simplified some things by eliminating some try/catch blocks where an exception can't actually (except may an out-of-memory exception). Also addressed some sonar issues in the tests (e.g., use "<>" where appropriate). Eliminated some assertException methods, replacing them with assertj methods. Did not attempt to increase junit coverage. Change-Id: I311acaffcd87f0cbbf382c06c7fa26177007abd5 Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-06-13More sonar fixes in policy/commonJim Hahn1-24/+23
Note: this does not increase code coverage, but should fix other code issues. Resolved cyclomatic complexity issue in ParameterValidationResult. Refactored duplicate code in GroupValidationResult. Removed IOException from NetworkUtil "throws". Replaced null/empty string tests with StringUtils.isBlank(). Added @FunctionalInterface where needed. Replaced anonymous classes with lambda expressions. Replaced duplicate strings with a constant. Added private constructors for utility classes. Removed sleep() from tests. Removed unused parameter from method call. Made some protected methods private. Compute integrity monitor's state-transition table once. Use for-loop instead of iterator. Moved constructors. Fixed some checkstyle issues (tabs => spaces, trailing spaces). Change-Id: I9a962ca45c4ff3f212c6014da799d06f07b232ef Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-11-27Remove Factory from IntegrityMonitorJim Hahn3-53/+17
Also removed unneeded method override in junit test. Change-Id: I7186e9f75443f7b8ba8376aa0e00a5cf4c573696 Issue-ID: POLICY-1287 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-11-27Fix checkstyle issue in policy commonKrishnakumar Jinka2-5/+5
Move method into class it is being called. Fix minor checkstyle formatting in the class. The changes have side effects hence revert some changes. Modify the javadoc tags Issue-ID: POLICY-1251 Change-Id: Iecb513dafe3f60628664f3e60d6c49d3e4ce3148 Signed-off-by: kris.jinka <kris.jinka@samsung.com>
2018-08-14Fixes for checkstyle issuesPamela Dragosh4-5/+14
More fixes for spacing, adding comments, adding period at the end, and move code closer to usage. Issue-ID: POLICY-881 Change-Id: Ife99eaf627a221e87d65d24dfd145b0ee4e06d21 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2018-06-21IntegrityMonitor: remove sleep from junit testsJim Hahn4-70/+184
Modified the code to use a CurrentTime object for its "time" operations (e.g., sleep(), currentTimeInMillis()). Modified junit tests to replace the CurrentTime object with TestTime objects so they don't actually do any sleeping. Update license date. Remove unneeded dependency from pom. Don't start FpManager thread within its own constructor. toMillis() should handle -1 as an input. Fix comment in test base superclass. Change time units in test base from DAYS to MILLISECONDS. Change-Id: Id6a4edb1747ca1a683e5d37522872b781294532d Issue-ID: POLICY-908 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-06-20IntegrityMonitory - remove latch for non-test codeJim Hahn2-20/+40
Change-Id: I95ebcf8aabfa01eb6453a4ba5dd88d11c8f025c9 Issue-ID: POLICY-908 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-03-20Removed checkstyle warningsmmis8-3049/+3082
Removed checkstyle warnings in policy/common/im Issue-ID: POLICY-695 Change-Id: I32b4797249386c0d1bd0f50792880a1759503a67 Signed-off-by: mmis <michael.morris@ericsson.com>
2018-03-16Fixing 12 reported bugs in Sonar for policy/commoneikrwaq2-204/+297
Change-Id: I7bf453828f7a62070e7a73362798e6f2d4806b2f Issue-ID: POLICY-661 Signed-off-by: eikrwaq <waqas.ikram@ericsson.com>
2018-02-16Fix more generic exceptions in commonJim Hahn1-1/+1
Fixed a few more generic exceptions in integrity-audit and integrity-monitor. Fixed license dates. Change-Id: Ibbc21ae5f853896e0d3e416e33b5ea2a13672f62 Issue-ID: POLICY-246 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-02-13Add test coverage to integrity-monitorJim Hahn11-2431/+2306
Removed "test" from package name. Refactored tests, creating common IntegrityMonitorTestBase. Turned log/print statements into assertEquals in StateTransitionTest. Turned log/print statements into assertEquals in StateManagementTest. Modified AllSeemsWellTest to use IntegrityMonitorTestBase. Modified IntegrityMonitorTest to use IntegrityMonitorTestBase. Added several hooks to IntegrityMonitor to control timers at a finer granularity. Added hooks to IntegrityMonitor to control the FPManager thread. Remove hooks for refresh timer, as property suffices. Added assertException() and assertNoException() methods to IntegrityMonitorTestBase, and then replaced most "try/catch" blocks with calls to those methods. Updated StateManagement to close EntityManagers. Modify pom to remove scope from utils dependency. Fix some comments and remove an unneeded EntityTransaction variable. Change-Id: Ic0789d26f985a40a35f618343fa4e88aa473b2b3 Issue-ID: POLICY-582 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-02-05Add utils-test projectJim Hahn1-0/+86
Added utils-test project to policy/common. Modified integrity-audit and integrity-monitor to use the new utils-test project to test the Exception subclasses. Change-Id: If4a27cdb2351b7c49b084dbf287950172fa059cf Issue-ID: POLICY-582 Signed-off-by: Jim Hahn <jrh3@att.com>
2018-02-01Fix sonar generic Exceptions in policy/commonJim Hahn1-7/+5
IntegrityMonitor.java: Renamed variables, Ex: dep_groups => depGroups. Renamed enum constants, Ex: pdp_xacml => PDP_XACML. Merged "if" tests. Cast values to "long" before multiplying. Re-throw interrupt(). Write exception via logger instead of e.printStackTrace(). Moved constructor to top of the file. Removed most logger.isDebugEnabled() checks. Returned generic List instead of ArrayList. Used entrySet() instead of keySet(). Removed useless parentheses. Removed superfluous exceptions from "throws" declaration. DbAudit.java: Modified DbAudit to throw DbAuditException. Replaced references to HashSet and HashMap with generic Set and Map. Modified DbAudit to iterate over entrySet() instead of keySet(). ComponentAdminException: Created ComponentAdminException class. Modified ComponentAdmin methods to throw new exception class. Extracted "stateManager" String constant. Eliminated logger.isDebugEnabled() calls. Updated the license data. Eliminated double-checked locking problem from PropertyUtil: Modified code to use Initialization On Demand Holder idiom. Change-Id: Ic01288542041da26df483ce85ecaf292ac138f85 Issue-ID: POLICY-246 Signed-off-by: Jim Hahn <jrh3@att.com>
2017-12-15Fix issues blocking election handler threadKevin McKiou5-614/+489
Patch 1: This bug tracks the AT&T bug 355533. The symptom was that drools pdps that were backing each other up were becoming stuck in a standby state. The cause was that the election handler thread was being hung by a call to PolicyEngine.manager.deactivate which shuts down the topic endpoints when the drools pdp operational state transitions to disabled. Related problems were that the election handler heartbeat was NOT blocked when the main thread was blocked and the IntegrityMonitor forward progress counter was NOT blocked from incrementing when the election handler thread was blocked. This prevented the correct failover of the drools pdp to another healthy one. This change fixes the two causes of the thread blockage, moves the election handler heartbeat to the main thread and adds an interface (AllSeemsWell) which is called when the election handler has stalled/resumed. The AllSeemsWell interface will block forward progress counter increments when ALLNOTWELL and will resume forward progress counter increments when ALLSEEMSWELL. In addition, it reduces the run time of the StandbyStateManagementTest from approximately 8 minutes to approximately 2 minutes. Since this changes classes also changed by POLICY-444, this change must be merged before POLICY-444 can be merged. Patch 2: Extended sleep times in AllSeemsWellTest. Patch 3: Commented out asserts that are keeping it from building. Note: It builds just fine in local environment. Patch 4: Moved the check of allNotWellMap from testTransaction to endTransaction so it will cover calls to endTransaction from application code rather than just calls from testTransaction. Patch 5: Fixed potential Sonar issue in initialization of HashMaps allSeemsWellMap and allNotWellMap Patch 6: Changes to IntegrityMonitorTest to make it run faster and more deterministically. This satisfies POLICY-444. Issue-ID: POLICY-501 Change-Id: I8fbbdc481839ec6066f26392d30e230d6b1293f2 Signed-off-by: Kevin McKiou <km097d@att.com>
2017-09-14Fix sonar critical for passwordPamela Dragosh1-4/+9
Focused on hard coded passwords. I believe they are only used for JUnit tests so I moved them into a file for use. If they still show up on sonar then I will move into a properties file and/or mark as not going to fix. Issue-ID: POLICY-237 Change-Id: I6fa561714091043a2ea5e2edfb0441c2dfc8b044 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-09-14Changed logger to slf4jMagnusen, Drew (dm741q)4-322/+357
Changed all instances of Sys.out or PolicyLogger to slf4j. Issue-ID: POLICY-178 Change-Id: Ia91af1deb18a9b5c466f6f8a6c546c17c54e14ad Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2017-09-08Clean up unused imports and duplicate versionPamela Dragosh4-10/+0
Seems oparent sets the version resulting in Eclipse generating warnings for the pom. Also cleaned up unused imports. Issue-ID: POLICY-216 Change-Id: I634025f67aa8847d1c2b6c76b0c8c09336886594 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-08-24Tweak Common Module JUnitsKevin McKiou4-9/+9
Patch 1: Tweaks Integrity-Audit JUnits to allow at least some estimate of code coverage. It was not possible to enable all the tests as there are threading issues when run in the JUnit environment. Consequently, this is about 2/3 of the actual code coverage. The estimate coverage is about 46% Patch 2: Changes a persistence unit in DBDAOTest. Patch 3: Adds tweaks to IntegrityMonitor JUnits. The estimated state management code coverage is 70%. Patch 4: Removed an IntegrityAudit test that failed which reduced the estimated coverage to 45% Issue-ID: POLICY-108 Change-Id: I693e56083c3ed66e020e82d5ac906ce29224bd58 Signed-off-by: Kevin McKiou <km097d@att.com>
2017-08-15Resolve major/critical issues in integrity-monitorMagnusen, Drew (dm741q)1-1/+1
Resolved major and critical sonar issues in integrity-monitor module. Issue-ID: [POLICY-96] Change-Id: If1da196134a73535668d42f429d647fc819ecaee Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2017-07-31[POLICY-71] replace openecomp for policy-commonGuo Ruijing5-26/+26
Change-Id: I3241f5d1f0234043b4dff718eda1ffdc48052276 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com> Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-07-25[POLICY-81] Code cleanup to eliminate the presence of warning messages in ↵Magnusen, Drew (dm741q)4-51/+5
Eclipse. Change-Id: Id98fdf0241487d56707ac91cde47975c91225f3c Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2017-07-24[POLICY-105] Modifications to RefreshStateAuditKevin McKiou1-2/+3
Made the refreshStateAudit configurable and changed the default interval to 10 minutes from 1 minute. Added a check to fpCheck to check the state of the dependent before setting the opstate to disabled. Added a refresh to the forwardprogressentity object in stateAudit() so that we are not reading stale timestamp data. Change-Id: I394feca083fc1fb356d11b9f6886e566c31f248a Signed-off-by: Kevin McKiou <km097d@att.com>
2017-05-09Batch submitRalph Straubs1-5/+403
[ECOMPD2TD-000] Update version.properties for iter 41 [US866186 1707] Adding methods to IntegrityMonitor to support state audit. [US866186 1710] Made more progress on teh stateAudit method of IntegritryMontor. Completed all except the addition of properties. [US866186 1710] Addition of IntegrityMonitorProperties.STATE_AUDIT_INTERVAL_MS and logic to stateAudit to determine whether or not to run [US866186 1710] Created a JUnit for getAllForwardProgressEntity() method and debugged and fixed it. [US866186 1710] Making progress on the testStateAudit() JUnit. Was able to create forward progress entries and manually change the lastUpdated date on an entry using a persistence update query. [US866186 1710] First cut of stateAudit JUnit test. Still need to test more cases, but I got it working so far. [US866186 1710] Completed the JUnit for stateAudit. Added 5 new scenarios. Conflicts: version.properties Change-Id: I7b5622a27021cf01b5d916b75824d8e51b5252eb Signed-off-by: Ralph Straubs <rs8887@att.com>
2017-04-20Batch submitRalph Straubs3-10/+121
[ECOMPD2TD-1073 1707] Removal of extra flush statements and addition of rollbacks in catch blocks instead of commits. [ECOMPD2TD-1073 1707] Adding some needed synchronized statements to IntegrityMonitor. [ECOMPD2TD-1159] - Loggers should be Serializable By making loggers Serializable, they can be included in Drools persistent data. 'EelfLogger' and 'SystemOutLogger' can do this trivially, but 'Logger4J' needed some additional work, because it has a non-serializable field 'log'. [ECOMPD2TD-000] Fix versioning of org.openecomp.policy.* dependencies [US866186 1707] First cut of stateCheck mod and non-working JUnit [US866186 1707] Completed the coding for the task TA1998344 which adds a check of forward progress for dependencies. [US866186 1707] Completed updates to IntegrityMonitor.stateCheck and IntegrityMonitorTest which includes addition of a JUnit for stateCheck and control of the order of JUnit execution. [US865296] ECOMP Policy Logging Compliance, add TargetEntity and TargetServiceName, remove unit from ElapsedTime [US865296] ECOMP Policy Logging Compliance, set audit log statuscode to 'COMPLETE' instead of N/A [US865296] ECOMP Policy Logging Compliance, remove time unit (seconds and milliseconds) from ElapsedTime for logging compliance [US866186 1707] Cleaned up IntegrityAudit JUnit tests. [US866186 1707] IntegrityMonitor JUnit clean up [US866186 1707] Re-added missing classes that were erroneously deleted. [US865296] - add get/setters and inits for required log fields Change-Id: I76ef4606ed6832ed48eaca68e72839a05c8bc3a8 Signed-off-by: Ralph Straubs <rs8887@att.com>
2017-02-19adding back in unit tests with ignorePamela Dragosh4-0/+3457
Change-Id: Ib81e9a63869b8a97b858d204e38637acd5483083 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-02-16Removing JUnit testsPamela Dragosh4-3451/+0
Change-Id: I4df12acdca56955bc462c90b36791f7562be95ba Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-02-14Initial OpenECOMP policy/common commitPamela Dragosh6-0/+3714
Change-Id: I61cd29d6d8bf8702c1a66915895b519bf3484afa Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>