jenkins-releng [Mon, 20 Sep 2021 14:52:36 +0000 (14:52 +0000)]
Release aai/babel
wr148d [Mon, 20 Sep 2021 14:31:38 +0000 (10:31 -0400)]
[AAI] Upversion babel to 1.9.1
Issue-ID: AAI-3361
Change-Id: I665b01198795ccdbdd47cd24c922e9b204b83709
Signed-off-by: wr148d <wr148d@att.com>
wr148d [Mon, 20 Sep 2021 13:59:24 +0000 (09:59 -0400)]
[AAI] Update babel to use the latest schema service version
Issue-ID: AAI-3361
Signed-off-by: wr148d <wr148d@att.com>
Change-Id: I78adc4bb3e700501a6b1af6cd6ce25c887b0b7bd
wr148d [Mon, 13 Sep 2021 17:16:53 +0000 (13:16 -0400)]
[AAI] Updating the info yamls adding Robby Maharajh and removing Steven Blimkie
Issue-ID: AAI-3380
Signed-off-by: wr148d <wr148d@att.com>
Change-Id: I688e760d18aa232b943bde6f106d2065e9fcb243
wr148d [Tue, 24 Aug 2021 16:23:35 +0000 (12:23 -0400)]
[AAI] Updates for releasing the latest docker release for Istanbul
Issue-ID: AAI-3361
Signed-off-by: wr148d <wr148d@att.com>
Change-Id: Ib134e573e79f56bca7e61a095076c8633f54c2bd
wr148d [Mon, 23 Aug 2021 15:34:18 +0000 (11:34 -0400)]
[AAI] Updates for releasing the latest maven for Istanbul
Issue-ID: AAI-3361
Change-Id: I7416f68cb836b326b1ac3beb6d2cab3fe4b6b790
Signed-off-by: wr148d <wr148d@att.com>
wr148d [Mon, 23 Aug 2021 13:44:30 +0000 (09:44 -0400)]
[AAI] Updates for v24 upgrade on Babel
Issue-ID: AAI-3361
Signed-off-by: wr148d <wr148d@att.com>
Change-Id: Id4891b769d07daa4102b696c9ecc80192ce2359f
Polavarapu, Chaitanya (cp8128) [Fri, 12 Mar 2021 20:28:47 +0000 (15:28 -0500)]
Resolve files with licensing issues in Babel
Issue-ID: AAI-3301
Change-Id: Ia376802e449b0bf013dfd3a3e9843448234afef1
Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
Harish Venkata Kajur [Tue, 2 Mar 2021 14:41:49 +0000 (09:41 -0500)]
Release 1.8.0 container properly
Issue-ID: AAI-2996
Change-Id: I5235e299ef55333cd9dd25c8a2e2f6630d6ffd22
Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
Venkata Harish Kajur [Wed, 24 Feb 2021 18:35:15 +0000 (18:35 +0000)]
Merge "Upversion to 1.8.1-SNAPSHOT"
Maharajh, Robby (rx2202) [Wed, 24 Feb 2021 17:50:35 +0000 (12:50 -0500)]
Upversion to 1.8.1-SNAPSHOT
Issue-ID: AAI-2996
Change-Id: I40de75a09971bfe3ad65835d00e969087149fd50
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@us.att.com>
Venkata Harish Kajur [Wed, 24 Feb 2021 17:49:57 +0000 (17:49 +0000)]
Merge "Release 1.8.0 container"
Maharajh, Robby (rx2202) [Wed, 24 Feb 2021 17:42:24 +0000 (12:42 -0500)]
Release 1.8.0 container
Issue-ID: AAI-2996
Change-Id: If39059b06469042cc12589927751c3b400eef5d4
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@us.att.com>
Maharajh, Robby (rx2202) [Wed, 24 Feb 2021 17:40:06 +0000 (12:40 -0500)]
Release 1.8.0 maven artifact
Issue-ID: AAI-2996
Change-Id: I7db7669da5a28435503e431a874fd2327faccdc7
Signed-off-by: Maharajh, Robby (rx2202) <rx2202@us.att.com>
Harish Venkata Kajur [Wed, 24 Feb 2021 16:08:05 +0000 (11:08 -0500)]
Ignore application logger test
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>
Harish Venkata Kajur [Wed, 24 Feb 2021 02:45:10 +0000 (21:45 -0500)]
Use released docker base image
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>
Polavarapu, Chaitanya (cp8128) [Fri, 12 Feb 2021 18:32:33 +0000 (13:32 -0500)]
Updated pom to remove distribution-management section and corrected aai base image version
Issue-ID: AAI-2996
Change-Id: I28da9ccf5618e180e04e3f29b0440bab5e3ffc3f
Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
Igor Dysko [Wed, 25 Nov 2020 08:41:04 +0000 (09:41 +0100)]
Change of the parent project to aai-parent
Parent project set to aai-parent:1.7.3
Issue-ID: AAI-2630
Signed-off-by: Igor Dysko <igor1.dysko@orange.com>
Change-Id: I439324475673dda4653cd14ad484bb759bd3cccb
Harish Venkata Kajur [Mon, 16 Nov 2020 04:44:50 +0000 (23:44 -0500)]
Upversion artifacts to 1.8.0-SNAPSHOT
Issue-ID: AAI-3222
Change-Id: Ia6201ac4d1aff9f5c4db6736fe39d6313f6c5b8d
Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
Dominik Mizyn [Thu, 10 Sep 2020 14:55:09 +0000 (16:55 +0200)]
[AAI] Set logging.config
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
William Reehil [Tue, 1 Sep 2020 12:53:18 +0000 (12:53 +0000)]
Merge "[aai-babel] Release docker container 1.7.1"
efiacor [Tue, 1 Sep 2020 09:58:32 +0000 (10:58 +0100)]
[aai-babel] Release docker container 1.7.1
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: Ic411e2488545ce48d75905ab1dd5129969cbefd2
Issue-ID: AAI-3099
efiacor [Tue, 1 Sep 2020 09:41:45 +0000 (10:41 +0100)]
[aai-babel] Release maven artifact 1.7.1
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I43ba7b3a36a5e158602fa0413ef5c91fa3b0162b
Issue-ID: AAI-3099
efiacor [Sun, 30 Aug 2020 11:46:28 +0000 (12:46 +0100)]
[aai-babel] Bump version to 1.7.1
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I262713a7b88d031a2b13b52a589bc9af3b883d76
Issue-ID: AAI-3099
efiacor [Thu, 27 Aug 2020 12:07:44 +0000 (13:07 +0100)]
[aai-babel] Add support for sndc props parsing
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: AAI-3121
Change-Id: I9ed925e7e95d73b30942df895d19fba0c36500f0
William Reehil [Thu, 6 Aug 2020 16:01:42 +0000 (16:01 +0000)]
Merge "Add 'category' of service model to Babel artifact"
dhebeha [Mon, 3 Aug 2020 16:13:37 +0000 (21:43 +0530)]
Add 'category' of service model to Babel artifact
Issue-ID: AAI-3017
Signed-off-by: dhebeha <dhebeha.mj71@wipro.com>
Change-Id: I079d3a1ea8c681a1c6d854adf80776ce934c49e2
Venkata Harish Kajur [Fri, 31 Jul 2020 00:46:59 +0000 (00:46 +0000)]
Merge "Update Lifecycle state to mature"
wr148d [Thu, 30 Jul 2020 18:51:06 +0000 (14:51 -0400)]
Update Lifecycle state to mature
Issue-ID: AAI-3101
Signed-off-by: wr148d <wr148d@att.com>
Change-Id: I830d96d19c7f27570903e389ba94e0df16085c3b
Chris André [Fri, 10 Jul 2020 15:44:49 +0000 (11:44 -0400)]
aai-babel - Java 11 migration
- added explicit dependencies for JAXB and Javax.activation
Issue-ID: AAI-2996
Signed-off-by: Chris Andre <chris.andre@yoppworks.com>
Change-Id: Idb4c234bd4f27a8d231b4d784b8435bfa1361944
Jimmy Forsyth [Thu, 2 Jul 2020 19:35:37 +0000 (15:35 -0400)]
Promote Bill Reehil as AAI PTL
Issue-ID: AAI-2967
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: Iadc0bfccd331e553ac7ab9f007e0bb2b18987bbb
wsliwka [Wed, 25 Sep 2019 11:13:32 +0000 (13:13 +0200)]
Extend service model
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
James Forsyth [Tue, 16 Jun 2020 13:12:21 +0000 (13:12 +0000)]
Merge "Added William Reehil as committer"
wr148d [Thu, 11 Jun 2020 18:26:46 +0000 (14:26 -0400)]
Added William Reehil as committer
Issue-ID: AAI-2928
Signed-off-by: wr148d <wr148d@att.com>
Change-Id: I45e74ddf43111692c153e01c1d46350e60e24a4a
wr148d [Mon, 1 Jun 2020 17:38:37 +0000 (13:38 -0400)]
Containers should not run as root by default
Issue-ID: AAI-2822
Change-Id: I28d5426805bbf5d60aa0cd0bc1701165f233d6a9
Signed-off-by: wr148d <wr148d@att.com>
wr148d [Mon, 11 May 2020 13:29:36 +0000 (09:29 -0400)]
Remove Tian Lee from committers and update TSC section
Issue-ID: AAI-2898
Change-Id: I30ceb14dfa4669bf34bbacacc3dec882c02b764a
Signed-off-by: wr148d <wr148d@att.com>
Jimmy Forsyth [Wed, 8 Apr 2020 14:31:19 +0000 (10:31 -0400)]
Upversion to 1.7.0
Issue-ID: AAI-2860
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Change-Id: Iab4f5397b370b7e4fec6d3b053b62ecde056aff5
Jimmy Forsyth [Tue, 31 Mar 2020 19:01:16 +0000 (15:01 -0400)]
Upversion to 1.6.3
Issue-ID: AAI-2580
Change-Id: Ic958cf275dc7ddfff4dc6712ce7afeee446d89bd
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Jimmy Forsyth [Tue, 31 Mar 2020 18:52:14 +0000 (14:52 -0400)]
Release 1.6.2 container
Issue-ID: AAI-2580
Change-Id: I24fbc7567b3c140e2eea1152d36fe0a64af2476d
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Jimmy Forsyth [Tue, 31 Mar 2020 18:39:25 +0000 (14:39 -0400)]
Release 1.6.2 artifacts
Issue-ID: AAI-2850
Change-Id: I087a020555841a4e9eafd5f30158af850eb10f86
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Jimmy Forsyth [Mon, 30 Mar 2020 21:29:24 +0000 (17:29 -0400)]
Upversion to 1.6.2
Issue-ID: AAI-2850
Change-Id: Ic0c0a616293171b6e244f012a22e927ab22c3472
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Jimmy Forsyth [Wed, 18 Mar 2020 17:02:25 +0000 (13:02 -0400)]
Use aai-schema-service:1.6.6
Issue-ID: AAI-2839
Change-Id: Ia3232b67e13c81d60db59b197fbc7c48f0ffc076
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Forsyth, James (jf2512) [Fri, 14 Feb 2020 20:46:08 +0000 (15:46 -0500)]
Update for sonarcloud.io
Issue-ID: AAI-2793
Signed-off-by: Forsyth, James (jf2512) <jf2512@att.com>
Change-Id: I42c7e869a12651ca09a9631ae928af4f9a3065ce
Forsyth, James (jf2512) [Sat, 18 Jan 2020 02:57:29 +0000 (21:57 -0500)]
Release artifacts
Issue-ID: AAI-2757
Signed-off-by: Forsyth, James (jf2512) <jf2512@att.com>
Change-Id: Ie424205a407fa7fde3958d0b7435d3baa4e59851
Forsyth, James (jf2512) [Sat, 18 Jan 2020 02:37:36 +0000 (21:37 -0500)]
Release container
Issue-ID: AAI-2758
Signed-off-by: Forsyth, James (jf2512) <jf2512@att.com>
Change-Id: I5a9ac4ee2cef49aadf3850ffe8053b7dc7abc38d
Forsyth, James (jf2512) [Fri, 17 Jan 2020 22:30:21 +0000 (17:30 -0500)]
Upversion to 1.6.1
Issue-ID: AAI-2757
Signed-off-by: Forsyth, James (jf2512) <jf2512@att.com>
Change-Id: Iecc97358ad8cdb94960c426c88f4815481bd22cd
sblimkie [Thu, 21 Nov 2019 19:56:17 +0000 (14:56 -0500)]
Update schema-service dep to 1.6.0
Change-Id: Idfabac878db11ccde4859ee04bdf45b560460a88
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
Issue-ID: AAI-2607
Lee, Tian (tl5884) [Thu, 3 Oct 2019 11:22:40 +0000 (12:22 +0100)]
Enforce minimum Jacoco line coverage
Current coverage at 97%, enforced limit set to 90%
Change-Id: Ib6ad68dc5b72c2c76d02b42e18943b79400968a6
Issue-ID: AAI-2363
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
Dmitry Puzikov [Tue, 16 Apr 2019 14:53:15 +0000 (16:53 +0200)]
Fixed project version parsing
Fixed pom.xml to execute vesion parsing earlier.
Change-Id: Ic5f2c1c304ab025cbac93d5177776c17a8ff803b
Issue-ID: INT-801
Signed-off-by: Dmitry Puzikov <dmitry.puzikov@tieto.com>
Jimmy Forsyth [Tue, 13 Aug 2019 22:17:11 +0000 (18:17 -0400)]
Upversion babel in master
Issue-ID: AAI-2579
Change-Id: Iefe4ab17ab71fd6e50e1148befc6ebb786c12853
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Lee, Tian (tl5884) [Tue, 30 Jul 2019 15:45:43 +0000 (16:45 +0100)]
Upgrade Spring Boot from 1.5.x to 2.1.6
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>
Jimmy Forsyth [Thu, 27 Jun 2019 21:04:38 +0000 (17:04 -0400)]
Prepare babel for global-jjb
Issue-ID: AAI-2477
Change-Id: I19ee7cc0bc5f28954eafa591b380db755a3ed635
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Jimmy Forsyth [Fri, 14 Jun 2019 09:20:13 +0000 (11:20 +0200)]
Upversion in preparation of initial release
Issue-ID: AAI-2477
Change-Id: I476c3e329bb8ae247b3850d96c0f5b71da1cd190
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Jimmy Forsyth [Thu, 2 May 2019 01:35:54 +0000 (21:35 -0400)]
Upversion prior to release
Issue-ID: AAI-2403
Change-Id: Ib10dbb984fb1d24252adcb4975707fc91d2379b2
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Jimmy Forsyth [Wed, 1 May 2019 12:54:33 +0000 (08:54 -0400)]
Update to latest version of schema-service
Update to TOSCA Parser 1.5.1
Issue-ID: AAI-2402
Issue-ID: AAI-2169
Change-Id: I13152cecf7e8e6de2e7add5c0f829d769a35dd20
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Jimmy Forsyth [Mon, 15 Apr 2019 15:38:30 +0000 (11:38 -0400)]
Roll back springboot upgrade
Issue-ID: AAI-2378
Change-Id: I39447e84938a928432b95783b0ed4ebd729cf668
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Polavarapu, Chaitanya (cp8128) [Thu, 11 Apr 2019 18:11:41 +0000 (14:11 -0400)]
Updated version.properties
Updated to match with pom.xml snapshot version
Issue-ID: AAI-2338
Change-Id: Ief05d895de8cbe5eff7e8bc9705d691b660dcbb0
Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
Polavarapu, Chaitanya (cp8128) [Tue, 9 Apr 2019 21:02:50 +0000 (17:02 -0400)]
Updated to use dublin schema version
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>
Polavarapu, Chaitanya (cp8128) [Tue, 9 Apr 2019 20:49:30 +0000 (16:49 -0400)]
This enhancement will enable Babel to process artifacts of version n.n
Issue-ID: AAI-2338
Change-Id: I829ba56aa09ac1d98a8c9d27fabb85d95d571534
Signed-off-by: Polavarapu, Chaitanya (cp8128) <cp8128@att.com>
Steven Blimkie [Tue, 9 Apr 2019 17:05:32 +0000 (17:05 +0000)]
Merge "Upgrade to springboot 1.5.20.RELEASE"
Jimmy Forsyth [Tue, 9 Apr 2019 15:56:42 +0000 (11:56 -0400)]
Upgrade to springboot 1.5.20.RELEASE
Issue-ID: AAI-2349
Change-Id: I2762773f1bde721b0b18a73e6e5ccec54bae6541
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
mark.j.leonard [Wed, 3 Apr 2019 13:07:09 +0000 (14:07 +0100)]
GenerateArtifactsServiceImpl code coverage
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>
mark.j.leonard [Wed, 3 Apr 2019 11:23:11 +0000 (12:23 +0100)]
Fix new Sonar code smell
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>
mark.j.leonard [Wed, 3 Apr 2019 10:47:34 +0000 (11:47 +0100)]
Delete temp file in FileWatcher test
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>
mark.j.leonard [Fri, 29 Mar 2019 17:55:49 +0000 (17:55 +0000)]
Add tests for uncovered FileWatcher code
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>
Tian Lee [Wed, 3 Apr 2019 10:34:37 +0000 (10:34 +0000)]
Merge "Move REQUIRE_CLIENT_AUTH code to start script"
mark.j.leonard [Fri, 29 Mar 2019 16:29:44 +0000 (16:29 +0000)]
Move REQUIRE_CLIENT_AUTH code to start script
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>
Tian Lee [Tue, 2 Apr 2019 16:31:04 +0000 (16:31 +0000)]
Merge "Additional Logger tests for code coverage"
Mark Leonard [Mon, 1 Apr 2019 23:42:45 +0000 (00:42 +0100)]
Additional Logger tests for code coverage
Change-Id: Ib94fc61ae43d59a32fba19363b06dc7aed5a96bc
Issue-ID: AAI-2280
Signed-off-by: Mark Leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Mon, 1 Apr 2019 18:07:53 +0000 (19:07 +0100)]
Exception handling for image software versions
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>
mark.j.leonard [Fri, 29 Mar 2019 10:50:04 +0000 (10:50 +0000)]
Additional null checks and comments
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>
mark.j.leonard [Thu, 28 Mar 2019 17:28:41 +0000 (17:28 +0000)]
Use checked Exception instead of RuntimeException
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>
mark.j.leonard [Wed, 27 Mar 2019 17:13:21 +0000 (17:13 +0000)]
Depend on sdc-tosca version 1.5.0
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>
mark.j.leonard [Wed, 27 Mar 2019 15:22:08 +0000 (15:22 +0000)]
Change generic-vnf delete flag to true
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>
mark.j.leonard [Tue, 26 Mar 2019 13:38:40 +0000 (13:38 +0000)]
Remove all references to artifactgenerator config
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>
mark.j.leonard [Tue, 26 Mar 2019 10:51:07 +0000 (10:51 +0000)]
Allow UUID definitions in the mappings JSON
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>
mark.j.leonard [Mon, 25 Mar 2019 23:38:53 +0000 (23:38 +0000)]
Refactor Widget creation methods
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>
mark.j.leonard [Mon, 25 Mar 2019 18:12:48 +0000 (18:12 +0000)]
Additional JUnit tests for Model classes
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>
mark.j.leonard [Mon, 25 Mar 2019 15:50:45 +0000 (15:50 +0000)]
Improve javadoc comments and formatting
Issue-ID: AAI-2281
Change-Id: I0f5cce16ce76113b1fee603ad3c191cb6f9fe80f
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Mon, 25 Mar 2019 15:41:12 +0000 (15:41 +0000)]
Add hasWidgetType() helper method
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>
mark.j.leonard [Fri, 22 Mar 2019 14:49:33 +0000 (14:49 +0000)]
Simplify VNF Vendor Image extraction
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>
mark.j.leonard [Fri, 22 Mar 2019 12:17:38 +0000 (12:17 +0000)]
New JUnit tests for Babel auth module
Increase code coverage
Change-Id: I7eb50720fb20ce44ff87c0011e784a77606cf9ff
Issue-ID: AAI-2280
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Thu, 21 Mar 2019 12:25:13 +0000 (12:25 +0000)]
Create new Resource objects for each new model
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>
James Forsyth [Wed, 20 Mar 2019 20:32:16 +0000 (20:32 +0000)]
Merge "Upversion Spring-Boot to 1.5.19.RELEASE"
Lee, Tian (tl5884) [Tue, 19 Mar 2019 16:17:37 +0000 (16:17 +0000)]
Upversion Spring-Boot to 1.5.19.RELEASE
Change-Id: I15591a0bac5849e7c1185261fcc6c765dc2d4baa
Issue-ID: AAI-2255
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
mark.j.leonard [Thu, 14 Mar 2019 15:05:28 +0000 (15:05 +0000)]
Add Eclipse files to .gitignore
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>
James Forsyth [Wed, 13 Mar 2019 11:35:21 +0000 (11:35 +0000)]
Merge "AAI-2210 Add .gitignore to aai/babel"
James Forsyth [Wed, 13 Mar 2019 00:52:01 +0000 (00:52 +0000)]
Merge "Add missing INFO.yaml blocks"
mark.j.leonard [Mon, 11 Mar 2019 17:50:07 +0000 (17:50 +0000)]
Refactor auth classes and add tests
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>
mark.j.leonard [Mon, 11 Mar 2019 15:37:58 +0000 (15:37 +0000)]
Test starting application with OBF: password
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>
mark.j.leonard [Mon, 11 Mar 2019 15:17:15 +0000 (15:17 +0000)]
Reimplement Widget.Type enum class
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>
mark.j.leonard [Mon, 11 Mar 2019 12:28:26 +0000 (12:28 +0000)]
Additional JUnit tests for code coverage
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>
mark.j.leonard [Mon, 11 Mar 2019 11:10:50 +0000 (11:10 +0000)]
Refactor AaiModelGenerator classes
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>
mark.j.leonard [Thu, 7 Mar 2019 16:17:06 +0000 (16:17 +0000)]
Re-implement model type value for Resource Mapping
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>
mark.j.leonard [Wed, 6 Mar 2019 15:58:55 +0000 (15:58 +0000)]
Remove redundant methods from codebase
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>
mark.j.leonard [Wed, 6 Mar 2019 13:18:43 +0000 (13:18 +0000)]
Add JUnit test for invalid TOSCA mappings JSON
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>
mark.j.leonard [Tue, 5 Mar 2019 16:07:33 +0000 (16:07 +0000)]
Fix checkstyle warnings and formatting
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>
mark.j.leonard [Tue, 5 Mar 2019 12:28:24 +0000 (12:28 +0000)]
Move Widget attribute data to the mappings JSON
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>
Keong Lim [Tue, 5 Mar 2019 00:30:43 +0000 (11:30 +1100)]
AAI-2210 Add .gitignore to aai/babel
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>
Jessica Wagantall [Sat, 2 Mar 2019 02:45:02 +0000 (18:45 -0800)]
Add missing INFO.yaml blocks
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>