summaryrefslogtreecommitdiffstats
path: root/odlsli/src/main
AgeCommit message (Collapse)AuthorFilesLines
2018-09-12Merge "Add dependencies for blueprint-processor"Dan Timoney1-4/+5
2018-09-12Add dependencies for blueprint-processorAlexis de Talhouët1-4/+5
Change-Id: I6eb0a5b2202ab7af324a01e453ae9e4510c3d64d Issue-ID: CCSDK-505 Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
2018-09-05Fix syntax error in SQL statementAaron Hay1-1/+1
Change-Id: I9f6c7f0d167d536692e4af390eb54ddfa2824900 Issue-ID: APPC-1191 Signed-off-by: Aaron Hay <ah415j@att.com>
2018-08-02Fix logging configurationTimoney, Dan (dt5972)1-60/+84
ODL Oxygen uses log4j2, which has a different configuration format from log4j. The org.ops4j.pax.logging.cfg that we were installing was in log4j format, which is what caused logging to break. The old format also created a large number of log files for each node executed. In this commit, we no longer create separate log files for each dg / node. We do, however, add the current directed graph and node id to each line logged in karaf.log Change-Id: I1377efa7e0c6fa6963e18370d69bafab60ba024d Issue-ID: CCSDK-427 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-07-06Manually update feature bootTimoney, Dan (dt5972)1-8/+9
As workaround for issue using opendaylight-ansible, add features to org.apache.karaf.features.cfg directly in Dockerfile. This is intended as a temporary fix until LF provides a way for us to git clone from https://git.opendaylight.org so we can install and use opendaylight-ansible. Change-Id: If21e82aa8cdfbada6a3a566c79960ed3f59e96ea Issue-ID: CCSDK-285 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-07-03Merge "Install ansible apt repo manually"Dan Timoney2-6/+13
2018-07-02Install ansible apt repo manuallyTimoney, Dan (dt5972)2-6/+13
add-apt-repository does not work on ONAP Jenkins, so install ansible apt repo manually Change-Id: I91d1ae7044f95ac536433d10b347fc60db3bd870 Issue-ID: CCSDK-285 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-06-26Change RANGE_RULE table to support multiple rangessb53561-2/+2
Change-Id: I376b9a5c13d9fb371693fc0ae725353ec468bb59 Issue-ID: CCSDK-316 Signed-off-by: Stan Bonev <sb5356@att.com>
2018-06-22Improve odlsli startup timeTimoney, Dan (dt5972)6-270/+54
Improved odlsli startup time by moving feature installation to build time, using ansible-opendaylight. Change-Id: I3f846da70e9aa0b8ce818ff83811c1b52aef1436 Issue-ID: CCSDK-285 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-06-18Update odlsli for ODL OxygenTimoney, Dan (dt5972)1-1/+1
Update odlsli to use ODL Oxygen as base container and to support local docker builds for testing. Change-Id: Ie615896e56177bf4b239ec080f09c50d8c16c0c5 Issue-ID: CCSDK-285 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-04-26Adding feature daexim-allv0.2.1Stilwell, Daivd (stilwelld)1-1/+1
Update installCcsdkFeatures.sh to add odl-daexim-all Change-Id: Ie02eccef0c5cf4f4507673c566415f8bb5b682a8 Issue-ID: CCSDK-255 Signed-off-by: Stilwell, Daivd (stilwelld) <stilwelld@att.com>
2018-04-24Updating properties in aaiclient.propertiesRich Tabedzki1-1/+1
Changes made: * Updated certificate file location Change-Id: Ifdce62a8402ebc49e58b37297d473f6dce86e9d4 Issue-ID: CCSDK-250 Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
2018-04-23Fixing trustStore issues in AAI ClientRich Tabedzki2-187/+20
Changes made: * updated trustore.onap.client.jks to use latest AAF certificates * updated aaiclient.properties file Change-Id: I0eb06766983ae128fa9304fc62e5e8596b726b02 Issue-ID: CCSDK-247 Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
2018-04-13Install host keyTimoney, Dan (dt5972)3-8/+30
Create a new script to install karaf host.key on ODL installation. Also, updated base ODL container to move ODL base distribution directory to /opt/opendaylight/current and create a symlink with the original name. This is done to allow OOM to support an external mount to /opt/opendaylight/current/daexim to preserve backups. Change-Id: I048b7d8002636dcd4ffbdff7242eb40d2a2787da Issue-ID: CCSDK-241 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-03-19Add sleep for stopTimoney, Dan (dt5972)1-4/+6
Stop takes a few seconds, so wait 60 seconds after issuing stop for karaf to finish coming down. Change-Id: Icbde6152e417e60a9e4d138671ddf8ef8decb978 Issue-ID: CCSDK-208 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-03-19Fix ODL restart issueTimoney, Dan (dt5972)2-14/+15
Found root cause of ODL restart issue had to do with order of installation of base ODL features. Fixed startup order and removed workaround in startODL.sh Change-Id: Id4b4f96242b981fba336b9e0a4de0439d2a93115 Issue-ID: CCSDK-208 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-03-19Fix installation orderTimoney, Dan (dt5972)1-1/+1
Fix order of installation so that filters installs after sli Change-Id: I4742b476cbe2661185f7e644577770f30684a6bc Issue-ID: CCSDK-216 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-03-13Fix config dir nameTimoney, Dan (dt5972)1-1/+1
Config directory (SDNC_CONFIG_DIR) for CCSDK should be /opt/onap/ccsdk/data/properties. Change-Id: Ib9da44e19236414202400033c8ad251b2913f4fd Issue-ID: CCSDK-208 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-03-13Wait on termination of java processTimoney, Dan (dt5972)1-2/+3
Exec of client didn't work - docker container still dies at end of script. Trying instead to wait on death of java process. Change-Id: I5687ca46b55b13a4918b0be1e2204abf58ca43b2 Issue-ID: CCSDK-208 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-03-13Exec last line of startODL.shTimoney, Dan (dt5972)1-1/+1
Need to exec last line of startODL.sh to get that process to be the one docker waits on Change-Id: Id697cd8f0347970ad3038ba2c576ab28f0e4cbad Issue-ID: CCSDK-208 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-03-12Fix odlsli restart issueTimoney, Dan (dt5972)1-20/+19
Instead of restarting container (which seems to fail), just start karaf client in foreground at end of startODL.sh to cause docker container to stay up as long as karaf is up. Also, remove Carbon container which is no longer needed for ONAP Beijing, and produces false positives in security scan. Change-Id: I8ea49769899cea206f46657bf6a3660d6a8a8d97 Issue-ID: CCSDK-208 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-03-09Resolve timing issue with restartTimoney, Dan (dt5972)1-1/+3
With Nitrogen, it can take some time after stop is issued for karaf container to actually come down. Add a sleep to allow time for stop to complete before execing karaf. Change-Id: Ifb39cb78390bd595791cc96ac148d17d3c9db08c Issue-ID: CCSDK-208 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-03-08Fix error in install featuresTimoney, Dan (dt5972)1-7/+7
Ccsdk install features script does not install northbound and plugin components properly. Change-Id: I61c87e9e6d7f05f616110762cebea1168d05e655 Issue-ID: CCSDK-179 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com> Fix error in install features Ccsdk install features script does not install northbound and plugin components properly. Change-Id: I7ec2276dca33555141233303ab2f30ae747ad1ba Issue-ID: CCSDK-179 Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
2018-02-27Create nitrogen dockersDan Timoney5-117/+145
Updated dockers to install Nitrogen artifacts. Change-Id: I9710346f064fa5fff0d92b5d6de32cc84d9e1b3d Issue-ID: CCSDK-179 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-11-21Fix org.ops4j.pax.logging.cfg logging configMarcus G K Williams1-4/+8
Update karaf logging config to keep logs from filling the disk by limiting DG logging file number and size. Issue-ID: SDNC-204 SDNC-203 Change-Id: I325357ed2c22018f1298faff0da1bedb40ab16ae Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2017-10-23Updated keystore file in ccsdk/distributionRich Tabedzki3-1/+1
Changes made: - updated content of the truststore.opendaylight.client.jks file Change-Id: I422ff6cd3d05993304e67af8fa65358d7efdd9ab Issue-ID: SDNC-134 Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
2017-10-18Add keystore file to ccsdk/distributionRich Tabedzki1-0/+0
Changes made: 1. added main/stores directory 2. added truststore file 3. updated pom file to properly include stores directory Change-Id: Ic10370e3c21c5e413c5745c2fbee7116f14a86a2 Issue-ID: SDNC-134 Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
2017-09-26Fix feature versionsMarcus G K Williams1-3/+1
Issue-Id: CCSDK-104 Change-Id: Ifb53104404482b11aab08e411bc9ed798ac9a64c Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2017-09-22Another change to fix failing featurePatrick Brady1-1/+1
Change-Id: I7b1cbae4a6102dd19e69f1fa9f867c689a00d3b0 Signed-off-by: Patrick Brady <pb071s@att.com> Issue-id: CCSDK-102
2017-09-21Fix installFeatures.shDan Timoney1-1/+1
Fix name of core-utils feature in installFeatures.sh Change-Id: I4a99eb8f36cc399cbdf8b7ed6f66b06173e57943 Issue-ID: CCSDK-54 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-21Install sdnc-core-utils featureDan Timoney2-0/+2
Update odlsli container to install new sdnc-core-utils feature. Change-Id: I315d35387257b91e5f8f0bdf24f7ad43f43ffb99 Issue-ID: CCSDK-54 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-19Fix dblib driver propertyDan Timoney1-1/+1
dblib.properties file contains wrong name for JDBC driver property Change-Id: I989ef7076bbadb44e3be9554fe39384ef685ca82 Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-18Merge "Add Graph/Node to org.ops4j.pax.logging.cfg"Dan Timoney2-0/+66
2017-09-18Use mariadb JDBC connectorDan Timoney1-1/+1
Update CCSDK container to use MariaDB JDBC connector instead of mysql connector. This is needed to resolve licensing issue. Both connectors are compatible with both MySQL and MariaDB back end databases, but mysql JDBC connector is licensed under GPL 2.0, while MariaDB JDBC is licensed under LGPL 2.0. Change-Id: I919e8463c1e0ef162b9becc5023ebf623423df78 Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-09-15Prepared dblib.properties to support multi-vendorRich Tabedzki1-0/+1
Changes made: 1. updated dblib.properties, added new propery org.openecomp.sdnc.sli.jdbc.drive needed to identify JDBC driver used by core/dblib bundle Change-Id: I772f22a3fd3928661170235120fe123dbfd7dce8 Issue-ID: CCSDK-92 Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
2017-09-14Add Graph/Node to org.ops4j.pax.logging.cfgMarcus G K Williams2-0/+66
This change adds org.ops4j.pax.logging.cfg file that contains standard ODL logging config with added sections for 'Directed Graph Node Id appender' and 'Directed Graph Name appender'. Addition of these sections should allow current Graph and Node Id to be appended to karaf log using MDC. Issue-Id: CCSDK-71 Change-Id: Id62ba038fbe6bb51e2c58f6a415a860cfa11dd89 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
2017-08-30Correct typo in db install scriptDan Timoney1-1/+1
Database install script is looking for file called 'sdnctl.dump', when it should be 'odlsli.dump'. Change-Id: I4a69d2fbce54cafb56f48face99c2109df515620 Issue-ID: CCSDK-74 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-24Install database schemaDan Timoney2-406/+4
Fixed bug in database installation script to load database schema Change-Id: Ie5478a40c7792ee8a5d91ea0a8af753717777971 Issue-ID: CCSDK-27 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-23Fix odlsli feature installDan Timoney1-1/+1
Fix issues with installation of features and DGS in odlsli container Change-Id: If50db422ccd9b2493fa237c7b4090fef00e91968 Issue-ID: CCSDK-27 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-22Use docker profileDan Timoney1-13/+2
Docker plugin should be defined in separate profile so that it is only triggered by docker Jenkins jobs, which enable the docker profile via -P docker command line arg. Change-Id: I42826bf5fe1c4cfcf6dd0122b3d889ddd031306a Issue-ID: CCSDK-64 Signed-off-by: Dan Timoney <dtimoney@att.com>
2017-08-21Add ODL + SLI containerDan Timoney15-0/+2813
Add docker container that starts up OpenDaylight with SLI preinstalled Change-Id: Iffbc21e0437108608fc35fc573d8ef47e413eca8 Issue-ID: CCSDK-27 Signed-off-by: Dan Timoney <dtimoney@att.com>