aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/org
AgeCommit message (Collapse)AuthorFilesLines
2019-04-11Updated to use dublin schema versionPolavarapu, Chaitanya (cp8128)1-10/+2
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)2-6/+8
Issue-ID: AAI-2338 Change-Id: I829ba56aa09ac1d98a8c9d27fabb85d95d571534 Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2019-04-03GenerateArtifactsServiceImpl code coveragemark.j.leonard2-17/+20
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.leonard1-0/+1
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.leonard1-2/+2
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.leonard2-14/+49
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 Lee2-17/+13
2019-04-03Move REQUIRE_CLIENT_AUTH code to start scriptmark.j.leonard2-17/+13
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-01Exception handling for image software versionsmark.j.leonard1-3/+17
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.leonard5-37/+57
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.leonard1-4/+11
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.leonard4-30/+167
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-28Remove all references to artifactgenerator configmark.j.leonard3-58/+2
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.leonard3-28/+41
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.leonard6-21/+83
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.leonard2-6/+7
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.leonard6-37/+55
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.leonard1-109/+86
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-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.leonard2-48/+57
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.leonard1-8/+15
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.leonard10-71/+141
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-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.leonard9-127/+80
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.leonard6-95/+24
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-05Fix checkstyle warnings and formattingmark.j.leonard11-36/+53
Add Javadoc and make cosmetic changes to prevent Checkstyle messages Change-Id: Ibab7be42d6a01b181cdb625b6b34d580658c7046 Issue-ID: AAI-2212 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-05Move Widget attribute data to the mappings JSONmark.j.leonard33-839/+218
Extend the TOSCA mappings JSON content by adding a set of of Widget types defining the type name and data-delete flag. In this change the set of supported types (defined by an enum) remains. However the intention is to replace this in a future commit. The hierarchy of annotated Widget types is replaced by this new configuration, which is accessed from the Widget class. Refactoring has been kept to a minimum to simplify the code review process but further improvements can now be made. Ideally the set of supported Widgets can be extended through configuration changes only. Change-Id: I005cfe6976778b14f14c3ad06d8acf3745c8dd8f Issue-ID: AAI-2212 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-02-19Fix outstanding Sonar issuesmark.j.leonard3-33/+39
Change-Id: I9699ee13321f136b4460d5c85d49ab13378f52b4 Issue-ID: AAI-2121 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-02-11Rename the groupfilter.config System Propertymark.j.leonard5-39/+73
Rename the System Property to be tosca.mappings.config and default the value to ${CONFIG_HOME}/tosca-mappings.json Update Java code and comments to remove the word "filter" where this is now outdated. Add new JUnit tests for better code coverage. Change-Id: Iaa9685638e099c898894171a958b0d5d51542fde Issue-ID: AAI-2121 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-02-11Merge "Fix checkstyle issues including javadoc"Tian Lee6-49/+62
2019-02-06Merge "Optionally disable client authentication"Tian Lee1-0/+5
2019-02-06Optionally disable client authenticationSerban Popescu1-0/+5
based on an env. variable, client authentication can be disabled Change-Id: Ifa3e5d109d0609e0836ddaea2c1183799252ddd3 Issue-ID: AAI-2132 Signed-off-by: Serban Popescu <serban.popescu@amdocs.com>
2019-02-05Fix checkstyle issues including javadocmark.j.leonard6-49/+62
Minor code tidy-ups: mostly formatting and Javadoc comments Change-Id: I8a9ab692428fa09c73bd1fb542100610a86f6eca Issue-ID: AAI-2121 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-02-05Replace Resource sub-classes with configurationmark.j.leonard17-502/+306
Delete the sub-classes of the Resource (internal Model class) and replace the annotated properties of these classes with TOSCA-to-Model mappping data loaded from the JSON configuration. Change-Id: I56d5d9d4893be45eb42ae65099ea9abe5f4409b9 Issue-ID: AAI-2121 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-01-30Load type mappings from a group configuration filemark.j.leonard6-75/+139
Change the filter-types.properties file: re-implement to use JSON content. Remove the System Property that defines the location of the file and add this to the Spring application properties. Initialise the type-to-model mappings using the key=value pairs from this JSON content. Refactor existing Junit tests to remove duplicated resource loading code. Change-Id: Idb2e962fe5cae39b70cc8cf16053d0a253f4fac0 Issue-ID: AAI-2121 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-01-23Do not try to unobfuscate clear text passwordsSerban Popescu1-1/+4
The keystore password does not need to be decrypted if in clear text Change-Id: Ia0d8591e1d5ca6890fcb77295de9573921f6652f Issue-ID: AAI-2072 Signed-off-by: Serban Popescu <serban.popescu@amdocs.com>
2018-12-05Add null check for Group member with no A&AI Modelmark.j.leonard1-8/+18
Protect against a Null Pointer Exception when any member of an Instance Group cannot be mapped to an output XML Resource or Widget. Change-Id: Icf099686681b8dffb86e9f003bd92ace6e8679b1 Issue-ID: AAI-1991 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-27Process Service-level Instance Groupsmark.j.leonard1-297/+316
Create an InstanceGroup XML model for groups of the Service topology template in the case where there is no Resource model generated. Add a test CSAR file for a Service Proxy (an unsupported type). Assert that the Service is associated with the instance-group Models. Change-Id: If76bf7a1cfb960bc8692f1e136ee85176725915e Issue-ID: AAI-1963 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-27Refactor processProvidingService methodmark.j.leonard2-382/+396
Remedy some Java formatting issues and also simplify Providing Service processing code. Change-Id: Ifddc045e6a1fd1280f63065d4f3b6df83251800c Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-27Refactor model generation algorithmmark.j.leonard3-469/+431
Reorganize the Service and Resource Model generation code for readability. Resort methods to put public before private. Rename generateService() to generateAllArtifacts() Reimplement this method such that the NodeTemplate list is iterated once only. This is intended to simplify future changes to the code. Change-Id: Ie0c6003eab99f42945747c6d79827881e05afc87 Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-22Refactor Instance Group processingmark.j.leonard2-432/+466
Minor refactoring and reformatting of Java code using Eclipse. Add private method mergeProperties() to replace duplicated code logic for populating the Group model. Change-Id: I1360bbbf5b065149028a94392dd530af9c9153e8 Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-09Add support for ResourceInstanceGroupmark.j.leonard1-26/+50
Refactor existing code and add a Junit test for the relevant method. Change-Id: I66703f1d2e93173df4676070faf66e289360609a Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-09Minor formatting fixesmark.j.leonard2-2/+0
Non-functional changes addressing whitespace inconsistencies. Change-Id: Ife84f6b04bf8ce0204409d2f3708ab85b3a3caff Issue-ID: AAI-1884 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-11-07Upgrade Babel to sdc-tosca 1.4.6mark.j.leonard1-1/+2
Change-Id: I53863aabd02050606605f2e905186b01232a77c9 Issue-ID: AAI-1771 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-10-09Downgrade to sdc-tosca 1.4.41.3.0mark.j.leonard1-1/+1
Release 1.4.5 has a dependency on a SNAPSHOT jar and therefore must not be used. Change-Id: Ibc7a3d8f7f60eb06c01daaacb451fbc9748c4048 Issue-ID: AAI-1445 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-10-09Update to sdc-tosca 1.4.5mark.j.leonard1-3/+2
Update to use a newer release of the SDC TOSCA parser. Change-Id: I8bd3288e000c27c2fbcb5b4b24c3a31cf12bfab8 Issue-ID: AAI-1445 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-10-08Generate models for child resourcesmark.j.leonard2-93/+145
Babel now generates models for immediate children of Resources, non-recursively. Existing functionality is unchanged. Some large methods are refactored to avoid a Cognitive Complexity Sonar code smell. Change-Id: I7ab173a5693f25d0b303dfa97a25106e7e29b5f2 Issue-ID: AAI-1704 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-11Improved logging for VNF image extractionmark.j.leonard5-70/+142
Changes to logging messages to help with debugging issues. Improved Javadoc comments. Issue-ID: AAI-1242 Change-Id: I255eeb774b791a9653fdd0274367801245be6bbd Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2018-09-10Add support for InstanceGroup resource modelsmark.j.leonard8-39/+251
Generate models for Instance Groups (for specific supported types). Process groups with a metadata type of CR or Configuration. Add InstanceGroup Widget to the supported Widgets. Add support for a group filter properties resource/file (with the single property key "AAI.instance-group-types" which provides a comma-separated list of supported types). Add the System Propery groupfilter.config to define the file path. Change-Id: I6153e6284965c57ae43291b1dc3ee4a1d11e6583 Issue-ID: AAI-1579 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>