From a0081c9434b6ef4b43ef29af01b1f1f06dcc0b25 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Tue, 28 Aug 2018 11:48:14 -0700 Subject: [PATCH] Retrieve demo artifacts via nexus REST API This supports the use of SNAPSHOT demo artifacts in the vnf HEAT templates. Change-Id: I980c879819b1a396c985c7a2af1885b28e4f150a Issue-ID: INT-592 Signed-off-by: Gary Wu --- boot/robot/integration_preload_parameters.py | 3 +-- heat/vCPE/infra/base_vcpe_infra.env | 3 +-- heat/vCPE/infra/base_vcpe_infra.yaml | 12 ------------ heat/vCPE/vbng/base_vcpe_vbng.env | 3 +-- heat/vCPE/vbng/base_vcpe_vbng.yaml | 6 ------ heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env | 3 +-- heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml | 6 ------ heat/vCPE_build/vbng/build_vcpe_vbng.env | 3 +-- heat/vCPE_build/vbng/build_vcpe_vbng.yaml | 6 ------ heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env | 3 +-- heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml | 6 ------ heat/vCPE_build/vgmux/build_vcpe_vgmux.env | 3 +-- heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml | 6 ------ heat/vCPE_build/vgw/build_vcpe_vgw.env | 3 +-- heat/vCPE_build/vgw/build_vcpe_vgw.yaml | 6 ------ heat/vFW/base_vfw.env | 3 +-- heat/vFW/base_vfw.yaml | 9 --------- heat/vFWCL/vFWSNK/base_vfw.env | 3 +-- heat/vFWCL/vFWSNK/base_vfw.yaml | 7 ------- heat/vFWCL/vPKG/base_vpkg.env | 3 +-- heat/vFWCL/vPKG/base_vpkg.yaml | 6 ------ heat/vLB/base_vlb.env | 3 +-- heat/vLB/base_vlb.yaml | 10 ---------- heat/vLB/dnsscaling.env | 3 +-- heat/vLB/dnsscaling.yaml | 6 ------ heat/vLBMS/base_vlb.env | 3 +-- heat/vLBMS/base_vlb.yaml | 10 ---------- heat/vLBMS/dnsscaling.env | 1 - heat/vLBMS/dnsscaling.yaml | 6 ------ vnfs/vCPE/preload/vcpe_infra_preload_example.json | 4 ++-- vnfs/vCPE/preload/vcpe_metro_preload_example.json | 4 ++-- vnfs/vCPE/scripts/v_aaa_install.sh | 3 ++- vnfs/vCPE/scripts/v_dhcp_install.sh | 5 +++-- vnfs/vCPE/scripts/v_dns_install.sh | 3 ++- vnfs/vCPE/scripts/v_web_install.sh | 3 ++- vnfs/vFW/scripts/v_firewall_install.sh | 9 +++++---- vnfs/vFW/scripts/v_packetgen_install.sh | 7 ++++--- vnfs/vLB/scripts/v_dns_install.sh | 5 +++-- vnfs/vLB/scripts/v_lb_install.sh | 9 +++++---- vnfs/vLB/scripts/v_packetgen_install.sh | 5 +++-- vnfs/vLBMS/scripts/v_dns_install.sh | 2 +- vnfs/vLBMS/scripts/v_lb_install.sh | 9 +++++---- vnfs/vLBMS/scripts/v_packetgen_install.sh | 5 +++-- 43 files changed, 56 insertions(+), 162 deletions(-) diff --git a/boot/robot/integration_preload_parameters.py b/boot/robot/integration_preload_parameters.py index 108d470f..1ab11f50 100644 --- a/boot/robot/integration_preload_parameters.py +++ b/boot/robot/integration_preload_parameters.py @@ -3,8 +3,7 @@ GLOBAL_PRELOAD_PARAMETERS = { "defaults" : { 'key_name' : 'vfw_key${uuid}', "pub_key" : "${GLOBAL_INJECTED_VNF_PUB_KEY}", - "repo_url_blob" : "https://nexus.onap.org/content/repositories/raw", - "repo_url_artifacts" : "https://nexus.onap.org/content/groups/staging", + "nexus_artifact_repo" : "${GLOBAL_INJECTED_NEXUS_ARTIFACT_REPO}", "demo_artifacts_version" : "${GLOBAL_INJECTED_ARTIFACTS_VERSION}", "onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}", "onap_private_subnet_id" : "${GLOBAL_INJECTED_NETWORK}", diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env index d1340a40..96560f74 100644 --- a/heat/vCPE/infra/base_vcpe_infra.env +++ b/heat/vCPE/infra/base_vcpe_infra.env @@ -29,8 +29,7 @@ parameters: vf_module_id: vCPE_Intrastructure dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT install_script_version: 1.3.0-SNAPSHOT key_name: vaaa_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vCPE/infra/base_vcpe_infra.yaml b/heat/vCPE/infra/base_vcpe_infra.yaml index 77935dfb..9eccf335 100644 --- a/heat/vCPE/infra/base_vcpe_infra.yaml +++ b/heat/vCPE/infra/base_vcpe_infra.yaml @@ -161,10 +161,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages install_script_version: type: string label: Installation script version number @@ -243,7 +239,6 @@ resources: __oam_ipaddr__: { get_param: vaaa_private_ip_1 } __oam_cidr__: { get_param: onap_private_net_cidr } __cpe_signal_net_cidr__: { get_param: cpe_signal_net_cidr } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } @@ -259,7 +254,6 @@ resources: echo "__oam_ipaddr__" > /opt/config/oam_ipaddr.txt echo "__oam_cidr__" > /opt/config/oam_cidr.txt echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt @@ -308,7 +302,6 @@ resources: __cpe_public_net_ipaddr__: { get_param: vdns_private_ip_0 } __oam_cidr__: { get_param: onap_private_net_cidr } __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } @@ -322,7 +315,6 @@ resources: echo "__cpe_public_net_ipaddr__" > /opt/config/cpe_public_net_ipaddr.txt echo "__oam_cidr__" > /opt/config/oam_cidr.txt echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt @@ -373,7 +365,6 @@ resources: __cpe_signal_net_cidr__ : { get_param: cpe_signal_net_cidr } __mr_ip_addr__ : { get_param: mr_ip_addr } __mr_ip_port__ : { get_param: mr_ip_port } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } @@ -389,7 +380,6 @@ resources: echo "__cpe_signal_net_cidr__" > /opt/config/cpe_signal_net_cidr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__mr_ip_port__" > /opt/config/mr_ip_port.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt @@ -438,7 +428,6 @@ resources: __cpe_public_ipaddr__: { get_param: vweb_private_ip_0 } __oam_cidr__: { get_param: onap_private_net_cidr } __cpe_public_net_cidr__: { get_param: cpe_public_net_cidr } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __cloud_env__ : { get_param: cloud_env } @@ -452,7 +441,6 @@ resources: echo "__cpe_public_ipaddr__" > /opt/config/cpe_public_ipaddr.txt echo "__oam_cidr__" > /opt/config/oam_cidr.txt echo "__cpe_public_net_cidr__" > /opt/config/cpe_public_net_cidr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env index a29fe632..85d38961 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.env +++ b/heat/vCPE/vbng/base_vcpe_vbng.env @@ -24,8 +24,7 @@ sdnc_ip_addr: 10.0.7.1 dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT script_version: 1.3.0-SNAPSHOT key_name: vbng_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vCPE/vbng/base_vcpe_vbng.yaml b/heat/vCPE/vbng/base_vcpe_vbng.yaml index fbdbf8f2..bed084af 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.yaml +++ b/heat/vCPE/vbng/base_vcpe_vbng.yaml @@ -137,10 +137,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages script_version: type: string label: Installation script version number @@ -241,7 +237,6 @@ resources: __bng_gmux_cidr__: { get_param: bng_gmux_private_net_cidr } __dcae_collector_ip__: { get_param: dcae_collector_ip } __dcae_collector_port__: { get_param: dcae_collector_port } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -262,7 +257,6 @@ resources: echo "__brgemu_bng_cidr__" > /opt/config/brgemu_bng_net_cidr.txt echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env index 41b5bfcf..6d0b1db2 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env @@ -13,8 +13,7 @@ vbrgemu_name_0: zdcpe1cpe01brgemu01 vnf_id: vCPE_Infrastructure_BGREMU_demo_app vf_module_id: vCPE_Customer_BRGEMU - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT script_version: 1.3.0-SNAPSHOT key_name: vbrgemu_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml index e0b6da49..d6b8fbc2 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.yaml @@ -96,10 +96,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages script_version: type: string label: Installation script version number @@ -192,7 +188,6 @@ resources: # __brgemu_net_ipaddr__: { get_param: vbrgemu_private_ip_1 } # __brgemu_cidr__: { get_param: vbrgemu_private_net_cidr } __brgemu_bng_private_net_cidr__: { get_param: vbrgemu_bng_private_net_cidr } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -206,7 +201,6 @@ resources: #echo "__brgemu_net_ipaddr__" > /opt/config/brgemu_net_ipaddr.txt #echo "__brgemu_cidr__" > /opt/config/brgemu_net_cidr.txt echo "__brgemu_bng_private_net_cidr__" > /opt/config/brgemu_bng_private_net_cidr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vCPE_build/vbng/build_vcpe_vbng.env b/heat/vCPE_build/vbng/build_vcpe_vbng.env index ba9a2c40..8b9f88ce 100644 --- a/heat/vCPE_build/vbng/build_vcpe_vbng.env +++ b/heat/vCPE_build/vbng/build_vcpe_vbng.env @@ -5,8 +5,7 @@ vbng_name_0: zdcpe1cpe01bng01 vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app vf_module_id: vCPE_Intrastructure_Metro_vBNG - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT script_version: 1.3.0-SNAPSHOT key_name: vbng_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vCPE_build/vbng/build_vcpe_vbng.yaml b/heat/vCPE_build/vbng/build_vcpe_vbng.yaml index 59cc2911..0822185d 100644 --- a/heat/vCPE_build/vbng/build_vcpe_vbng.yaml +++ b/heat/vCPE_build/vbng/build_vcpe_vbng.yaml @@ -65,10 +65,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages script_version: type: string label: Build script version number @@ -143,7 +139,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -157,7 +152,6 @@ resources: # Create configuration files mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env index be905dc8..f389085b 100644 --- a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env +++ b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env @@ -5,8 +5,7 @@ vbrgemu_name_0: zdcpe1cpe01brgemu01 vnf_id: vCPE_Infrastructure_BGREMU_demo_app vf_module_id: vCPE_Customer_BRGEMU - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT script_version: 1.3.0-SNAPSHOT key_name: vbrgemu_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh diff --git a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml index e176747f..d49b07f4 100644 --- a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml +++ b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.yaml @@ -67,10 +67,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages script_version: type: string label: Build script version number @@ -152,7 +148,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -168,7 +163,6 @@ resources: # Create configuration files mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vCPE_build/vgmux/build_vcpe_vgmux.env b/heat/vCPE_build/vgmux/build_vcpe_vgmux.env index 47863acd..9a38f38b 100644 --- a/heat/vCPE_build/vgmux/build_vcpe_vgmux.env +++ b/heat/vCPE_build/vgmux/build_vcpe_vgmux.env @@ -7,8 +7,7 @@ vf_module_id: vCPE_Intrastructure_Metro_vGMUX dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT script_version: 1.3.0-SNAPSHOT key_name: vgmux_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml b/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml index f7d843d7..8d23e173 100644 --- a/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml +++ b/heat/vCPE_build/vgmux/build_vcpe_vgmux.yaml @@ -73,10 +73,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages script_version: type: string label: Script version number @@ -169,7 +165,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -187,7 +182,6 @@ resources: # Create configuration files mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vCPE_build/vgw/build_vcpe_vgw.env b/heat/vCPE_build/vgw/build_vcpe_vgw.env index def032f5..adcf0994 100644 --- a/heat/vCPE_build/vgw/build_vcpe_vgw.env +++ b/heat/vCPE_build/vgw/build_vcpe_vgw.env @@ -7,8 +7,7 @@ vf_module_id: vCPE_Customer_GW dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT script_version: 1.3.0-SNAPSHOT key_name: vgw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vCPE_build/vgw/build_vcpe_vgw.yaml b/heat/vCPE_build/vgw/build_vcpe_vgw.yaml index 3bd8532b..968f157a 100644 --- a/heat/vCPE_build/vgw/build_vcpe_vgw.yaml +++ b/heat/vCPE_build/vgw/build_vcpe_vgw.yaml @@ -73,10 +73,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages script_version: type: string label: Script version number @@ -157,7 +153,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __script_version__ : { get_param: script_version } __cloud_env__ : { get_param: cloud_env } @@ -172,7 +167,6 @@ resources: # Create configuration files mkdir /opt/config - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__script_version__" > /opt/config/script_version.txt echo "__cloud_env__" > /opt/config/cloud_env.txt diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env index f41a7122..f74b12bf 100644 --- a/heat/vFW/base_vfw.env +++ b/heat/vFW/base_vfw.env @@ -23,8 +23,7 @@ parameters: vf_module_id: vFirewall dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT install_script_version: 1.3.0-SNAPSHOT key_name: vfw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vFW/base_vfw.yaml b/heat/vFW/base_vfw.yaml index e8a05555..58bbd946 100644 --- a/heat/vFW/base_vfw.yaml +++ b/heat/vFW/base_vfw.yaml @@ -137,10 +137,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages install_script_version: type: string label: Installation script version number @@ -252,7 +248,6 @@ resources: params: __dcae_collector_ip__ : { get_param: dcae_collector_ip } __dcae_collector_port__ : { get_param: dcae_collector_port } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 } @@ -270,7 +265,6 @@ resources: mkdir /opt/config echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt @@ -328,7 +322,6 @@ resources: __fw_ipaddr__: { get_param: vfw_private_ip_0 } __protected_net_cidr__: { get_param: protected_private_net_cidr } __sink_ipaddr__: { get_param: vsn_private_ip_0 } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 } @@ -345,7 +338,6 @@ resources: echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt @@ -400,7 +392,6 @@ resources: params: __protected_net_gw__: { get_param: vfw_private_ip_1 } __unprotected_net__: { get_param: unprotected_private_net_cidr } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __install_script_version__ : { get_param: install_script_version } __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 } __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 } diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env index 83d90f28..c0a53d1f 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.env +++ b/heat/vFWCL/vFWSNK/base_vfw.env @@ -23,8 +23,7 @@ parameters: vf_module_id: vFirewallCL dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT install_script_version: 1.3.0-SNAPSHOT key_name: vfw_key pub_key: PUT YOUR KEY HERE diff --git a/heat/vFWCL/vFWSNK/base_vfw.yaml b/heat/vFWCL/vFWSNK/base_vfw.yaml index 73b2c2a5..116ee9fb 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.yaml +++ b/heat/vFWCL/vFWSNK/base_vfw.yaml @@ -137,10 +137,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages install_script_version: type: string label: Installation script version number @@ -254,7 +250,6 @@ resources: params: __dcae_collector_ip__ : { get_param: dcae_collector_ip } __dcae_collector_port__ : { get_param: dcae_collector_port } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 } @@ -272,7 +267,6 @@ resources: mkdir /opt/config echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt @@ -329,7 +323,6 @@ resources: params: __protected_net_gw__: { get_param: vfw_private_ip_1 } __unprotected_net__: { get_param: unprotected_private_net_cidr } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __install_script_version__ : { get_param: install_script_version } __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 } __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 } diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env index 080d02f9..4c81d4be 100644 --- a/heat/vFWCL/vPKG/base_vpkg.env +++ b/heat/vFWCL/vPKG/base_vpkg.env @@ -16,8 +16,7 @@ parameters: vpg_name_0: zdfw1fwl01pgn01 vnf_id: vPNG_Firewall_demo_app vf_module_id: vTrafficPNG - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT install_script_version: 1.3.0-SNAPSHOT key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE diff --git a/heat/vFWCL/vPKG/base_vpkg.yaml b/heat/vFWCL/vPKG/base_vpkg.yaml index 62d405a7..6d1902ba 100644 --- a/heat/vFWCL/vPKG/base_vpkg.yaml +++ b/heat/vFWCL/vPKG/base_vpkg.yaml @@ -109,10 +109,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages install_script_version: type: string label: Installation script version number @@ -194,7 +190,6 @@ resources: __fw_ipaddr__: { get_param: vfw_private_ip_0 } __protected_net_cidr__: { get_param: protected_private_net_cidr } __sink_ipaddr__: { get_param: vsn_private_ip_0 } - __repo_url_artifacts__ : { get_param: repo_url_artifacts } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 } @@ -211,7 +206,6 @@ resources: echo "__fw_ipaddr__" > /opt/config/fw_ipaddr.txt echo "__protected_net_cidr__" > /opt/config/protected_net_cidr.txt echo "__sink_ipaddr__" > /opt/config/sink_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env index fecfc520..db302b63 100644 --- a/heat/vLB/base_vlb.env +++ b/heat/vLB/base_vlb.env @@ -26,8 +26,7 @@ parameters: vf_module_id: vLoadBalancer dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT install_script_version: 1.3.0-SNAPSHOT key_name: vlb_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vLB/base_vlb.yaml b/heat/vLB/base_vlb.yaml index 0d8c575a..d57f5afa 100644 --- a/heat/vLB/base_vlb.yaml +++ b/heat/vLB/base_vlb.yaml @@ -149,10 +149,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages demo_artifacts_version: type: string label: Artifacts version used in demo vnfs @@ -273,7 +269,6 @@ resources: __gre_ipaddr__: { get_param: gre_ipaddr } __pktgen_ipaddr__: { get_param: vpg_private_ip_0 } __oam_private_ipaddr__: { get_param: vlb_private_ip_1 } - __repo_url_artifacts__: { get_param: repo_url_artifacts } __demo_artifacts_version__: { get_param: demo_artifacts_version } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } @@ -295,7 +290,6 @@ resources: echo "__gre_ipaddr__" > /opt/config/gre_ipaddr.txt echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt @@ -352,7 +346,6 @@ resources: __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } __local_private_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } - __repo_url_artifacts__: { get_param: repo_url_artifacts } __demo_artifacts_version__: { get_param: demo_artifacts_version } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } @@ -368,7 +361,6 @@ resources: echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt @@ -417,7 +409,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__: { get_param: repo_url_artifacts } __local_private_ipaddr__: { get_param: vpg_private_ip_0 } __oam_private_ipaddr__: { get_param: vpg_private_ip_1 } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } @@ -439,7 +430,6 @@ resources: echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__pg_int__" > /opt/config/pg_int.txt diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env index 62e65935..ed69dca5 100644 --- a/heat/vLB/dnsscaling.env +++ b/heat/vLB/dnsscaling.env @@ -14,8 +14,7 @@ parameters: vdns_name_0: zdfw1lb01dns02 vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer - repo_url_artifacts: https://nexus.onap.org/content/repositories/staging - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT install_script_version: 1.3.0-SNAPSHOT key_name: vlb_key_scaling pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vLB/dnsscaling.yaml b/heat/vLB/dnsscaling.yaml index 69444fe7..0d22f804 100644 --- a/heat/vLB/dnsscaling.yaml +++ b/heat/vLB/dnsscaling.yaml @@ -101,10 +101,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages install_script_version: type: string label: Installation script version number @@ -187,7 +183,6 @@ resources: __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } __local_private_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } - __repo_url_artifacts__: { get_param: repo_url_artifacts } __demo_artifacts_version__: { get_param: demo_artifacts_version } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } @@ -203,7 +198,6 @@ resources: echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env index d41fa184..6b485307 100644 --- a/heat/vLBMS/base_vlb.env +++ b/heat/vLBMS/base_vlb.env @@ -26,9 +26,8 @@ parameters: vf_module_id: vLoadBalancer dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - repo_url_artifacts: https://nexus.onap.org/content/groups/staging nb_api_version: 1.2.0 - demo_artifacts_version: 1.3.0 + demo_artifacts_version: 1.3.0-SNAPSHOT install_script_version: 1.3.0-SNAPSHOT key_name: vlb_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vLBMS/base_vlb.yaml b/heat/vLBMS/base_vlb.yaml index ca3db36c..f3d5f1c8 100644 --- a/heat/vLBMS/base_vlb.yaml +++ b/heat/vLBMS/base_vlb.yaml @@ -149,10 +149,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages demo_artifacts_version: type: string label: Artifacts version used in demo vnfs @@ -278,7 +274,6 @@ resources: __pktgen_ipaddr__: { get_param: vpg_private_ip_0 } __vdns_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vlb_private_ip_1 } - __repo_url_artifacts__: { get_param: repo_url_artifacts } __demo_artifacts_version__: { get_param: demo_artifacts_version } __nb_api_version__: { get_param: nb_api_version } __install_script_version__: { get_param: install_script_version } @@ -304,7 +299,6 @@ resources: echo "__pktgen_ipaddr__" > /opt/config/pktgen_ipaddr.txt echo "__vdns_ipaddr__" > /opt/config/vdns_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__nb_api_version__" > /opt/config/nb_api_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt @@ -362,7 +356,6 @@ resources: __lb_to_pktgen_if__: { get_param: vlb_private_ip_2} __local_private_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } - __repo_url_artifacts__: { get_param: repo_url_artifacts } __nb_api_version__: { get_param: nb_api_version } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } @@ -379,7 +372,6 @@ resources: echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__nb_api_version__" > /opt/config/nb_api_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt @@ -428,7 +420,6 @@ resources: user_data: str_replace: params: - __repo_url_artifacts__: { get_param: repo_url_artifacts } __local_private_ipaddr__: { get_param: vpg_private_ip_0 } __oam_private_ipaddr__: { get_param: vpg_private_ip_1 } __onap_private_net_cidr__: { get_param: onap_private_net_cidr } @@ -451,7 +442,6 @@ resources: echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__pktgen_private_net_cidr__" > /opt/config/pktgen_private_net_cidr.txt echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt echo "__nb_api_version__" > /opt/config/nb_api_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env index 355ffd68..ffdf44e8 100644 --- a/heat/vLBMS/dnsscaling.env +++ b/heat/vLBMS/dnsscaling.env @@ -15,7 +15,6 @@ parameters: vdns_name_0: zdfw1lb01dns02 vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer - repo_url_artifacts: https://nexus.onap.org/content/groups/staging nb_api_version: 1.2.0 install_script_version: 1.3.0-SNAPSHOT key_name: vlb_key_scaling diff --git a/heat/vLBMS/dnsscaling.yaml b/heat/vLBMS/dnsscaling.yaml index f0a9a2d5..a3707bfb 100644 --- a/heat/vLBMS/dnsscaling.yaml +++ b/heat/vLBMS/dnsscaling.yaml @@ -105,10 +105,6 @@ parameters: type: string label: Public key description: Public key to be installed on the compute instance - repo_url_artifacts: - type: string - label: Repository URL - description: URL of the repository that hosts the demo packages install_script_version: type: string label: Installation script version number @@ -191,7 +187,6 @@ resources: __lb_to_pktgen_if__: { get_param: vlb_private_ip_2} __local_private_ipaddr__: { get_param: vdns_private_ip_0 } __oam_private_ipaddr__: { get_param: vdns_private_ip_1 } - __repo_url_artifacts__: { get_param: repo_url_artifacts } __nb_api_version__: { get_param: nb_api_version } __install_script_version__: { get_param: install_script_version } __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr } @@ -208,7 +203,6 @@ resources: echo "__lb_to_pktgen_if__" > /opt/config/lb_to_pktgen_if.txt echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt echo "__oam_private_ipaddr__" > /opt/config/oam_private_ipaddr.txt - echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt echo "__nb_api_version__" > /opt/config/nb_api_version.txt echo "__install_script_version__" > /opt/config/install_script_version.txt echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt diff --git a/vnfs/vCPE/preload/vcpe_infra_preload_example.json b/vnfs/vCPE/preload/vcpe_infra_preload_example.json index 17356a28..f8735b9d 100644 --- a/vnfs/vCPE/preload/vcpe_infra_preload_example.json +++ b/vnfs/vCPE/preload/vcpe_infra_preload_example.json @@ -15,8 +15,8 @@ }, "vnf-parameters": [ { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" + "vnf-parameter-name": "nexus_artifact_repo", + "vnf-parameter-value": "https://nexus.onap.org" }, { "vnf-parameter-name": "demo_artifacts_version", diff --git a/vnfs/vCPE/preload/vcpe_metro_preload_example.json b/vnfs/vCPE/preload/vcpe_metro_preload_example.json index 876c26e1..16acb3d6 100644 --- a/vnfs/vCPE/preload/vcpe_metro_preload_example.json +++ b/vnfs/vCPE/preload/vcpe_metro_preload_example.json @@ -15,8 +15,8 @@ }, "vnf-parameters": [ { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "https://nexus.onap.org/content/groups/staging" + "vnf-parameter-name": "nexus_artifact_repo", + "vnf-parameter-value": "https://nexus.onap.org" }, { "vnf-parameter-name": "demo_artifacts_version", diff --git a/vnfs/vCPE/scripts/v_aaa_install.sh b/vnfs/vCPE/scripts/v_aaa_install.sh index a019e6a0..c9a9bdfb 100644 --- a/vnfs/vCPE/scripts/v_aaa_install.sh +++ b/vnfs/vCPE/scripts/v_aaa_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) diff --git a/vnfs/vCPE/scripts/v_dhcp_install.sh b/vnfs/vCPE/scripts/v_dhcp_install.sh index 822c2f8e..aa5c9291 100644 --- a/vnfs/vCPE/scripts/v_dhcp_install.sh +++ b/vnfs/vCPE/scripts/v_dhcp_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) MR_IP_ADDR=$(cat /opt/config/mr_ip_addr.txt) @@ -57,7 +58,7 @@ sleep 1 # Download the kea hook cd /opt -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vcpe/kea-sdnc-notify-mod/$DEMO_ARTIFACTS_VERSION/kea-sdnc-notify-mod-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +wget -O kea-sdnc-notify-mod-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vcpe&a=kea-sdnc-notify-mod&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" tar -zxvf kea-sdnc-notify-mod-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv kea-sdnc-notify-mod-$DEMO_ARTIFACTS_VERSION VDHCP rm *.tar.gz diff --git a/vnfs/vCPE/scripts/v_dns_install.sh b/vnfs/vCPE/scripts/v_dns_install.sh index 4835c9d8..81669d1b 100644 --- a/vnfs/vCPE/scripts/v_dns_install.sh +++ b/vnfs/vCPE/scripts/v_dns_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) diff --git a/vnfs/vCPE/scripts/v_web_install.sh b/vnfs/vCPE/scripts/v_web_install.sh index 8be71979..e5a77993 100644 --- a/vnfs/vCPE/scripts/v_web_install.sh +++ b/vnfs/vCPE/scripts/v_web_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) diff --git a/vnfs/vFW/scripts/v_firewall_install.sh b/vnfs/vFW/scripts/v_firewall_install.sh index f5156ff0..d9767142 100755 --- a/vnfs/vFW/scripts/v_firewall_install.sh +++ b/vnfs/vFW/scripts/v_firewall_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -69,9 +70,9 @@ cd /opt unzip -p -j /opt/vfw-scripts-$INSTALL_SCRIPT_VERSION.zip v_firewall_init.sh > /opt/v_firewall_init.sh unzip -p -j /opt/vfw-scripts-$INSTALL_SCRIPT_VERSION.zip vfirewall.sh > /opt/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/ves5/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves_vfw_reporting/$DEMO_ARTIFACTS_VERSION/ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +wget -O sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf&a=sample-distribution&c=hc&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" +wget -O ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" +wget -O ves_vfw_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves_vfw_reporting&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" tar -zmxvf 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 b2ae1c32..7559024a 100755 --- a/vnfs/vFW/scripts/v_packetgen_install.sh +++ b/vnfs/vFW/scripts/v_packetgen_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -60,8 +61,8 @@ cd /opt unzip -p -j /opt/vfw-scripts-$INSTALL_SCRIPT_VERSION.zip v_packetgen_init.sh > /opt/v_packetgen_init.sh unzip -p -j /opt/vfw-scripts-$INSTALL_SCRIPT_VERSION.zip vpacketgen.sh > /opt/vpacketgen.sh unzip -p -j /opt/vfw-scripts-$INSTALL_SCRIPT_VERSION.zip run_traffic_fw_demo.sh > /opt/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 +wget -O sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf&a=sample-distribution&c=hc&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" +wget -O vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vfw&a=vfw_pg_streams&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" tar -zmxvf sample-distribution-$DEMO_ARTIFACTS_VERSION-hc.tar.gz tar -zmxvf vfw_pg_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz diff --git a/vnfs/vLB/scripts/v_dns_install.sh b/vnfs/vLB/scripts/v_dns_install.sh index 8f9f924f..ae83e81b 100644 --- a/vnfs/vLB/scripts/v_dns_install.sh +++ b/vnfs/vLB/scripts/v_dns_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -58,7 +59,7 @@ unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip v_dns_init.sh > /opt/v_ unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip vdns.sh > /opt/vdns.sh unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip dnsclient.sh > /opt/dnsclient.sh unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip set_gre_tunnel.sh > /opt/set_gre_tunnel.sh -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/dns-client/$DEMO_ARTIFACTS_VERSION/dns-client-$DEMO_ARTIFACTS_VERSION.jar +wget -O dns-client-$DEMO_ARTIFACTS_VERSION-dns-client.jar "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=dns-client&e=jar&v=$DEMO_ARTIFACTS_VERSION" mv dns-client-$DEMO_ARTIFACTS_VERSION.jar /opt/FDclient/ mv dnsclient.sh /opt/FDclient/ diff --git a/vnfs/vLB/scripts/v_lb_install.sh b/vnfs/vLB/scripts/v_lb_install.sh index 41ee6001..03c308c0 100644 --- a/vnfs/vLB/scripts/v_lb_install.sh +++ b/vnfs/vLB/scripts/v_lb_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -68,9 +69,9 @@ unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip vlb.sh > /opt/vlb.sh unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip dnsmembership.sh > /opt/dnsmembership.sh unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip add_dns.sh > /opt/add_dns.sh unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip remove_dns.sh > /opt/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/ves5/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +wget -O dns-manager-$DEMO_ARTIFACTS_VERSION-dns-manager.jar "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=dns-manager&e=jar&v=$DEMO_ARTIFACTS_VERSION" +wget -O ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" +wget -O ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves_vlb_reporting&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" tar -zmxvf 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 2bff89af..d061f3eb 100644 --- a/vnfs/vLB/scripts/v_packetgen_install.sh +++ b/vnfs/vLB/scripts/v_packetgen_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -55,7 +56,7 @@ cd /opt unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip v_packetgen_init.sh > /opt/v_packetgen_init.sh unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip vpacketgen.sh > /opt/vpacketgen.sh unzip -p -j /opt/vlb-scripts-$INSTALL_SCRIPT_VERSION.zip run_streams_dns.sh > /opt/run_streams_dns.sh -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/vlb_dns_streams/$DEMO_ARTIFACTS_VERSION/vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +wget -O vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=vlb_dns_streams&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" tar -zmxvf vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz mv vlb_dns_streams-$DEMO_ARTIFACTS_VERSION dns_streams diff --git a/vnfs/vLBMS/scripts/v_dns_install.sh b/vnfs/vLBMS/scripts/v_dns_install.sh index 78b2d290..61e11109 100644 --- a/vnfs/vLBMS/scripts/v_dns_install.sh +++ b/vnfs/vLBMS/scripts/v_dns_install.sh @@ -1,6 +1,6 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) NB_API_VERSION=$(cat /opt/config/nb_api_version.txt) INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) diff --git a/vnfs/vLBMS/scripts/v_lb_install.sh b/vnfs/vLBMS/scripts/v_lb_install.sh index 7a32ae79..c82368ce 100644 --- a/vnfs/vLBMS/scripts/v_lb_install.sh +++ b/vnfs/vLBMS/scripts/v_lb_install.sh @@ -1,7 +1,8 @@ -#/bin/bash +#!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) #DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +#if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi NB_API_VERSION=$(cat /opt/config/nb_api_version.txt) INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -68,8 +69,8 @@ unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip add_dns.sh > /opt/add unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip remove_dns.sh > /opt/remove_dns.sh unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip properties.conf > /opt/config/properties.conf unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip run_health.sh > /opt/run_health.sh -#wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves/$DEMO_ARTIFACTS_VERSION/ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz -#wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/ves5/ves_vlb_reporting/$DEMO_ARTIFACTS_VERSION/ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +#wget -O ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" +#wget -O ves_vlb_reporting-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.ves5&a=ves_vlb_reporting&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" #tar -zmxvf ves-$DEMO_ARTIFACTS_VERSION-demo.tar.gz #mv ves-$DEMO_ARTIFACTS_VERSION VES diff --git a/vnfs/vLBMS/scripts/v_packetgen_install.sh b/vnfs/vLBMS/scripts/v_packetgen_install.sh index ff1a9222..333218be 100644 --- a/vnfs/vLBMS/scripts/v_packetgen_install.sh +++ b/vnfs/vLBMS/scripts/v_packetgen_install.sh @@ -1,7 +1,8 @@ #!/bin/bash -REPO_URL_ARTIFACTS=$(cat /opt/config/repo_url_artifacts.txt) +NEXUS_ARTIFACT_REPO=$(cat /opt/config/nexus_artifact_repo.txt) DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) +if [[ "$DEMO_ARTIFACTS_VERSION" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi NB_API_VERSION=$(cat /opt/config/nb_api_version.txt) INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) @@ -58,7 +59,7 @@ unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip vpacketgen.sh > /opt/ unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip run_streams_dns.sh > /opt/run_streams_dns.sh unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip properties.conf > /opt/config/properties.conf unzip -p -j /opt/vlbms-scripts-$INSTALL_SCRIPT_VERSION.zip run_health.sh > /opt/run_health.sh -wget $REPO_URL_ARTIFACTS/org/onap/demo/vnf/vlb/vlb_dns_streams/$DEMO_ARTIFACTS_VERSION/vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz +wget -O vlb_dns_streams-$DEMO_ARTIFACTS_VERSION-demo.tar.gz "${NEXUS_ARTIFACT_REPO}/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo.vnf.vlb&a=vlb_dns_streams&c=demo&e=tar.gz&v=$DEMO_ARTIFACTS_VERSION" sed -i 's/primary=.*/primary=false/g' /opt/config/properties.conf sed -i 's/vnfc=.*/vnfc=vPacketGen/g' /opt/config/properties.conf -- 2.16.6