From 3e4c0d93034e07a93d881ef13db3e5f2e2f9f3ba Mon Sep 17 00:00:00 2001 From: Marco Platania Date: Tue, 7 May 2019 16:22:53 -0400 Subject: Keep POMs to 1.4.0-SNAPSHOT and update scripts Change-Id: I01870bf4636741a2ca4447e6cdf57627b54a3859 Issue-ID: INT-1070 Signed-off-by: Marco Platania Signed-off-by: Gary Wu --- heat/vCPE/infra/base_vcpe_infra.env | 4 ++-- heat/vCPE/vbng/base_vcpe_vbng.env | 4 ++-- heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env | 4 ++-- heat/vCPE/vgmux/base_vcpe_vgmux.env | 2 +- heat/vCPE/vgw/base_vcpe_vgw.env | 2 +- heat/vCPE_build/vbng/build_vcpe_vbng.env | 4 ++-- heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env | 4 ++-- heat/vCPE_build/vgmux/build_vcpe_vgmux.env | 4 ++-- heat/vCPE_build/vgw/build_vcpe_vgw.env | 4 ++-- heat/vFW/base_vfw.env | 4 ++-- heat/vFWCL/vFWSNK/base_vfw.env | 4 ++-- heat/vFWCL/vPKG/base_vpkg.env | 4 ++-- heat/vFWCL_arm64/vFWSNK/base_vfw.env | 4 ++-- heat/vFWCL_arm64/vPKG/base_vpkg.env | 4 ++-- heat/vFWDT/vFWSNK/base_vfw.env | 4 ++-- heat/vFWDT/vPKG/base_vpkg.env | 4 ++-- heat/vFW_HPA/vFW/base_vfw.env | 4 ++-- heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env | 4 ++-- heat/vFW_HPA/vFWCL/vPKG/base_vpkg.env | 4 ++-- heat/vFW_NextGen/examples/vfw.env | 4 ++-- heat/vFW_NextGen/examples/vpg.env | 4 ++-- heat/vFW_NextGen/examples/vsn.env | 4 ++-- heat/vFW_NextGen/templates/vfw.env | 4 ++-- heat/vFW_NextGen/templates/vpg.env | 4 ++-- heat/vFW_NextGen/templates/vsn.env | 4 ++-- heat/vIPsec/vIPsec/base_vipsec.env | 4 ++-- heat/vLB/base_vlb.env | 4 ++-- heat/vLB/dnsscaling.env | 4 ++-- heat/vLBMS/base_vlb.env | 4 ++-- heat/vLBMS/dnsscaling.env | 2 +- heat/vLB_CDS/vdns.env | 2 +- heat/vLB_CDS/vlb.env | 4 ++-- heat/vLB_CDS/vpkg.env | 4 ++-- pom.xml | 2 ++ vnfs/honeycomb_plugin/parent-pom/pom.xml | 3 --- 35 files changed, 64 insertions(+), 65 deletions(-) diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env index 96560f74..18462020 100644 --- a/heat/vCPE/infra/base_vcpe_infra.env +++ b/heat/vCPE/infra/base_vcpe_infra.env @@ -29,8 +29,8 @@ parameters: vf_module_id: vCPE_Intrastructure dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - demo_artifacts_version: 1.3.0-SNAPSHOT - install_script_version: 1.3.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vaaa_key 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) diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env index 85d38961..b8b76b76 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng.env +++ b/heat/vCPE/vbng/base_vcpe_vbng.env @@ -24,8 +24,8 @@ sdnc_ip_addr: 10.0.7.1 dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - demo_artifacts_version: 1.3.0-SNAPSHOT - script_version: 1.3.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + script_version: 1.4.0 key_name: vbng_key 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) diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env index 6d0b1db2..c9f2c639 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env @@ -13,8 +13,8 @@ vbrgemu_name_0: zdcpe1cpe01brgemu01 vnf_id: vCPE_Infrastructure_BGREMU_demo_app vf_module_id: vCPE_Customer_BRGEMU - demo_artifacts_version: 1.3.0-SNAPSHOT - script_version: 1.3.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + script_version: 1.4.0 key_name: vbrgemu_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env index 48a4c8f8..346a1cc4 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux.env +++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env @@ -21,7 +21,7 @@ bng_gmux_private_ip: 10.1.0.10 dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - script_version: 1.3.0-SNAPSHOT + script_version: 1.4.0 key_name: vgmux_key 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) diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env index 977dce1e..e7de8e48 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw.env +++ b/heat/vCPE/vgw/base_vcpe_vgw.env @@ -22,7 +22,7 @@ vg_vgmux_tunnel_vni: 100 dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - script_version: 1.3.0-SNAPSHOT + script_version: 1.4.0 key_name: vgw_key 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) diff --git a/heat/vCPE_build/vbng/build_vcpe_vbng.env b/heat/vCPE_build/vbng/build_vcpe_vbng.env index 8b9f88ce..8a691053 100644 --- a/heat/vCPE_build/vbng/build_vcpe_vbng.env +++ b/heat/vCPE_build/vbng/build_vcpe_vbng.env @@ -5,8 +5,8 @@ vbng_name_0: zdcpe1cpe01bng01 vnf_id: vCPE_Infrastructure_Metro_vBNG_demo_app vf_module_id: vCPE_Intrastructure_Metro_vBNG - demo_artifacts_version: 1.3.0-SNAPSHOT - script_version: 1.3.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + script_version: 1.4.0 key_name: vbng_key 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) diff --git a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env index f389085b..5989ec16 100644 --- a/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env +++ b/heat/vCPE_build/vbrgemu/build_vcpe_vbrgemu.env @@ -5,8 +5,8 @@ vbrgemu_name_0: zdcpe1cpe01brgemu01 vnf_id: vCPE_Infrastructure_BGREMU_demo_app vf_module_id: vCPE_Customer_BRGEMU - demo_artifacts_version: 1.3.0-SNAPSHOT - script_version: 1.3.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + script_version: 1.4.0 key_name: vbrgemu_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh cloud_env: PUT THE CLOUD PROVIDED HERE (openstack or rackspace) diff --git a/heat/vCPE_build/vgmux/build_vcpe_vgmux.env b/heat/vCPE_build/vgmux/build_vcpe_vgmux.env index 9a38f38b..1e638e10 100644 --- a/heat/vCPE_build/vgmux/build_vcpe_vgmux.env +++ b/heat/vCPE_build/vgmux/build_vcpe_vgmux.env @@ -7,8 +7,8 @@ vf_module_id: vCPE_Intrastructure_Metro_vGMUX dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - demo_artifacts_version: 1.3.0-SNAPSHOT - script_version: 1.3.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + script_version: 1.4.0 key_name: vgmux_key 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) diff --git a/heat/vCPE_build/vgw/build_vcpe_vgw.env b/heat/vCPE_build/vgw/build_vcpe_vgw.env index adcf0994..a3612265 100644 --- a/heat/vCPE_build/vgw/build_vcpe_vgw.env +++ b/heat/vCPE_build/vgw/build_vcpe_vgw.env @@ -7,8 +7,8 @@ vf_module_id: vCPE_Customer_GW dcae_collector_ip: 10.0.4.1 dcae_collector_port: 8081 - demo_artifacts_version: 1.3.0-SNAPSHOT - script_version: 1.3.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + script_version: 1.4.0 key_name: vgw_key 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) diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env index 0f68939f..3f152b52 100644 --- a/heat/vFW/base_vfw.env +++ b/heat/vFW/base_vfw.env @@ -50,8 +50,8 @@ parameters: # APP/USER_DATA dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: openstack diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env index c7d3c03e..2f3f114e 100644 --- a/heat/vFWCL/vFWSNK/base_vfw.env +++ b/heat/vFWCL/vFWSNK/base_vfw.env @@ -45,8 +45,8 @@ parameters: # APP/USER_DATA dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key pub_key: PUT YOUR KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env index 72396cec..1f8114b0 100644 --- a/heat/vFWCL/vPKG/base_vpkg.env +++ b/heat/vFWCL/vPKG/base_vpkg.env @@ -31,8 +31,8 @@ parameters: # APP/USER_DATA vfw_private_ip_0: 192.168.10.100 vsn_private_ip_0: 192.168.20.250 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL_arm64/vFWSNK/base_vfw.env b/heat/vFWCL_arm64/vFWSNK/base_vfw.env index 6b7e334c..c4573153 100644 --- a/heat/vFWCL_arm64/vFWSNK/base_vfw.env +++ b/heat/vFWCL_arm64/vFWSNK/base_vfw.env @@ -44,8 +44,8 @@ parameters: # APP/USER_DATA dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key pub_key: PUT YOUR KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWCL_arm64/vPKG/base_vpkg.env b/heat/vFWCL_arm64/vPKG/base_vpkg.env index 72396cec..1f8114b0 100644 --- a/heat/vFWCL_arm64/vPKG/base_vpkg.env +++ b/heat/vFWCL_arm64/vPKG/base_vpkg.env @@ -31,8 +31,8 @@ parameters: # APP/USER_DATA vfw_private_ip_0: 192.168.10.100 vsn_private_ip_0: 192.168.20.250 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFWDT/vFWSNK/base_vfw.env b/heat/vFWDT/vFWSNK/base_vfw.env index aca228ad..d7d1109c 100755 --- a/heat/vFWDT/vFWSNK/base_vfw.env +++ b/heat/vFWDT/vFWSNK/base_vfw.env @@ -28,8 +28,8 @@ parameters: vf_module_id: vFirewallCL dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 nexus_artifact_repo: https://nexus.onap.org key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE diff --git a/heat/vFWDT/vPKG/base_vpkg.env b/heat/vFWDT/vPKG/base_vpkg.env index a9b13287..34436997 100755 --- a/heat/vFWDT/vPKG/base_vpkg.env +++ b/heat/vFWDT/vPKG/base_vpkg.env @@ -22,8 +22,8 @@ parameters: vpg_name_0: zdfw1fwl01pgn01 vnf_id: vPNG_Firewall_demo_app vf_module_id: vTrafficPNG - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 nexus_artifact_repo: https://nexus.onap.org key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE diff --git a/heat/vFW_HPA/vFW/base_vfw.env b/heat/vFW_HPA/vFW/base_vfw.env index d56f60b2..59d03be9 100644 --- a/heat/vFW_HPA/vFW/base_vfw.env +++ b/heat/vFW_HPA/vFW/base_vfw.env @@ -32,8 +32,8 @@ parameters: vf_module_id: vFirewall dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: openstack diff --git a/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env b/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env index d11ba189..cdca7e24 100644 --- a/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env +++ b/heat/vFW_HPA/vFWCL/vFWSNK/base_vfw.env @@ -29,8 +29,8 @@ parameters: vf_module_id: vFirewallCL dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key pub_key: PUT YOUR KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.env b/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.env index 10ac872e..5f1a3a68 100644 --- a/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.env +++ b/heat/vFW_HPA/vFWCL/vPKG/base_vpkg.env @@ -18,8 +18,8 @@ parameters: vpg_name_0: zdfw1fwl01pgn01 vnf_id: vPNG_Firewall_demo_app vf_module_id: vTrafficPNG - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key pub_key: PUT YOUR PUBLIC KEY HERE cloud_env: PUT openstack OR rackspace HERE diff --git a/heat/vFW_NextGen/examples/vfw.env b/heat/vFW_NextGen/examples/vfw.env index 4a12cb65..0c1cf495 100644 --- a/heat/vFW_NextGen/examples/vfw.env +++ b/heat/vFW_NextGen/examples/vfw.env @@ -20,8 +20,8 @@ parameters: vf_module_id: vFirewall dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key cloud_env: openstack sec_group: default diff --git a/heat/vFW_NextGen/examples/vpg.env b/heat/vFW_NextGen/examples/vpg.env index b77bb572..a4c696e3 100644 --- a/heat/vFW_NextGen/examples/vpg.env +++ b/heat/vFW_NextGen/examples/vpg.env @@ -16,8 +16,8 @@ parameters: name_0: zdfw1fwl01pgn01 vnf_id: vPacketGen_demo_app vf_module_id: vTrafficPNG - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vpg_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: openstack diff --git a/heat/vFW_NextGen/examples/vsn.env b/heat/vFW_NextGen/examples/vsn.env index 4de64a58..90c4b88a 100644 --- a/heat/vFW_NextGen/examples/vsn.env +++ b/heat/vFW_NextGen/examples/vsn.env @@ -15,8 +15,8 @@ parameters: name_0: zdfw1fwl01snk01 vnf_id: vSink_demo_app vf_module_id: vFirewallCL - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vsn_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: openstack diff --git a/heat/vFW_NextGen/templates/vfw.env b/heat/vFW_NextGen/templates/vfw.env index 1fded1dc..aa8a2c17 100644 --- a/heat/vFW_NextGen/templates/vfw.env +++ b/heat/vFW_NextGen/templates/vfw.env @@ -20,8 +20,8 @@ parameters: vf_module_id: vFirewallCL dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key cloud_env: PUT openstack OR rackspace HERE sec_group: PUT THE ONAP SECURITY GROUP HERE diff --git a/heat/vFW_NextGen/templates/vpg.env b/heat/vFW_NextGen/templates/vpg.env index e9246161..ce961fc9 100644 --- a/heat/vFW_NextGen/templates/vpg.env +++ b/heat/vFW_NextGen/templates/vpg.env @@ -16,8 +16,8 @@ parameters: vpg_name_0: zdfw1fwl01pgn01 vnf_id: vPacketGen_demo_app vf_module_id: vTrafficPNG - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key cloud_env: PUT openstack OR rackspace HERE sec_group: PUT THE ONAP SECURITY GROUP HERE diff --git a/heat/vFW_NextGen/templates/vsn.env b/heat/vFW_NextGen/templates/vsn.env index 6afe4377..08da71d1 100644 --- a/heat/vFW_NextGen/templates/vsn.env +++ b/heat/vFW_NextGen/templates/vsn.env @@ -15,8 +15,8 @@ parameters: vsn_name_0: zdfw1fwl01snk01 vnf_id: vSink_demo_app vf_module_id: vFirewallCL - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vfw_key cloud_env: PUT openstack OR rackspace HERE sec_group: PUT THE ONAP SECURITY GROUP HERE diff --git a/heat/vIPsec/vIPsec/base_vipsec.env b/heat/vIPsec/vIPsec/base_vipsec.env index 20c39d26..3b840be5 100644 --- a/heat/vIPsec/vIPsec/base_vipsec.env +++ b/heat/vIPsec/vIPsec/base_vipsec.env @@ -50,8 +50,8 @@ parameters: vf_module_id: vIPsec dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vipsec_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: openstack diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env index d52afaf6..a57f75ff 100644 --- a/heat/vLB/base_vlb.env +++ b/heat/vLB/base_vlb.env @@ -26,8 +26,8 @@ parameters: vf_module_id: vLoadBalancer dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vlb_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT openstack OR backspace HERE diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env index d6a62ac4..01098115 100644 --- a/heat/vLB/dnsscaling.env +++ b/heat/vLB/dnsscaling.env @@ -14,8 +14,8 @@ parameters: vdns_name_0: zdfw1lb01dns02 vnf_id: vLoadBalancer_demo_app vf_module_id: vLoadBalancer - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 key_name: vlb_key_scaling pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN cloud_env: PUT openstack OR backspace HERE diff --git a/heat/vLBMS/base_vlb.env b/heat/vLBMS/base_vlb.env index 624c4159..5630b4df 100644 --- a/heat/vLBMS/base_vlb.env +++ b/heat/vLBMS/base_vlb.env @@ -50,8 +50,8 @@ parameters: dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 nb_api_version: 1.2.0 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 cloud_env: PUT openstack OR rackspace HERE sec_group: PUT THE ONAP SECURITY GROUP HERE nexus_artifact_repo: https://nexus.onap.org diff --git a/heat/vLBMS/dnsscaling.env b/heat/vLBMS/dnsscaling.env index 2741ac59..1213ad7c 100644 --- a/heat/vLBMS/dnsscaling.env +++ b/heat/vLBMS/dnsscaling.env @@ -33,7 +33,7 @@ parameters: # APP/USER_DATA nb_api_version: 1.2.0 - install_script_version: 1.4.0-SNAPSHOT + install_script_version: 1.4.0 cloud_env: PUT openstack OR rackspace HERE sec_group: PUT THE ONAP SECURITY GROUP HERE nexus_artifact_repo: https://nexus.onap.org diff --git a/heat/vLB_CDS/vdns.env b/heat/vLB_CDS/vdns.env index 3c0657a8..3a5ad63d 100644 --- a/heat/vLB_CDS/vdns.env +++ b/heat/vLB_CDS/vdns.env @@ -32,7 +32,7 @@ parameters: # APP/USER_DATA nb_api_version: 1.2.0 - install_script_version: 1.4.0-SNAPSHOT + install_script_version: 1.4.0 cloud_env: PUT openstack OR rackspace HERE sec_group: PUT THE ONAP SECURITY GROUP HERE nexus_artifact_repo: https://nexus.onap.org \ No newline at end of file diff --git a/heat/vLB_CDS/vlb.env b/heat/vLB_CDS/vlb.env index d3ca3614..781240e5 100644 --- a/heat/vLB_CDS/vlb.env +++ b/heat/vLB_CDS/vlb.env @@ -43,8 +43,8 @@ parameters: dcae_collector_ip: 10.0.4.1 dcae_collector_port: 30235 nb_api_version: 1.2.0 - install_script_version: 1.4.0-SNAPSHOT - demo_artifacts_version: 1.4.0-SNAPSHOT + install_script_version: 1.4.0 + demo_artifacts_version: 1.4.0 cloud_env: PUT openstack OR rackspace HERE sec_group: PUT THE ONAP SECURITY GROUP HERE nexus_artifact_repo: https://nexus.onap.org \ No newline at end of file diff --git a/heat/vLB_CDS/vpkg.env b/heat/vLB_CDS/vpkg.env index 4a1a7cde..3f68f345 100644 --- a/heat/vLB_CDS/vpkg.env +++ b/heat/vLB_CDS/vpkg.env @@ -31,8 +31,8 @@ parameters: # APP/USER_DATA pg_int: 192.168.9.109 nb_api_version: 1.2.0 - demo_artifacts_version: 1.4.0-SNAPSHOT - install_script_version: 1.4.0-SNAPSHOT + demo_artifacts_version: 1.4.0 + install_script_version: 1.4.0 cloud_env: PUT openstack OR rackspace HERE sec_group: PUT THE ONAP SECURITY GROUP HERE nexus_artifact_repo: https://nexus.onap.org \ No newline at end of file diff --git a/pom.xml b/pom.xml index 524e3060..ebf2cfa7 100755 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,8 @@ vnfs/vFW/scripts vnfs/vLB/scripts vnfs/vLBMS/scripts + vnfs/vIPSEC/pg_streams + vnfs/vIPSEC/scripts diff --git a/vnfs/honeycomb_plugin/parent-pom/pom.xml b/vnfs/honeycomb_plugin/parent-pom/pom.xml index d331f68e..2b7fe77e 100644 --- a/vnfs/honeycomb_plugin/parent-pom/pom.xml +++ b/vnfs/honeycomb_plugin/parent-pom/pom.xml @@ -69,12 +69,9 @@ done - - ../stream-count/stream-count-api ../stream-count/stream-count-impl ../stream-count/stream-count-distribution - -- cgit 1.2.3-korg