Fix vLBMS artifacts and scripts upload path

- Update script/deploy.sh to upload vLBMS installation scripts
- Update POM structure to write to Nexus staging

Change-Id: Ie420c0856fc155a595c1954800be2f5fdebb94f8
Issue-ID: INT-447
Signed-off-by: Marco Platania <platania@research.att.com>

diff --git a/pom.xml b/pom.xml
index e96123a..be4f0e6 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
     <module>vnfs/vCPE/kea-sdnc-notify-mod</module>
     <module>vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin</module>
     <module>vnfs/vLBMS/apis/health-vnf-onap-plugin</module>
+    <module>vnfs/vLBMS/apis/vlb-vnf-onap-distribution</module>
   </modules>
 
   <properties>

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index f20f984..67da5fc 100755 (executable)
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -18,20 +18,22 @@ echo "Version number: " $VERSION
 
 PATH_TO_PARENT=${WORKSPACE}
 PATH_TO_BOOT=${WORKSPACE}"/boot"
-PATH_TO_HEAT_MASTER=${WORKSPACE}"/heat/ONAP"
-PATH_TO_HEAT_VFW=${WORKSPACE}"/heat/vFW"
-PATH_TO_HEAT_VLB=${WORKSPACE}"/heat/vLB"
+#PATH_TO_HEAT_MASTER=${WORKSPACE}"/heat/ONAP"
+#PATH_TO_HEAT_VFW=${WORKSPACE}"/heat/vFW"
+#PATH_TO_HEAT_VLB=${WORKSPACE}"/heat/vLB"
 PATH_TO_VFW=${WORKSPACE}"/vnfs/vFW/scripts"
 PATH_TO_VLB=${WORKSPACE}"/vnfs/vLB/scripts"
+PATH_TO_VLBMS=${WORKSPACE}"/vnfs/vLBMS/scripts"
 PATH_TO_VCPE=${WORKSPACE}"/vnfs/vCPE/scripts"
 
 PARENT_GROUP_ID="org.onap.demo"
 BOOT_GROUP_ID=$PARENT_GROUP_ID"/boot"
-HEAT_MASTER_GROUP_ID=$PARENT_GROUP_ID"/heat/ONAP"
-HEAT_VFW_GROUP_ID=$PARENT_GROUP_ID"/heat/vFW"
-HEAT_VLB_GROUP_ID=$PARENT_GROUP_ID"/heat/vLB"
+#HEAT_MASTER_GROUP_ID=$PARENT_GROUP_ID"/heat/ONAP"
+#HEAT_VFW_GROUP_ID=$PARENT_GROUP_ID"/heat/vFW"
+#HEAT_VLB_GROUP_ID=$PARENT_GROUP_ID"/heat/vLB"
 VFW_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vfw"
 VLB_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vlb"
+VLBMS_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vlbms"
 VCPE_GROUP_ID=$PARENT_GROUP_ID"/vnfs/vcpe"
 
 REPO_URL="https://nexus.onap.org/content/sites/raw"
@@ -49,14 +51,14 @@ curl -vk --netrc-file "${NETRC}" --upload-file LICENSE.TXT $REPO_URL/$PARENT_GRO
 cd $PATH_TO_BOOT
 ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$BOOT_GROUP_ID/$VERSION/{}
 
-cd $PATH_TO_HEAT_MASTER
-ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_MASTER_GROUP_ID/$VERSION/{}
+#cd $PATH_TO_HEAT_MASTER
+#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_MASTER_GROUP_ID/$VERSION/{}
 
-cd $PATH_TO_HEAT_VFW
-ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_VFW_GROUP_ID/$VERSION/{}
+#cd $PATH_TO_HEAT_VFW
+#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_VFW_GROUP_ID/$VERSION/{}
 
-cd $PATH_TO_HEAT_VLB
-ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_VLB_GROUP_ID/$VERSION/{}
+#cd $PATH_TO_HEAT_VLB
+#ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$HEAT_VLB_GROUP_ID/$VERSION/{}
 
 cd $PATH_TO_VFW
 ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW_GROUP_ID/$VERSION/{}
@@ -64,6 +66,9 @@ ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VFW
 cd $PATH_TO_VLB
 ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLB_GROUP_ID/$VERSION/{}
 
+cd $PATH_TO_VLBMS
+ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VLBMS_GROUP_ID/$VERSION/{}
+
 cd $PATH_TO_VCPE
 ls | xargs -I{} curl -vk --netrc-file "${NETRC}" --upload-file {} $REPO_URL/$VCPE_GROUP_ID/$VERSION/{}
 ####################################################

diff --git a/vnfs/vLBMS/apis/health-vnf-onap-plugin/pom.xml b/vnfs/vLBMS/apis/health-vnf-onap-plugin/pom.xml
index 1ed7e89..7dbc664 100755 (executable)
--- a/vnfs/vLBMS/apis/health-vnf-onap-plugin/pom.xml
+++ b/vnfs/vLBMS/apis/health-vnf-onap-plugin/pom.xml
@@ -31,7 +31,6 @@
   <modules>
     <module>health-vnf-onap-plugin-api</module>
     <module>health-vnf-onap-plugin-impl</module>
-    <module>../vlb-vnf-onap-distribution</module>
   </modules>
 
   <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->