summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2020-12-03Merge "Remove unused imports"Ajith Sreekumar7-9/+4
2020-12-02Remove unused importsliamfallon7-9/+4
Issue-ID: POLICY-2900 Change-Id: Iaba37b81473b60d3da15a52ffcccdaa16a5b7091 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-12-02Merge "Use common LocalDateTimeTypeAdaptor for SO"Pamela Dragosh1-37/+4
2020-12-02Merge "Add extra authorative TOSCA concepts"Liam Fallon37-84/+538
2020-12-01Add extra authorative TOSCA conceptsliamfallon37-84/+538
This review brings in extra TOSCA concepts for Node types, nodes, and capabilities. The TOSCA handling is also amended to make the handling of equality consistent. Now, if filtering or ordering is required using an order rather than natural ordering, a comparator must be supplied by the user. Issue-ID: POLICY-2900 Change-Id: Ie40e86870b97eb993b1338bdc0666ac116f72f67 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-11-30Use common LocalDateTimeTypeAdaptor for SOJim Hahn1-37/+4
SO has its own specialized GSON type adapter. Modified it to subclass from the common type adapter. Issue-ID: POLICY-2903 Change-Id: I578eecbb1a37b5c95c5c27e6deb5c9f72ca7ae28 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-30Remove targetEntity from makeOutcomeJim Hahn10-55/+35
The Actor Params class had two flavors of makeOutcome, the second of which took a "targetEntity" parameter. As the Params no longer deal directly with the targetEntity, the second flavor was removed. Issue-ID: POLICY-2804 Change-Id: Ic736dd1c809ce54f6bb7cd37d03bc84cf4a1410c Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-20Delete preprocessed flag from actorsJim Hahn21-79/+64
Removed the "preprocessed" flag from the Actor parameter class, now that the actors no longer have a startPreprocess() method. Also removed targetEntity from Actor parameter class. Created a makeOutcome method within OperationPartial, which is used to create an initial outcome whose target field is pre-populated with the target-entity extracted from the properties. As the meaning of "target" may be specific to an operation, the makeOutcome method may be overridden by an operation subclass. Issue-ID: POLICY-2804 Change-Id: Ifb66de63301d644e69340009593513773ee5672d Signed-off-by: Jim Hahn <jrh3@att.com>
2020-11-18Merge "Make Actors event-agnostic"Ram Krishna Verma54-7372/+212
2020-11-06Fix upcoming checkstyle issuesPamela Dragosh2-2/+3
When we upgrade to oparent, these will fail as oparent upgrades to 8.37 of puppycrawl which fixes a few bugs that should have flagged these previously. Issue-ID: POLICY-2887 Change-Id: Ia0ceab23ff3d5c177f657c5852115ab1b265c698 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-10-27Make Actors event-agnosticJim Hahn54-7372/+212
Removed event and event-context code from the Actor code. Also removed the preprocessing steps from the Actor code, giving the application complete control over any preprocessing. Also fixed a bug wherein the APPC actor was treating the AAI_RESOURCE_VNF property as a String instead of as a GenericVnf. Issue-ID: POLICY-2746-actor Change-Id: Ibc05fe39ffedc0bc461abf10e6a960861ac70119 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-27Point to snapshot versionsJim Hahn1-2/+2
Issue-ID: POLICY-2875 Change-Id: Ifac2f1e3330f6cf3ce6225bbc960974c257805f5 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-27Bump models master to 2.4.0 SNAPSHOTJim Hahn44-45/+45
Bumping minor version now that guilin branch has been created. Issue-ID: POLICY-2875 Change-Id: Iec7868062610a3acca6f883f999615ccc109f850 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-19Bump models to 2.3.6 snapshotJim Hahn44-44/+44
Issue-ID: POLICY-2869 Change-Id: I98223c20d6d1d6d9bf5bd958d9d3ed4aacdf17e6 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-19Release models 2.3.5 artifacts7.0.0-ONAPJim Hahn1-0/+4
Issue-ID: POLICY-2869 Change-Id: I920b1da9fb26f3cf12ea23775188aa33d8bc80ed Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-16Merge "Default should be an object on TOSCA properties"Pamela Dragosh4-13/+83
2020-10-15Default should be an object on TOSCA propertiesliamfallon4-13/+83
Property default value is serialized to the database as Yaml and deserialized back into an object on a DB read. Issue-ID: POLICY-2844 Change-Id: I69f2843a93cd5f831359a0965223298b769498d9 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-10-13Bug fixes and improvements in CDS Simulatora.sreekumar3-15/+79
1) CDS Simulator was not able to run alone. It needed one of the RestServer simulators to start up to continue running. Providing the cds simulators parameters alone in the config file was resulting in termination of the Main process. This is fixed. 2) Response from the CDS Simuator when blueprint and action names are unknown (in real cases, when a corresponding CBA is not uploaded to CDS) is updated to mimic an actual CDS response instead of always returning a dummy success response. Change-Id: I79a6d158addaad31649809006d1e3c1dfdb47a1f Issue-ID: POLICY-2828 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-10-09Bump models to 2.3.5Jim Hahn44-44/+44
Issue-ID: POLICY-2863 Change-Id: Iba0dfe78576a2ad1551c165e3b9f53fa3c55259a Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-09Release models 2.3.4 artifactsJim Hahn1-0/+4
Issue-ID: POLICY-2863 Change-Id: I5d523aaed4da8a2e97a2ef520cdac73b2351633a Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-09Bump models to 2.3.4 snapshotJim Hahn44-44/+44
Issue-ID: POLICY-2863 Change-Id: I9d764a0cd695aa95a5880fd20b594e465d14c658 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-09Release models 2.3.3 artifactsJim Hahn1-0/+4
Issue-ID: POLICY-2863 Change-Id: I45e1de278f17fd3527cf700113ee0a879f4c90aa Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-09Specify "Accept" header in A&AI requestsJim Hahn4-7/+4
Modified the A&AI superclass to specify application/json for the Accept header. Removed the header from the subclasses. Issue-ID: POLICY-2863 Change-Id: I90974e305cb36ee2fa01999be4d79225a510e55b Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-07Bump models to 2.3.3Jim Hahn44-46/+46
Issue-ID: POLICY-2839 Change-Id: Ifd7f45854904545b4f2973e1429cb791ac00b600 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-07Release models 2.3.2 artifactsJim Hahn1-0/+4
Issue-ID: POLICY-2839 Change-Id: Ib17668226d28bd966ddab5c583278e66bd61e321 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-07Fix parent package name in models simulatorJim Hahn2-2/+4
Stage release failed saying: Non-resolvable parent POM for org.onap.policy.models.sim:models-simulator-tarball Fixed the name of the parent artifact in the package poms. Issue-ID: POLICY-2839 Change-Id: I61c81133095d9dadd51d77d73ecfd1ef11695419 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-07Merge "fix orphan module issue"Jorge Hernandez2-0/+7
2020-10-07Merge "Adding basic logging to CDS Simulator"Jorge Hernandez2-1/+14
2020-10-07Merge "rename controller.controllerName to controller.name"Jorge Hernandez1-1/+1
2020-10-07Adding basic logging to CDS Simulatora.sreekumar2-1/+14
1) Adding log statements to capture actions taken by CDS Simulator. 2) Fixing the way CDSRequest input is read from a String. StandardCoder decode method cannot directly decode from a String to protobuf type. Change-Id: I597c64ffb095f6a518b0b6c67c1617ca789ad7d6 Issue-ID: POLICY-2828 Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
2020-10-06Merge "Don't always validate restServerParameters"Jorge Hernandez9-11/+84
2020-10-06fix orphan module issueTaka Cho2-0/+7
when running sonar:sonar models-simulator-tarball" module gets orphan module error Issue-ID: POLICY-2859 Change-Id: I1d08a7ffadb7446c04fb62460e33ba3d2abffe6e Signed-off-by: Taka Cho <takamune.cho@att.com>
2020-10-06rename controller.controllerName to controller.namejhh1-1/+1
Issue-ID: POLICY-2860 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I097e15f5e6343b26bfb1afe69c530ce3142e18ec Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
2020-10-06Fix random failures in CdsSimulatorTestJim Hahn2-4/+11
Modified CdsSimulatorTest to allocate a unique server port for each test. Issue-ID: POLICY-2862 Change-Id: I4a7ed299c7458dade7444c6c8f2b476e24500dd4 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-06Don't always validate restServerParametersJim Hahn9-11/+84
Restored original validation code to DmaapSimParameterGroup so it works as it originally worked (i.e., required "restServerParameters"). However, modified SimulatorParameters to validate the relevant fields directly, rather than relying on DmaapSimParameterGroup.validate(), thus eliminating all checks on "restServerParameters" when used within SimulatorParameters. Issue-ID: POLICY-2858 Change-Id: I9a09431ce3056a874bf2dba1c5bd6c418f37f69b Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-06Merge "Make simulator parameters optional"Ajith Sreekumar10-24/+72
2020-10-05Make simulator parameters optionalJim Hahn10-24/+72
Modified the simulator to make the DMaaP and GRPC parameters optional so that a simulator can be started without them. Also added parameter validation, as that was not being performed on the DMaaP or GRPC parameters. Also modified the validation so-as not to require the rest server parameter field contained within the DMaaP parameter class. Issue-ID: POLICY-2858 Change-Id: I85dde93c7baf863eca2cb10eab37806f3e08a087 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-05Merge "Log simulator output at INFO level"Ram Krishna Verma2-0/+51
2020-10-02Log simulator output at INFO levelJim Hahn2-0/+51
The simulator is defaulting to DEBUG log level which generates too much output to wade through. Changing to INFO level and sending to stdout for easier use in docker & kubernetes environments. Issue-ID: POLICY-2742 Change-Id: I078a406d539068e25747a59955214c35fc31510e Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-02Fix eclipse/sonar warnings in modelsJim Hahn4-4/+4
Addressed the following eclipse/sonar warnings: - unused imports - unchanged type - unreachable "catch" block - reinterrupt Issue-ID: POLICY-2714 Change-Id: I2fe6011ec74b7fab8889050e5c83647ab034ea25 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-10-01Merge "Enhance gRPC Simulator:"Ajith Sreekumar25-10/+959
2020-09-30Remove Entity annotation from PfConceptContainerliamfallon1-1/+0
The PfConceptContainer class uses incompatible JPA anotations @MappedSuperClass and @Entity are incompatible as a MappedSuperClass cannot be an entity. Eclipselink silently tolerates this incompatibility but Hibernate (used in CLAMP) throws a build error on this class. Issue-ID: POLICY-2851 Change-Id: I2fd3d9217dc00717f8f2471e4848d254e7726b11 Signed-off-by: liamfallon <liam.fallon@est.tech>
2020-09-30Enhance gRPC Simulator:puthuparambil.aditya25-10/+959
1.Make gRPC Simulator respond to different actions by generating the response on the basis of received request. 2.Include CDS Simulator in policy-models-simulator 3.Introduce a packages module in models-sim to package the docker image of policy-models-simulator which includes all the simulators(pdp-simulator to be added in future) in models. 4.The Jenkins job changes to push this newly created Docker image may be taken in the next release. Issue-ID: POLICY-2828 Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca> Change-Id: Ic1663bbe8205c64a8133ea0b0c28152f21d0732a
2020-09-28Merge "Add DCAE policy types"Liam Fallon3-0/+307
2020-09-24update default keystoresjhh3-0/+0
Issue-ID: POLICY-2827 Signed-off-by: jhh <jorge.hernandez-herrero@att.com> Change-Id: I7622d382aec1bd4ba62405355854d1bad510a892
2020-09-24Add DCAE policy typesPamela Dragosh3-0/+307
These policy types were removed from SDC and added into policy. They are legacy and will be determined later if they should be permanently deleted or moved into use case code. The default fields need to be changed because our TOSCA code expects a string and does not recognize list. Issue-ID: SDC-3229 Change-Id: I36a03032134d6d320d1a459cfe1d56ce6a702d5d Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
2020-09-16Use latest alpine base imageJim Hahn1-1/+1
Simulators are only used while testing, thus the version of the alpine image need not be specified. Removing the version from the Dockerfile eliminates the need to update the Dockerfile every time the version changes. Issue-ID: POLICY-2819 Change-Id: Ie81079f4734b369eaf865c58d319b8244427207a Signed-off-by: Jim Hahn <jrh3@att.com>
2020-09-16Remove base64 encoding of password from modelsRam Krishna Verma6-21/+12
Remove base64 encoding of db password from models. This will have impact on the defaultConfig of API & PAP component. Seperate reviews are raised for those repos. Issue-ID: POLICY-2550 Change-Id: I258f76d01c21893bb40b4095a82e56ed51bd1377 Signed-off-by: Ram Krishna Verma <ram_krishna.verma@bell.ca>
2020-09-08Bump models to 2.3.2Jim Hahn41-41/+41
Issue-ID: POLICY-2789 Change-Id: I19b397ecb165bea30059142d9d4c5357ceba9825 Signed-off-by: Jim Hahn <jrh3@att.com>
2020-09-08Release 2.3.1 modelsJim Hahn1-0/+4
Issue-ID: POLICY-2789 Change-Id: I2199abef6ff9e34f3bdcc0103c59e3d5a761df6c Signed-off-by: Jim Hahn <jrh3@att.com>