Move poms/scripts from OpenECOMP to ONAP 07/6507/1
authorMarco Platania <platania@research.att.com>
Tue, 1 Aug 2017 19:06:44 +0000 (15:06 -0400)
committerMarco Platania <platania@research.att.com>
Tue, 1 Aug 2017 19:06:44 +0000 (15:06 -0400)
Change-Id: I733aa812860e5126ffbf1242780006a611e0a694
Signed-off-by: Marco Platania <platania@research.att.com>
41 files changed:
.gitignore
boot/aai2_install.sh
boot/aai_install.sh
boot/appc_install.sh
boot/asdc_install.sh
boot/dcae_install.sh
boot/dns_install.sh
boot/mr_install.sh
boot/mso_install.sh
boot/policy_install.sh
boot/portal_install.sh
boot/robot_install.sh
boot/sdnc_install.sh
boot/vid_install.sh
heat/ONAP/onap_openstack.env [moved from heat/OpenECOMP/onap_openstack.env with 100% similarity]
heat/ONAP/onap_openstack.yaml [moved from heat/OpenECOMP/onap_openstack.yaml with 100% similarity]
heat/ONAP/onap_openstack_float.env [moved from heat/OpenECOMP/onap_openstack_float.env with 100% similarity]
heat/ONAP/onap_openstack_float.yaml [moved from heat/OpenECOMP/onap_openstack_float.yaml with 100% similarity]
heat/ONAP/onap_openstack_nofloat.env [moved from heat/OpenECOMP/onap_openstack_nofloat.env with 100% similarity]
heat/ONAP/onap_openstack_nofloat.yaml [moved from heat/OpenECOMP/onap_openstack_nofloat.yaml with 100% similarity]
heat/ONAP/onap_rackspace.env [moved from heat/OpenECOMP/onap_rackspace.env with 100% similarity]
heat/ONAP/onap_rackspace.yaml [moved from heat/OpenECOMP/onap_rackspace.yaml with 100% similarity]
pom.xml
scripts/deploy.sh
vnfs/VES/pom.xml
vnfs/VESreporting_vFW/pom.xml
vnfs/VESreporting_vLB/pom.xml
vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
vnfs/vFW/pg_streams/pom.xml
vnfs/vFW/scripts/v_firewall_install.sh
vnfs/vFW/scripts/v_packetgen_install.sh
vnfs/vFW/scripts/v_sink_install.sh
vnfs/vLB/DNSClient/pom.xml
vnfs/vLB/DNSManager/pom.xml
vnfs/vLB/dns_streams/pom.xml
vnfs/vLB/scripts/db_dnsdemo_onap_org [new file with mode: 0644]
vnfs/vLB/scripts/named.conf.local
vnfs/vLB/scripts/v_dns_install.sh
vnfs/vLB/scripts/v_lb_install.sh
vnfs/vLB/scripts/v_packetgen_install.sh

index 1c44a07..93fc263 100644 (file)
@@ -1,2 +1,3 @@
 /.project
+/.pydevproject
 .*.sw?
index 3dbfe21..d270801 100644 (file)
@@ -53,8 +53,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai2_vm_init.sh -o /opt/aai2_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai2_serv.sh -o /opt/aai2_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai2_vm_init.sh -o /opt/aai2_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai2_serv.sh -o /opt/aai2_serv.sh
 chmod +x /opt/aai2_vm_init.sh
 chmod +x /opt/aai2_serv.sh
 mv /opt/aai2_serv.sh /etc/init.d
index b119418..d4a04ed 100644 (file)
@@ -51,8 +51,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai_vm_init.sh -o /opt/aai_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/aai_serv.sh -o /opt/aai_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai_vm_init.sh -o /opt/aai_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/aai_serv.sh -o /opt/aai_serv.sh
 chmod +x /opt/aai_vm_init.sh
 chmod +x /opt/aai_serv.sh
 mv /opt/aai_serv.sh /etc/init.d
index 5433a34..c2d4512 100644 (file)
@@ -52,8 +52,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/appc_vm_init.sh -o /opt/appc_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/appc_serv.sh -o /opt/appc_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/appc_vm_init.sh -o /opt/appc_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/appc_serv.sh -o /opt/appc_serv.sh
 chmod +x /opt/appc_vm_init.sh
 chmod +x /opt/appc_serv.sh
 mv /opt/appc_serv.sh /etc/init.d
