diff options
Diffstat (limited to 'vnfs/vCPE')
-rw-r--r-- | vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf | 15 | ||||
-rw-r--r-- | vnfs/vCPE/scripts/v_bng_install.sh | 4 | ||||
-rwxr-xr-x | vnfs/vCPE/scripts/v_brgemu_install.sh | 8 | ||||
-rw-r--r-- | vnfs/vCPE/scripts/v_gmux_install.sh | 8 | ||||
-rw-r--r-- | vnfs/vCPE/scripts/v_gw_install.sh | 10 | ||||
-rw-r--r-- | vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch | 34 |
6 files changed, 42 insertions, 37 deletions
diff --git a/vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf b/vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf index 170b8f3c..5db8dccb 100644 --- a/vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf +++ b/vnfs/vCPE/scripts/kea-dhcp4_no_hook.conf @@ -2,8 +2,9 @@ "Dhcp4": { # For testing, you can use veth pair as described in README.md +# eth1 is the 10.2.0.1 interface on the vDHCP/vDNS server (CPE_PUBLIC) "interfaces-config": { - "interfaces": ["eth0" ] + "interfaces": ["eth1" ] }, "lease-database": { @@ -25,14 +26,18 @@ # otherwise the options won't be added at all. # Also keep in mind that if kea doesn't receive the desired values for some # reason, these values will be sent to the client. +# 10.2.0.10 is assigned to the webserver so reserve 10-19 for hosts on the CPE_PUBLIC network "subnet4": [ - { "subnet": "10.3.0.0/24", - "pools" : [ { "pool": "10.3.0.2 - 10.3.0.255"} ], - "next-server": "10.3.0.1", + { "subnet": "10.2.0.0/24", + "pools" : [ + { "pool": "10.2.0.2 - 10.2.0.9"}, + { "pool": "10.2.0.20 - 10.2.0.255"} + ], + "next-server": "10.2.0.1", "option-data": [ { "name": "routers", - "data": "10.3.0.1" + "data": "10.2.0.1" } ] } diff --git a/vnfs/vCPE/scripts/v_bng_install.sh b/vnfs/vCPE/scripts/v_bng_install.sh index 49bca161..2c164a08 100644 --- a/vnfs/vCPE/scripts/v_bng_install.sh +++ b/vnfs/vCPE/scripts/v_bng_install.sh @@ -7,7 +7,7 @@ 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_BRANCH=$(cat /opt/config/vpp_source_repo_branch.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) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) BNG_GMUX_NET_CIDR=$(cat /opt/config/bng_gmux_net_cidr.txt) @@ -81,7 +81,7 @@ then #Download and build the VPP codes cd /opt - git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_BRANCH} vpp + git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp wget -O Vpp-Integrate-FreeRADIUS-Client-for-vBNG.patch ${VPP_PATCH_URL} cd vpp # The patch will place a "dummy" version of dhcp.api.h so the build will succeed diff --git a/vnfs/vCPE/scripts/v_brgemu_install.sh b/vnfs/vCPE/scripts/v_brgemu_install.sh index e3a32fd5..9e8d9d47 100755 --- a/vnfs/vCPE/scripts/v_brgemu_install.sh +++ b/vnfs/vCPE/scripts/v_brgemu_install.sh @@ -5,10 +5,10 @@ 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_BRANCH=$(cat /opt/config/vpp_source_repo_branch.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_BRANCH=$(cat /opt/config/hc2vpp_source_repo_branch.txt) +HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) # Build states are: @@ -56,7 +56,7 @@ then 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_BRANCH} vpp + 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 @@ -347,7 +347,7 @@ then # Download and install HC2VPP from source cd /opt - git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_BRANCH} hc2vpp + git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp apt-get -f -y install apt-get install -y maven diff --git a/vnfs/vCPE/scripts/v_gmux_install.sh b/vnfs/vCPE/scripts/v_gmux_install.sh index e1702ee4..5245c6d7 100644 --- a/vnfs/vCPE/scripts/v_gmux_install.sh +++ b/vnfs/vCPE/scripts/v_gmux_install.sh @@ -5,10 +5,10 @@ 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_BRANCH=$(cat /opt/config/vpp_source_repo_branch.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_BRANCH=$(cat /opt/config/hc2vpp_source_repo_branch.txt) +HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt) HC2VPP_PATCH_URL=$(cat /opt/config/hc2vpp_patch_url.txt) LIBEVEL_PATCH_URL=$(cat /opt/config/libevel_patch_url.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -77,7 +77,7 @@ then #Download and build the VPP codes cd /opt - git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_BRANCH} vpp + git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp wget -O Vpp-Add-VES-agent-for-vG-MUX.patch ${VPP_PATCH_URL} cd vpp @@ -249,7 +249,7 @@ if [[ $BUILD_STATE != "done" ]] then # Download and install HC2VPP from source cd /opt - git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_BRANCH} hc2vpp + git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp wget -O Hc2vpp-Add-VES-agent-for-vG-MUX.patch ${HC2VPP_PATCH_URL} apt-get install -y maven diff --git a/vnfs/vCPE/scripts/v_gw_install.sh b/vnfs/vCPE/scripts/v_gw_install.sh index 6d3f6d8c..f5df26be 100644 --- a/vnfs/vCPE/scripts/v_gw_install.sh +++ b/vnfs/vCPE/scripts/v_gw_install.sh @@ -5,9 +5,9 @@ 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_BRANCH=$(cat /opt/config/vpp_source_repo_branch.txt) +VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/vpp_source_repo_release_tag.txt) HC2VPP_SOURCE_REPO_URL=$(cat /opt/config/hc2vpp_source_repo_url.txt) -HC2VPP_SOURCE_REPO_BRANCH=$(cat /opt/config/hc2vpp_source_repo_branch.txt) +HC2VPP_SOURCE_REPO_RELEASE_TAG=$(cat /opt/config/hc2vpp_source_repo_release_tag.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) MUX_GW_IP=$(cat /opt/config/mux_gw_private_net_ipaddr.txt) MUX_GW_CIDR=$(cat /opt/config/mux_gw_private_net_cidr.txt) @@ -75,7 +75,7 @@ then #Download and build the VPP codes cd /opt - git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_BRANCH} vpp + git clone ${VPP_SOURCE_REPO_URL} -b ${VPP_SOURCE_REPO_RELEASE_TAG} vpp cd vpp make install-dep @@ -239,7 +239,7 @@ then # Download and install HC2VPP from source cd /opt - git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_BRANCH} hc2vpp + git clone ${HC2VPP_SOURCE_REPO_URL} -b ${HC2VPP_SOURCE_REPO_RELEASE_TAG} hc2vpp apt --allow-unauthenticated install -y python-ply-lex-3.5 python-ply-yacc-3.5 python-pycparser python-cffi apt-get install -y maven @@ -447,7 +447,7 @@ EOF sed -i "s/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g" /etc/default/grub grub-mkconfig -o /boot/grub/grub.cfg sed -i "s/ens[0-9]*/eth0/g" /etc/network/interfaces.d/*.cfg - sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules + #sed -i "s/ens[0-9]*/eth0/g" /etc/udev/rules.d/70-persistent-net.rules echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg reboot fi diff --git a/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch b/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch index 7899ed9a..47c8388e 100644 --- a/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch +++ b/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch @@ -60,13 +60,13 @@ index 0000000..1ded010 + <parent> + <groupId>io.fd.hc2vpp.common</groupId> + <artifactId>hc2vpp-parent</artifactId> -+ <version>1.17.04.1-SNAPSHOT</version> ++ <version>1.17.04</version> + <relativePath>../common/hc2vpp-parent</relativePath> + </parent> + + <groupId>io.fd.hc2vpp.ves</groupId> + <artifactId>ves-agent</artifactId> -+ <version>1.17.04.1-SNAPSHOT</version> ++ <version>1.17.04</version> + <name>ves-agent</name> + <packaging>pom</packaging> + <modelVersion>4.0.0</modelVersion> @@ -131,7 +131,7 @@ index 0000000..78bf47b + <parent> + <groupId>io.fd.hc2vpp.common</groupId> + <artifactId>api-parent</artifactId> -+ <version>1.17.04.1-SNAPSHOT</version> ++ <version>1.17.04</version> + <relativePath>../../common/api-parent</relativePath> + </parent> + @@ -139,7 +139,7 @@ index 0000000..78bf47b + <groupId>io.fd.hc2vpp.ves</groupId> + <artifactId>ves-api</artifactId> + <name>ves-api</name> -+ <version>1.17.04.1-SNAPSHOT</version> ++ <version>1.17.04</version> + <packaging>bundle</packaging> + + <dependencies> @@ -282,7 +282,7 @@ index 0000000..5ed2c1b + <parent> + <groupId>io.fd.hc2vpp.common</groupId> + <artifactId>vpp-impl-parent</artifactId> -+ <version>1.17.04.1-SNAPSHOT</version> ++ <version>1.17.04</version> + <relativePath>../../vpp-common/vpp-impl-parent</relativePath> + </parent> + @@ -290,12 +290,12 @@ index 0000000..5ed2c1b + <groupId>io.fd.hc2vpp.ves</groupId> + <artifactId>ves-impl</artifactId> + <name>${project.artifactId}</name> -+ <version>1.17.04.1-SNAPSHOT</version> ++ <version>1.17.04</version> + <packaging>bundle</packaging> + + <properties> -+ <honeycomb.infra.version>1.17.04.1-SNAPSHOT</honeycomb.infra.version> -+ <hc2vpp.common.version>1.17.04.1-SNAPSHOT</hc2vpp.common.version> ++ <honeycomb.infra.version>1.17.04</honeycomb.infra.version> ++ <hc2vpp.common.version>1.17.04</hc2vpp.common.version> + </properties> + + <dependencies> @@ -319,7 +319,7 @@ index 0000000..5ed2c1b + <dependency> + <groupId>io.fd.vpp</groupId> + <artifactId>jvpp-ves</artifactId> -+ <version>17.04.2-SNAPSHOT</version> ++ <version>17.04</version> + </dependency> + + <!-- Honeycomb infrastructure--> @@ -369,7 +369,7 @@ index 0000000..5ed2c1b + <dependency> + <groupId>io.fd.honeycomb</groupId> + <artifactId>translate-impl</artifactId> -+ <version>1.17.04.1-SNAPSHOT</version> ++ <version>1.17.04</version> + </dependency> + + @@ -1055,13 +1055,13 @@ index e126114..ca0e5b2 100644 --- a/vpp-integration/minimal-distribution/pom.xml +++ b/vpp-integration/minimal-distribution/pom.xml @@ -40,6 +40,7 @@ - <routing.version>1.17.04.1-SNAPSHOT</routing.version> - <acl.version>1.17.04.1-SNAPSHOT</acl.version> - <dhcp.version>1.17.04.1-SNAPSHOT</dhcp.version> -+ <vesagent.version>1.17.04.1-SNAPSHOT</vesagent.version> - <vpp.classifier.version>1.17.04.1-SNAPSHOT</vpp.classifier.version> - <l3-impl.version>1.17.04.1-SNAPSHOT</l3-impl.version> - <vpp-management-impl.version>1.17.04.1-SNAPSHOT</vpp-management-impl.version> + <routing.version>1.17.04</routing.version> + <acl.version>1.17.04</acl.version> + <dhcp.version>1.17.04</dhcp.version> ++ <vesagent.version>1.17.04</vesagent.version> + <vpp.classifier.version>1.17.04</vpp.classifier.version> + <l3-impl.version>1.17.04</l3-impl.version> + <vpp-management-impl.version>1.17.04</vpp-management-impl.version> @@ -63,6 +64,7 @@ io.fd.hc2vpp.routing.RoutingModule, io.fd.hc2vpp.acl.AclModule, |