From 5363b2782d906a6c6067eb840392f959ed4dfe4b Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 18 Jul 2017 20:23:07 -0400 Subject: [CCSDK-6] Populate seed code Add seed code for sli/adaptors repository Update code to use org.onap.ccsdk.sli.core Change-Id: I477c7a24f2cc1fed8fb0975fe9f33733411c27f9 Signed-off-by: Dan Timoney --- .gitignore | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 .gitignore (limited to '.gitignore') diff --git a/.gitignore b/.gitignore new file mode 100755 index 000000000..2932cb920 --- /dev/null +++ b/.gitignore @@ -0,0 +1,38 @@ +#####standard .git ignore entries##### + +## IDE Specific Files ## +org.eclipse.core.resources.prefs +.classpath +.project +.settings +.idea +.externalToolBuilders +maven-eclipse.xml +workspace +.checkstyle + +## Compilation Files ## +*.class +**/target +target +target-ide +MANIFEST.MF + +## Misc Ignores (OS specific etc) ## +bin/ +dist +*~ +*.ipr +*.iml +*.iws +classes +out/ +.DS_STORE +.metadata +provider/src/main/java/META-INF/ +provider/src/main/java/inventory/ + +## BlackDuck generated file +sdnc-adaptors_bdio.jsonld +blackDuckHubProjectName.txt +blackDuckHubProjectVersionName.txt -- cgit 1.2.3-korg From 3c3e80c786c42381e75a5e72254729a92ab7722c Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Fri, 18 Aug 2017 13:42:02 -0700 Subject: Clean final ecomp references from sli-adaptors Issue-Id: CCSDK-19 Change-Id: I40c0287ebdaeb93fc17370a8692fbac5edf32d08 Signed-off-by: Marcus G K Williams --- .gitignore | 2 +- README.md | 2 +- aai-service/pom.xml | 82 ++++++++++----------- example-settings.xml | 163 ------------------------------------------ jenkins-settings.xml | 168 -------------------------------------------- mdsal-resource/pom.xml | 2 +- pom.xml | 29 ++++---- resource-assignment/pom.xml | 2 +- sql-resource/pom.xml | 2 +- 9 files changed, 61 insertions(+), 391 deletions(-) delete mode 100644 example-settings.xml delete mode 100644 jenkins-settings.xml (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 2932cb920..f7a3d77cd 100755 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,6 @@ provider/src/main/java/META-INF/ provider/src/main/java/inventory/ ## BlackDuck generated file -sdnc-adaptors_bdio.jsonld +ccsdk-adaptors_bdio.jsonld blackDuckHubProjectName.txt blackDuckHubProjectVersionName.txt diff --git a/README.md b/README.md index c1e7af927..c906c67da 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ This source repository contains the code for the SDN Controller adaptors. To compile this code: -1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the OpenECOMP repositories and OpenDaylight repositories. See example-settings.xml for an example. +1. Make sure your local Maven settings file ($HOME/.m2/settings.xml) contains references to the ONAP repositories and OpenDaylight repositories. See example-settings.xml for an example. 2. To compile, run "mvn clean install". diff --git a/aai-service/pom.xml b/aai-service/pom.xml index 9c89a1773..857ada4d5 100755 --- a/aai-service/pom.xml +++ b/aai-service/pom.xml @@ -1,45 +1,45 @@ - - org.onap.ccsdk.sli.adaptors - sdnc-adaptors - 0.1.0-SNAPSHOT - - - 4.0.0 - pom - org.onap.ccsdk.sli.adaptors - aai-service - - - AAI Interface Service - The AAI Interface service exposes an interface to AAI as an OSGi service - - 0.1.0-SNAPSHOT - - - - - org.onap.ccsdk.sli.adaptors - aai-service-features - features - ${project.version} - xml - - - - org.onap.ccsdk.sli.adaptors - aai-service-provider - ${project.version} - - - - - - - provider - features - installer - + + org.onap.ccsdk.sli.adaptors + ccsdk-adaptors + 0.1.0-SNAPSHOT + + + 4.0.0 + pom + org.onap.ccsdk.sli.adaptors + aai-service + + + AAI Interface Service + The AAI Interface service exposes an interface to AAI as an OSGi service + + 0.1.0-SNAPSHOT + + + + + org.onap.ccsdk.sli.adaptors + aai-service-features + features + ${project.version} + xml + + + + org.onap.ccsdk.sli.adaptors + aai-service-provider + ${project.version} + + + + + + + provider + features + installer + diff --git a/example-settings.xml b/example-settings.xml deleted file mode 100644 index 2e7ce6445..000000000 --- a/example-settings.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - openecomp-release - - - openecomp-release - openecomp-release - https://ecomp-nexus:8443/repository/maven-releases/ - - true - never - - - false - - - - - - openecomp-release - openecomp-release - https://ecomp-nexus:8443/repository/maven-releases/ - - true - never - - - false - - - - - - - openecomp-snapshots - - - openecomp-snapshot - openecomp-snapshot - https://ecomp-nexus:8443/repository/maven-snapshots/ - - false - - - true - - - - - - openecomp-snapshot - openecomp-snapshot - https://ecomp-nexus:8443/repository/maven-snapshots/ - - false - - - true - - - - - - opendaylight-release - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - - opendaylight-snapshots - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - - - openecomp-release - openecomp-snapshots - opendaylight-release - opendaylight-snapshots - - - - - nexus - USERNAME - PASSWORD - - - openecomp-release - USERNAME - PASSWORD - - - openecomp-snapshot - USERNAME - PASSWORD - - - diff --git a/jenkins-settings.xml b/jenkins-settings.xml deleted file mode 100644 index 344994f85..000000000 --- a/jenkins-settings.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - - - openecomp-release - - - openecomp-release - openecomp-release - https://ecomp-nexus:8443/repository/maven-releases/ - - true - never - - - false - - - - - - openecomp-release - openecomp-release - https://ecomp-nexus:8443/repository/maven-releases/ - - true - never - - - false - - - - - - - openecomp-snapshots - - - openecomp-snapshot - openecomp-snapshot - https://ecomp-nexus:8443/repository/maven-snapshots/ - - false - - - true - - - - - - openecomp-snapshot - openecomp-snapshot - https://ecomp-nexus:8443/repository/maven-snapshots/ - - false - - - true - - - - - - opendaylight-release - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - opendaylight-mirror - opendaylight-mirror - https://nexus.opendaylight.org/content/repositories/public/ - - true - never - - - false - - - - - - - opendaylight-snapshots - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - opendaylight-snapshot - opendaylight-snapshot - https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/ - - false - - - true - - - - - - - - openecomp-release - openecomp-snapshots - opendaylight-release - opendaylight-snapshots - - - - - nexus - ${ecomp.nexus.user} - ${ecomp.nexus.password} - - - openecomp-release - ${ecomp.nexus.user} - ${ecomp.nexus.password} - - - openecomp-snapshot - ${ecomp.nexus.user} - ${ecomp.nexus.password} - - - sdnc-javadoc - ${ecomp.nexus.user} - ${ecomp.nexus.password} - - - diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml index eddff3039..ba4b94429 100755 --- a/mdsal-resource/pom.xml +++ b/mdsal-resource/pom.xml @@ -2,7 +2,7 @@ org.onap.ccsdk.sli.adaptors - sdnc-adaptors + ccsdk-adaptors 0.1.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index f4e8fcb52..5544f1bea 100755 --- a/pom.xml +++ b/pom.xml @@ -11,34 +11,35 @@ 4.0.0 pom org.onap.ccsdk.sli.adaptors - sdnc-adaptors + ccsdk-adaptors - SDN-C Adaptors - https://wiki.openecomp.org - The SDN-C core components contains the SLI, dblib and root pom + CCSDK SLI Adaptors + https://wiki.onap.org + The CCSDK core components contains the SLI, dblib and root pom JIRA - https://jira.openecomp.org/ + https://jira.onap.org/ - scm:git:ssh://git@${openecomp.git.host}/sdnc-adaptors.git - scm:git:ssh://${openecomp.git.host}:${openecomp.git.port}/${openecomp.git.project}/sdnc-adaptors.git - ${openecomp.git.protocol}://${openecomp.git.host}/projects/${openecomp.git.project}/repos/sdnc-adaptors/browse + scm:git:ssh://git@${onap.git.host}/ccsdk/sli/adaptors + scm:git:ssh://${onap.git.host}:${onap.git.port}/ccsdk/sli/adaptors + ${onap.git.protocol}://${onap.git.host}/ccsdk/sli/adaptors + ccsdk-adaptors-${project.version} Jenkins - https://jenkins.openecomp.org/ + https://jenkins.onap.org/ sdnc-javadoc - dav:https://${openecomp.nexus.host}/content/sites/site/org/onap/sdnc/adaptors/${project.artifactId}/${project.version} + dav:https://${onap.nexus.host}/content/sites/site/org/onap/sdnc/adaptors/${project.artifactId}/${project.version} @@ -96,9 +97,9 @@ 1.6.7 true - https://${openecomp.nexus.host} - ${openecomp.nexus.staging.profile-id} - ${openecomp.nexus.staging.server-id} + https://${onap.nexus.host} + ${onap.nexus.staging.profile-id} + ${onap.nexus.staging.server-id} @@ -111,7 +112,7 @@ sql-resource - OpenECOMP + ONAP 0.1.0-SNAPSHOT diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml index 37889db03..17860829d 100755 --- a/resource-assignment/pom.xml +++ b/resource-assignment/pom.xml @@ -2,7 +2,7 @@ org.onap.ccsdk.sli.adaptors - sdnc-adaptors + ccsdk-adaptors 0.1.0-SNAPSHOT diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml index ffec0c427..a84e7e4ee 100755 --- a/sql-resource/pom.xml +++ b/sql-resource/pom.xml @@ -2,7 +2,7 @@ org.onap.ccsdk.sli.adaptors - sdnc-adaptors + ccsdk-adaptors 0.1.0-SNAPSHOT -- cgit 1.2.3-korg From 69c4c5b6100492d3158364699d46a7c80e49ca49 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 20 Apr 2018 14:25:32 -0400 Subject: Fix feature dependency versions Fix single-feature pom.xmls to use version of sli/core artifactsi specified in parent poms, as opposed to project.version, which is incorrect and causes release build to break. Change-Id: Iec00a73b1b4adf9e8fecdb190385bb35ab1fe1c7 Issue-ID: CCSDK-248 Signed-off-by: Timoney, Dan (dt5972) --- .gitignore | 3 +++ aai-service/features/ccsdk-aai-service/pom.xml | 1 - .../ansible-adapter-bundle/debug-logs/EELF/debug.log | 0 .../ansible-adapter-bundle/logs/EELF/application.log | 19 ------------------- .../ansible-adapter-bundle/logs/EELF/audit.log | 0 .../ansible-adapter-bundle/logs/EELF/error.log | 0 .../ansible-adapter-bundle/logs/EELF/metrics.log | 0 .../ansible-adapter-bundle/logs/EELF/performance.log | 0 .../ansible-adapter-bundle/logs/EELF/policy.log | 0 .../ansible-adapter-bundle/logs/EELF/security.log | 0 .../ansible-adapter-bundle/logs/EELF/server.log | 0 mdsal-resource/features/ccsdk-mdsal-resource/pom.xml | 1 - .../features/ccsdk-resource-assignment/pom.xml | 3 +-- sql-resource/features/ccsdk-sql-resource/pom.xml | 3 +-- 14 files changed, 5 insertions(+), 25 deletions(-) delete mode 100644 ansible-adapter/ansible-adapter-bundle/debug-logs/EELF/debug.log delete mode 100644 ansible-adapter/ansible-adapter-bundle/logs/EELF/application.log delete mode 100644 ansible-adapter/ansible-adapter-bundle/logs/EELF/audit.log delete mode 100644 ansible-adapter/ansible-adapter-bundle/logs/EELF/error.log delete mode 100644 ansible-adapter/ansible-adapter-bundle/logs/EELF/metrics.log delete mode 100644 ansible-adapter/ansible-adapter-bundle/logs/EELF/performance.log delete mode 100644 ansible-adapter/ansible-adapter-bundle/logs/EELF/policy.log delete mode 100644 ansible-adapter/ansible-adapter-bundle/logs/EELF/security.log delete mode 100644 ansible-adapter/ansible-adapter-bundle/logs/EELF/server.log (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index f7a3d77cd..3865ebb96 100755 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,9 @@ out/ .metadata provider/src/main/java/META-INF/ provider/src/main/java/inventory/ +logs/ +debug-logs/ +*.log ## BlackDuck generated file ccsdk-adaptors_bdio.jsonld diff --git a/aai-service/features/ccsdk-aai-service/pom.xml b/aai-service/features/ccsdk-aai-service/pom.xml index 3e1a5059e..1e33927ce 100644 --- a/aai-service/features/ccsdk-aai-service/pom.xml +++ b/aai-service/features/ccsdk-aai-service/pom.xml @@ -27,7 +27,6 @@ org.onap.ccsdk.sli.core ccsdk-sli - ${project.version} xml features diff --git a/ansible-adapter/ansible-adapter-bundle/debug-logs/EELF/debug.log b/ansible-adapter/ansible-adapter-bundle/debug-logs/EELF/debug.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/application.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/application.log deleted file mode 100644 index e42f4053d..000000000 --- a/ansible-adapter/ansible-adapter-bundle/logs/EELF/application.log +++ /dev/null @@ -1,19 +0,0 @@ -2018-04-17 22:38:28,679|||main||||INFO||||||| EELF0005I Searching path "${user.home};etc;../etc" for log configuration file "logback-test.xml" -2018-04-17 22:38:28,682|||main||||INFO||||||| EELF0001I Loading default logging configuration from system resource file "com/att/eelf/logback.xml" -2018-04-17 22:38:28,698|||main||||INFO||||||| Retrieving results from https://192.168.1.1?Id=101&Type=GetLog -2018-04-17 22:38:28,698|||main||||INFO||||||| Querying url = https://192.168.1.1?Id=101&Type=GetLog -2018-04-17 22:38:28,709|||main||||INFO||||||| Request output = {"Results":{"192.168.1.10":{"Id":"101","StatusCode":200,"StatusMessage":"SUCCESS"}},"StatusCode":200,"StatusMessage":"FINISHED"} -2018-04-17 22:38:28,712|||main||||INFO||||||| Got uri -2018-04-17 22:38:28,715|||main||||INFO||||||| Querying url = https://192.168.1.1?Id=100&Type=GetResult -2018-04-17 22:38:28,715|||main||||INFO||||||| Parsing response from Server = {"Results":{"192.168.1.10":{"Id":"100","StatusCode":200,"StatusMessage":"SUCCESS"}},"StatusCode":200,"StatusMessage":"FINISHED"} -2018-04-17 22:38:28,719|||main||||INFO||||||| Received response with code = 200, Message = FINISHED -2018-04-17 22:38:28,719|||main||||INFO||||||| Processing results in response -2018-04-17 22:38:28,719|||main||||INFO||||||| Get JSON dictionary from Results .. -2018-04-17 22:38:28,719|||main||||INFO||||||| Iterating through hosts -2018-04-17 22:38:28,719|||main||||INFO||||||| Processing host = 192.168.1.10 -2018-04-17 22:38:28,719|||main||||INFO||||||| Code = 200, Message = SUCCESS -2018-04-17 22:38:28,720|||main||||INFO||||||| Request response = FINISHED -2018-04-17 22:38:28,720|||main||||INFO||||||| Ansible Request 100 finished with Result = success, Message = FINISHED -2018-04-17 22:38:28,775|||main||||INFO||||||| Updated Payload = {"Id":"cd75d4da-096c-419e-a2c8-3e14362c729c","PlaybookName":"test_playbook.yaml"} -2018-04-17 22:38:28,775|||main||||INFO||||||| Posting request = {"Id":"cd75d4da-096c-419e-a2c8-3e14362c729c","PlaybookName":"test_playbook.yaml"} to url = https://192.168.1.1 -2018-04-17 22:38:28,775|||main||||INFO||||||| Submission of Test successful. diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/audit.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/audit.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/error.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/error.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/metrics.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/metrics.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/performance.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/performance.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/policy.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/policy.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/security.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/security.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/ansible-adapter/ansible-adapter-bundle/logs/EELF/server.log b/ansible-adapter/ansible-adapter-bundle/logs/EELF/server.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml index 6869f16c5..a6d6c3057 100644 --- a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml +++ b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml @@ -28,7 +28,6 @@ org.onap.ccsdk.sli.core ccsdk-sli - ${project.version} xml features diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml index c50cf3ca5..568b246a6 100644 --- a/resource-assignment/features/ccsdk-resource-assignment/pom.xml +++ b/resource-assignment/features/ccsdk-resource-assignment/pom.xml @@ -28,7 +28,6 @@ org.onap.ccsdk.sli.core ccsdk-sli - ${project.version} xml features @@ -36,7 +35,7 @@ org.onap.ccsdk.sli.core ccsdk-dblib - ${project.version} + ${ccsdk.sli.core.version} xml features diff --git a/sql-resource/features/ccsdk-sql-resource/pom.xml b/sql-resource/features/ccsdk-sql-resource/pom.xml index d547eb1d5..5a20846a5 100644 --- a/sql-resource/features/ccsdk-sql-resource/pom.xml +++ b/sql-resource/features/ccsdk-sql-resource/pom.xml @@ -28,14 +28,13 @@ org.onap.ccsdk.sli.core ccsdk-sli - ${project.version} xml features org.onap.ccsdk.sli.core ccsdk-dblib - ${project.version} + ${ccsdk.sli.core.version} xml features -- cgit 1.2.3-korg From 99f1934d72099f7d77467290722ea74da983d3bb Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Wed, 14 Aug 2019 08:48:48 -0400 Subject: Fix version in base module Fix version, which was breaking merge build. Change-Id: I73c8d1e2be56e739164545ad1b5f9bf69985b719 Issue-ID: CCSDK-1618 Signed-off-by: Timoney, Dan (dt5972) --- .gitignore | 1 + base/http/features/ccsdk-base-http/pom.xml | 4 ++-- base/http/features/features-base-http/pom.xml | 4 ++-- base/http/features/pom.xml | 4 ++-- base/http/installer/pom.xml | 4 ++-- base/http/pom.xml | 4 ++-- base/http/provider/pom.xml | 9 ++++----- base/pom.xml | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 3865ebb96..d61fc8074 100755 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,7 @@ provider/src/main/java/inventory/ logs/ debug-logs/ *.log +*.versionsBackup ## BlackDuck generated file ccsdk-adaptors_bdio.jsonld diff --git a/base/http/features/ccsdk-base-http/pom.xml b/base/http/features/ccsdk-base-http/pom.xml index 0e18c737e..38181b683 100644 --- a/base/http/features/ccsdk-base-http/pom.xml +++ b/base/http/features/ccsdk-base-http/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-base-http - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT feature ccsdk-sli-adaptors :: base-http :: ${project.artifactId} diff --git a/base/http/features/features-base-http/pom.xml b/base/http/features/features-base-http/pom.xml index 84004858c..3b7766fd9 100644 --- a/base/http/features/features-base-http/pom.xml +++ b/base/http/features/features-base-http/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.2 + 1.3.3-SNAPSHOT org.onap.ccsdk.sli.adaptors features-base-http - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT feature ccsdk-sli-adaptors :: base-http :: ${project.artifactId} diff --git a/base/http/features/pom.xml b/base/http/features/pom.xml index a9abe519e..960a71952 100644 --- a/base/http/features/pom.xml +++ b/base/http/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-features - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT pom ccsdk-sli-adaptors :: base-http :: ${project.artifactId} diff --git a/base/http/installer/pom.xml b/base/http/installer/pom.xml index ac233cb4f..4ba0614e1 100644 --- a/base/http/installer/pom.xml +++ b/base/http/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.ccsdk.sli.adaptors base-http-installer - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT pom ccsdk-sli-adaptors :: base-http :: ${project.artifactId} diff --git a/base/http/pom.xml b/base/http/pom.xml index 368e3fb18..65571050a 100644 --- a/base/http/pom.xml +++ b/base/http/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT org.onap.ccsdk.sli.adaptors.base http - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT pom diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 4cbe85c13..083a7fc7f 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -1,18 +1,17 @@ - + 4.0.0 org.onap.ccsdk.parent binding-parent - 1.3.2 - + 1.3.3-SNAPSHOT + org.onap.ccsdk.sli.adaptors base-http-provider - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT bundle diff --git a/base/pom.xml b/base/pom.xml index eb18d160a..12a2f779c 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.2 + 1.3.3-SNAPSHOT @@ -12,7 +12,7 @@ pom org.onap.ccsdk.sli.adaptors base-parent - 0.5.1-SNAPSHOT + 0.5.2-SNAPSHOT http -- cgit 1.2.3-korg From 9ed4144aa7a72da788306a420b8a9a26fd0d4401 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 10 Dec 2019 10:30:14 -0500 Subject: Generate dependency list Generate list of direct dependencies for repository and publish to Nexus. Change-Id: Iedca8bf65f4f7ea494816197b4e4b94dfbcf9b48 Issue-ID: CCSDK-1986 Signed-off-by: Timoney, Dan (dt5972) --- .gitignore | 3 +++ pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index d61fc8074..34a96c158 100755 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,6 @@ debug-logs/ ccsdk-adaptors_bdio.jsonld blackDuckHubProjectName.txt blackDuckHubProjectVersionName.txt + +#Generated dependencies list +direct-dependencies.txt diff --git a/pom.xml b/pom.xml index c8fe41506..fa8254e8e 100755 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,50 @@ + + dependency-list + + + + com.github.ferstl + depgraph-maven-plugin + + + validate + false + + aggregate + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + package + false + + attach-artifact + + + + + ${dependency-list.file} + txt + dependencies + + + + + + + + + + -- cgit 1.2.3-korg From 3960d5fe8a04c505334714516c3144c327bb98c1 Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 30 Jul 2020 13:44:53 -0400 Subject: Add error handling for OSGi classes not found Added error handling to correctly handle case where SqlResource is used outside an OSGi container. Change-Id: I0b5a526b01c151c4a7924f474bf7d21e783ac260 Issue-ID: CCSDK-2625 Signed-off-by: Dan Timoney --- .gitignore | 1 + .../sli/adaptors/resource/sql/SqlResource.java | 48 +++++++++++++--------- 2 files changed, 30 insertions(+), 19 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 34a96c158..cc576b7b2 100755 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ org.eclipse.core.resources.prefs maven-eclipse.xml workspace .checkstyle +.vscode ## Compilation Files ## *.class diff --git a/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResource.java b/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResource.java index 69965d101..435bc5bb1 100755 --- a/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResource.java +++ b/sql-resource/provider/src/main/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResource.java @@ -355,28 +355,36 @@ public class SqlResource implements SvcLogicResource, SvcLogicJavaPlugin { return(dblibSvc); } // Try to get dblib as an OSGI service - BundleContext bctx = null; - ServiceReference sref = null; - Bundle bundle = FrameworkUtil.getBundle(SqlResource.class); - - if (bundle != null) { - bctx = bundle.getBundleContext(); - } - - if (bctx != null) { - sref = bctx.getServiceReference(DBLIB_SERVICE); - } - - if (sref == null) { - LOG.warn("Could not find service reference for DBLIB service (" + DBLIB_SERVICE + ")"); - } else { - dblibSvc = (DbLibService) bctx.getService(sref); - if (dblibSvc == null) { + try { + BundleContext bctx = null; + ServiceReference sref = null; + + + + Bundle bundle = FrameworkUtil.getBundle(SqlResource.class); + + if (bundle != null) { + bctx = bundle.getBundleContext(); + } + + if (bctx != null) { + sref = bctx.getServiceReference(DBLIB_SERVICE); + } + + if (sref == null) { LOG.warn("Could not find service reference for DBLIB service (" + DBLIB_SERVICE + ")"); + } else { + dblibSvc = (DbLibService) bctx.getService(sref); + if (dblibSvc == null) { + LOG.warn("Could not find service reference for DBLIB service (" + DBLIB_SERVICE + ")"); + } } + } catch (NoClassDefFoundError ex) { + LOG.info("OSGI classes not found - must be running outside an OSGi container"); } + if (dblibSvc == null) { // Must not be running in an OSGI container. See if you can load it // as a @@ -386,7 +394,8 @@ public class SqlResource implements SvcLogicResource, SvcLogicJavaPlugin { // be the properties passed to DBResourceManager constructor. // If not, as default just use system properties. Properties dblibProps = System.getProperties(); - String cfgDir = System.getenv("SDNC_CONFIG_DIR"); + + String cfgDir = dblibProps.getProperty("sdnc.config.dir", System.getenv("SDNC_CONFIG_DIR")); if ((cfgDir == null) || (cfgDir.length() == 0)) { cfgDir = "/opt/sdnc/data/properties"; @@ -395,10 +404,11 @@ public class SqlResource implements SvcLogicResource, SvcLogicJavaPlugin { File dblibPropFile = new File(cfgDir + "/dblib.properties"); if (dblibPropFile.exists()) { try { + LOG.debug("Loading dblib properties from {}", dblibPropFile.getAbsolutePath()); dblibProps = new Properties(); dblibProps.load(new FileInputStream(dblibPropFile)); } catch (Exception e) { - LOG.warn("Could not load properties file " + dblibPropFile.getAbsolutePath(), e); + LOG.warn("Could not load properties file {}", dblibPropFile.getAbsolutePath(), e); dblibProps = System.getProperties(); } -- cgit 1.2.3-korg From 6fb8dfad11c84c0833e842183ec43a4ee95e81de Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 14 Jul 2020 08:55:33 -0400 Subject: Update adaptors to sodium Update sli/adaptors to OpenDaylight Sodium release. 2 changes were needed: - mdsal-resource : needed to add unimplemented abstract methods in inner anonymous BundleContext class in test case. - resource-assignment: needed to correct unit test problems that were ignored in earlier versions of h2 Change-Id: Ice63bfce64768e46c4376db55e3e9e97d0b934ad Issue-ID: CCSDK-2551 Signed-off-by: Dan Timoney --- .gitignore | 1 + .../adaptors/aai/AAIClientRESTExecutorTest.java | 3 ++ features/ccsdk-ansible-adapter/pom.xml | 6 +++ features/ccsdk-saltstack-adapter/pom.xml | 10 ++++- .../resource/mdsal/TestMdsalResourceActivator.java | 49 ++++++++++++++++++---- .../onap/ccsdk/sli/adaptors/ra/TestReserve.java | 8 ++++ .../provider/src/test/resources/sql/schema.sql | 2 +- 7 files changed, 69 insertions(+), 10 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index cc576b7b2..42cca13bb 100755 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ classes out/ .DS_STORE .metadata +.vscode provider/src/main/java/META-INF/ provider/src/main/java/inventory/ logs/ diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutorTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutorTest.java index b0272f5d0..f60b2da64 100644 --- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutorTest.java +++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutorTest.java @@ -11,6 +11,8 @@ import static org.junit.Assert.assertNotNull; public class AAIClientRESTExecutorTest { private static AAIClientRESTExecutor aaiExecute; + private static AAIService aaiService; + @BeforeClass public static void setUpBeforeClass() throws Exception { Properties properties = new Properties(); @@ -22,6 +24,7 @@ public class AAIClientRESTExecutorTest { properties.setProperty("connection.timeout", "60000"); properties.setProperty("read.timeout", "60000"); aaiExecute = new AAIClientRESTExecutor(properties); + aaiService = new AAIService(properties); } diff --git a/features/ccsdk-ansible-adapter/pom.xml b/features/ccsdk-ansible-adapter/pom.xml index 32ec5058f..da497f56f 100644 --- a/features/ccsdk-ansible-adapter/pom.xml +++ b/features/ccsdk-ansible-adapter/pom.xml @@ -36,6 +36,12 @@ ${project.groupId} ansible-adapter-bundle ${project.version} + + + powermock-api-mockito + org.powermock + + diff --git a/features/ccsdk-saltstack-adapter/pom.xml b/features/ccsdk-saltstack-adapter/pom.xml index ffc43e152..2e51c83be 100644 --- a/features/ccsdk-saltstack-adapter/pom.xml +++ b/features/ccsdk-saltstack-adapter/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 @@ -33,6 +34,13 @@ ${project.groupId} saltstack-adapter-provider ${project.version} + + + + powermock-api-mockito + org.powermock + + diff --git a/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestMdsalResourceActivator.java b/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestMdsalResourceActivator.java index 397915d08..6174bc84d 100644 --- a/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestMdsalResourceActivator.java +++ b/mdsal-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/mdsal/TestMdsalResourceActivator.java @@ -30,7 +30,9 @@ import org.osgi.framework.BundleListener; import org.osgi.framework.Filter; import org.osgi.framework.FrameworkListener; import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceFactory; import org.osgi.framework.ServiceListener; +import org.osgi.framework.ServiceObjects; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; @@ -49,8 +51,7 @@ public class TestMdsalResourceActivator { mdsal = new MdsalResourceActivator(); } - - @Test (expected = ConfigurationException.class) + @Test(expected = ConfigurationException.class) public void testStartResource() throws Exception { BundleContext ctx = new BundleContext() { @Override @@ -119,27 +120,32 @@ public class TestMdsalResourceActivator { } @Override - public ServiceRegistration registerService(String[] clazzes, Object service, Dictionary properties) { + public ServiceRegistration registerService(String[] clazzes, Object service, + Dictionary properties) { return null; } @Override - public ServiceRegistration registerService(String clazz, Object service, Dictionary properties) { + public ServiceRegistration registerService(String clazz, Object service, + Dictionary properties) { return null; } @Override - public ServiceRegistration registerService(Class clazz, S service, Dictionary properties) { + public ServiceRegistration registerService(Class clazz, S service, + Dictionary properties) { return null; } @Override - public ServiceReference[] getServiceReferences(String clazz, String filter) throws InvalidSyntaxException { + public ServiceReference[] getServiceReferences(String clazz, String filter) + throws InvalidSyntaxException { return new ServiceReference[0]; } @Override - public ServiceReference[] getAllServiceReferences(String clazz, String filter) throws InvalidSyntaxException { + public ServiceReference[] getAllServiceReferences(String clazz, String filter) + throws InvalidSyntaxException { return new ServiceReference[0]; } @@ -154,7 +160,8 @@ public class TestMdsalResourceActivator { } @Override - public Collection> getServiceReferences(Class clazz, String filter) throws InvalidSyntaxException { + public Collection> getServiceReferences(Class clazz, String filter) + throws InvalidSyntaxException { return null; } @@ -182,6 +189,19 @@ public class TestMdsalResourceActivator { public Bundle getBundle(String location) { return null; } + + @Override + public ServiceRegistration registerService(Class clazz, ServiceFactory factory, + Dictionary properties) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ServiceObjects getServiceObjects(ServiceReference reference) { + // TODO Auto-generated method stub + return null; + } }; mdsal.start(ctx); @@ -320,6 +340,19 @@ public class TestMdsalResourceActivator { public Bundle getBundle(String location) { return null; } + + @Override + public ServiceRegistration registerService(Class clazz, ServiceFactory factory, + Dictionary properties) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ServiceObjects getServiceObjects(ServiceReference reference) { + // TODO Auto-generated method stub + return null; + } }; mdsal.stop(ctx); diff --git a/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestReserve.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestReserve.java index ab2d936cf..dbf0c4aac 100644 --- a/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestReserve.java +++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestReserve.java @@ -216,6 +216,7 @@ public class TestReserve { rr.requestType = "New"; rr.rangeMaxOverride = -1; rr.rangeMinOverride = -1; + rr.applicationId = "myapp"; List rsList = new ArrayList<>(); @@ -513,6 +514,7 @@ public class TestReserve { rr.endPointPosition = "VPE-Cust"; rr.rangeMaxOverride = -1; rr.rangeMinOverride = -1; + rr.applicationId = "myapp"; List rsList = new ArrayList<>(); resourceAllocator.reserve(sd, rt, rr, rsList); @@ -533,6 +535,7 @@ public class TestReserve { rr.endPointPosition = "VPE-Core1"; rr.rangeMaxOverride = -1; rr.rangeMinOverride = -1; + rr.applicationId = "myapp"; rsList = new ArrayList<>(); resourceAllocator.reserve(sd, rt, rr, rsList); @@ -553,6 +556,7 @@ public class TestReserve { rr.endPointPosition = "VPE-Core2"; rr.rangeMaxOverride = -1; rr.rangeMinOverride = -1; + rr.applicationId = "myapp"; rsList = new ArrayList<>(); resourceAllocator.reserve(sd, rt, rr, rsList); @@ -573,6 +577,7 @@ public class TestReserve { rr.endPointPosition = "VPE-Core3"; rr.rangeMaxOverride = -1; rr.rangeMinOverride = -1; + rr.applicationId = "myapp"; rsList = new ArrayList<>(); resourceAllocator.reserve(sd, rt, rr, rsList); @@ -720,6 +725,7 @@ public class TestReserve { rr.rangeMaxOverride = 3901; rr.rangeMinOverride = 3900; rr.resourceType = ResourceType.Range; + rr.applicationId = "myapp"; List rsList = new ArrayList<>(); resourceAllocator.reserve(sd, rt, rr, rsList); @@ -748,6 +754,7 @@ public class TestReserve { rr.rangeMinOverride = -1; rr.rangeOverrideList = Arrays.asList(range); rr.resourceType = ResourceType.Range; + rr.applicationId = "myapp"; rsList = new ArrayList<>(); resourceAllocator.reserve(sd, rt, rr, rsList); @@ -781,6 +788,7 @@ public class TestReserve { rr.rangeOverrideList = new ArrayList<>(); rr.rangeOverrideList.add(range1); rr.rangeOverrideList.add(range2); + rr.applicationId = "myapp"; rr.resourceType = ResourceType.Range; rsList = new ArrayList<>(); diff --git a/resource-assignment/provider/src/test/resources/sql/schema.sql b/resource-assignment/provider/src/test/resources/sql/schema.sql index ed123ddd6..275337e44 100644 --- a/resource-assignment/provider/src/test/resources/sql/schema.sql +++ b/resource-assignment/provider/src/test/resources/sql/schema.sql @@ -124,7 +124,7 @@ CREATE TABLE SERVICE_RESOURCE ( service_status VARCHAR(10) NOT NULL, service_change_number SMALLINT NOT NULL, resource_set_id VARCHAR(100) NOT NULL, - resource_union_id VARCHAR(100) NOT NULL, + resource_union_id VARCHAR(100) NOT NULL ); ALTER TABLE SERVICE_RESOURCE ADD CONSTRAINT C1_SERVICE_RESOURCE CHECK (service_status IN ('Active', 'Pending')); -- cgit 1.2.3-korg