summaryrefslogtreecommitdiffstats
path: root/controlloop/common
AgeCommit message (Collapse)AuthorFilesLines
2017-09-22Merge "Add simple JUnit test for LCMResponse"Pamela Dragosh2-2/+110
2017-09-22Add simple JUnit test for LCMResponsePamela Dragosh2-2/+110
This covers all the methods Issue-ID: POLICY-32 Change-Id: I6da6c54c257f6254f5116c99a64c02dbf0c77e05 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-09-22Merge "Fix Use Case Testing"Jorge Hernandez8-11/+69
2017-09-22Added private constructorramanjaneya1-0/+4
Issue-ID: POLICY-239 Change-Id: I2ed90fc27c70ae03a772913bf3fefd28b692cec7 Signed-off-by: ramanjaneya <ramanjaneya.palleti@huawei.com>
2017-09-22Fix Use Case Testingdaniel8-11/+69
These changes are necessary to get the use cases working on an actual PDP. So far vCPE, vFW, and vDNS have been tested successfully on a pdp. These are priliminary tests to just test a FINAL SUCCESS without A&AI GET queries being used. A&AI named queries for vFW and vDNS have been verified to work. Changes in the template were made for SO as there were changes in the JUnit template that did not get reflected in the archetype template. Changes in the code were made in various places to use the environment properties for REST urls, usernames, and passwords. Due to VoLTE not being tested yet, the url for VFC is still hard coded and will be changed later. It has been confirmed with APPC that LCM will have two topics: APPC-LCM-READ and APPC-LCM-WRITE. Policy needs to sink to APPC-LCM-READ and pull from source APPC-LCM-WRITE. This has been reflected in the controller properties file. Issue-ID: POLICY-259 Change-Id: Ib9a8df07ae5ad9d3052c88907c1e522952af474d Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-22Create common object to consolidate AAI responseJoseph Chou4-76/+16
Create base object for AAI GET query Change-Id: I874b10f89054d8adcc28b1e601e9ff15ee884784 Issue-ID: POLICY-228 Signed-off-by: Joseph Chou <jc2555@att.com>
2017-09-22Merge "Add VFC Response in Working Memory & JUNIT"Pamela Dragosh8-16/+58
2017-09-21Add guard simulator and multiple AAI responsesCharles Cole8-6/+142
Added a guard simulator that can permit or deny (it sends a deny if the clname is denyGuard). Added responses to the AAI simulator to set the is-closed-loop-disabled to true (use a get query with a key of disableClosedLoop). Changed the content-type of all responses to application/json. Issue-ID: POLICY-256 Change-Id: If84813968d3ea59d9ebe029caa69f444a1f413c8 Signed-off-by: Charles Cole <cc847m@att.com>
2017-09-21Merge "ONAP AAI GET QUERY code to support ONAP project"Jorge Hernandez3-39/+124
2017-09-21ONAP AAI GET QUERY code to support ONAP projectJoseph Chou3-39/+124
check in code to use simulator url Issue-ID: POLICY-103 Change-Id: I352140dd3cb3159fc2c5738bf02dbb6272de48bc Signed-off-by: Joseph Chou <jc2555@att.com>
2017-09-21Merge "Implement restful call to xacml pdp guard"Jorge Hernandez3-56/+105
2017-09-21pdp-d feature to simulate aai/mso/vfc in labJorge Hernandez11-214/+599
implemented as an optional loadable feature, this capability enables to bring up simulators used by junits in a pdp-d lab configuration. After lab installation, perform: 1. features enable controlloop-util 2. policy start Now the simulators are opened at ports 6666, 6667, and 6668. netstat output: tcp6 0 0 127.0.0.1:6666 :::* LISTEN 21562/java tcp6 0 0 127.0.0.1:6667 :::* LISTEN 21562/java tcp6 0 0 127.0.0.1:6668 :::* LISTEN 21562/java 21562 is the pdp-d PID in the lab. curl http://localhost:6666/aai/v11/network/generic-vnfs/generic-vnf/vnfIdA { "vnf-id": "5e49ca06-2972-4532-9ed4-6d071588d792", ... } Change-Id: I3f05333ce5549b2274eb967b2b8866189b7f8843 Issue-ID: POLICY-259 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-21Implement restful call to xacml pdp guardTemoc Rodriguez3-56/+105
Removed the embedded guard decision and replace with restful call to xacml pdp to restore guard functionality. Set guard URL with PolicyEngine env properties. Modified templates accordingly. Issue-Id: POLICY-260 Change-Id: Ic1558a6ebdd5f6d1b74a748f69433f6213dbf984 Signed-off-by: Temoc Rodriguez <cr056n@att.com> Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-09-21Add VFC Response in Working Memory & JUNITRitu Sood8-16/+58
Adding code to insert VFC reponse in working memory and handling that response. Also adding JUNIT and yaml file for VoLTE usecase. Issue-Id: POLICY-212 Change-Id: I74a13272ccd931478d27d80715d8c3ac756fb5c7 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2017-09-20Merge "Fix for Sonar major issues"Jorge Hernandez1-1/+2
2017-09-20Merge "Fixing VFC simulator for junit tests"Pamela Dragosh3-6/+17
2017-09-20Merge "Fix Major sonar issues"Pamela Dragosh1-6/+7
2017-09-20Fix for Sonar major issuesSwapnilPathak1-1/+2
Add override annotation above the method signature. Issue-ID: POLICY-248 Change-Id: I8086a6fc1dc24719c3ffd3785a12c086ab453ae9 Signed-off-by: SwapnilPathak <SP00494485@techmahindra.com>
2017-09-20Fix Major sonar issuesshashikanth1-6/+7
Fix Major sonar issues in policy/drools-applications module https://sonar.onap.org/component_issues?id=org.onap.policy.drools-applications%3Adrools-pdp-apps#resolved=false|severities=MAJOR Add the "@Override" annotation above this method signature "value" is already a string, there's no need to call "toString()" on it Issue-Id:POLICY-239 Change-Id: Ia64ac87c13d88c5d961b943e0b2286b273bd4831 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-19Merge "Adding reading service-id from AA&I"Jorge Hernandez2-14/+61
2017-09-19Remove sonar blocker and unused importPamela Dragosh2-8/+6
Remove the 3 sonar blockers and unused import in AAI code. Issue-ID: POLICY-111 Change-Id: I73001a06810ecff3f22da627583a0238c4a09967 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-09-18Inherit guard install env properties for cl.Jorge Hernandez1-1/+1
Clean up a few "mso" references. Disable 1.0.0 template build for now (note that some references are still pointing to old mso). Ie., see https://git.onap.org/policy/drools-applications/tree/controlloop /templates/template.demo.v1.0.0/template.demo /src/test/java/org/onap/policy/template/demo/TestSO.java Since this is going away, rather than maintaining it, and changing this code, disabling it for the build. It will be deleted within the next few days. Issue-ID: POLICY-162 Change-Id: Ibb819a318fbbb2b7f3aa14cdf76155bdec321024 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-18Merge "Fix sonar critical"Jorge Hernandez5-9/+28
2017-09-18Fixing VFC simulator for junit testsRitu Sood3-6/+17
Added response type to post and removed response id as it is unused. Breaking up from the junit patch for ease of review. Issue-id: POLICY-212 Change-Id: I0c6b0c02b240cfe81246587184fe6a589dcc2367 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2017-09-17Adding reading service-id from AA&IRitu Sood2-14/+61
For VFC adding getting service-id from AA&I. Issue-Id: POLICY-57 Change-Id: I740c7749bfb2d395851cbd5eb3e486bf4eb9b560 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2017-09-15Fix sonar criticalPamela Dragosh5-9/+28
Last transient/serializable issues. Throw a dedicated exception for DateUtil class Unused imports Make the enclosing method "static" or remove this set. Issue-ID: POLICY-115 Change-Id: I366f85922c4d4d290b320e0b88678c805de59872 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-09-15Merge "ONAP AAI GET Query code"Jorge Hernandez3-2/+150
2017-09-15ONAP AAI GET Query codeJoseph Chou3-2/+150
Update ControlLoopEventManager to raise exception on null AAI response Issue-ID: POLICY-103 Change-Id: Iebe8b03269a1801c4293600920aa267490cea1af Signed-off-by: Joseph Chou <jc2555@att.com>
2017-09-15Fix sonar criticalsPamela Dragosh20-41/+43
Either re-interrupt this method or rethrow Exception Transient/Serializable issues Unused imports logging exceptions Issue-ID: POLICY-115 Change-Id: I4c8a0c780e2f6c6e8218c1457f18470f7d95919c Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-09-15Merge "Modify AAI simulator to support new requests"Pamela Dragosh11-49/+148
2017-09-15Modify AAI simulator to support new requestsCharles Cole11-49/+148
Updated the AAI simulator to support new AAI queries. Also, modified the post response to allow multiple responses. Added code to ensure the simulators were able to sucessfully start up. Change-Id: I3e855b5e54c073f55fbaadc0064c140695fc1a58 Issue-ID: POLICY-200 Signed-off-by: Charles Cole <cc847m@att.com>
2017-09-14Clear eclipse warnings and sonarPamela Dragosh9-82/+35
Removing warnings introduced with A&AI code. This should also address sonar criticals and majors. Issue-ID: POLICY-140 Change-Id: I3f8186dd9c5aa52bfbb061bf95d67b5614b3fb2e Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-09-14Merge "Move credential information out of persistence.xml"Jorge Hernandez5-13/+69
2017-09-14Merge "master lab template maintained under archetype"Jorge Hernandez2-88/+81
2017-09-14master lab template maintained under archetypeJorge Hernandez2-88/+81
This is work in progress, the official pom.xml with dependencies, drl template, and support files for controller deployment are maintained here. In the near future the junit template should be consolidated with this one. Added controlloop.properties.environment, this environment file will be populated at installation time with the lab's aai url, etc .. and will be accessible by any drools application such as control loops through the PolicyEngine interface. Note that PDP-D server already supports these environment files, so it is just natural. Therefore, this is the default mechanism to provide to applications, the url, username, and passwords to use at runtime by the control loops for the time being. In the future MSB could set them globally here through existing APIs, or it can be queried by any drools application using MSB library, doesn't matter. There's been some trouble playing nicely with the dependencies used by a control loop application classsloader, and the pdp-d middleware one, causing issues between dependencies version of libraries. Specifically, the snakeyaml library does not play well across classloader when using constructor functionality, note that the snakeyaml libraries are pulled also from jackson parsers used in the pdp-d. I made a change in ControlLoopProcessor to specifically tell the "Yaml" object which classloader to use in order to find the class with the constructor that is intended to be built, otherwise, yaml libraries use a different classloader that does not have visibility into the ControlLoopPolicy that is trying to construct, and fails. This also should respect junits that use the same classloader I pressume and does not give issues. Change-Id: I36271d29cdbf8ff861f9c03ff91cf7116927906a Issue-ID: POLICY-162 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-14Move credential information out of persistence.xmlTemoc Rodriguez5-13/+69
Move credential information out of persistence.xml. Define properties file which will contain the credentials instead. Access db using new properties file. Issue-ID: POLICY-55 Change-Id: I01ad0611c053ad4285de2a225fca7920a3b1bc8f Signed-off-by: Temoc Rodriguez <cr056n@att.com>
2017-09-14Merge "Added changes for vDNS Use Case"Jorge Hernandez34-200/+289
2017-09-14Added changes for vDNS Use CaseHockla, Ali (ah999m)34-200/+289
-Renamed remaining MSO classes and packages to SO and modified drl accordingly -Connected SO Interface to SO Simulator -Added vDNS Control Loop junit -Modified SOActorServiceProvider to reflect AAI class changes (POLICY-103) Issue-ID: POLICY-102 Change-Id: Iea5d3f096c4ccfedde68e79d7593d66331127aaf Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-09-13Fix AAINQF199 object references to AAINQ objectsdaniel1-14/+14
This is a small change to now reference the new AAI model instead of using the older AAINQF199 model. Issue-ID: POLICY-104 Change-Id: I2a1d2830fbd3bd7d62a9e27067a8c32a1c1ab4b1 Signed-off-by: daniel <dc443y@att.com>
2017-09-13Merge "Fix A&AI Named Query for vFW"Jorge Hernandez5-19/+89
2017-09-13Merge "ONAP code for AAI, consolidate name and get query"Jorge Hernandez31-23/+1906
2017-09-12Fix A&AI Named Query for vFWdaniel5-19/+89
The vFW named query has now been verified with the A&AI simulator. Null checks were added to make the namedQuery method work properly. In addition, a recursive A&AI response parser was added to traverse the response to find the correct generic-vnf object with the target vnf-id. For now the simulator URL is hard coded and the UUID of the named query is hard coded. These should be configurable in future releases. Issue-ID: POLICY-104 Change-Id: I05a1a992ff68ca2c17fb6a578983e6b21626bf44 Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-12ONAP code for AAI, consolidate name and get queryJoseph Chou31-23/+1906
Adding AAI GET query feature to support ONAP project (1 commit) Issue-ID: POLICY-103 Change-Id: I0a55f41c3edd7a0bc0562ae4e12a19f262a50d74 Signed-off-by: Joseph Chou <jc2555@att.com>
2017-09-12Merge "Fix nullPointerException"Jorge Hernandez1-2/+3
2017-09-12Merge "Fixing VFC Model response class"Pamela Dragosh4-43/+10
2017-09-12Fix nullPointerExceptionTemoc Rodriguez1-2/+3
Fix nullPointerException by changing return values of attributesProvided and attributesRequired from null to empty Set. Issue-ID: POLICY-55 Change-Id: I9516a9bcad591cc582834cb49fa54e58a1f45a47 Signed-off-by: Temoc Rodriguez <cr056n@att.com>
2017-09-12Fixing VFC Model response classRitu Sood4-43/+10
Fixed the response class for VFC response and also removed the Ignore test case. Change-Id: I4373e86399089b7a3d743be4d19f76cc37d1ceea Issue-id: POLICY-57 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2017-09-11Add Support for Locking VNF Target Typesdaniel1-0/+8
Fixed the target lock to support vnf target_types. Generic-vnf.vnf-id and generic-vnf.vnf-name are also supported when retrieving the target instance from the onset. These changes are relfected in the vFW and vCPE junits as they now work with VNF target types. Issue-ID: POLICY-222 Change-Id: I92abeb02c769d35f3a9912cce6eaaec4c9cc8efb Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-11Move the simulators to a new packageCharles Cole9-0/+438
Moved the simulators to the simulators project in controlloop/common. They can now be accessed with the Util class in the simulators project or the Util class in template.demo, for backwards compatability. Also renamed AaiSimulator to AaiSimulatorJaxRs Issue-IS: POLICY-200 Change-Id: Id131af0243777db31a8f22e110d8a708dc033dcf Signed-off-by: Charles Cole <cc847m@att.com>
2017-09-11Fix Eclipse warnings for raw type parameterizationPamela Dragosh1-4/+4
Eclipse generates warnings for raw types and 2 fields are not accessed statically. Issue-ID: POLICY-102 Change-Id: Ibeb2a76d527949cfd7283ab1a78d97e582725337 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>