aboutsummaryrefslogtreecommitdiffstats
path: root/sli
AgeCommit message (Collapse)AuthorFilesLines
2017-09-25Remove hardcoded dependency versionsGaurav Agrawal2-3/+3
Remove the hardcoded junit & common-lang version and rather take from parent pom. Change-Id: Ibc71ff4b86a2fefc89365017f06333776cb2fed3 Issue-Id: CCSDK-105 Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
2017-09-21Merge "Improve code coverage for MdsalHelper"Dan Timoney3-78/+309
2017-09-21Improve code coverage for MdsalHelperGaurav Agrawal3-78/+309
Changes includes 1. Modified pom to take JUNIT version from parent pom. 2. Added basic testcases for MdsalHelper utilities with test YANG. 3. Made necessary pom additions. Change-Id: Ib46bd9c8a87db33c90aaaf36736d709a7c17cbdd Issue-Id: CCSDK-101 Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
2017-09-21Remove unnecessary parenthesessurya-huawei1-18/+18
*Useless parentheses can sometimes be misleading and hence removed Issue-Id: CCSDK-87 Change-Id: I018d791500a42356296d07d04de45517d061bb7f Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-20Merge "Fixes for MdsalHelper util"Dan Timoney1-1002/+1062
2017-09-20Fixes for MdsalHelper utilGaurav Agrawal1-1002/+1062
1. Convert tabs to 4 spaces. 2. Break lines to be less than 120 characters 3. Remove extraneous spaces and parenthesis 4. Fixed blocker/critical sonar issues. https://sonar.onap.org/component_issues/index?id=org.onap.ccsdk.sli.core%3Accsdk-sli-core#resolved=false|severities=BLOCKER%2CCRITICAL Change-Id: I8b40784ecb178409a6fe9a00d28ccd03873044c5 Issue-Id: CCSDK-67 Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
2017-09-20Fix few Major sonar issuesramu.n1-45/+44
Fix few Major sonar issues in CCSDK SLI Core module * Remove useless assignment to local variable * Use built-in logger method string formatting instead of string concatination * code indentation Change-Id: I20fc9d8f4c510f6169e6f989c6f5595371e5f2dd Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-19Merge "Use Junit4 instead of Junit3 in sli/common"Dan Timoney2-54/+85
2017-09-19Remove mysql dependencies in sli/coreDan Timoney3-26/+24
Remove lingering mysql dependencies in sli/core, which prevented odlsli container from starting up clean. Note: tested this using bareodl container and verified that these changes install clean AFTER changing incorrect driver property name in dblib.properties. This patch is fine, but a second patch to ccsdk/distribution is needed to fix that property file. Change-Id: I6a900d1c29998867bfbae29d5e113c4e392a8bb9 Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-20Use Junit4 instead of Junit3 in sli/commonramu.n2-54/+85
Modified sli/common pom.xml file to take Junit version from parent pom file and modified one Testfile as per Junit4 Change-Id: Iee4397125d9873def60c77ba8be5d541e0df62fa Issue-Id: CCSDK-98 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-19Merge "Fix few Major sonar issues"Dan Timoney1-297/+314
2017-09-19Merge "Fix few Major sonar issues"Dan Timoney3-56/+56
2017-09-18Fix mariadb-connector-java referencesDan Timoney1-1/+1
Correct mariadb JDBC connector artifactId should be mariadb-java-client, not mariadb-connector-java Change-Id: If58a33a1ef22d47e1d5c138bad164b0ad89219eb Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-18Update sli/core to use Mariadb connectoriDan Timoney2-4/+4
Update sli/core (including dblib, notably) to use mariadb-connector for any jUnit tests. Update Import-Package in dblib provider pom.xml to import org.mariadb.jdbc so that org.mariadb.jdbc.Driver will be resolved Change-Id: I39dfe2cafb955ba1bf05b0ecdb0212d766fcc96c Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-18Fix few Major sonar issuesramu.n1-297/+314
Fix few Major sonar issues in CCSDK SLI Core module * Use logger method's built-in string formatting instead of string concatination * code formatting * Use Integer.toString() instead of concatenating empty string "" to a primitive Change-Id: I5a15c9b0049b71d7b0fa06c6791abe766a035c46 Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-18Fix few Major sonar issuesramu.n3-56/+56
Fix few Major sonar issues in CCSDK SLI Core module * Remove useless parentheses * Remove useless assignment to local variable * Use logger method instead of string formatting Change-Id: Ie9958d0bc4e754c36c127d465a1953160c2c3e2b Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-18Fix few Major sonar issuesramu.n2-181/+128
Fix few Major sonar issues in CCSDK SLI Core module * Remove useless parentheses * Either log or rethrow the exception * Add the "@Override" annotation * Change "try" to a try-with-resources * Replace duplicate string literals with constants Change-Id: If52163220d7231ae42ef42b0313d56435f6745e1 Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-17Fix Sonar issues in sli/core modulesurya-huawei1-8/+2
One major issue * Use try with resources instead of try Issue-Id: CCSDK-87 Change-Id: Ic30016f70ebc355f80a73c9e4632b7971d2b87be Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-16Merge "Fix few Major sonar issues"Dan Timoney1-94/+41
2017-09-15Fix service tag in sli/recording blueprintDan Timoney1-1/+1
One of the service tags in sli/recording blueprint uses attribute 'class' instead of 'interface' to advertise the service. This is preventing SDNC container from loading sdnc-sli-recording feature. Change-Id: I4f6863d74dd6fb8babd91fde53b9680594aa7a31 Issue-ID: SDNC-54 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-15Merge "Log current DG & NodeId using MDC"Dan Timoney1-216/+221
2017-09-15Merge "Fix Blocker/Critical sonar issues"Dan Timoney1-13/+12
2017-09-15Fix few Major sonar issuesramu.n1-94/+41
Fix few Major sonar issues in CCSDK SLI Core module * Remove useless parentheses * Either log or rethrow the exception * Remove unused variables * Add the "@Override" annotation * Change "try" to a try-with-resources Change-Id: I64c4bd3c746bb2f226f4f58c39f28a8b2d178953 Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-14Log current DG & NodeId using MDCMarcus G K Williams1-216/+221
Uses MDC.put to add current directed graph and current nodeId to MDC context which is then logged into the standard karaf log. Issue-Id: CCSDK-71 Change-Id: Ieeeea6a89761cdf0ee7a3e63f4e58e182f37ff28 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2017-09-14Merge "Fix critical issues"Dan Timoney1-16/+6
2017-09-14Merge "Fix SDNC service registration"Dan Timoney3-77/+20
2017-09-14Merge "Fix few sonar issues"Dan Timoney2-66/+93
2017-09-14Merge "Clean up public interfaces"Marcus Williams1-41/+41
2017-09-14Fix SDNC service registrationRyan Goulding3-77/+20
Instead of registgering services via BundleActivator(s), use blueprint instead. This change deletes the RecordingActivator, as it was just used to kickstart the service registration using felix dm. The idea here is to instead use blueprint through recording-blueprint.xml. The decision was also made to register the Service(s) using the implementation class name instead of the interface class name for backwards compatibility reasons. In all reality, registering Service(s) under the implementation name is less future proof since clients are no longer able to easily swap in a separate implementation Service. In the future, we should consider finding usages of this Service and ensuring that they poll for the interface rather than the implementation. However, that is separate from this change and is considered future work. Issue-Id: SDNC-54 Change-Id: I757bb90f91d114668c153ec5debb5c65af44452a Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-09-14Clean up public interfacesRyan Goulding1-41/+41
The Java programming language assigns certain defaults for methods and constants defined in interfaces. This change removes the unnecessary redundant modifiers appropriately. For example: * interface methods are public by default * interface constants are public by default * interface methods are abstract unless "default" is specifically used (as of JDK8+). This is really just to get rid of annoying warnings present in IDE(s). Issue-Id: SDNC-79 Change-Id: I2e6b3e4fa02bad1beee2cbb49d3766722eff1ba0 Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-09-14Fix few sonar issuesramu.n2-66/+93
Fix few sonar issues in CCSDK SLI Core module Change-Id: I0e2454f7e23e73087ac42880c5e0b1e4c089dde8 Issue-Id: CCSDK-67 Signed-off-by: Ramu N <ramu.n@huawei.com>
2017-09-14Fix Blocker/Critical sonar issuesshashikanth1-13/+12
Fix Blocker/Critical sonar issues in vnfapi module https://sonar.onap.org/component_issues?id=org.openecomp.sdnc.core%3Asdnc-core#resolved=false|severities=BLOCKER Issue-Id: CCSDK-67 Change-Id: Ie2ace1bc30bbb50d2b6f25a56e716c7a952e7ea0 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
2017-09-14Fix critical issuessurya-huawei1-16/+6
few critical/major issues in core/sli module Issue-Id: CCSDK-87 Change-Id: Ib7ef026ecb7fcf658ea8fc66ad5d9b739f02c55b Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-13Use oparent-odlparent in sli/coreDan Timoney5-230/+263
Update sli/core to use oparent-odlparent. To prevent verify builds from failing due to unit test errors, also changed unit tests that require database access to use MariaDB4j to start up a local MariaDB database. Change-Id: I928b7e1e83bdb328ca9e0785c8b81f67f982eeda Issue-ID: CCSDK-43 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-13Merge "Fix Sonar Issues"Dan Timoney1-2/+2
2017-09-13Remove unused imports in java filesRyan Goulding8-30/+5
Code sanitation-- remove unused imports. Issue-Id: SDNC-79 Change-Id: I5306a9b90f302086459fcac98d04f541ba7c79a4 Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-09-12Fix Sonar Issuessurya-huawei1-2/+2
few major issues in sli/core module Issue-Id: CCSDK-87 Change-Id: Id563cd2fb31f477f96e14b180501feeb37fb24a7 Signed-off-by: surya-huawei <a.u.surya@huawei.com>
2017-09-11Remove cast to DBResourceManagerDan Timoney7-9/+9
Remove cast to DBResourceManager, which no longer works after DbLibService is advertised via Aries Blueprint and which is no longer needed after DbLibService interface exposes getConnection() method. Updated version number - seems like an older 0.1.1-SNAPSHOT without DbLibService change is being used, so trying to see if bumping version will help. Change-Id: Ia411d1514bca396cc052f4f16eda6c79e0d13648 Issue-ID: CCSDK-86 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-07Fix sonar blocker issues in ccsdk/core moduleArun S. Yerra2-5/+29
Sonarqube report for CCSDK core identfied some blcoker issues. This fix addresses those bugs. Issue-Id: CCSDK-84 Change-Id: Ie6ff19b7b0815a129f9809243e8e3eb0a64144ab Signed-off-by: Arun S. Yerra <arun.yerra@huawei.com>
2017-09-07Update dblib service nameDan Timoney1-3/+3
Update name of dblib service to match the DbLibService interface name rather than implemtation class (previous advertised name). Change-Id: I999298c089e75fe3bd467241a473abcc04138852 Issue-ID: CCSDK-83 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-06Fix service registration for SDNCRyan Goulding1-1/+1
Addresses the inherit race conditions associated with the BundleActivator abstraction. From lessons learned in OpenDaylight project, dependency injection and service injection via Aries Blueprint is faster, more deterministic, and has better error messaging than using BundleActivator(s). This change addresses several aspects: 1) DBLIBResourceActivator is changed to DBLIBResourceProvider. This was done in order to imply that this is no longer an Activator or subclass of an Activator. The class is a POJO. 2) DBLIBResourceProvider is split from a single monolithic method into several more manageable and better documented methods. 3) Documentation surrounding the resolution of the DB properties is added so that a developer can more easily identify the strategy (priority) used for resolving properties. 4) dblib-blueprint.xml is added. This is used to register the configuration bean (DBLIBResourceProvider), and pass it as an argument to the actual Service (DBLIBResourceManager). 5) Tests are added to test the functionality and resolution of the properties file loading. Issue-Id: SDNC-54 Change-Id: Ie9d5fb423ae7a67e9aec026c78321537399cc308 Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
2017-08-30Roll version to rule out staging issueDan Timoney6-7/+7
Behavior observed in the odlsli docker container suggests that it might be picking up an old build of 0.1.0-SNAPSHOT version of sli/core. We have observed this problem before due to issues with the Nexus staging plugin. This change bumps the version of sli/core to 0.1.1-SNAPSHOT and comments out the staging plugin from the sli/core pom.xml to make sure that the current build is picked up. There will be a corresponding change in ccsdk/distribution to change which version of sli/core is used in the odlsli container Change-Id: Ie3c2b4ff66191748df14240a69a7d461fc0d4639 Issue-ID: CCSDK-69 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-29Merge "Change 2 sli/core unit tests to int. tests"Dan Timoney2-2/+2
2017-08-29Cleanup artifactId for ccsdk/sli/coreDan Timoney1-1/+1
ArtifactId for ccsdk/sli/core pom.xml should not be identical to that for sdnc/core, otherwise import to Eclipse of both will be confusing. Update parent tag in each module pom under ccsdk/sli/core to new artifactId Change-Id: Ia78a11dc4f82dfda8fd863167daa8e8f4951b6f5 Issue-ID: CCSDK-70 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-28Change 2 sli/core unit tests to int. testsMarcus G K Williams2-2/+2
Change SvcLogicGraphExecutorTest and SvcLogicParserTest to IT Tests because they require outside dependencies (sql database). This change enables running jobs without skipping tests and futher enables SONAR scans of unit tests. Issue-Id: CCSDK-67 Change-Id: I74184b2f2d8cb5fcc7b065c3e2e859b85dd1630b Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2017-08-15Fix license headersDan Timoney88-88/+176
Licence headers were accidentally updated incorrectly by previous update. This commit restores the license headers for seed code to the wording from the original seed code Change-Id: Ie73bc836079be7eb1b310c472ee39b58ffeaa01c Issue-ID: CCSDK-31 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-11Compile against CarbonDan Timoney17-29/+29
Update sli/core to compile against OpenDaylight Carbon SR1 Change-Id: Ibb4a3a4cfa64f0539b520f56f11d7bf1fce62357 Issue-ID: CCSDK-23 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-11Remove remaining references to openecompDan Timoney20-249/+244
Remove remaining references to openecomp from properties and sample files Change-Id: I985bae5e80ae130ffb512c9574f13172252bf6f8 Issue-ID: CCSDK-11 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-03Fix unit testsDan Timoney1-4/+4
Corrected typo in jUnit test cases for SLI MdsalHelper class Issue: CCSDK-57 Change-Id: Id014ed5f8855494daafd12aee436880d76c5a1fe Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-01Refactor dblibDan Timoney93-566/+483
Changed openecomp references in dblib, filters and sli to onap. Note: these must be committed together to get a clean compile. Issue: CCSDK-11 Change-Id: Ibe0f64fb20f3ae9cdda2f7ea969ca722bbde0d15 Signed-off-by: Dan Timoney <dtimoney@att.com>