From dbadd6eec0e82088b652147dc46f5ebf05ef2ce8 Mon Sep 17 00:00:00 2001 From: RehanRaza Date: Tue, 12 Nov 2019 20:10:43 +0100 Subject: [PATCH] Add platform installer for A1 controller Change-Id: Ic24aeab182ffba1d4efd937ad4e3359752c5677c Issue-ID: NONRTRIC-70 Signed-off-by: RehanRaza --- sdnc-a1-controller/oam/installation/sdnc/pom.xml | 31 ---------- sdnc-a1-controller/oam/platform-logic/.gitignore | 12 ++++ .../oam/platform-logic/installer/pom.xml | 55 +++++++++++++++++ .../installer/src/assembly/assemble_zip.xml | 62 ++++++++++++++++++++ sdnc-a1-controller/oam/platform-logic/pom.xml | 42 +++++++++++++ .../oam/platform-logic/setup/pom.xml | 68 ++++++++++++++++++++++ .../src/main/scripts/updateDgNamespace.sh | 12 ++++ .../src/main/scripts/updatePackages.sh | 21 +++++++ sdnc-a1-controller/oam/pom.xml | 4 ++ 9 files changed, 276 insertions(+), 31 deletions(-) create mode 100644 sdnc-a1-controller/oam/platform-logic/.gitignore create mode 100644 sdnc-a1-controller/oam/platform-logic/installer/pom.xml create mode 100644 sdnc-a1-controller/oam/platform-logic/installer/src/assembly/assemble_zip.xml create mode 100644 sdnc-a1-controller/oam/platform-logic/pom.xml create mode 100644 sdnc-a1-controller/oam/platform-logic/setup/pom.xml create mode 100755 sdnc-a1-controller/oam/platform-logic/src/main/scripts/updateDgNamespace.sh create mode 100755 sdnc-a1-controller/oam/platform-logic/src/main/scripts/updatePackages.sh diff --git a/sdnc-a1-controller/oam/installation/sdnc/pom.xml b/sdnc-a1-controller/oam/installation/sdnc/pom.xml index b6e1c844..ea1a52bd 100644 --- a/sdnc-a1-controller/oam/installation/sdnc/pom.xml +++ b/sdnc-a1-controller/oam/installation/sdnc/pom.xml @@ -340,38 +340,7 @@ - - unpack migration utility - generate-sources - - unpack - - - ${basedir}/target/docker-stage/opt/onap/sdnc/data-migrator - - - org.onap.sdnc.oam - data-migrator - ${project.version} - zip - - - - - - - org.onap.sdnc.oam - platform-logic-installer - 1.6.2 - pom - - - org.onap.sdnc.oam - data-migrator - 1.6.2 - - exec-maven-plugin diff --git a/sdnc-a1-controller/oam/platform-logic/.gitignore b/sdnc-a1-controller/oam/platform-logic/.gitignore new file mode 100644 index 00000000..1b8a6ba9 --- /dev/null +++ b/sdnc-a1-controller/oam/platform-logic/.gitignore @@ -0,0 +1,12 @@ +org.eclipse.core.resources.prefs +.classpath +.project +.settings +.idea +.externalToolBuilders +maven-eclipse.xml +*.class +target/ +MANIFEST.MF +.DS_STORE +.metadata diff --git a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml new file mode 100644 index 00000000..1bc0a03a --- /dev/null +++ b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml @@ -0,0 +1,55 @@ + + + 4.0.0 + + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + + + + org.onap.ccsdk.parent + odlparent-lite + 1.4.3 + + + + org.onap.sdnc.oam + platform-logic-installer + 1.7.3-SNAPSHOT + pom + + sdnc-oam :: platform-logic :: ${project.artifactId} + Contains platform-level service logic installer + + + + + + maven-assembly-plugin + 2.6 + + + create-zip + + single + + package + + true + + src/assembly/assemble_zip.xml + + false + + + + + + + + + diff --git a/sdnc-a1-controller/oam/platform-logic/installer/src/assembly/assemble_zip.xml b/sdnc-a1-controller/oam/platform-logic/installer/src/assembly/assemble_zip.xml new file mode 100644 index 00000000..9fc5ff8b --- /dev/null +++ b/sdnc-a1-controller/oam/platform-logic/installer/src/assembly/assemble_zip.xml @@ -0,0 +1,62 @@ + + + + + + bin + + zip + + + false + + + + + ../target/svclogic + svclogic + + **/* + + + + ../target/restapi + restapi + + **/* + + + + ../target/restconfapi + restconfapi + + **/* + + + + + + + diff --git a/sdnc-a1-controller/oam/platform-logic/pom.xml b/sdnc-a1-controller/oam/platform-logic/pom.xml new file mode 100644 index 00000000..be067fc9 --- /dev/null +++ b/sdnc-a1-controller/oam/platform-logic/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + + + + org.onap.ccsdk.parent + odlparent-lite + 1.4.3 + + + + org.onap.sdnc.oam + platform-logic + 1.7.3-SNAPSHOT + pom + + sdnc-oam :: platform-logic + Contains platform-level service logic + + ONAP + + + + setup + installer + + + + platform-logic + + yyyyMMdd'T'HHmmss'Z' + ${maven.build.timestamp} + + diff --git a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml new file mode 100644 index 00000000..2efbb2ce --- /dev/null +++ b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml @@ -0,0 +1,68 @@ + + + 4.0.0 + + + + onap-releases + onap-releases + https://nexus.onap.org/content/repositories/releases/ + + + + + org.onap.ccsdk.parent + odlparent-lite + 1.4.3 + + + + org.onap.sdnc.oam + platform-logic-setup + 1.7.3-SNAPSHOT + pom + + sdnc-oam :: platform-logic :: ${project.artifactId} + Copies base ONAP platform-logic + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + unpack + validate + + unpack + + + + + org.onap.ccsdk.distribution + platform-logic-installer + ${ccsdk.distribution.version} + zip + true + ../target + + + false + true + true + ../target/repository + + + + + + + + + + + + diff --git a/sdnc-a1-controller/oam/platform-logic/src/main/scripts/updateDgNamespace.sh b/sdnc-a1-controller/oam/platform-logic/src/main/scripts/updateDgNamespace.sh new file mode 100755 index 00000000..dde88911 --- /dev/null +++ b/sdnc-a1-controller/oam/platform-logic/src/main/scripts/updateDgNamespace.sh @@ -0,0 +1,12 @@ +#! /bin/bash + +updateFile() { +sed -i .orig -e ' +s/openecomp.org/onap.org/g +' $1 +} + +for file in $@ +do + updateFile $file +done diff --git a/sdnc-a1-controller/oam/platform-logic/src/main/scripts/updatePackages.sh b/sdnc-a1-controller/oam/platform-logic/src/main/scripts/updatePackages.sh new file mode 100755 index 00000000..2fd0e363 --- /dev/null +++ b/sdnc-a1-controller/oam/platform-logic/src/main/scripts/updatePackages.sh @@ -0,0 +1,21 @@ +#! /bin/bash + +updateFile() { +sed -i .orig -e ' +s/\(plugin=.\)org.openecomp.sdnc.\(prop\)/\org.onap.ccsdk.sli.plugins.\2/g +s/\(plugin=.\)org.openecomp.sdnc.\(ra\)/\1org.onap.ccsdk.sli.adaptors.\2/g +s/\(plugin=.\)org.openecomp.sdnc.\(restapicall\)/\1org.onap.ccsdk.sli.plugins.\2/g +s/\(plugin=.\)org.openecomp.sdnc.sli.\(aai\)/\1org.onap.ccsdk.sli.adaptors.\2/g +s/\(plugin=.\)org.openecomp.sdnc.sli.common/\1org.onap.ccsdk.sli.core.sli/g +s/\(plugin=.\)org.openecomp.sdnc.\(sli.provider\)/\1org.onap.ccsdk.sli.core.\2/g +s/\(plugin=\\\{0,1\}.\)com.att.sdnctl.\(sli.recording\)/\1org.openecomp.sdnc.\2/g +s/\(plugin=.\)org.openecomp.sdnc.sli.\(resource.mdsal\)/\1org.onap.ccsdk.sli.adaptors.\2/g +s/\(plugin=.\)org.openecomp.sdnc.sli\(resource.sql\)/\org.onap.ccsdk.sli.adaptors.\2/g +s/\(plugin=.\)org.openecomp.sdnc.sli.SliPluginUtils/\1org.onap.ccsdk.sli.core.slipluginutils/g +' $1 +} + +for file in $@ +do + updateFile $file +done diff --git a/sdnc-a1-controller/oam/pom.xml b/sdnc-a1-controller/oam/pom.xml index d805ebad..5b86ce5b 100755 --- a/sdnc-a1-controller/oam/pom.xml +++ b/sdnc-a1-controller/oam/pom.xml @@ -28,6 +28,10 @@ AT&T + + platform-logic + + scm:git:ssh://git@${onap.git.host}/sdnc-oam.git scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-oam.git -- 2.16.6