diff options
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux.env | 4 | ||||
| -rw-r--r-- | heat/vCPE/vgmux/base_vcpe_vgmux.yaml | 20 | ||||
| -rw-r--r-- | vnfs/vCPE/scripts/v_gmux_install.sh | 8 | ||||
| -rw-r--r-- | vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch | 34 |
4 files changed, 33 insertions, 33 deletions
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env index 663408e8..8f495409 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.env +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env @@ -29,9 +29,9 @@ pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) vpp_source_repo_url: https://gerrit.fd.io/r/vpp - vpp_source_repo_branch: stable/1704 + vpp_source_repo_release_tag: v17.04 hc2vpp_source_repo_url: https://gerrit.fd.io/r/hc2vpp - hc2vpp_source_repo_branch: stable/1704 + hc2vpp_source_repo_release_tag: v1.17.04 vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Vpp-Add-VES-agent-for-vG-MUX.patch hc2vpp_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/Hc2vpp-Add-VES-agent-for-vG-MUX.patch libevel_patch_url: https://git.onap.org/demo/plain/vnfs/vCPE/vpp-ves-agent-for-vgmux/src/patches/vCPE-vG-MUX-libevel-fixup.patch diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml index 43bbb986..b08d5c3c 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.yaml +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.yaml @@ -153,18 +153,18 @@ parameters: type: string label: VPP Source Git Repo description: URL for VPP source codes - vpp_source_repo_branch: + vpp_source_repo_release_tag: type: string - label: VPP Source Git Branch - description: Git Branch for the VPP source codes + label: VPP Source Git Release Tag + description: Git Tag for the VPP source codes hc2vpp_source_repo_url: type: string label: Honeycomb Source Git Repo description: URL for Honeycomb source codes - hc2vpp_source_repo_branch: + hc2vpp_source_repo_release_tag: type: string - label: Honeycomb Source Git Branch - description: Git Branch for the Honeycomb source codes + label: Honeycomb Source Git Release Tag + description: Git Tag for the Honeycomb source codes vpp_patch_url: type: string label: VPP Patch URL @@ -254,9 +254,9 @@ resources: __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } __vpp_source_repo_url__ : { get_param: vpp_source_repo_url } - __vpp_source_repo_branch__ : { get_param: vpp_source_repo_branch } + __vpp_source_repo_release_tag__ : { get_param: vpp_source_repo_release_tag } __hc2vpp_source_repo_url__ : { get_param: hc2vpp_source_repo_url } - __hc2vpp_source_repo_branch__ : { get_param: hc2vpp_source_repo_branch } + __hc2vpp_source_repo_release_tag__ : { get_param: hc2vpp_source_repo_release_tag } __vpp_patch_url__ : { get_param: vpp_patch_url } __hc2vpp_patch_url__ : { get_param: hc2vpp_patch_url } __libevel_patch_url__ : { get_param: libevel_patch_url } @@ -279,10 +279,10 @@ resources: echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt echo "__vpp_source_repo_url__" > /opt/config/vpp_source_repo_url.txt - echo "__vpp_source_repo_branch__" > /opt/config/vpp_source_repo_branch.txt + echo "__vpp_source_repo_release_tag__" > /opt/config/vpp_source_repo_release_tag.txt echo "__vpp_patch_url__" > /opt/config/vpp_patch_url.txt echo "__hc2vpp_source_repo_url__" > /opt/config/hc2vpp_source_repo_url.txt - echo "__hc2vpp_source_repo_branch__" > /opt/config/hc2vpp_source_repo_branch.txt + echo "__hc2vpp_source_repo_release_tag__" > /opt/config/hc2vpp_source_repo_release_tag.txt echo "__hc2vpp_patch_url__" > /opt/config/hc2vpp_patch_url.txt echo "__libevel_patch_url__" > /opt/config/libevel_patch_url.txt 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/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, |