summaryrefslogtreecommitdiffstats
path: root/controlloop/templates
AgeCommit message (Collapse)AuthorFilesLines
2017-10-05Fix JUnit Race Conditionsdaniel9-1210/+452
This fix now implements the observer pattern for the PolicyEngineJUnitImpl so that the test cases can be notified when an event is available to be pulled. This eliminates the need to sleep the thread for some arbitrary time to let the rules process events. Issue-ID: POLICY-291 Change-Id: I884c959c20b95a1b58f357602099d8a01c8d2e3c Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-28missing $ in guard expansion variablesJorge Hernandez1-4/+3
Change-Id: I05c577e8760f5b4b8e6375f50a327c9dde575e06 Issue-ID: POLICY-260 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-28Make Guard Configurabledaniel1-2/+5
This allows the user to disable or enable guard through the .properties.environment file. Verified and tested in a pdp. Properties were added to the simulators properties file for the simulators to work out of the box. Issue-ID: POLICY-259 Change-Id: I0027a5d28f1b30e81bdbe42fa17621b36a61c850 Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-28Delete ControlLoopXacmlGuardTest.javaTemoc Rodriguez7-426/+13
Deleted ControlLoopXacmlGuardTest.java so avoid sonar blockers. This junit will reduce coverage a bit but is not significant. This junit is already covered by the other use case junit files in template demo. A more robust junit is in need to test guard permit, deny, and pdp-x misconnecion in relation to the drl operations and rules. For now, this file does not add useful testing. Issue-ID: POLICY-260 Change-Id: Iaed0ad62f72ddc5b9a6b7626a037c26d6fd1ca52 Signed-off-by: Temoc Rodriguez <cr056n@att.com>
2017-09-28Fix Retries for Policiesdaniel8-37/+30
This applies changes to make retries work properly for all control loops. The current design was ignoring the upper bound of the retries and retrying until either a success or control loop timeout occured. This is now fixed to only do retries until the limit is reached that is specified from the policy. The operation is now started in the GUARD.PERMITTED rule. I think this is better because it stops Policy from doing extra processing if there is a guard deny. This is also needed so that we can properly do retries for all cases. The notifications sent in GUARD_NOT_YET_QUERIED and GUARD.RESPONSE are now more informative with the message specifying the actor and recipe. The not queried rule has a message stating that we are sending a query to guard and the guard response message in the guard response rule specifices the result from guard. During a retest of vDNS it appeared that the archetype template was no longer working, this was because there were changes in the JUnit template that were not reflected in the archetype template. These were added to archetype and vDNS is verified to work again. Another small fix needed was making sure the action for vCPE is "Restart" instead of "restart". APPC will reject our request if "Restart" is not sent as the action. Issue-ID: POLICY-259 Change-Id: I28dd3c9a629d297b408775a01afadd5c19351e37 Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-28Add missing auth headers to guard requestTemoc Rodriguez4-4/+11
Added guard authentication, client authentication, and environment http headers to the pdp-x guard restful request. Properties are set to PolicyEngine.manager. Property getter, setter, and properties in guard/.../Util.java. Test properties defined in junits themselves. Added code from GuardContext.java to grab the properties and make restful request. PolicyGuardXacmlHelper now closely resembles GuardContext in order to mimic functionality. Guard url no longer is passed into CallGuardTask, it is now a property. Issue-ID: POLICY-260 Change-Id: I5b144764828b6da0e7b738a578e4f6596a0f4f36 Signed-off-by: Temoc Rodriguez <cr056n@att.com>
2017-09-27Merge "Create common object to consolidate AAI response"Jorge Hernandez1-2/+2
2017-09-27Create common object to consolidate AAI responseJoseph Chou1-2/+2
Remove duplicate/obsolete code (NQF199) Change-Id: Ibe0d4d958a1fe5ae0bae93f740e8b32196a3b07b Issue-ID: POLICY-228 Signed-off-by: Joseph Chou <jc2555@att.com>
2017-09-27Fix Use Case Templatedaniel5-17/+42
This is a WIP for getting guard to work. Currently the A&AI GET and named queries are connecting to the simulator and working in the labs. Guard is not connecting to simulator and needs further analysis. Issue-ID: POLICY-259 Change-Id: If9875bfd83cbd82dcae04a876b3818ec9c07b1f7 Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-26force maven dependency plugin version to latestJorge Hernandez6-34/+39
the 2.1 version that comes with the ubuntu installation have problems with the maven repositoryUrls. disable asserts in fact counts, it seems almost impossible to get clean builds in jenkins server because these junit failures. Change-Id: I551f00a4a927f87a5e6294d936e9b9c926f21880 Issue-ID: POLICY-265 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-26Fix TestSO propertiesTemoc Rodriguez5-13/+22
TestSO was missing the environment properties for AAI and SO url, user, and pass. Set SO and AAI properties in TestSO.java. If this is not set, then the response will be null and the junit will fail. Moved setting properties to Util.java to promote code reuse. Issue-ID: POLICY-259 Change-Id: Id73611abab900675a1f2b543f71566baa05318b2 Signed-off-by: Temoc Rodriguez <cr056n@att.com>
2017-09-25Fix Usecase Template for VoLTEdaniel4-7/+127
This includes VoLTE support for the amsterdam template. As of right now all use cases are able to get a final success with guard disabled and no A&AI GET queries. Currently, the GET query is not working in the lab. I will address this in another pull request. Issue-ID: POLICY-259 Change-Id: I216aa84daaa1e93ab12c56ee53283b4cb413a7c3 Signed-off-by: Daniel Cruz<dc443y@att.com>
2017-09-22Fix Use Case Testingdaniel17-36/+214
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-21Add VFC Response in Working Memory & JUNITRitu Sood3-6/+402
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-21Merge "Implement restful call to xacml pdp guard"Jorge Hernandez5-11/+17
2017-09-21Implement restful call to xacml pdp guardTemoc Rodriguez5-11/+17
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-19test tooling to generate vcpe use case in labJorge Hernandez1-0/+22
run successully vcpe case in lab in 2 steps: 1. docker-install load 2. run create-cl-amsterdam (with defaults) 3. injecting dcae.onset and appc.success packaged with archetypes Change-Id: Idb20c0078228da962510dbf36dae96aceb43546c Issue-ID: POLICY-162 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-19enhancements to archetype and apps packagingJorge Hernandez4-21/+51
Change-Id: I3e659d35d3cb397c011657f39ef12b10b0564fc9 Issue-ID: POLICY-162 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-18Inherit guard install env properties for cl.Jorge Hernandez3-3/+2
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-15Master lab template changes for MSO rename to SOHockla, Ali (ah999m)3-18/+18
Issue-ID: POLICY-162 Change-Id: Ieb0952379cd854e0ed8e4a3b068b7e29f3b93770 Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-09-15Merge "Modify AAI simulator to support new requests"Pamela Dragosh5-7/+7
2017-09-15Modify AAI simulator to support new requestsCharles Cole5-7/+7
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-14Merge "master lab template maintained under archetype"Jorge Hernandez14-2/+1605
2017-09-14master lab template maintained under archetypeJorge Hernandez14-2/+1605
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-14Added changes for vDNS Use CaseHockla, Ali (ah999m)6-35/+331
-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-13Merge "Fix A&AI Named Query for vFW"Jorge Hernandez1-0/+17
2017-09-13Merge "ONAP code for AAI, consolidate name and get query"Jorge Hernandez1-0/+12
2017-09-12Fix A&AI Named Query for vFWdaniel1-0/+17
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 Chou1-0/+12
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-11Add Support for Locking VNF Target Typesdaniel3-11/+10
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-357/+29
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-08Added changes for vDNS Use Case - MSO InterfaceHockla, Ali (ah999m)9-72/+629
Rebased and fixed merge conflicts Issue-ID: POLICY-102 Change-Id: Icc36a2cf6391aa9137593bc04f0d4543798b7ccd Signed-off-by: Ali Hockla <ah999m@att.com> Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com> Signed-off-by: HOCKLA <ah999m@att.com> Signed-off-by: Hockla, Ali (ah999m) <ah999m@att.com>
2017-09-07Merge "Support drl compilation at design/development time"Jorge Hernandez3-1/+20
2017-09-07Add in-mem db to ControlLoopXacmlGuardTestTemoc Rodriguez4-88/+125
Add in-mem specification in test/resources/META-INF/persistence.xml for junit. Use system properties to choose which db to use. Removed named parameters in PIPEngineHistory.java. Change 6.3.0 versions of drools-core to 6.5.0 in pom. Make PIPEngineGetHistory query more general. Increased sleep times in junit. Issue-ID: POLICY-55 Change-Id: I6bc65fd88c43c4e7143f27a7e6d8666c2c4df060 Signed-off-by: Temoc Rodriguez <cr056n@att.com>
2017-09-07Support drl compilation at design/development timeJorge Hernandez3-1/+20
Change-Id: I0fe6277f92c0db7f596ff73d81987e2e78b5793e Issue-ID: POLICY-162 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-09-06Add APPC LCM Interfacedaniel10-18/+1154
The LCM model code and service provider code is implemented. This model code is now used for the vCPE use case scenario. The vFW use case is still using the legacy APPC API as request by APPC for Policy to use in R1. The APPC service provider now generates a demo legacy APPC request with pg-streams. An A&AI named query is implemented for the vFW use case. The code for obtaining the generic-vnf.vnf-id is not in use until we set up the A&AI simulator to work without having cyclical depenncies inside the POMs. JUnits for the vFW and vCPE use cases are now supported. These JUnits test the complete flow of each scenario. A&AI testing is not supported in the JUnit test yet. These JUnits use a target type of VM as VNF is not supported yet. This will be changed when the Target Lock supports VNF. Amended to fix Sonar blockers. Issue-ID: POLICY-104 Change-Id: I46869c5fd5094919da55ad563d608fe6d4b6fea7 Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-09-06Add missing license.Pamela Dragosh1-0/+20
The license checkstyle is now issueing errors for missing licenses. Change-Id: I3784c43e8d33d14c0ddd92668c68d400979b862f Issue-ID: POLICY-206 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2017-09-01Add vFC and MSO SimulatorsCharles Cole6-1/+231
Added vFC and MSO Simulators for jUnit testing Issue-ID: POLICY-201, POLICY-202 Change-Id: Ia30ff6ec74a8ee4fa71ce0456eb6dcb60c897695 Signed-off-by: Charles Cole <cc847m@att.com>
2017-08-31Add mock AAI endpoint for jUnit testingCharles Cole5-238/+273
Created an AAI endpoint for use in jUnit testing of closed loops. Added unit tests for my endpoint. Added methods to Util in template.demo to support creation of AAI endpoints and kieSessions. Issue-ID: POLICY-101 Change-Id: I8e110b79f4c2ca700b29dcb29e9828303772d56d Signed-off-by: Charles Cole <cc847m@att.com>
2017-08-31CL dependencies fixes for lab environment runtimeJorge Hernandez2-2/+14
This also includes workarounds to the recent oparent dependency introduction that breaks runtime (with the version-check-maven-plugin). manifested by loading control loops and failing to load some classes due to different versions. The issue was that underlying drools libraries use 3.2.5 and oparent has included a had dependency with transitive dependencies for some maven libraries in 3.2.3 and lower version xml parsers. Bottomoline, the classpath at runtime was formed by the union of both, with some libraries being resolved to the oparent one, and others to the drools one. These errors are very obscured to debug. Additional clean up of dependencies versions and order of build was introduced to avoid issues loading dependencies at runtime in a lab environment (non-junit).. Issue-ID: POLICY-162 Change-Id: I019c82e6bed4eab4884cdbf8f6f32472c3a7352f Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-08-30legacy archetype simplificationJorge Hernandez6-53/+31
removes pom warnings on versionn duplication from parent pom. Change-Id: I7b218d6d72bf4db2692370ecc637dbd74e96290f Issue-ID: POLICY-162 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-08-29Restored global ControlLoopLoggerMagnusen, Drew (dm741q)1-1/+2
Restored previously deleted global ControlLoopLogger which is loaded into the kieSession for the test. Issued-ID: POLICY-197 Change-Id: I55e9a3a0c2627ecbecbef8059e70d672e6157fdc Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2017-08-28Merge "Removal of sys.out/err with logger messages"Jorge Hernandez5-56/+68
2017-08-28Removal of sys.out/err with logger messagesMagnusen, Drew (dm741q)5-56/+68
Removed any use of System.out.println or System.err.println and replaced with relevant logger statements. Issue-ID: POLICY-176 Change-Id: I91513267635bfb2a34f2a9650c48f367d53fc842 Signed-off-by: Magnusen, Drew (dm741q) <dm741q@att.com>
2017-08-28Fix JUnit Test for ControlLoopsdaniel3-7/+24
Fixed the test case by using getters and setters for Policy objects in the drl. Added gson dependency in the pom to fix gson runtime errors. Fixed dependencies in template.demo pom to add vfc. The drl was having compilation errors in the guard permitted rule due to the operation request object not being casted into a VFCRequest when being passed into the VFCManager. Issue-ID: POLICY-194 Change-Id: Id71c74ad9727ad942a683f63a0dfad3f22b6376b Signed-off-by: Daniel Cruz <dc443y@att.com>
2017-08-24Add VFC integration codeRitu Sood1-4/+10
This patch adds VFC Actor code and updates drool template for VFC. This is WIP patch. There are two opens for this patch that are still in discussion 1) AA&I fields in onset event 2) VFC URL, username and password Issue-ID: POLICY-57 Change-Id: Idc1d1fada295fa1c2e563ba37dd359f7b5c59f87 Signed-off-by: Ritu Sood <ritu.sood@intel.com>
2017-08-17installation improvements and renaming archetypeJorge Hernandez13-15/+14
Two changes: - remove hardcoding of the DMaaP hosts, and DCAE topic to make it configurable. - rename archetype to better name. Change-Id: Ic50b9d1f06a138230c76cc6c50ca8072dc5da148 Issue-ID: POLICY-159 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-08-15Policy-yaml changesTarun Tej Velaga1-7/+7
Changes to Policy-yaml and sdc projects based on changes from policy/engine. Issue-Id: POLICY-88 Change-Id: Ic1a58f00029b9a66db6980fc7732a2ac57390229 Signed-off-by: Tarun Tej Velaga <tt3868@att.com>
2017-08-08move packages build + tweaking pom.xmlJorge Hernandez2-7/+2
Change-Id: Iac032aa8f379cc8d614ec7913b41a68cbda9674d Issue-ID: POLICY-162 Signed-off-by: Jorge Hernandez <jh1730@att.com>
2017-07-26[POLICY-91] POM dependencies cleanupGao, Chenfei (cg287m)3-124/+157
Change-Id: Idfc19a978be26e1dfa85736fea5ffecf6b298446 Signed-off-by: Gao, Chenfei (cg287m) <cgao@research.att.com>