Refactor vCPE vBRG and vBNG image creation process

Separate templates and build scripts have been created for vBRG and vBNG.

Build logic and parameters are removed from install scripts and

base heat/env files used to deploy the VMs.

For backwards compatibility, compile_state parameter was added to both VMs.

Small corrections were made to the heat templates for clarity.

Issue-ID: INT-615

Change-Id: Ia171994d2f4e17523f319b0a048d77fec29e487b
Signed-off-by: Mariah Jacobs <mariah.jacobs@intel.com>

1 files changed, 11 insertions, 205 deletions

diff --git a/vnfs/vCPE/scripts/v_brgemu_install.sh b/vnfs/vCPE/scripts/v_brgemu_install.sh
index c86e9711..e8be086e 100755
--- a/vnfs/vCPE/scripts/v_brgemu_install.sh
+++ b/vnfs/vCPE/scripts/v_brgemu_install.sh
@@ -1,25 +1,8 @@
 #!/bin/bash
 
-REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt)
-DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt)
-INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt)
-VPP_SOURCE_REPO_URL=$(cat /opt/config/vpp_source_repo_url.txt)
-VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/vpp_source_repo_release_tag.txt)
-VPP_PATCH_URL=$(cat /opt/config/vpp_patch_url.txt)
-HC2VPP_SOURCE_REPO_URL=$(cat /opt/config/hc2vpp_source_repo_url.txt)
-HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt)
+SCRIPT_VERSION=$(cat /opt/config/script_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 
-# Build states are:
-# 'build' - just build the code
-# 'done' - code is build, install and setup
-# 'auto' - bulid, install and setup
-BUILD_STATE="auto"
-
-if [[ -f /opt/config/compile_state.txt ]]
-then
-    BUILD_STATE=$(cat /opt/config/compile_state.txt)
-fi
 
 # Convert Network CIDR to Netmask
 cdr2mask () {
@@ -30,57 +13,18 @@ cdr2mask () {
 }
 
 # OpenStack network configuration
-if [[ $BUILD_STATE != "build" ]]
+if [[ $CLOUD_ENV == "openstack" ]]
 then
-    if [[ $CLOUD_ENV == "openstack" ]]
-    then
-        echo 127.0.0.1 $(hostname) >> /etc/hosts
+  echo 127.0.0.1 $(hostname) >> /etc/hosts
 
-        # Allow remote login as root
-        mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-        cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-    fi
-fi  # endif BUILD_STATE != "build"
+  # Allow remote login as root
+  mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
+  cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
+fi
 
-if [[ $BUILD_STATE != "done" ]]
-then
-    # Download required dependencies
-    echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >>  /etc/apt/sources.list.d/java.list
-    echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >>  /etc/apt/sources.list.d/java.list
-    apt-get update
-    apt-get install --allow-unauthenticated -y wget openjdk-8-jdk apt-transport-https ca-certificates g++ libcurl4-gnutls-dev
-    sleep 1
 
-    # Install the tools required for download codes
-    apt-get install -y expect git patch make linux-image-extra-`uname -r`
-    #Download and build the VPP codes
-    cd /opt
-    git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp
-    wget -O VPP-Add-Option82-Nat-Filter-For-vBRG.patch ${VPP_PATCH_URL}
-
-    cd vpp
-    patch -p1 < ../VPP-Add-Option82-Nat-Filter-For-vBRG.patch
-    expect -c "
-            set timeout 60;
-            spawn make install-dep;
-            expect {
-                    \"Do you want to continue?*\" {send \"Y\r\"; interact}
-            }
-    "
-
-    cd build-root
-    ./bootstrap.sh
-    make V=0 PLATFORM=vpp TAG=vpp install-deb
-
-    # Install the VPP package
-    dpkg -i *.deb
-    systemctl stop vpp
-fi  # endif BUILD_STATE != "done"
-
-if [[ $BUILD_STATE != "build" ]]
-then
-    # Auto-start configuration for the VPP
-    cat > /etc/vpp/startup.conf << EOF
+# Auto-start configuration for the VPP
+cat > /etc/vpp/startup.conf << EOF
 
 unix {
   nodaemon
@@ -339,144 +283,7 @@ sleep 15
 EOF
     chmod +x /opt/nat_service.sh
 
-fi  # endif BUILD_STATE != "build"
 
-if [[ $BUILD_STATE != "done" ]]
-then
-
-    # Download and install HC2VPP from source
-    cd /opt
-    git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp
-
-    apt-get -f -y install
-    apt-get install -y maven
-    mkdir -p /root/.m2
-    cat > ~/.m2/settings.xml << EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=2 tabstop=2: -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
-
-  <profiles>
-    <profile>
-   <id>fd.io-release</id>
-      <repositories>
-        <repository>
-          <id>fd.io-mirror</id>
-          <name>fd.io-mirror</name>
-          <url>https://nexus.fd.io/content/groups/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>fd.io-mirror</id>
-          <name>fd.io-mirror</name>
-          <url>https://nexus.fd.io/content/repositories/public/</url>
-          <releases>
-            <enabled>true</enabled>
-            <updatePolicy>never</updatePolicy>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-
-    <profile>
-      <id>fd.io-snapshots</id>
-      <repositories>
-        <repository>
-          <id>fd.io-snapshot</id>
-          <name>fd.io-snapshot</name>
-          <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-            <id>fd.io-snapshot</id>
-          <name>fd.io-snapshot</name>
-          <url>https://nexus.fd.io/content/repositories/fd.io.snapshot/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-    <profile>
-      <id>opendaylight-snapshots</id>
-      <repositories>
-        <repository>
-          <id>opendaylight-snapshot</id>
-          <name>opendaylight-snapshot</name>
-          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>opendaylight-shapshot</id>
-          <name>opendaylight-snapshot</name>
-          <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-
-  <activeProfiles>
-    <activeProfile>fd.io-release</activeProfile>
-    <activeProfile>fd.io-snapshots</activeProfile>
-    <activeProfile>opendaylight-snapshots</activeProfile>
-  </activeProfiles>
-</settings>
-EOF
-
-    cd hc2vpp
-    mvn clean install
-    l_version=$(cat pom.xml | grep "<version>" | head -1)
-    l_version=$(echo "${l_version%<*}")
-    l_version=$(echo "${l_version#*>}")
-    mv vpp-integration/minimal-distribution/target/vpp-integration-distribution-${l_version}-hc/vpp-integration-distribution-${l_version} /opt/honeycomb
-    sed -i 's/127.0.0.1/0.0.0.0/g' /opt/honeycomb/config/honeycomb.json
-
-    # Disable automatic upgrades
-    if [[ $CLOUD_ENV != "rackspace" ]]
-    then
-        echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic
-        sed -i 's/\(APT::Periodic::Unattended-Upgrade\) "1"/\1 "0"/' /etc/apt/apt.conf.d/20auto-upgrades
-    fi
-fi  # endif BUILD_STATE != "done"
-
-if [[ $BUILD_STATE != "build" ]]
-then
     # Create systemctl service for Honeycomb
     cat > /etc/systemd/system/honeycomb.service << EOF
 [Unit]
@@ -515,8 +322,8 @@ EOF
 
     # Download DHCP config files
     cd /opt
-    unzip -p -j /opt/vcpe-scripts-$INSTALL_SCRIPT_VERSION.zip v_brgemu_init.sh > /opt/v_brgemu_init.sh
-    unzip -p -j /opt/vcpe-scripts-$INSTALL_SCRIPT_VERSION.zip v_brgemu.sh > /opt/v_brgemu.sh
+    unzip -p -j /opt/vcpe-scripts-$SCRIPT_VERSION.zip v_brgemu_init.sh > /opt/v_brgemu_init.sh
+    unzip -p -j /opt/vcpe-scripts-$SCRIPT_VERSION.zip v_brgemu.sh > /opt/v_brgemu.sh
     sed -i '/# Provides:/c\# Provides:     vbrg ' /opt/v_brgemu.sh
     chmod +x v_brgemu_init.sh
     chmod +x v_brgemu.sh
@@ -535,4 +342,3 @@ EOF
     fi
 
     ./v_brgemu_init.sh
-fi  # endif BUILD_STATE != "build"