index 0f7b8ab..59d6c83 100644 (file)
@@ -52,8 +52,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/asdc_vm_init.sh -o /opt/asdc_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/asdc_serv.sh -o /opt/asdc_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/asdc_vm_init.sh -o /opt/asdc_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/asdc_serv.sh -o /opt/asdc_serv.sh
 chmod +x /opt/asdc_vm_init.sh
 chmod +x /opt/asdc_serv.sh
 mv /opt/asdc_serv.sh /etc/init.d
@@ -70,7 +70,7 @@ curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose
 chmod +x /opt/docker/docker-compose
 
 # Create partition and mount the external volume
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
 
 if [[ $CLOUD_ENV == "rackspace" ]]
 then
index 8e30e6d..4cf7896 100644 (file)
@@ -83,8 +83,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/dcae_vm_init.sh -o /opt/dcae_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/dcae_serv.sh -o /opt/dcae_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae_vm_init.sh -o /opt/dcae_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/dcae_serv.sh -o /opt/dcae_serv.sh
 chmod +x /opt/dcae_vm_init.sh
 chmod +x /opt/dcae_serv.sh
 mv /opt/dcae_serv.sh /etc/init.d
index d647aca..e76f371 100644 (file)
@@ -56,9 +56,9 @@ apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk bind9
 
 # Download script
 mkdir /etc/bind/zones
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/$ZONE_FILE -o /etc/bind/zones/db.simpledemo.openecomp.org
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/$OPTIONS_FILE -o /etc/bind/named.conf.options
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/named.conf.local -o /etc/bind/named.conf.local
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$ZONE_FILE -o /etc/bind/zones/db.simpledemo.openecomp.org
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/$OPTIONS_FILE -o /etc/bind/named.conf.options
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/named.conf.local -o /etc/bind/named.conf.local
 
 # Set the private IP address of each ONAP VM in the Bind configuration in OpenStack deployments
 if [[ $CLOUD_ENV != "rackspace" ]]
index b47d3d3..8c6ee20 100644 (file)
@@ -52,8 +52,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mr_vm_init.sh -o /opt/mr_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mr_serv.sh -o /opt/mr_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mr_vm_init.sh -o /opt/mr_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mr_serv.sh -o /opt/mr_serv.sh
 chmod +x /opt/mr_vm_init.sh
 chmod +x /opt/mr_serv.sh
 mv /opt/mr_serv.sh /etc/init.d
index 15af9e2..6d6e2aa 100644 (file)
@@ -53,8 +53,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mso_vm_init.sh -o /opt/mso_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/mso_serv.sh -o /opt/mso_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mso_vm_init.sh -o /opt/mso_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/mso_serv.sh -o /opt/mso_serv.sh
 chmod +x /opt/mso_vm_init.sh
 chmod +x /opt/mso_serv.sh
 mv /opt/mso_serv.sh /etc/init.d
index 648dd37..18cc3de 100644 (file)
@@ -52,8 +52,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/policy_vm_init.sh -o /opt/policy_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/policy_serv.sh -o /opt/policy_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/policy_vm_init.sh -o /opt/policy_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/policy_serv.sh -o /opt/policy_serv.sh
 chmod +x /opt/policy_vm_init.sh
 chmod +x /opt/policy_serv.sh
 mv /opt/policy_serv.sh /etc/init.d
index cf4788f..6b1c34f 100644 (file)
@@ -52,8 +52,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git unzip mysql-client-core-5.6 ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/portal_vm_init.sh -o /opt/portal_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/portal_serv.sh -o /opt/portal_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/portal_vm_init.sh -o /opt/portal_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/portal_serv.sh -o /opt/portal_serv.sh
 chmod +x /opt/portal_vm_init.sh
 chmod +x /opt/portal_serv.sh
 mv /opt/portal_serv.sh /etc/init.d
