aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--boot/aai2_install.sh4
-rw-r--r--boot/aai_install.sh4
-rw-r--r--boot/appc_install.sh4
-rw-r--r--boot/asdc_install.sh6
-rw-r--r--boot/dcae_install.sh4
-rw-r--r--boot/dns_install.sh6
-rw-r--r--boot/mr_install.sh4
-rw-r--r--boot/mso_install.sh4
-rw-r--r--boot/policy_install.sh4
-rw-r--r--boot/portal_install.sh4
-rw-r--r--boot/robot_install.sh4
-rw-r--r--boot/sdnc_install.sh4
-rw-r--r--boot/vid_install.sh4
-rw-r--r--heat/ONAP/onap_openstack.env (renamed from heat/OpenECOMP/onap_openstack.env)0
-rw-r--r--heat/ONAP/onap_openstack.yaml (renamed from heat/OpenECOMP/onap_openstack.yaml)0
-rw-r--r--heat/ONAP/onap_openstack_float.env (renamed from heat/OpenECOMP/onap_openstack_float.env)0
-rw-r--r--heat/ONAP/onap_openstack_float.yaml (renamed from heat/OpenECOMP/onap_openstack_float.yaml)0
-rw-r--r--heat/ONAP/onap_openstack_nofloat.env (renamed from heat/OpenECOMP/onap_openstack_nofloat.env)0
-rw-r--r--heat/ONAP/onap_openstack_nofloat.yaml (renamed from heat/OpenECOMP/onap_openstack_nofloat.yaml)0
-rw-r--r--heat/ONAP/onap_rackspace.env (renamed from heat/OpenECOMP/onap_rackspace.env)0
-rw-r--r--heat/ONAP/onap_rackspace.yaml (renamed from heat/OpenECOMP/onap_rackspace.yaml)0
-rwxr-xr-xpom.xml2
-rwxr-xr-xscripts/deploy.sh8
-rw-r--r--vnfs/VES/pom.xml4
-rw-r--r--vnfs/VESreporting_vFW/pom.xml4
-rw-r--r--vnfs/VESreporting_vLB/pom.xml4
-rw-r--r--vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml4
-rwxr-xr-xvnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml4
-rw-r--r--vnfs/vFW/pg_streams/pom.xml4
-rw-r--r--vnfs/vFW/scripts/v_firewall_install.sh10
-rw-r--r--vnfs/vFW/scripts/v_packetgen_install.sh10
-rw-r--r--vnfs/vFW/scripts/v_sink_install.sh4
-rw-r--r--vnfs/vLB/DNSClient/pom.xml4
-rw-r--r--vnfs/vLB/DNSManager/pom.xml4
-rw-r--r--vnfs/vLB/dns_streams/pom.xml4
-rw-r--r--vnfs/vLB/scripts/db_dnsdemo_onap_org24
-rw-r--r--vnfs/vLB/scripts/named.conf.local4
-rw-r--r--vnfs/vLB/scripts/v_dns_install.sh18
-rw-r--r--vnfs/vLB/scripts/v_lb_install.sh16
-rw-r--r--vnfs/vLB/scripts/v_packetgen_install.sh12
41 files changed, 113 insertions, 88 deletions
diff --git a/.gitignore b/.gitignore
index 1c44a074..93fc263e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/.project
+/.pydevproject
.*.sw?
diff --git a/boot/aai2_install.sh b/boot/aai2_install.sh
index 3dbfe214..d2708018 100644
--- a/boot/aai2_install.sh
+++ b/boot/aai2_install.sh
@@ -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
diff --git a/boot/aai_install.sh b/boot/aai_install.sh
index b119418b..d4a04ed4 100644
--- a/boot/aai_install.sh
+++ b/boot/aai_install.sh
@@ -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
diff --git a/boot/appc_install.sh b/boot/appc_install.sh
index 5433a348..c2d4512c 100644
--- a/boot/appc_install.sh
+++ b/boot/appc_install.sh
@@ -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
diff --git a/boot/asdc_install.sh b/boot/asdc_install.sh
index 0f7b8ab2..59d6c836 100644
--- a/boot/asdc_install.sh
+++ b/boot/asdc_install.sh
@@ -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
diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh
index 8e30e6df..4cf78964 100644
--- a/boot/dcae_install.sh
+++ b/boot/dcae_install.sh
@@ -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
diff --git a/boot/dns_install.sh b/boot/dns_install.sh
index d647aca1..e76f371a 100644
--- a/boot/dns_install.sh
+++ b/boot/dns_install.sh
@@ -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" ]]
diff --git a/boot/mr_install.sh b/boot/mr_install.sh
index b47d3d35..8c6ee206 100644
--- a/boot/mr_install.sh
+++ b/boot/mr_install.sh
@@ -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
diff --git a/boot/mso_install.sh b/boot/mso_install.sh
index 15af9e21..6d6e2aa2 100644
--- a/boot/mso_install.sh
+++ b/boot/mso_install.sh
@@ -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
diff --git a/boot/policy_install.sh b/boot/policy_install.sh
index 648dd371..18cc3def 100644
--- a/boot/policy_install.sh
+++ b/boot/policy_install.sh
@@ -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
diff --git a/boot/portal_install.sh b/boot/portal_install.sh
index cf4788f5..6b1c34f0 100644
--- a/boot/portal_install.sh
+++ b/boot/portal_install.sh
@@ -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
diff --git a/boot/robot_install.sh b/boot/robot_install.sh
index d6cd3829..caf5bef4 100644
--- a/boot/robot_install.sh
+++ b/boot/robot_install.sh
@@ -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
diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh
index 2c8be6ad..88148764 100644
--- a/boot/sdnc_install.sh
+++ b/boot/sdnc_install.sh
@@ -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
diff --git a/boot/vid_install.sh b/boot/vid_install.sh
index a24b5c9c..d9f775cc 100644
--- a/boot/vid_install.sh
+++ b/boot/vid_install.sh
@@ -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/heat/OpenECOMP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 6ac4e006..6ac4e006 100644
--- a/heat/OpenECOMP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index a17a0eeb..a17a0eeb 100644
--- a/heat/OpenECOMP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
diff --git a/heat/OpenECOMP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env
index 6446e3d5..6446e3d5 100644
--- a/heat/OpenECOMP/onap_openstack_float.env
+++ b/heat/ONAP/onap_openstack_float.env
diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml
index 2ba23220..2ba23220 100644
--- a/heat/OpenECOMP/onap_openstack_float.yaml
+++ b/heat/ONAP/onap_openstack_float.yaml
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env
index 4409dca6..4409dca6 100644
--- a/heat/OpenECOMP/onap_openstack_nofloat.env
+++ b/heat/ONAP/onap_openstack_nofloat.env
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml
index a5b7f814..a5b7f814 100644
--- a/heat/OpenECOMP/onap_openstack_nofloat.yaml
+++ b/heat/ONAP/onap_openstack_nofloat.yaml
diff --git a/heat/OpenECOMP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env
index 422dce3b..422dce3b 100644
--- a/heat/OpenECOMP/onap_rackspace.env
+++ b/heat/ONAP/onap_rackspace.env
diff --git a/heat/OpenECOMP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml
index bfcad835..bfcad835 100644
--- a/heat/OpenECOMP/onap_rackspace.yaml
+++ b/heat/ONAP/onap_rackspace.yaml
diff --git a/pom.xml b/pom.xml
index f5408e91..91dca019 100755
--- 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>
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 3b9f449a..aac67f0f 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -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
diff --git a/vnfs/VES/pom.xml b/vnfs/VES/pom.xml
index ca996880..b45b0285 100644
--- a/vnfs/VES/pom.xml
+++ b/vnfs/VES/pom.xml
@@ -26,14 +26,14 @@
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>
diff --git a/vnfs/VESreporting_vFW/pom.xml b/vnfs/VESreporting_vFW/pom.xml
index 9b89913e..9963f9fa 100644
--- a/vnfs/VESreporting_vFW/pom.xml
+++ b/vnfs/VESreporting_vFW/pom.xml
@@ -26,14 +26,14 @@
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>
diff --git a/vnfs/VESreporting_vLB/pom.xml b/vnfs/VESreporting_vLB/pom.xml
index 65ee26b6..83767523 100644
--- a/vnfs/VESreporting_vLB/pom.xml
+++ b/vnfs/VESreporting_vLB/pom.xml
@@ -26,14 +26,14 @@
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>
diff --git a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
index 8304b473..da9c5680 100644
--- a/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/parent-pom/pom.xml
@@ -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 -->
diff --git a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
index e582fa21..39038433 100755
--- a/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
+++ b/vnfs/honeycomb_plugin/sample_plugin/sample-distribution/pom.xml
@@ -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>
diff --git a/vnfs/vFW/pg_streams/pom.xml b/vnfs/vFW/pg_streams/pom.xml
index 7a60ae39..cea0a7c5 100644
--- a/vnfs/vFW/pg_streams/pom.xml
+++ b/vnfs/vFW/pg_streams/pom.xml
@@ -26,14 +26,14 @@
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>
diff --git a/vnfs/vFW/scripts/v_firewall_install.sh b/vnfs/vFW/scripts/v_firewall_install.sh
index 5ec634e4..0a2c8da8 100644
--- a/vnfs/vFW/scripts/v_firewall_install.sh
+++ b/vnfs/vFW/scripts/v_firewall_install.sh
@@ -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
diff --git a/vnfs/vFW/scripts/v_packetgen_install.sh b/vnfs/vFW/scripts/v_packetgen_install.sh
index dd75278d..4ec1e4e6 100644
--- a/vnfs/vFW/scripts/v_packetgen_install.sh
+++ b/vnfs/vFW/scripts/v_packetgen_install.sh
@@ -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
diff --git a/vnfs/vFW/scripts/v_sink_install.sh b/vnfs/vFW/scripts/v_sink_install.sh
index 71bab414..88c194d0 100644
--- a/vnfs/vFW/scripts/v_sink_install.sh
+++ b/vnfs/vFW/scripts/v_sink_install.sh
@@ -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
diff --git a/vnfs/vLB/DNSClient/pom.xml b/vnfs/vLB/DNSClient/pom.xml
index d4d60f8d..cd746b7b 100644
--- a/vnfs/vLB/DNSClient/pom.xml
+++ b/vnfs/vLB/DNSClient/pom.xml
@@ -26,14 +26,14 @@
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>
diff --git a/vnfs/vLB/DNSManager/pom.xml b/vnfs/vLB/DNSManager/pom.xml
index 2dda1f82..4d837b25 100644
--- a/vnfs/vLB/DNSManager/pom.xml
+++ b/vnfs/vLB/DNSManager/pom.xml
@@ -26,14 +26,14 @@
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>
diff --git a/vnfs/vLB/dns_streams/pom.xml b/vnfs/vLB/dns_streams/pom.xml
index 8a508f60..ca758f8e 100644
--- a/vnfs/vLB/dns_streams/pom.xml
+++ b/vnfs/vLB/dns_streams/pom.xml
@@ -26,14 +26,14 @@
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
index 00000000..45da8164
--- /dev/null
+++ b/vnfs/vLB/scripts/db_dnsdemo_onap_org
@@ -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
diff --git a/vnfs/vLB/scripts/named.conf.local b/vnfs/vLB/scripts/named.conf.local
index 1b5c9f01..94f8ad29 100644
--- a/vnfs/vLB/scripts/named.conf.local
+++ b/vnfs/vLB/scripts/named.conf.local
@@ -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
};
diff --git a/vnfs/vLB/scripts/v_dns_install.sh b/vnfs/vLB/scripts/v_dns_install.sh
index 5e51ee2c..83441ac9 100644
--- a/vnfs/vLB/scripts/v_dns_install.sh
+++ b/vnfs/vLB/scripts/v_dns_install.sh
@@ -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
diff --git a/vnfs/vLB/scripts/v_lb_install.sh b/vnfs/vLB/scripts/v_lb_install.sh
index da1c5b41..394a6c8c 100644
--- a/vnfs/vLB/scripts/v_lb_install.sh
+++ b/vnfs/vLB/scripts/v_lb_install.sh
@@ -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
diff --git a/vnfs/vLB/scripts/v_packetgen_install.sh b/vnfs/vLB/scripts/v_packetgen_install.sh
index e48e9be5..2a2d7a24 100644
--- a/vnfs/vLB/scripts/v_packetgen_install.sh
+++ b/vnfs/vLB/scripts/v_packetgen_install.sh
@@ -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