From: platania <platania@research.att.com>
Date: Tue, 7 Mar 2017 20:29:33 +0000 (-0500)
Subject: Update structure of POM files
X-Git-Tag: 1.0.0-Amsterdam~378
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=7ffc784e98f5f608000d1deff778e5aa1496a4fc

Update structure of POM files

Change-Id: I24ceb375aa3c89b311fb0a0e1b40f8e8ae719343
Signed-off-by: platania <platania@research.att.com>
---

diff --git a/boot/asdc_vm_init.sh b/boot/asdc_vm_init.sh
index 024120db..48f12905 100644
--- a/boot/asdc_vm_init.sh
+++ b/boot/asdc_vm_init.sh
@@ -5,6 +5,7 @@ NEXUS_PASSWD=$(cat /opt/config/nexus_password.txt)
 NEXUS_DOCKER_REPO=$(cat /opt/config/nexus_docker_repo.txt)
 NEXUS_DOCKER_PORT=$(echo $NEXUS_DOCKER_REPO | cut -d':' -f2)
 ENV_NAME=$(cat /opt/config/env_name.txt)
+MR_IP_ADDR=$(cat /opt/config/mr_ip_addr.txt)
 RELEASE=latest
 
 cd /opt/sdc
@@ -20,8 +21,8 @@ chmod +x /data/scripts/docker_health.sh
 IP_ADDRESS=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
 cat /data/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > /data/environments/$ENV_NAME.json
 sed -i "s/xxx/"$ENV_NAME"/g" /data/environments/$ENV_NAME.json
-sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \"10.0.11.1,10.0.11.1\",/g" /data/environments/$ENV_NAME.json
-sed -i "s/\"fqdn\":.*/\"fqdn\": [\"10.0.11.1\", \"10.0.11.1\"]/g" /data/environments/$ENV_NAME.json
+sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \""$MR_IP_ADDR","$MR_IP_ADDR"\",/g" /data/environments/$ENV_NAME.json
+sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" /data/environments/$ENV_NAME.json
 
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 bash /data/scripts/docker_run.sh -e $ENV_NAME -r $RELEASE -p $NEXUS_DOCKER_PORT
diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml
index d255f5da..f5431276 100644
--- a/heat/OpenECOMP/openecomp_rackspace.yaml
+++ b/heat/OpenECOMP/openecomp_rackspace.yaml
@@ -790,6 +790,7 @@ resources:
             echo "__gitlab_username__" > /opt/config/gitlab_username.txt
             echo "__gitlab_password__" > /opt/config/gitlab_password.txt
             echo "__env_name__" > /opt/config/env_name.txt
+            echo "10.0.11.1" > /opt/config/mr_ip_addr.txt
 
             # Run SDC-specific instructions
             cd /opt
diff --git a/pom.xml b/pom.xml
index 29fb83be..bce268fb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
   </prerequisites>
 
   <modules>
-    <module>vnfs/honeycomb_plugin/sample_plugin</module>
+    <module>vnfs/honeycomb_plugin/sample_plugin/parent-pom</module>
     <module>vnfs/vFW/pg_streams</module>
     <module>vnfs/vLB/dns_streams</module>
     <module>vnfs/vLB/DNSClient</module>
diff --git a/vnfs/.DS_Store b/vnfs/.DS_Store
index 42fd5df9..1515c79e 100644
Binary files a/vnfs/.DS_Store and b/vnfs/.DS_Store differ
diff --git a/vnfs/honeycomb_plugin/.DS_Store b/vnfs/honeycomb_plugin/.DS_Store
index 8ae4e662..8ab6e0a2 100644
Binary files a/vnfs/honeycomb_plugin/.DS_Store and b/vnfs/honeycomb_plugin/.DS_Store differ
diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index e089e713..589a0a2e 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -65,6 +65,12 @@ done
     <packaging>pom</packaging>
 
     <!-- Generate executable shell script -->
+  <modules>
+    <module>../sample-plugin-api</module>
+    <module>../sample-plugin-impl</module>
+    <module>../sample-distribution</module>
+  </modules>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -239,7 +245,6 @@ done
                         <skip>true</skip>
                     </configuration>
                 </plugin>
-
             </plugins>
         </pluginManagement>
     </build>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/pom.xml
deleted file mode 100755
index 502fdf81..00000000
--- a/vnfs/honeycomb_plugin/sample_plugin/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2015 Cisco and/or its affiliates.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at:
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent</artifactId>
-    <version>1.6.2-Beryllium-SR2</version>
-  </parent>
-
-  <groupId>org.openecomp.demo.vnf</groupId>
-  <artifactId>sample-plugin-aggregator</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <name>sample-plugin-aggregator</name>
-  <packaging>pom</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
-
-  <modules>
-    <module>sample-plugin-api</module>
-    <module>sample-plugin-impl</module>
-    <module>sample-distribution</module>
-  </modules>
-
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>none</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-
-    </plugins>
-  </build>
-
-</project>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index 07261c81..9d01b41e 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -5,13 +5,10 @@
 <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>minimal-distribution-parent</artifactId>
     <version>1.16.9</version>
-<relativePath>../parent-pom/pom.xml</relativePath>
 </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf</groupId>
   <artifactId>sample-distribution</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
 
   <properties>
     <main.class>io.fd.honeycomb.vpp.integration.distro.Main</main.class>
@@ -85,7 +82,7 @@
     <dependency>
       <groupId>org.openecomp.demo.vnf</groupId>
       <artifactId>sample-plugin-impl</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <version>latest</version>
     </dependency>
   </dependencies>
 
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
index 77a4b4fd..c89f3118 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-api/pom.xml
@@ -17,13 +17,10 @@
     <groupId>io.fd.honeycomb.common</groupId>
     <artifactId>api-parent</artifactId>
     <version>1.16.9</version>
-    <relativePath>../../common/api-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf</groupId>
   <artifactId>sample-plugin-api</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencyManagement>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
index 6113ecd3..ad61616d 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-plugin-impl/pom.xml
@@ -17,13 +17,10 @@
         <groupId>io.fd.honeycomb.common</groupId>
         <artifactId>impl-parent</artifactId>
         <version>1.16.9</version>
-        <relativePath>../../common/impl-parent</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openecomp.demo.vnf</groupId>
     <artifactId>sample-plugin-impl</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <properties>
@@ -34,7 +31,7 @@
         <dependency>
             <groupId>org.openecomp.demo.vnf</groupId>
             <artifactId>sample-plugin-api</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
+            <version>latest</version>
         </dependency>
 
         <!-- Honeycomb infrastructure-->