index d6cd382..caf5bef 100644 (file)
@@ -52,8 +52,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/robot_vm_init.sh -o /opt/robot_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/robot_serv.sh -o /opt/robot_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/robot_vm_init.sh -o /opt/robot_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/robot_serv.sh -o /opt/robot_serv.sh
 chmod +x /opt/robot_vm_init.sh
 chmod +x /opt/robot_serv.sh
 mv /opt/robot_serv.sh /etc/init.d
index 2c8be6a..8814876 100644 (file)
@@ -52,8 +52,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/sdnc_vm_init.sh -o /opt/sdnc_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/sdnc_serv.sh -o /opt/sdnc_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdnc_vm_init.sh -o /opt/sdnc_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/sdnc_serv.sh -o /opt/sdnc_serv.sh
 chmod +x /opt/sdnc_vm_init.sh
 chmod +x /opt/sdnc_serv.sh
 mv /opt/sdnc_serv.sh /etc/init.d
index a24b5c9..d9f775c 100644 (file)
@@ -52,8 +52,8 @@ apt-get update
 apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make
 
 # Download scripts from Nexus
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/vid_vm_init.sh -o /opt/vid_vm_init.sh
-curl -k $NEXUS_REPO/org.openecomp.demo/boot/$ARTIFACTS_VERSION/vid_serv.sh -o /opt/vid_serv.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/vid_vm_init.sh -o /opt/vid_vm_init.sh
+curl -k $NEXUS_REPO/org.onap.demo/boot/$ARTIFACTS_VERSION/vid_serv.sh -o /opt/vid_serv.sh
 chmod +x /opt/vid_vm_init.sh
 chmod +x /opt/vid_serv.sh
 mv /opt/vid_serv.sh /etc/init.d
diff --git a/pom.xml b/pom.xml
index f5408e9..91dca01 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 <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">
 
-  <groupId>org.openecomp.demo.vnf</groupId>
+  <groupId>org.onap.demo.vnf</groupId>
   <artifactId>demo-aggregator</artifactId>
   <version>1.1.0-SNAPSHOT</version>
   <name>demo-aggregator</name>
index 3b9f449..aac67f0 100755 (executable)
@@ -18,15 +18,15 @@ echo "Version number: " $VERSION
 
 PATH_TO_PARENT=${WORKSPACE}
 PATH_TO_BOOT=${WORKSPACE}"/boot"
-PATH_TO_HEAT_MASTER=${WORKSPACE}"/heat/OpenECOMP"
+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"
 
-PARENT_GROUP_ID="org.openecomp.demo"
+PARENT_GROUP_ID="org.onap.demo"
 BOOT_GROUP_ID=$PARENT_GROUP_ID"/boot"
-HEAT_MASTER_GROUP_ID=$PARENT_GROUP_ID"/heat/OpenECOMP"
+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"
@@ -37,7 +37,7 @@ USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS
 PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
 NETRC=$(mktemp)
 echo "machine nexus.onap.org login ${USER} password ${PASS}" > "${NETRC}"
-#######################################
+####################################################
 
 ##### Upload scripts into Nexus raw repository #####
 cd $PATH_TO_PARENT
index ca99688..b45b028 100644 (file)
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
+    <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.ves</groupId>
+  <groupId>org.onap.demo.vnf.ves</groupId>
   <artifactId>ves</artifactId>
 
   <build>
index 9b89913..9963f9f 100644 (file)
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 <parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
+    <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.ves</groupId>
+  <groupId>org.onap.demo.vnf.ves</groupId>
   <artifactId>ves_vfw_reporting</artifactId>
 
   <build>
index 65ee26b..8376752 100644 (file)
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
+    <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.ves</groupId>
+  <groupId>org.onap.demo.vnf.ves</groupId>
   <artifactId>ves_vlb_reporting</artifactId>
 
   <build>
index 8304b47..da9c568 100644 (file)
@@ -24,7 +24,7 @@
 
 
 <parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
+    <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../../pom.xml</relativePath>
@@ -64,7 +64,7 @@ done
     </properties>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>hc-openecomp</artifactId>
+    <artifactId>hc-onap</artifactId>
     <packaging>pom</packaging>
 
     <!-- Generate executable shell script -->
index e582fa2..3903843 100755 (executable)
@@ -8,8 +8,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 <parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
-    <artifactId>hc-openecomp</artifactId>
+    <groupId>org.onap.demo.vnf</groupId>
+    <artifactId>hc-onap</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../parent-pom/pom.xml</relativePath>
 </parent>
