aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-11-12Implement closest match algorithmPamela Dragosh15-153/+1281
Needed to add more obligations, which make it easier to scan through obligations and be able to pull information about the policy. Adding weight as an obligation for Optimization policies in order to implement "closest match" algorithm. Moved Obligation to a support class. Added JUnit code coverage on the translator classes. Split some methods up to reduce complexity via sonar. Issue-ID: POLICY-2066 Change-Id: Ibb13d2dc0a63ab2a6d585b0697a0c1d129fa8f7b Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-11-04More examples of optimization policies and cleanupPamela Dragosh4-131/+215
Fixed a couple of sonar issues - log exception and do not nest more 3 if-else-try. Cleaned up the JUnit test to make debugging a bit easier. Added more examples for testing optimization tests. Moved the target back into the Policy and kept the Condition on the Rule. Works exactly the same, just a bit cleaner and one less rule to deal with. Issue-ID: POLICY-2066 Change-Id: Ife28dc2ce959dcf1fb8ca72061ebc5dca862a7f4 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-11-01Add common Jersey versionliamfallon2-2/+4
Add a common version of Jersey for all Policy Framework components. Issue-ID: POLICY-2209 Change-Id: I0d61800b423bffbe584e29621a87068eef4c1e6c Signed-off-by: liamfallon <liam.fallon@est.tech>
2019-10-28Optimization improvements and test casesPamela Dragosh6-62/+576
* StdBaseTranslator added helpful support methods and can now add obligations to either rule, policy or policy sets. * StdMatchablePolicyRequest improved to support optional policy-type as part of the request to refine the output results. * Added more tests to ensure that the decision is returning the appropriate results. * Added more Javadoc for code. * Added some sonar fix for either log or throw exception. Issue-ID: POLICY-2066 Change-Id: I90d6d90c2cdbb627e96cfce1d2632b2439a1e477 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-10-24Merge "Fix sonar and coverage"Liam Fallon2-30/+115
2019-10-24Fix sonar and coveragePamela Dragosh2-30/+115
Turns out cyclomatic complexity is there in one method. The other JUnits in the applications cover the rest of the class, when time permits I will add that in there for completeness. Issue-ID: POLICY-2066 Change-Id: I31fd43625883bd569d4078bbd684554f6f3fbf53 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-10-24Merge "Removed type_version from abbreviated Monitor decision results"Pamela Dragosh1-0/+1
2019-10-23Removed type_version from abbreviated Monitor decision resultsHOCKLA1-0/+1
Issue-ID: POLICY-2126 Change-Id: I2a4907bb61651d9cfe2793e69404d9ccbe41ccd8 Signed-off-by: HOCKLA <ah999m@att.com>
2019-10-23Consolidate common translatable code some sonarPamela Dragosh14-342/+227
There is duplicate code for some common translation of policy decision responses and for scanning obligations. Removed some TODO items (left others because I want to look at them more closely). Stored System.lineSeparator into a static var so that I can remove some unnecessary ifs. There's still one left that I am not worried about. Gson as a static variable. Issue-ID: POLICY-2066 Change-Id: I9c8162d5ad1c5f884be347dd94631fa74ca76f85 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-10-21Use yaml policies in models-examplesPamela Dragosh7-261/+21
Now that yaml is supported, use those policies that are stored in the models-examples that are preloaded into the api. Fixed a minor checkstyle issue. Not sure why it was missed. Issue-ID: POLICY-2066 Change-Id: I2f4384a310bfa818555de5dacb477daf82fac6de Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-10-21Merge "Modified Decision API to accept query parameters and abbreviate ↵Pamela Dragosh13-30/+389
Monitor decision results"
2019-10-18Modified Decision API to accept query parameters and abbreviate Monitor ↵HOCKLA13-30/+389
decision results Issue-ID: POLICY-2126 Change-Id: I18d50a8746ede792ec9507ab98125383c5914ba1 Signed-off-by: HOCKLA <ah999m@att.com>
2019-10-17override cert storesjhh1-3/+14
Issue-ID: POLICY-2064 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: Ia98f383de7e1946e49c1f2c6117f2065c84ad26e
2019-10-09Sonar xacml-pdp issuesPamela Dragosh6-90/+114
Either log or re-throw exception Refactor to not nest more than 3 statements Refactor to throw at most one exception Move variable to comply with Java Code conventions String literal on LHS Issue-ID: POLICY-2079 Change-Id: Iac33623ef4694cf38c4a69c8f0b9040d8439998e Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-10-02Removed TestUtils from common and into a 'xacml-test' projectAli Hockla12-6/+81
Issue-ID: POLICY-2090 Change-Id: Id688e305f878f56e374e6bd9047d9d6c75fbe0c6 Signed-off-by: Ali Hockla <ah999m@att.com>
2019-09-13Upgrade to Tosca derivedFrom fixPamela Dragosh7-86/+74
Upgrade to models fix for derivedFrom() append of 0.0.0 And some sonar fixes for: Exceptions should be either logged or rethrown but not both Preconditions" and logging arguments should not require evaluation Reduced cognitive complexity Issue-ID: POLICY-2079 Change-Id: Ied8630020e8a737c33b1484db953df133c89398f Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-09-12Add yaml support to xacml-pdp rest serverJim Hahn7-35/+28
Also modified code to use StandardYamlCoder. Change-Id: I0596c8b054339ac68ef8c4250cd25b9ff88d47e4 Issue-ID: POLICY-2085 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-09-10Bump versions for xacml-pdp masterJim Hahn15-15/+16
Change-Id: I6ca46b3bbc9529c6fef5a332b224a4de69e3cdef Issue-ID: POLICY-2045 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-09-09Release xacml-pdp 2.1.25.0.0-ONAPPamela Dragosh1-0/+4
Releasing 2.1.2 Issue-ID: POLICY-2045 Change-Id: I2c7c1968a6b194d7f582062a27416ffc57c4ad68 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-09-09Upgrade to released artifactsPamela Dragosh1-3/+3
Upgrade to released parent, common and models Issue-ID: POLICY-2045 Change-Id: I4ee2e7d752d45449d7d2c0173c3b6b672e160166 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-09-09Integrate using Policy Type to find MatchablePamela Dragosh26-175/+1186
Utilize's Jim's helper class to pull from API policy types definitions so that Xacml PDP can determine which properties are "matchable". Override initialize to set translator parameters. Utilize the metadata section of ToscaProperties to store the matchable field. Updated Matchable Request to be dynamic with respect to the incoming resource attributes. Stored the policy types as JSON. Issue-ID: POLICY-1899 Change-Id: Icff3605495b0a34ebfcdfa54346095ce2d8468a4 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-09-03Change "pap" to "policy-api" in xacml-pdp configJim Hahn1-1/+1
The json config file is really only an example, but the example leads users down the wrong path, because it implies that xacml-pdp connects to "pap" to get policy type information, when it actually talks to "policy-api". Updated the config file. Change-Id: Id2a42264591acd37b7813673fdcaa790257a9d8a Issue-ID: POLICY-1911 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-30Get policy type from policy-apiJim Hahn17-79/+616
Added a class to retrieve a policy type from the policy-api. Updated property files to include parameters that are needed to configure it. Updates per review comments: - change PolicyApi to PolicyApiCaller - use HttpClientFactory - removed superfluous constructors from exception classes - changed parameters to use RestServerParameters instead of BusTopicParams Change-Id: I8aad6ca5a733c8ad9cc983496e745ebe7400dd17 Issue-ID: POLICY-1911 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-23XACML junit spews dmaap errorsJim Hahn1-1/+1
Modified junit parameters to specify "noop" instead of "dmaap" in the topic properties, eliminating the dmaap error messages from the log. Change-Id: I350d988d10219e6ded2c011a4ed117fd5e71876a Issue-ID: POLICY-1725 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-22update keystorejhh2-0/+0
Issue-ID: POLICY-1988 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I544a0bdf63582cdff74765d7fad1b7f993d0bfa0 Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-08-08Review maven dependency for snakeyamlBruno Sakoto1-2/+1
Remove explicit version for snakeyaml maven dependency and inherit it from integration parent artifact. Issue-ID: POLICY-1603 Signed-off-by: Bruno Sakoto <bruno.sakoto@bell.ca> Change-Id: Iae360f073f9962014fbb64dbe150e75edc49d039
2019-08-07Bump version of policy/xacml-pdpJim Hahn14-16/+16
Change-Id: I2770d2803c79b5eb72b69bb6aa4a1da43a0f6a0b Issue-ID: POLICY-1965 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-08-06Add release 2.1.1 filejhh1-0/+4
Issue-ID: POLICY-1953 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I352905ea9e2876879896cc0842df43139d487d65
2019-08-06Update to latest common/models released versionsjhh1-2/+2
policy/models: 2.1.2 policy/common: 1.5.1 Issue-ID: POLICY-1953 Change-Id: I9ea6939e760ae5098896aedcfa632cc7426e927d Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2019-07-31Merge "Use new addTopic() method in xacml-pdp"Jorge Hernandez3-18/+5
2019-07-31Merge "Fix guard table creation during startup issue"Ram Krishna Verma1-2/+40
2019-07-30Fix guard table creation during startup issueMichael Mokry1-2/+40
- Added -hpolicydb to the mysql command in the script - Made this configurable by utilizing the existing parameters in xacml.properties for db connections. No OOM or CSIT changes should be needed now. PATCH UPDATE: - used Awk to extract property values - removed echo except one needed for the base64 command, as far as I can tell it is needed when assigning output to a variable, I tried to get it to work unsuccessfully. - added exit code 2 for missing properties as suggested by Jorge and Jim PATCH UPDATE: - remove echo from base64 using Jim's suggestion - Added code to remove escape backslashes from properties file, I didn't see these locally but when testing in windriver they show up in the xacml.properties file on OOM installs - More changes per Jorge's latest review Change-Id: I79c0502d8a4fadd2160785014fcb9db3c0faab5e Issue-ID: POLICY-1934 Signed-off-by: Michael Mokry <michael.mokry@att.com>
2019-07-30Use new addTopic() method in xacml-pdpJim Hahn3-18/+5
Replaced ParameterUtils with the use of the new addTopic(TopicParameterGroup) method. Change-Id: I35bf8a78d4670835dda005cdb218665a3bf48a16 Issue-ID: POLICY-1953 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-26Add stopBubbling to lombok.config for XACML-PDPJim Hahn1-0/+1
Change-Id: If489f95f80f324620bbcdca85d0fe2b4b2285d31 Issue-ID: POLICY-1938 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-24Merge "Add more junit coverage to xacml-pdp (round #2)"Jim Hahn9-81/+932
2019-07-24Merge "S3P Stability and Performance Tests"Pamela Dragosh2-95/+1972
2019-07-23Add more junit coverage to xacml-pdp (round #2)Jim Hahn9-81/+932
Also removed unused methods. Also extracted constants. Change-Id: I8d2cff05a365f145f2080369e9ea52d08be7e508 Issue-ID: POLICY-1772 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-23S3P Stability and Performance TestsMichael Mokry2-95/+1972
- Modified the jmeter scripts to include performance and stability testing with Decision APIs Change-Id: If10e5c598406af21d620b359a1f20b64fd433b18 Issue-ID: POLICY-1773 Signed-off-by: Michael Mokry <michael.mokry@att.com>
2019-07-23Fixed xacml-pdp registrationJim Hahn2-38/+46
Apparently, TimerTasks may not be cancelled and then re-scheduled. Modified the code to use a scheduled thread pool instead. Change-Id: I2e26a5a37636f570f362481823a0274fe558e2e9 Issue-ID: POLICY-1939 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-23Add junit coverage to xacml-pdpJim Hahn11-51/+1041
Change-Id: I9b59dcd27705e40c424b6a76420e0395adbe44bb Issue-ID: POLICY-1772 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-17Modify xacml-pdp to use RestServer from commonJim Hahn2-171/+9
Change-Id: I331483e2e28f2c57160b3eaace40fc84a1c13727 Issue-ID: POLICY-1652 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-10Added comment to checkstyle suppressionJim Hahn1-5/+11
Change-Id: I7c7c89e8b4367bbc2ea7a97e403eb253e955a9a5 Issue-ID: POLICY-1074 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-08Fix xacml-pdp due to sonar changes in commonJim Hahn3-11/+13
Fixed breakages due to changes made in policy/common to satisfy sonar. Change-Id: I6c655ca9509bc1d52277d55b02103e9875de2c29 Issue-ID: POLICY-1791 Signed-off-by: Jim Hahn <jrh3@att.com>
2019-07-04Remove topic.properties and incorporate into overall config file for xacmla.sreekumar19-357/+240
Change-Id: I3be6248db65041f5d9b7acfcf0fcd2f49d9d70f8 Issue-ID: POLICY-1744 Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
2019-07-03Fix xacml decision policy-typePamela Dragosh3-9/+27
Wrong attribute id was being used. Added info logging statement to assist in debugging. Added JUnit to support this. Issue-ID: POLICY-1843 Change-Id: I11d83574f91751804a45281d2e0c9cd3150e30eb Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-07-01Use ToStringTester from utils-testramverma2-3/+3
Changing ToStringTester from utils to utils-test. Bumping the policy/common & policy/models version. Change-Id: Idf665bc92345c445f483ebfb190d39c7019280aa Issue-ID: POLICY-1746 Signed-off-by: ramverma <ram.krishna.verma@est.tech>
2019-06-28Bump xacml-pdp to 2.1.1-SNAPSHOTPamela Dragosh14-14/+14
Released 2.1.0 Issue-ID: POLICY-1737 Change-Id: Ieb3015e9373a9a71a71f2811cbc6db9315d58109 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2019-06-28Remove POLICY_PDPX_HOME in policy-pdpx.sh and Dockerfileshaoqiu2-12/+12
Update the policy-pdpx.sh and Dockerfile according to the comments in commit: https://gerrit.onap.org/r/c/policy/api/+/89972 Issue-ID: POLICY-1702 Change-Id: Id46c108f5893d3e81e2038d9d5063b9f8a5eb5ee Signed-off-by: shaoqiu <tim.huang@est.tech>
2019-06-26Fix xacml-pdp latest tag2.1.0Pamela Dragosh1-12/+12
Eliminating the patch - using Rashmi's changes. Issue-ID: POLICY-1737 Change-Id: Iaacd198aeca5daef71e4356f7446e23b9c65d9ce Signed-off-by: Pamela Dragosh <pdragosh@research.att.com> Signed-off-by: pdragosh <pdragosh@research.att.com>
2019-06-24Upgrade to release common & modelsPamela Dragosh1-2/+2
Released common 1.5.0 and models 2.1.0 Issue-ID: POLICY-1737 Change-Id: Ia5bf6965c7c85b1de74b90b1d4fd179cac01bdea Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>