aboutsummaryrefslogtreecommitdiffstats
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2022-08-16Merge "[AAI] Upversion to 1.9.6 to include v27"Manisha Aggarwal34-34/+34
2022-08-16[AAI] Upversion to 1.9.6 to include v27wr148d34-34/+34
Issue-ID: AAI-3489 Signed-off-by: wr148d <wr148d@att.com> Change-Id: I5ee90a52e6d3e8752b9ca254084686d146ade420
2022-02-22Merge "[AAI] Update babel to use the new v26 schema and upversion to 1.9.3"Robby Maharajh34-34/+34
2022-02-22[AAI] Update babel to use the new v26 schema and upversion to 1.9.3wr148d34-34/+34
Issue-ID: AAI-3435 Change-Id: I280aa7e646329999d066a88a33fa19c8e714d599 Signed-off-by: wr148d <wr148d@att.com>
2021-09-07Fix sonar issuesSamuel Liard17-93/+56
Issue-ID: AAI-3362 Signed-off-by: sliard <samuel.liard@gmail.com> Change-Id: I42e20a29a35eba600d18c2e4c85daed183c4d829
2021-08-23[AAI] Updates for v24 upgrade on Babelwr148d36-36/+36
Issue-ID: AAI-3361 Signed-off-by: wr148d <wr148d@att.com> Change-Id: Id4891b769d07daa4102b696c9ecc80192ce2359f
2021-03-12Resolve files with licensing issues in BabelPolavarapu, Chaitanya (cp8128)7-22/+0
Issue-ID: AAI-3301 Change-Id: Ia376802e449b0bf013dfd3a3e9843448234afef1 Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2021-02-24Ignore application logger testHarish Venkata Kajur1-0/+2
Logging test is consistently failing in centos and failing intermittently in other distros It seems to be due to the reliance of date time that might have caused this issue Since the test is not critical and it is stopping the progress of releasing the artifact its best to ignore this test for now Issue-ID: AAI-2996 Change-Id: I507b981243bacebe7bd268924967d4fb9416a68b Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2021-02-23Use released docker base imageHarish Venkata Kajur1-2/+2
Also remove the tini init process as it was preferred that we have one process in onap Issue-ID: AAI-2996 Change-Id: Ice4fce3580b3912ea59db22c79c385bd1aecd465 Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
2021-02-23Updated pom to remove distribution-management section and corrected aai base ↵Polavarapu, Chaitanya (cp8128)79-121/+6584
image version Issue-ID: AAI-2996 Change-Id: I28da9ccf5618e180e04e3f29b0440bab5e3ffc3f Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2020-09-10[AAI] Set logging.configguilinDominik Mizyn1-0/+1
This commit adds logging.config to app start properties. The goal is to get control on with conf files are loaded to configure logback logging framework. Issue-ID: OOM-2514 Signed-off-by: Dominik Mizyn <d.mizyn@partner.samsung.com> Change-Id: I0f71107bace8ff29ad2470cbfb600e1325063739
2020-08-28[aai-babel] Add support for sndc props parsingefiacor7-4/+81
Signed-off-by: efiacor <fiachra.corcoran@est.tech> Issue-ID: AAI-3121 Change-Id: I9ed925e7e95d73b30942df895d19fba0c36500f0
2020-08-06Add 'category' of service model to Babel artifactdhebeha21-27/+40
Issue-ID: AAI-3017 Signed-off-by: dhebeha <dhebeha.mj71@wipro.com> Change-Id: I079d3a1ea8c681a1c6d854adf80776ce934c49e2
2020-06-23Extend service modelwsliwka6-4/+69
extend service model by adding orchestrationType Issue-ID: AAI-2594 Signed-off-by: wsliwka <wojciech.sliwka@nokia.com> Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com> Change-Id: I34de40005b6ddad0cd71ccb20fae94f7f45c6257
2020-06-01Containers should not run as root by defaultwr148d1-2/+11
Issue-ID: AAI-2822 Change-Id: I28d5426805bbf5d60aa0cd0bc1701165f233d6a9 Signed-off-by: wr148d <wr148d@att.com>
2019-11-21Update schema-service dep to 1.6.0sblimkie18-18/+18
Change-Id: Idfabac878db11ccde4859ee04bdf45b560460a88 Signed-off-by: sblimkie <steven.blimkie@amdocs.com> Issue-ID: AAI-2607
2019-08-28Fixed project version parsingDmitry Puzikov4-19/+249
Fixed pom.xml to execute vesion parsing earlier. Change-Id: Ic5f2c1c304ab025cbac93d5177776c17a8ff803b Issue-ID: INT-801 Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
2019-07-30Upgrade Spring Boot from 1.5.x to 2.1.6Lee, Tian (tl5884)3-3/+3
Changes required to upgrade Babel to latest Spring Boot version. This changelist is dependent on https://gerrit.onap.org/r/c/aai/oom/+/92293 Issue-ID: AAI-2540 Change-Id: I804b80506514d274249fa4eae36392793cb737fb Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2019-04-11Updated to use dublin schema versionPolavarapu, Chaitanya (cp8128)4-12/+76
Using 1.0.2 schema-service version Fixed the junit test failure for default service version Issue-ID: AAI-2338 Change-Id: Ie0ddda41f6895ff0ce8e97ad065fb935462e643a Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2019-04-10This enhancement will enable Babel to process artifacts of version n.nPolavarapu, Chaitanya (cp8128)19-23/+25
Issue-ID: AAI-2338 Change-Id: I829ba56aa09ac1d98a8c9d27fabb85d95d571534 Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2019-04-03GenerateArtifactsServiceImpl code coveragemark.j.leonard3-26/+115
Additional tests for coverage of the generateArtifacts() implementation. Replace use of the generic Exception by catching only the specific types of Exception thrown by the parser/generators. Modify existing tests to ensure that each branch is covered. Change-Id: Id35e8a4a51b785f0367ac04a31ed23226cdb4810 Issue-ID: AAI-2280 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-04-03Fix new Sonar code smellmark.j.leonard2-2/+2
Log the Exception for missing software versions to prevent a Sonar violation. Change-Id: I1a5da4357947a57c05f2d4a40b788999149d543c Issue-ID: AAI-2281 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-04-03Delete temp file in FileWatcher testmark.j.leonard2-2/+3
Ensure the temporary file is deleted after the test completes. Change-Id: I25fbab4c28d9489df0ed9b6cb74a068873aa9854 Issue-ID: AAI-2280 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-04-03Add tests for uncovered FileWatcher codemark.j.leonard3-14/+130
Move the onChange() method so that it can be tested. Change-Id: I8a011ae581a16cf31e9573e6d4c9b2fa1c858b8a Issue-ID: AAI-2280 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-04-03Merge "Move REQUIRE_CLIENT_AUTH code to start script"Tian Lee5-17/+32
2019-04-03Move REQUIRE_CLIENT_AUTH code to start scriptmark.j.leonard5-17/+32
Move the conversion from the REQUIRE_CLIENT_AUTH env variable to the Spring setting server.ssl.client-auth out of the Java code and in to the start script. This declutters the code and exposes this setting. Refactor the code for readability: have Jetty deobfuscate the password string for us rather than manually detecting the "OBF:" prefix. Also fix a typo (spelling mistake). Change-Id: Ic670c04f97f59e06e48ca2cf4d7a0188020b3eaa Issue-ID: AAI-2280 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-04-02Merge "Additional Logger tests for code coverage"Tian Lee2-6/+56
2019-04-02Additional Logger tests for code coverageMark Leonard2-6/+56
Change-Id: Ib94fc61ae43d59a32fba19363b06dc7aed5a96bc Issue-ID: AAI-2280 Signed-off-by: Mark Leonard <mark.j.leonard@gmail.com>
2019-04-01Exception handling for image software versionsmark.j.leonard3-12/+45
Throw an exception when no software versions are present for a VNF image. This needs to be an unchecked exception when using Streams. Change-Id: If7a429c79a614eed1dad6ed8ac1993caca47ab6d Issue-ID: AAI-2306 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-29Additional null checks and commentsmark.j.leonard8-45/+68
Add defensive coding to check for possible null pointer values, thus preventing certain potential runtime exceptions. Fix some minor spelling inconsistencies. Refactor some method signatures and update the Javadoc. Reformat Resource toString() method to avoid lengthy String concatenation and duplicated separators. Change-Id: I4b01eb844700e00d0c909bcc5fa2dbc91d5149e4 Issue-ID: AAI-2281 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-28Use checked Exception instead of RuntimeExceptionmark.j.leonard2-17/+34
Replace IllegalArgumentException with XmlArtifactGenerationException in the ArtifactGeneratorToscaParser method processResourceModels(). Add comments to explain the processing. Change-Id: Icf401ae22ebe26d687fc58c33743582c9c9e576e Issue-ID: AAI-2281 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-28Depend on sdc-tosca version 1.5.0mark.j.leonard5-38/+173
Replace the following deprecated API methods with equivalent functions: getGroupsOfOriginOfNodeTemplate() getNodeTemplateCustomizationUuid() getNodeTemplateChildren() getServiceVfList() getMembersOfVfModule() getVfModulesByVf() Create a helper class and move the remaining deprecated API calls into a single Java file for ease of maintenance. Change-Id: Icb08b2d66a34b0a3e717adb49f2d62e8f2e2ddb5 Issue-ID: AAI-2294 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-28Change generic-vnf delete flag to truemark.j.leonard2-2/+2
Alter the test values for the generic-vnf Widget Type to match the actual configured values used in historic deployments of the Babel Service. The test values will then be aligned to the actual run-time values thus avoiding any confusion caused by the disparity. Issue-ID: AAI-2292 Change-Id: Ia8bef2e31d62027c4edb636a78c8cde93da6638b Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-28Remove all references to artifactgenerator configmark.j.leonard13-124/+12
Delete the artifact-generator.properties file. Remove all related functionality from the code. Change-Id: I652d99b6424bb60af5820f5afb97ef139e3f9511 Issue-ID: AAI-2284 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-26Allow UUID definitions in the mappings JSONmark.j.leonard8-530/+95
Add support for reading the Widget invariant and version UUIDs from the TOSCA mappings JSON. In this commit the artifact-generator.properties is also read and used to provide default values. This step prevents any existing deployments (e.g. automated test integration) from failing. The redundant properties file will be deprecated in a future commit, only when the JSON configuration has been updated. Also remove two unused Java files to help with coverage stats. Change-Id: Idc82e28092a2b028214225c7974db411c9f8a173 Issue-ID: AAI-2284 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-25Refactor Widget creation methodsmark.j.leonard10-78/+153
Rename getWidget() to createWidget() to indicate that a new Object is created. Add a method to create a Widget from the String representation of its type. Change-Id: I430acf02ea67c7b730e28e79887f8fbdb18feb42 Issue-ID: AAI-2281 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-25Additional JUnit tests for Model classesmark.j.leonard7-26/+112
Increase code coverage for Model and Service Change-Id: I02430f470cfa6497535a372a0b18be8678279270 Issue-ID: AAI-2280 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-25Improve javadoc comments and formattingmark.j.leonard7-38/+61
Issue-ID: AAI-2281 Change-Id: I0f5cce16ce76113b1fee603ad3c191cb6f9fe80f Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-25Add hasWidgetType() helper methodmark.j.leonard7-18/+41
Replace getWidgetType() == WidgetType.valueOf("type") with hasWidgetType("type") for improved readability. Change-Id: Id51bed7c4cb9ce38799bf3ff34301c8feb664922 Issue-ID: AAI-2281 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-22Simplify VNF Vendor Image extractionmark.j.leonard2-124/+93
Refactoring of the software version extraction routines to reduce complexity. Pass the NodeTemplates directly to the extractSoftwareVersions() method and move the exception handling up the calling stack. Remove the creation/usage of an intermediate Pair object. Query for the Service VF list once only. Use Streams rather than converting from Stream to List and back. This change will simplify future work: either to convert sdc-tosca API methods (that will be deprecated), or to use an alternative parser. Change-Id: I745ced9e6095f389ee1bede37e8480dfaf65716a Issue-ID: AAI-2281 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-22New JUnit tests for Babel auth modulemark.j.leonard2-19/+118
Increase code coverage Change-Id: I7eb50720fb20ce44ff87c0011e784a77606cf9ff Issue-ID: AAI-2280 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-21Create new Resource objects for each new modelmark.j.leonard2-2/+19
When creating multiple Resources of the same type, ensure that each Resource has a new Java Object: follow the same pattern as used for Widget types. Change-Id: I1e41d3258a3ccdad91448234ae3cf40235d7b210 Issue-ID: AAI-2267 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-11Refactor auth classes and add testsmark.j.leonard4-53/+175
Add new tests to give better coverage of the authorization classes. Refactor the core class for readability. Change-Id: I2be467d8f4492249a0c29be8b108bb2bce2818dd Issue-ID: AAI-2229 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-11Test starting application with OBF: passwordmark.j.leonard2-8/+27
Test an uncovered code path. Remove the unnecessary declaration of the Jetty OBF: prefix constant String. Ensure that the Spring Application exits before the next JUnit test runs. Change-Id: Iceb2e79a923359c15ca6ad366c2ac94a63e381b0 Issue-ID: AAI-2229 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-11Reimplement Widget.Type enum classmark.j.leonard14-190/+273
Replace this with a WidgetType dynamic enumeration, which may be extended at runtime. Load the Widget Types from the mapping configuration (JSON file). Issue-ID: AAI-2229 Change-Id: I5d1bc4291b4446f6d744821bf1d74b1f117b901f Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-11Additional JUnit tests for code coveragemark.j.leonard3-0/+160
Improve code coverage to address Sonar code smells. Include a dummy keystore file to allow the Spring Boot Application to start up without error. Change-Id: Ifab33a67e5d051baacfad91d3f317a8fb8b0a669 Issue-ID: AAI-2212 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-11Refactor AaiModelGenerator classesmark.j.leonard4-279/+248
Refactor the AAI Model Generator implementation by removing duplicate code and improving the variable and method names. This is not a rewrite. The unnecessary interface has been removed to simpify code maintenance. Change-Id: Ia8d630360008c7cfadefda3c04ff7b747ecd1577 Issue-ID: AAI-2212 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-07Re-implement model type value for Resource Mappingmark.j.leonard11-167/+105
Refactor the Model/Service/Resource/Widget hierarchy to improve code readability. Replace the configurable Boolean value for a Resource's model type with a value from the existing ModelType enum. Obtain the A&AI XML Model name (always resource or service) directly from the Model class and not from the configured model type for the Resource. Change-Id: I1487d919392b34e4bf1314da8cd2805a9fbf96a3 Issue-ID: AAI-2212 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-06Remove redundant methods from codebasemark.j.leonard8-113/+25
Delete methods that are never called (or only called from test code) Issue-ID: AAI-2212 Change-Id: I1554bd76de4a9ac2e3cc05987dac1d04966b9200 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-06Add JUnit test for invalid TOSCA mappings JSONmark.j.leonard10-73/+63
Add a test to improve code coverage. Also tidy up some out of date test code comments and unnecessary structural code. Change-Id: Ib38a3d602bc5ae46d16f3067d1d3e0ba0838c446 Issue-ID: AAI-2212 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>