summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-04-15Roll back springboot upgrade1.4.1Jimmy Forsyth1-1/+1
Issue-ID: AAI-2378 Change-Id: I39447e84938a928432b95783b0ed4ebd729cf668 Signed-off-by: Jimmy Forsyth <jf2512@att.com>
2019-04-11Updated version.propertiesPolavarapu, Chaitanya (cp8128)1-1/+1
Updated to match with pom.xml snapshot version Issue-ID: AAI-2338 Change-Id: Ief05d895de8cbe5eff7e8bc9705d691b660dcbb0 Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2019-04-11Updated to use dublin schema versionPolavarapu, Chaitanya (cp8128)5-13/+77
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)20-26/+28
Issue-ID: AAI-2338 Change-Id: I829ba56aa09ac1d98a8c9d27fabb85d95d571534 Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
2019-04-09Merge "Upgrade to springboot 1.5.20.RELEASE"Steven Blimkie1-1/+1
2019-04-09Upgrade to springboot 1.5.20.RELEASEJimmy Forsyth1-1/+1
Issue-ID: AAI-2349 Change-Id: I2762773f1bde721b0b18a73e6e5ccec54bae6541 Signed-off-by: Jimmy Forsyth <jf2512@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.leonard6-39/+174
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.leonard15-126/+16
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.leonard8-40/+63
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-20Merge "Upversion Spring-Boot to 1.5.19.RELEASE"James Forsyth1-1/+1
2019-03-19Upversion Spring-Boot to 1.5.19.RELEASELee, Tian (tl5884)1-1/+1
Change-Id: I15591a0bac5849e7c1185261fcc6c765dc2d4baa Issue-ID: AAI-2255 Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
2019-03-14Add Eclipse files to .gitignoremark.j.leonard1-0/+3
Also add appconfig-local/ which is the local testing configuration folder passed to Spring Boot as specified in the pom.xml Change-Id: I38ccdc3a12c1161c5377117535e2f569f8423382 Issue-ID: AAI-2210 Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
2019-03-13Merge "AAI-2210 Add .gitignore to aai/babel"James Forsyth1-0/+11
2019-03-13Merge "Add missing INFO.yaml blocks"James Forsyth1-5/+44
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.leonard4-2/+162
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>
2019-03-05Fix checkstyle warnings and formattingmark.j.leonard15-72/+107
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.leonard45-888/+506
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-03-05AAI-2210 Add .gitignore to aai/babelKeong Lim1-0/+11
Ignore target directory created by babel and other commonly-seen files. Change-Id: Iacb9b4413d3c191e6cfb78f3adb20112ffc32ca5 Issue-ID: AAI-2210 Signed-off-by: Keong Lim <keong.lim@huawei.com>
2019-03-01Add missing INFO.yaml blocksJessica Wagantall1-5/+44
Add missing information so that the new verify job passes. Change-Id: I9f0d4db3459cb790660dfead69dc96acb5271931 Issue-ID: CIMAN-134 Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
2019-02-19Fix outstanding Sonar issuesmark.j.leonard7-61/+83
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.leonard12-54/+115
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 Lee13-84/+148
2019-02-06Merge "Optionally disable client authentication"Tian Lee2-1/+5
2019-02-06Optionally disable client authenticationSerban Popescu2-1/+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>