index 7a60ae3..cea0a7c 100644 (file)
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
+    <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.vfw</groupId>
+  <groupId>org.onap.demo.vnf.vfw</groupId>
   <artifactId>vfw_pg_streams</artifactId>
 
   <build>
index 5ec634e..0a2c8da 100644 (file)
@@ -67,11 +67,11 @@ pip install jsonschema
 mkdir /opt/honeycomb
 cd /opt
 
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_firewall_init.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vfirewall.sh
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/ves/ves_vfw_reporting/$DEMO_ARTIFACTS_VERSION/ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_firewall_init.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vfirewall.sh
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves_vfw_reporting/$DEMO_ARTIFACTS_VERSION/ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
 
 tar -zxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
 mv ves-$DEMO_ARTIFACTS_VERSION VES
index dd75278..4ec1e4e 100644 (file)
@@ -57,11 +57,11 @@ pip install jsonschema
 mkdir /opt/honeycomb
 cd /opt
 
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_packetgen_init.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vpacketgen.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/run_traffic_fw_demo.sh
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/vfw/vfw_pg_streams/$DEMO_ARTIFACTS_VERSION/vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz 
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_packetgen_init.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vpacketgen.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/run_traffic_fw_demo.sh
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vfw/vfw_pg_streams/$DEMO_ARTIFACTS_VERSION/vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz 
 
 tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
 tar -zxvf vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
index 71bab41..88c194d 100644 (file)
@@ -57,8 +57,8 @@ sed -i "s/INTERFACE=.*/INTERFACE=\"-i eth1\"/g" /etc/darkstat/init.cfg
 
 # Download scripts for virtual sink
 cd /opt
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_sink_init.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vsink.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/v_sink_init.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vfw/$INSTALL_SCRIPT_VERSION/vsink.sh
 chmod +x v_sink_init.sh
 chmod +x vsink.sh
 
index d4d60f8..cd746b7 100644 (file)
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
+    <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.vlb</groupId>
+  <groupId>org.onap.demo.vnf.vlb</groupId>
   <artifactId>dns-client</artifactId>
   <name>DNS Client</name>
   <packaging>jar</packaging>
index 2dda1f8..4d837b2 100644 (file)
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
+    <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.vlb</groupId>
+  <groupId>org.onap.demo.vnf.vlb</groupId>
   <artifactId>dns-manager</artifactId>
   <name>DNS Manager</name>
   <packaging>jar</packaging>
index 8a508f6..ca758f8 100644 (file)
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
-    <groupId>org.openecomp.demo.vnf</groupId>
+    <groupId>org.onap.demo.vnf</groupId>
     <artifactId>demo-aggregator</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.openecomp.demo.vnf.vlb</groupId>
+  <groupId>org.onap.demo.vnf.vlb</groupId>
   <artifactId>vlb_dns_streams</artifactId>
 
   <build>
diff --git a/vnfs/vLB/scripts/db_dnsdemo_onap_org b/vnfs/vLB/scripts/db_dnsdemo_onap_org
new file mode 100644 (file)
index 0000000..45da816
--- /dev/null
@@ -0,0 +1,24 @@
+;
+; BIND data file for local loopback interface
+;
+$TTL    604800
+@       IN      SOA     dnsdemo.onap.org. admin.dnsdemo.onap.org. (
+                              3         ; Serial
+                         604800         ; Refresh
+                          86400         ; Retry
+                        2419200         ; Expire
+                         604800 )       ; Negative Cache TTL
+; name servers - NS records
+    IN      NS      dnsdemo.onap.org.
+; name servers - A records
+dnsdemo.onap.org.                IN      A       10.0.100.100
+host1.dnsdemo.onap.org.          IN      A       10.0.100.101
+host2.dnsdemo.onap.org.          IN      A       10.0.100.102
+host3.dnsdemo.onap.org.          IN      A       10.0.100.103
+host4.dnsdemo.onap.org.          IN      A       10.0.100.104
+host5.dnsdemo.onap.org.          IN      A       10.0.100.105
+host6.dnsdemo.onap.org.          IN      A       10.0.100.106
+host7.dnsdemo.onap.org.          IN      A       10.0.100.107
+host8.dnsdemo.onap.org.          IN      A       10.0.100.108
+host9.dnsdemo.onap.org.          IN      A       10.0.100.109
+host10.dnsdemo.onap.org.         IN      A       10.0.100.110
index 1b5c9f0..94f8ad2 100644 (file)
@@ -6,7 +6,7 @@
 // organization
 //include "/etc/bind/zones.rfc1918";
 
