Tian Lee [Fri, 17 Aug 2018 10:22:43 +0000 (10:22 +0000)]
Merge "Fixing the achtype variable name"
Arul.Nambi [Mon, 13 Aug 2018 16:14:22 +0000 (12:14 -0400)]
Fixing the achtype variable name
Issue-ID: AAI-1449
Change-Id: I862fd89a4f9aa9525c5475997ca8c360c6cb39a7
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
mark.j.leonard [Thu, 16 Aug 2018 14:14:07 +0000 (15:14 +0100)]
Additional VNF Configuration test scenarios
Add test cases for both 0 and 2 VNF Configurations in the input CSAR file
Issue-ID: AAI-1250
Change-Id: I0cae09f876d7bbb08cbe48019220e1836e4b7fca
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Thu, 16 Aug 2018 11:22:58 +0000 (12:22 +0100)]
Update SdWanServiceTest CSAR to make it valid
The SD-WAN test CSAR file is parseable using the sdc-tosca dependency
version 1.4.1 but it cannot be parsed using version 1.4.2 and above, as
there are missing data types leading to inheritance errors.
Correct the test CSAR file by adding the missing types. This has a
beneficial side-effect of increasing code coverage.
Issue-ID: AAI-1250
Change-Id: I41682b49d9d0a260a6feff05fda135949b46ec05
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Lee, Tian (tl5884) [Tue, 14 Aug 2018 10:43:17 +0000 (11:43 +0100)]
Fix Babel build issue
Caused by a change in the structure of the aai-schema jar that Babel
depends on.
Change-Id: I68575ba0c727826de9a930a5e85c4f077d1127d1
Issue-ID: AAI-1449
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
Arul.Nambi [Mon, 13 Aug 2018 14:23:38 +0000 (10:23 -0400)]
Fixing the docker jenkins job
Issue-ID: AAI-1449
Change-Id: I5cda30518c34d52e49bb61055e29aaf839e090c6
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>
mark.j.leonard [Wed, 8 Aug 2018 14:47:57 +0000 (15:47 +0100)]
Refactor method processServiceTosca for Sonar
Fix for a new Sonar issue detected when a method was moved within an
existing Java class file. See
https://sonar.onap.org/project/issues?id=org.onap.aai%3Ababel&open=AWUZW80uwGn37JfbxewF
Change-Id: I3ac7ecf74c261d39a8762fd39123f7f8048894e3
Issue-ID: AAI-1242
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Tue, 7 Aug 2018 17:33:38 +0000 (18:33 +0100)]
Add VF Module Groups to the SD-WAN Service test
Create additional TOSCA YAML content for the existing SD-WAN Service
CSAR input file, so that the VF Module processing code is invoked.
Issue-ID: AAI-1250
Change-Id: I24a842223154d52e1a4a19e5b9cd739b0ceee4f4
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Tue, 7 Aug 2018 16:26:14 +0000 (17:26 +0100)]
Add test CSAR file for missing Service metadata
Change-Id: I4138d1d60fe234949264f3c2d2e2156681e9075c
Issue-ID: AAI-1448
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Tue, 7 Aug 2018 15:43:55 +0000 (16:43 +0100)]
Check getMetaData() return value for null
Added code to check for null metadata.
Decomposed existing methods to avoid Sonar complexity warnings.
Renamed some variables for readability.
Change-Id: Id68be06bb5c105f45870a08f60a4ddc4dfbe5b09
Issue-ID: AAI-1448
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Mon, 6 Aug 2018 17:49:45 +0000 (18:49 +0100)]
Use sdc-tosca version 1.4.1
Update the sdc-tosca dependency to version 1.4.1
Change-Id: Idad51e28a8ebb9f345f705329cbf05e62510e38f
Issue-ID: AAI-1445
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Mon, 6 Aug 2018 17:04:09 +0000 (18:04 +0100)]
Add support for the CR Widget
Issue-ID: AAI-1444
Change-Id: If25a2ea001fe7b43dbd14eed008a14e5dd8b3579
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Mon, 6 Aug 2018 16:28:51 +0000 (17:28 +0100)]
Minor text fixes
Updated some Javadoc text for compatibility with Checkstyle settings.
Issue-ID: AAI-1444
Change-Id: I9d7541aa24d07e42d7d127f76b8576a7fa7184d4
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Mon, 6 Aug 2018 15:58:34 +0000 (16:58 +0100)]
Remove Byte Order Mark from License text
Change-Id: I331d3832828aa825c710d7fb058786dd1448c0c3
Issue-ID: AAI-1443
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Tue, 24 Jul 2018 11:45:57 +0000 (12:45 +0100)]
Update expected results to v14 namespace
The aai-schema version has changed from v13 to v14. Unit tests which
compare actual results with expected results are updated not to fail.
Change-Id: I464eec917d5062e21a5f9c41155fe86ca1e073b9
Issue-ID: AAI-1400
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Fri, 6 Jul 2018 13:16:22 +0000 (14:16 +0100)]
Refactor Widget class to reduce complexity
Remove a large switch statement to reduce Cyclomatic Complexity and thus
remove an oustanding Sonar code smell. Replace the switch with a Map so
that a look-up can be implemented.
Issue-ID: AAI-1242
Change-Id: I5b396216a28b77dcb3953eb4897a5397c98d119d
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Fri, 6 Jul 2018 11:05:54 +0000 (12:05 +0100)]
Create new tests for adding Widgets to VfModule
Also correct formatting for Checkstyle and add Javadoc comments where
missing.
Issue-ID: AAI-1250
Change-Id: I614fd748fb288e6fc8f763f073e99a5067cbaac4
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Tian Lee [Fri, 6 Jul 2018 10:32:55 +0000 (10:32 +0000)]
Merge "Test coverage and refactor for GeneratorUtil"
Adam Wudzinski [Wed, 27 Jun 2018 14:53:30 +0000 (16:53 +0200)]
Test coverage and refactor for GeneratorUtil
Added tests and made GeneratorUtil final class
Change-Id: I3e9b3fa22dff5c50fa37ad10ba0ddd8b9bbef2d9
Issue-ID: AAI-1334
Signed-off-by: awudzins <adam.wudzinski@nokia.com>
Lee, Tian (tl5884) [Thu, 5 Jul 2018 11:39:02 +0000 (12:39 +0100)]
Resolve Nexus-IQ security vulnerabilities
Threat level 4+
Change-Id: Iedd7b44f7d8d07d81825b2c7cc076e82aba81b91
Issue-ID: AAI-1291
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
mark.j.leonard [Tue, 3 Jul 2018 11:40:49 +0000 (12:40 +0100)]
Refactor Model methods to reduce complexity
Change-Id: Ie67b85df855670974aa7939caf0f9afc3effe077
Issue-ID: AAI-1242
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Mon, 2 Jul 2018 14:27:36 +0000 (15:27 +0100)]
Revert "Drop registry prefix from pom.xml"
This reverts commit
1227efa25a23815c7c943c5d50da561bf369cd5d.
Issue-ID: AAI-1352
Change-Id: I8ae4f512f832567c93da8599baf23a70d9d44d48
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Lee, Tian (tl5884) [Thu, 28 Jun 2018 16:35:04 +0000 (17:35 +0100)]
Support Port Mirroring Configuration model
Add support for Port Mirroring Configuration XML model generation from SDC TOSCA
Change-Id: I44718d20a53e343ee34ae47ef2bc35d49c862ddf
Issue-ID: AAI-1345
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
mark.j.leonard [Wed, 27 Jun 2018 17:27:47 +0000 (18:27 +0100)]
Additional junit tests for artifact generation
New tests to improve code coverage. Remove underscores from existing
Junit test method names.
Issue-ID: AAI-1250
Change-Id: I8d0d9c41d7a124cbedea69d64c4cd78ac6e4bcfa
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Wed, 27 Jun 2018 10:46:19 +0000 (11:46 +0100)]
Remove the Generator Constants class
Move the String constants out of a common class and into the individual
classes where they are used. This eliminates a set of Sonar code smells
relating to non-standard ordering of declarations. It simplifies the
code by removing the need for an empty private constructor in the static
class (i.e. containing static methods only).
Additionally, simplify the AaiModelGenerator interface by removing the
static factory method (which is not currently required). If multiple
implementations are needed we can use Spring annotations in the future.
Issue-ID: AAI-1242
Change-Id: Ica03b66ae2fd899977093d11d3e23dc3f3c8f194
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
mark.j.leonard [Tue, 26 Jun 2018 10:37:52 +0000 (11:37 +0100)]
Fix remaining Sonar code smells
Code reformatting to address Sonar code smells, excluding the cyclomatic
complexity errors which will require some heavier refactoring.
Issue-ID: AAI-1242
Change-Id: I0f2502c8038b1e70f53f3b82b9d4d0761d9137cc
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Wiktor Garbarek [Mon, 25 Jun 2018 13:43:14 +0000 (15:43 +0200)]
Extracted repeating strings; added annotations
Change-Id: Ibe92169b6819f032f5609849f785c22d76ffc237
Issue-ID: AAI-1239
Signed-off-by: Wiktor Garbarek <wiktor.garbarek@nokia.com>
Lee, Tian (tl5884) [Tue, 29 May 2018 09:45:17 +0000 (10:45 +0100)]
Re-add arm64 support changes
Re-adding some of the changes made to support arm64 that were lost in a
previous commit.
Commits that were lost:
b50d09cce12ac78b3f518a5e52ffa45cde259e70
04e6b061e130c40e92e3e45c8fd1355f3c99ac29
1227efa25a23815c7c943c5d50da561bf369cd5d
Change-Id: Iff90e4d0fde55a283c47b687254ea4b9da2814c3
Issue-ID: CIMAN-154
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
Daniel Silverthorn [Fri, 25 May 2018 12:46:18 +0000 (08:46 -0400)]
Make babel run as root
Change-Id: I14a0e96ab0b1c4b4c04b8050ea853e74d31e94ce
Issue-ID: AAI-1179
Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
Steven Blimkie [Wed, 23 May 2018 18:47:46 +0000 (18:47 +0000)]
Merge "Upversion for Casablanca"
Jimmy Forsyth [Wed, 23 May 2018 17:56:25 +0000 (13:56 -0400)]
Upversion for Casablanca
Issue-ID: AAI-1169
Change-Id: Iddc4a76f40b9ab60f698a0f1b5cb9ec13581c10e
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Lee, Tian (tl5884) [Tue, 8 May 2018 11:01:21 +0000 (12:01 +0100)]
Fix Babel authorisation mechanism
Change-Id: Iae3139b33e315fae0c205fd7e0df67554d91cd5b
Issue-ID: AAI-1126
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
Lee, Tian (tl5884) [Tue, 1 May 2018 13:51:03 +0000 (14:51 +0100)]
Remove license violations
Remove un-needed javaee-api dependency.
Change-Id: I86967388afa404267a1ef7f7eb9110d134050946
Issue-ID: AAI-1108
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
James Forsyth [Tue, 1 May 2018 12:52:09 +0000 (12:52 +0000)]
Merge "Upversion logback classic and core dependencies"
Lee, Tian (tl5884) [Tue, 1 May 2018 09:47:29 +0000 (10:47 +0100)]
Upversion logback classic and core dependencies
To remove Nexus-IQ security vulnerability
Change-Id: Ia9ff4aaf36f525c427e30664f143803c9d08a6da
Issue-ID: AAI-1107
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
James Forsyth [Mon, 30 Apr 2018 16:27:55 +0000 (16:27 +0000)]
Merge "Convert Babel from AJSC2 to Spring Boot 1.5.12"
Lee, Tian (tl5884) [Fri, 27 Apr 2018 16:50:07 +0000 (17:50 +0100)]
Convert Babel from AJSC2 to Spring Boot 1.5.12
Change-Id: I2ea10250c3881827b6b274afadf1a8c89683f568
Issue-ID: AAI-1045
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
mark.j.leonard [Fri, 20 Apr 2018 10:36:57 +0000 (11:36 +0100)]
Remove test data containing proprietary marking
Update the test CSAR (compressed artifacts) to delete unnecessary text
files containing wording that indicates proprietary content.
The test files were based on genuine CSAR content from a test system and
the informational files were overlooked. These can be safely removed
without breaking the unit tests.
Change-Id: I4b20f7c9a5484bf181b687dbdd821fbc4662e5aa
Issue-ID: AAI-1086
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Lee, Tian (tl5884) [Wed, 18 Apr 2018 16:30:22 +0000 (17:30 +0100)]
Update groupid to match ONAP convention
groupid must contain the repository name
Change-Id: I33c40339fc24320968ada7355239c3100f6503d7
Issue-ID: AAI-1077
Signed-off-by: Lee, Tian (tl5884) <TianL@amdocs.com>
Lee, Tian (tl5884) [Tue, 17 Apr 2018 14:31:49 +0000 (15:31 +0100)]
Re-add maven license plugin
The plugin is now configured to enforce the presence of license headers
without overwriting any existing headers.
Change-Id: I11c2fc6fed0d893153f1bb8c02d5b9a70e56cdae
Issue-ID: AAI-920
Signed-off-by: Lee, Tian (tl5884) <tl5884@att.com>
Mohammed Naser [Mon, 16 Apr 2018 20:22:18 +0000 (13:22 -0700)]
Add .gitreview file for project
Change-Id: I281686783b6aa455c8964c519192b2adcd2c7cb0
Issue-ID: AAI-1038
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
Mohammed Naser [Mon, 16 Apr 2018 20:20:22 +0000 (13:20 -0700)]
Drop registry prefix from pom.xml
The registry prefix is not needed as when things get published
the maven plugin automatically prefixes them when you supply
it as part of the maven arguments.
Change-Id: I18aa3f62446b3a16924e2d3733e294bb98dd33b4
Issue-ID: CIMAN-154
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
Mohammed Naser [Mon, 16 Apr 2018 20:19:50 +0000 (13:19 -0700)]
Dynamically determine image architecture
The image architecture is currently hardcoded, this patch removes
that hardcoded value to allow for ARM64 builds to go through.
Change-Id: I214208421dd2b1d641166f0cfd977cf33073dc7a
Issue-ID: CIMAN-154
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
Mohammed Naser [Mon, 16 Apr 2018 20:19:24 +0000 (13:19 -0700)]
Pin jnr-unixsocket for Docker plugin to 0.13
The current verison of jnr-unixsocket is 0.12 from the Docker
plugin however in order to be able the images for ARM64, it needs
the newer version which has support for it.
There is work upstream to switch the version to 0.18[0] however
it seems that this is still pending, so we can pin it for now until
that merges.
[0]: https://github.com/spotify/docker-maven-plugin/pull/379
Change-Id: I81a8ed45a0c39eaa6ddab85c37a269b30c53acff
Issue-ID: CIMAN-154
Signed-off-by: Mohammed Naser <mnaser@vexxhost.com>
Eric Debeau [Tue, 10 Apr 2018 19:44:56 +0000 (19:44 +0000)]
Correct INFO.yaml to pass YAML Lint
Change-Id: I57f41b029b41e78520d73e7c200c18178ebd47d9
Issue-ID: AAI-1022
Signed-off-by: Eric Debeau <eric.debeau@orange.com>
mark.j.leonard [Mon, 9 Apr 2018 12:20:26 +0000 (13:20 +0100)]
Add explicit Maven dependency on DME2
Include com.att.aft.dme2 as a dependency rather than rely on this being
provided (as specified in the AJSC BOM) so as to solve a runtime error
with the Class Loader.
Change-Id: I268551455922a8e3bd259afe2fc4561a5c020fa1
Issue-ID: AAI-1007
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Jimmy Forsyth [Fri, 6 Apr 2018 17:55:00 +0000 (13:55 -0400)]
Add version.properties file
Issue-ID: AAI-1006
Change-Id: I053de7f323a28624be92fa8860ee8dfdbe2776ac
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
mark.j.leonard [Fri, 6 Apr 2018 16:20:11 +0000 (17:20 +0100)]
Ensure that all properties are passed on start-up
The System Properties KEY_STORE_PASSWORD and KEY_MANAGER_PASSWORD are
now read from the environment and written to the configured system
properties file. This prevents an error within AJSC on startup.
Issue-ID: AAI-1006
Change-Id: Ie92cff0a24352ef162d25dd6d60c75f23d6bdfd7
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
Leonard, Mark (ml401d) [Wed, 21 Mar 2018 18:40:41 +0000 (18:40 +0000)]
Incorporate the ECOMP SDC Artefact Generator code
Remove the Maven dependency on openecomp-sdc-artifact-generator-core,
because this is not maintained in the ONAP source code repositories.
The functionality provided by the SDC Artifact Generator is replaced
with equivalent code that depends on the SDC-TOSCA parsing library,
without introducing any backwards-compatibility breaks.
The intention is to make this Maven project more maintainable by
depending only the common ONAP libraries.
Change-Id: I01d78575d3b7c70a11e4c7989a021de3c0913a06
Issue-ID: AAI-943
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
RaviGeda [Thu, 15 Mar 2018 11:56:47 +0000 (11:56 +0000)]
Fix docker image name
Change docker image name to onap
Change-Id: I0c747e915c5ed84fe0b3d9748429f2363e5074ed
Issue-ID: AAI-878
Signed-off-by: RaviGeda <gravik@amdocs.com>
Jessica Wagantall [Tue, 27 Feb 2018 01:02:43 +0000 (17:02 -0800)]
Add INFO.yaml file
Add INFO.yaml to list:
- Project description
- Properties
- PTL information
- Meeting information
- Committer information
Change-Id: I23f88a7861ee8b0e18f5b18fdd08733c588ba34b
Issue-ID: CIMAN-134
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Jimmy Forsyth [Thu, 15 Feb 2018 21:40:45 +0000 (16:40 -0500)]
Add license to properties file
Change-Id: Id2f0469943f4ab6f574ec53ce43cddb9235758d1
Issue-ID: AAI-778
Signed-off-by: Jimmy Forsyth <jf2512@att.com>
Gildas Lanilis [Fri, 2 Feb 2018 22:14:41 +0000 (14:14 -0800)]
Clean up Sonar name
Issue-ID: CIMAN-65
Change-Id: I44f1915de8d119ec9fca98f44bef62aad30a00cf
Signed-off-by: Gildas Lanilis <gildas.lanilis@huawei.com>
Venkata Harish K Kajur [Mon, 8 Jan 2018 07:44:08 +0000 (02:44 -0500)]
Fix sonar plugin version to 3.2
Issue-ID: AAI-546
Change-Id: I523fafbdd7f8f6b40683f0499553dc7d86cf340a
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
Wong, Ben [Thu, 14 Dec 2017 11:59:04 +0000 (11:59 +0000)]
Remove snapshot reference to sdc client
Amend pom.xml to reference the release version of
sdc.distribution.client
Issue-ID: AAI-46
Change-Id: I5e2b68916ea6e3ecf06256ef6cba81105eaf4ce8
Signed-off-by: Wong, Ben <bwong@amdocs.com>
Edwin Lawrance [Mon, 9 Oct 2017 10:56:05 +0000 (11:56 +0100)]
Adding docker plugin to pom
Change-Id: I928ce2cec1cc8f358e62717190431b4368b75de4
Issue-Id: AAI-46
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
Edwin Lawrance [Fri, 6 Oct 2017 09:40:54 +0000 (10:40 +0100)]
Adding distribution management to pom
Change-Id: I00c798498a0c8fd6009a423f80e9977d28d8250a
Issue-Id: AAI-46
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
Edwin Lawrance [Thu, 5 Oct 2017 15:23:56 +0000 (16:23 +0100)]
Adding repositories to pom
Adding staging repository and updating babel groupId
Change-Id: I1929738d0f130fdce4edea2ff9c58f626c2a47cb
Issue-Id: AAI-46
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
Edwin Lawrance [Thu, 5 Oct 2017 13:28:34 +0000 (14:28 +0100)]
Updating pom version and adding missing plugins
Change-Id: I2059d29ff33cd22ed034ac68e2f57364ff3320b0
Issue-Id: AAI-46
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
Edwin Lawrance [Fri, 22 Sep 2017 15:55:07 +0000 (16:55 +0100)]
Initial code submit for Babel
Change-Id: I3738ebe15eadbbd6d16e24e374c6e40c535b425d
Issue-ID: AAI-46
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
Edwin Lawrance [Tue, 19 Sep 2017 16:18:23 +0000 (17:18 +0100)]
Initial commit - add readme file
Change-Id: I11f1bc802e823127afc2cbdf61cecf0a7db11c8a
Issue-Id: AAI-46
Signed-off-by: Edwin Lawrance <Edwin.Lawrance@amdocs.com>
Jessica Wagantall [Fri, 14 Jul 2017 17:19:40 +0000 (17:19 +0000)]
Initial empty repository