From 23c252a4637f16676021afa3dbc73a7e44dc6259 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Tue, 23 Sep 2025 13:50:16 +0530 Subject: [PATCH] Wrong path for AAA xml StartODL.sh contains an ONAP path instead of ODL path Issue-ID: OAM-509 Change-Id: I354392dfda3b60c1c783b8e3c3779d351d056971 Signed-off-by: Ravi Pendurty --- distribution/oam-controller/pom.xml | 2 +- distribution/oam-controller/src/main/docker/Dockerfile | 1 - distribution/oam-controller/src/main/scripts/startODL.sh | 9 ++------- features/sdnr/odlux/readthedocs/pom.xml | 6 +++--- features/sdnr/wt/oauth-provider/pom.xml | 2 +- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/distribution/oam-controller/pom.xml b/distribution/oam-controller/pom.xml index 2f4b187..eb3d92a 100644 --- a/distribution/oam-controller/pom.xml +++ b/distribution/oam-controller/pom.xml @@ -19,7 +19,7 @@ nexus3.onap.org:10001/onap/sdnc-image:2.6.0 eclipse-temurin:21.0.5_11-jdk-alpine 10.20.6.10:30000 - o-ran-sc/oam-oam-controller/sdnr-image + o-ran-sc/oam-oam-controller/sdnr-image 13.0.0-SNAPSHOT-latest 0.21.2 0.20.8 diff --git a/distribution/oam-controller/src/main/docker/Dockerfile b/distribution/oam-controller/src/main/docker/Dockerfile index c8f5980..3e58760 100644 --- a/distribution/oam-controller/src/main/docker/Dockerfile +++ b/distribution/oam-controller/src/main/docker/Dockerfile @@ -11,7 +11,6 @@ ENV FEATURES_SDNR ${ccsdk.feature.repopath} ENV SDNR_DM_REPO mvn:${CCSDKFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator/${CCSDKFEATUREVERSION}/xml/features, \ mvn:${CCSDKFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-devicemanager-base/${CCSDKFEATUREVERSION}/xml/features, \ mvn:${CCSDKFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-devicemanager/${CCSDKFEATUREVERSION}/xml/features, \ - mvn:${CCSDKFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-devicemanager-unm-generic/${CCSDKFEATUREVERSION}/xml/features, \ mvn:${CCSDKFEATURE_SDNR_GROUPID}/sdnr-wt-feature-aggregator-oauth/${CCSDKFEATUREVERSION}/xml/features ENV SDNR_FEATURES_BOOT_INITIAL odl-restconf-all,odl-netconf-topology,odl-netconf-callhome-ssh,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,odl-restconf-nb-rfc8040 diff --git a/distribution/oam-controller/src/main/scripts/startODL.sh b/distribution/oam-controller/src/main/scripts/startODL.sh index 197cae5..7f378bf 100755 --- a/distribution/oam-controller/src/main/scripts/startODL.sh +++ b/distribution/oam-controller/src/main/scripts/startODL.sh @@ -107,9 +107,7 @@ install_sdnrwt_features() { if $SDNRONLY; then cleanupFeatureBoot fi - if $SDNRUNMDM; then - addToFeatureBoot "$SDNRDM_UNM_BOOTFEATURES" - else + if $SDNRDM; then addToFeatureBoot "$SDNRDM_BOOTFEATURES" # if ! $SDNRDM; then # addToFeatureBoot "$SDNRODLUX_BOOTFEATURES" @@ -255,7 +253,6 @@ GEO_ENABLED=${GEO_ENABLED:-false} SDNRWT=${SDNRWT:-false} SDNRDM=${SDNRDM:-false} -SDNRUNMDM=${SDNRUNMDM:-false} #SDNRODLUX_BOOTFEATURES=${SDNRODLUX_BOOTFEATURES:-sdnr-wt-helpserver-feature,sdnr-wt-odlux-core-feature,sdnr-wt-odlux-apps-feature} SDNROAUTH_BOOTFEATURES=${SDNROAUTH_BOOTFEATURES:-sdnr-wt-feature-aggregator-oauth} SDNR_NETCONF_CALLHOME_ENABLED=${SDNR_NETCONF_CALLHOME_ENABLED:-false} @@ -263,7 +260,6 @@ SDNR_NETCONF_CALLHOME_ENABLED=${SDNR_NETCONF_CALLHOME_ENABLED:-false} # Add devicemanager features SDNRDM_SDM_LIST=${SDNRDM_SDM_LIST:-sdnr-wt-feature-aggregator-devicemanager} SDNRDM_BOOTFEATURES=${SDNRDM_BOOTFEATURES:-sdnr-wt-feature-aggregator-devicemanager-base,${SDNRDM_SDM_LIST}} -SDNRDM_UNM_BOOTFEATURES=${SDNRDM_UNM_BOOTFEATURES:-sdnr-wt-feature-aggregator-devicemanager-base,sdnr-wt-feature-aggregator-devicemanager-unm-generic} # Whether to Initialize the ElasticSearch DB. SDNRINIT=${SDNRINIT:-false} @@ -316,7 +312,6 @@ printf "%s\n" " ENABLE_OAUTH=$ENABLE_OAUTH" printf "%s\n" " ENABLE_ODLUX_RBAC=$ENABLE_ODLUX_RBAC" printf "%s\n" " SDNRWT=$SDNRWT" printf "%s\n" " SDNRDM=$SDNRDM" -printf "%s\n" " SDNRUNMDM=$SDNRUNMDM" printf "%s\n" " SDNRONLY=$SDNRONLY" printf "%s\n" " SDNRINIT=$SDNRINIT" printf "%s\n" " SDNRDBURL=$SDNRDBURL" @@ -410,7 +405,7 @@ then if $SDNRWT ; then install_sdnrwt_features ; fi if $ENABLE_OAUTH ; then - cp $SDNC_HOME/data/oauth-aaa-app-config.xml $(find $ODL_HOME/system/org/opendaylight/aaa/ -name *aaa-app-config.xml) + cp $ODL_HOME/etc/oauth-aaa-app-config.xml $(find $ODL_HOME/system/org/opendaylight/aaa/ -name *aaa-app-config.xml) echo -e "\norg.ops4j.pax.web.session.cookie.comment = disable" >> $ODL_HOME/etc/org.ops4j.pax.web.cfg install_sdnr_oauth_features fi diff --git a/features/sdnr/odlux/readthedocs/pom.xml b/features/sdnr/odlux/readthedocs/pom.xml index 79023c7..f85b57a 100644 --- a/features/sdnr/odlux/readthedocs/pom.xml +++ b/features/sdnr/odlux/readthedocs/pom.xml @@ -24,13 +24,13 @@ 4.0.0 - org.onap.ccsdk.parent + org.o-ran-sc.oam-oam-controller.parent odlparent-lite - 2.6.1 + 13.0.0-SNAPSHOT - org.onap.ccsdk.features.sdnr.wt + org.o-ran-sc.oam-oam-controller.features.sdnr.wt sdnr-wt-readthedocs-installer 13.0.0-SNAPSHOT pom diff --git a/features/sdnr/wt/oauth-provider/pom.xml b/features/sdnr/wt/oauth-provider/pom.xml index 0676148..21c8fd4 100755 --- a/features/sdnr/wt/oauth-provider/pom.xml +++ b/features/sdnr/wt/oauth-provider/pom.xml @@ -43,7 +43,7 @@ oauth-core oauth-realm - oauth-web + oauth-web oauth-cli -- 2.16.6