-zone "dnsdemo.openecomp.org" {
+zone "dnsdemo.onap.org" {
         type master;
-        file "/etc/bind/zones/db.dnsdemo.openecomp.org"; # zone file path
+        file "/etc/bind/zones/db.dnsdemo.onap.org"; # zone file path
 };
index 5e51ee2..83441ac 100644 (file)
@@ -58,11 +58,11 @@ mkdir /opt/config
 mkdir /opt/FDclient
 cd /opt
 
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_dns_init.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdns.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsclient.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/set_gre_tunnel.sh
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/vlb/dns-client/$DEMO_ARTIFACTS_VERSION/dns-client-$DEMO_ARTIFACTS_VERSION.jar
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_dns_init.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdns.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsclient.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/set_gre_tunnel.sh
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/dns-client/$DEMO_ARTIFACTS_VERSION/dns-client-$DEMO_ARTIFACTS_VERSION.jar
 
 mv dns-client-$DEMO_ARTIFACTS_VERSION.jar /opt/FDclient/
 mv dnsclient.sh /opt/FDclient/
@@ -75,15 +75,15 @@ chmod +x /opt/FDclient/set_gre_tunnel.sh
 
 # Download Bind config files
 cd /opt/config
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/db_dnsdemo_openecomp_org
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/named.conf.options
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/named.conf.local
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/db_dnsdemo_onap_org
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/named.conf.options
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/named.conf.local
 
 # Configure Bind
 modprobe ip_gre
 mkdir /etc/bind/zones
 sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9
-mv db_dnsdemo_openecomp_org /etc/bind/zones/db.dnsdemo.openecomp.org
+mv db_dnsdemo_onap_org /etc/bind/zones/db.dnsdemo.onap.org
 mv named.conf.options /etc/bind/
 mv named.conf.local /etc/bind/
 sleep 1
index da1c5b4..394a6c8 100644 (file)
@@ -58,14 +58,14 @@ mkdir /opt/config
 mkdir /opt/FDserver
 cd /opt
 
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_lb_init.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vlb.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsmembership.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/add_dns.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/remove_dns.sh
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/vlb/dns-manager/$DEMO_ARTIFACTS_VERSION/dns-manager-$DEMO_ARTIFACTS_VERSION.jar
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/ves/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_lb_init.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vlb.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/dnsmembership.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/add_dns.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/remove_dns.sh
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/dns-manager/$DEMO_ARTIFACTS_VERSION/dns-manager-$DEMO_ARTIFACTS_VERSION.jar
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
 
 tar -zxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz
 mv ves-$DEMO_ARTIFACTS_VERSION VES
index e48e9be..2a2d7a2 100644 (file)
@@ -26,12 +26,12 @@ pip install jsonschema
 mkdir /opt/config
 mkdir /opt/honeycomb
 cd /opt
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_packetgen_for_dns_demo_init.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vpacketgenfordnsdemo.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/run_streams_dns.sh
-wget $REPO_URL_BLOB/org.openecomp.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdnspacketgen_change_streams_ports.sh
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
-wget $REPO_URL_ARTIFACTS/org/openecomp/demo/vnf/vlb/vlb_dns_streams/$DEMO_ARTIFACTS_VERSION/vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz 
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/v_packetgen_for_dns_demo_init.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vpacketgenfordnsdemo.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/run_streams_dns.sh
+wget $REPO_URL_BLOB/org.onap.demo/vnfs/vlb/$INSTALL_SCRIPT_VERSION/vdnspacketgen_change_streams_ports.sh
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/sample-distribution/$DEMO_ARTIFACTS_VERSION/sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz
+wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/vlb_dns_streams/$DEMO_ARTIFACTS_VERSION/vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz 
 
 tar -zxvf vpp.tar.gz
 tar -zxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz