diff options
36 files changed, 1188 insertions, 24 deletions
diff --git a/boot/aai_install.sh b/boot/aai_install.sh index d11e1e18..dcb7119e 100644 --- a/boot/aai_install.sh +++ b/boot/aai_install.sh @@ -10,6 +10,10 @@ CLOUD_ENV=$(cat /opt/config/cloud_env.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/appc_install.sh b/boot/appc_install.sh index 4df0b4b8..a1e38393 100644 --- a/boot/appc_install.sh +++ b/boot/appc_install.sh @@ -11,6 +11,10 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/asdc_install.sh b/boot/asdc_install.sh index fa6e7994..99b2a39c 100644 --- a/boot/asdc_install.sh +++ b/boot/asdc_install.sh @@ -11,6 +11,10 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/dcae_install.sh b/boot/dcae_install.sh index 6ea93ff2..ee818e19 100644 --- a/boot/dcae_install.sh +++ b/boot/dcae_install.sh @@ -42,6 +42,10 @@ if [[ $CLOUD_ENV != "rackspace" ]] then # Add host name to /etc/host to avoid warnings in openstack images echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/dns_install.sh b/boot/dns_install.sh index 0bb2e5df..152a723a 100644 --- a/boot/dns_install.sh +++ b/boot/dns_install.sh @@ -9,6 +9,10 @@ if [[ $CLOUD_ENV != "rackspace" ]] then # Add host name to /etc/host to avoid warnings in openstack images echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh # Set the Bind configuration file name based on the deployment environment ZONE_FILE="bind_zones" diff --git a/boot/mr_install.sh b/boot/mr_install.sh index 480f2ea9..61c94729 100644 --- a/boot/mr_install.sh +++ b/boot/mr_install.sh @@ -11,6 +11,10 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/mso_install.sh b/boot/mso_install.sh index 491db5ce..fe7a9149 100644 --- a/boot/mso_install.sh +++ b/boot/mso_install.sh @@ -12,6 +12,10 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/policy_install.sh b/boot/policy_install.sh index c3f72a0c..eeb319f4 100644 --- a/boot/policy_install.sh +++ b/boot/policy_install.sh @@ -11,6 +11,10 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/portal_install.sh b/boot/portal_install.sh index f9ca52bb..95f0bb21 100644 --- a/boot/portal_install.sh +++ b/boot/portal_install.sh @@ -11,6 +11,10 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/robot_install.sh b/boot/robot_install.sh index b5b73878..0871f692 100644 --- a/boot/robot_install.sh +++ b/boot/robot_install.sh @@ -11,6 +11,10 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh index 44c15580..a62aeab9 100644 --- a/boot/sdnc_install.sh +++ b/boot/sdnc_install.sh @@ -11,6 +11,10 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/vid_install.sh b/boot/vid_install.sh index 2bdd89be..4fbb6ece 100644 --- a/boot/vid_install.sh +++ b/boot/vid_install.sh @@ -11,6 +11,10 @@ GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt) if [[ $CLOUD_ENV != "rackspace" ]] then echo 127.0.0.1 $(hostname) >> /etc/hosts + + # Allow remote login as root + mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk + cp /home/ubuntu/.ssh/authorized_keys /root/.ssh fi # Set private IP in /etc/network/interfaces manually in the presence of public interface diff --git a/boot/vid_vm_init.sh b/boot/vid_vm_init.sh index fe2bb56a..601ad16c 100644 --- a/boot/vid_vm_init.sh +++ b/boot/vid_vm_init.sh @@ -18,4 +18,4 @@ docker rm -f vid-server docker run --name vid-mariadb -e MYSQL_DATABASE=vid_openecomp_epsdk -e MYSQL_USER=vidadmin -e MYSQL_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -e MYSQL_ROOT_PASSWORD=LF+tp_1WqgSY -v /opt/vid/lf_config/vid-my.cnf:/etc/mysql/my.cnf -v /opt/vid/lf_config/vid-pre-init.sql:/docker-entrypoint-initdb.d/vid-pre-init.sql -v /var/lib/mysql -d mariadb:10 -docker run -e VID_MYSQL_DBNAME=vid_openecomp -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d $NEXUS_DOCKER_REPO/openecomp/vid:$DOCKER_IMAGE_VERSION +docker run -e VID_MYSQL_DBNAME=vid_openecomp_epsdk -e VID_MYSQL_PASS=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U --name vid-server -p 8080:8080 --link vid-mariadb:vid-mariadb-docker-instance -d $NEXUS_DOCKER_REPO/openecomp/vid:$DOCKER_IMAGE_VERSION diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml index 88062ffe..7237dee4 100644 --- a/heat/OpenECOMP/onap_openstack.yaml +++ b/heat/OpenECOMP/onap_openstack.yaml @@ -1,3 +1,27 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + heat_template_version: 2015-10-15 description: Heat template to install ONAP components diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml index 6bda4d2c..5623e49c 100644 --- a/heat/OpenECOMP/onap_openstack_float.yaml +++ b/heat/OpenECOMP/onap_openstack_float.yaml @@ -1,3 +1,27 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + heat_template_version: 2015-10-15 description: Heat template to install ONAP components diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml index 307db1a2..2eb0c251 100644 --- a/heat/OpenECOMP/onap_openstack_nofloat.yaml +++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml @@ -1,3 +1,27 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + heat_template_version: 2013-05-23 description: Heat template to install ONAP components diff --git a/heat/OpenECOMP/onap_rackspace.yaml b/heat/OpenECOMP/onap_rackspace.yaml index d92484a1..c4784971 100644 --- a/heat/OpenECOMP/onap_rackspace.yaml +++ b/heat/OpenECOMP/onap_rackspace.yaml @@ -1,3 +1,27 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + heat_template_version: 2013-05-23 description: Heat template to deploy ONAP components diff --git a/heat/vFW/base_vfw_openstack.yaml b/heat/vFW/base_vfw_openstack.yaml index 27ebb22b..6ef33cca 100644 --- a/heat/vFW/base_vfw_openstack.yaml +++ b/heat/vFW/base_vfw_openstack.yaml @@ -1,7 +1,37 @@ +##########################################################################
+#
+#==================LICENSE_START==========================================
+#
+#
+# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#==================LICENSE_END============================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+##########################################################################
+
heat_template_version: 2013-05-23
description: Heat template that deploys vFirewall demo app for ONAP
+##############
+# #
+# PARAMETERS #
+# #
+##############
+
parameters:
vfw_image_name:
type: string
@@ -128,6 +158,12 @@ parameters: label: Cloud environment
description: Cloud environment (e.g., openstack, rackspace)
+#############
+# #
+# RESOURCES #
+# #
+#############
+
resources:
random-str:
type: OS::Heat::RandomString
diff --git a/heat/vFW/base_vfw_rackspace.yaml b/heat/vFW/base_vfw_rackspace.yaml index 868ebc38..01d6c441 100644 --- a/heat/vFW/base_vfw_rackspace.yaml +++ b/heat/vFW/base_vfw_rackspace.yaml @@ -1,7 +1,37 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + heat_template_version: 2013-05-23 description: Heat template that deploys vFirewall demo app for ONAP +############## +# # +# PARAMETERS # +# # +############## + parameters: vfw_image_name: type: string @@ -128,6 +158,12 @@ parameters: label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) +############# +# # +# RESOURCES # +# # +############# + resources: random-str: type: OS::Heat::RandomString diff --git a/heat/vLB/.DS_Store b/heat/vLB/.DS_Store Binary files differdeleted file mode 100644 index 5008ddfc..00000000 --- a/heat/vLB/.DS_Store +++ /dev/null diff --git a/heat/vLB/base_vlb_openstack.env b/heat/vLB/base_vlb_openstack.env new file mode 100644 index 00000000..87f77d72 --- /dev/null +++ b/heat/vLB/base_vlb_openstack.env @@ -0,0 +1,29 @@ +parameters: + vlb_image_name: PUT THE IMAGE NAME HERE + vlb_flavor_name: PUT THE FLAVOR NAME HERE + public_net_id: PUT THE NETWORK ID HERE + vlb_private_net_id: zdfw1lb01_private + onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + vlb_private_net_cidr: 192.168.10.0/24 + vlb_private_net_id_for_floating: zdfw1lb01_private_for_floating + vlb_private_net_cidr_for_floating: 192.168.30.0/24 + onap_private_net_cidr: PUT THE ONAP NETWORK CIDR HERE + vlb_private_ip_0: 192.168.10.111 + vlb_private_ip_1: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VLB + vlb_private_ip_2_for_floating: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VLB + vdns_private_ip_0: 192.168.10.211 + vdns_private_ip_1: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS + vlb_name_0: zdfw1lb01lb01 + vdns_name_0: zdfw1lb01dns01 + vnf_id: vLoadBalancer_demo_app + vf_module_id: vLoadBalancer + dcae_collector_ip: PUT THE ADDRESS OF THE DCAE COLLECTOR HERE + dcae_collector_port: 8080 + repo_url_blob: https://nexus.onap.org/content/sites/raw + repo_url_artifacts: https://nexus.onap.org/content/groups/staging + demo_artifacts_version: 1.1.0 + install_script_version: 1.1.0-SNAPSHOT + key_name: vlb_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_openstack.yaml b/heat/vLB/base_vlb_openstack.yaml new file mode 100644 index 00000000..fe59d7fb --- /dev/null +++ b/heat/vLB/base_vlb_openstack.yaml @@ -0,0 +1,338 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + +heat_template_version: 2013-05-23 + +description: Heat template to deploy vLoadBalancer/vDNS demo app for ONAP + +############## +# # +# PARAMETERS # +# # +############## + +parameters: + vlb_image_name: + type: string + label: Image name or ID + description: Image to be used for compute instance + vlb_flavor_name: + type: string + label: Flavor + description: Type of instance (flavor) to be used + public_net_id: + type: string + label: Public network name or ID + description: Public network that enables remote connection to VNF + vlb_private_net_id: + type: string + label: vLoadBalancer private network name or ID + description: Private network that connects vLoadBalancer with vDNSs + vlb_private_net_id_for_floating: + type: string + label: vLoadBalancer private network name or ID + description: Private network that connects vLoadBalancer with the public OpenStack network using floating IP + onap_private_net_id: + type: string + label: ECOMP management network name or ID + description: Private network that connects ONAP component and the VNF + onap_private_subnet_id: + type: string + label: ECOMP management sub-network name or ID + description: Private sub-network that connects ONAP component and the VNF + vlb_private_net_cidr: + type: string + label: vLoadBalancer private network CIDR + description: The CIDR of the vLoadBalancer private network + vlb_private_net_cidr_for_floating: + type: string + label: vLoadBalancer private network CIDR + description: The CIDR of the vLoadBalancer private network that connects vLoadBalancer with the public OpenStack network using floating IP + onap_private_net_cidr: + type: string + label: ONAP private network CIDR + description: The CIDR of the protected private network + vlb_private_ip_0: + type: string + label: vLoadBalancer private IP address towards the private network + description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs + vlb_private_ip_1: + type: string + label: vLoadBalancer private IP address towards the ONAP management network + description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components + vlb_private_ip_2_for_floating: + type: string + label: vLoadBalancer private IP address towards the OpenStack public network via floating IP + description: vLoadBalancer private IP address towards the OpenStack public network via floating IP + vdns_private_ip_0: + type: string + label: vDNS private IP address towards the private network + description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer + vdns_private_ip_1: + type: string + label: vDNS private IP address towards the ONAP management network + description: Private IP address that is assigned to the vDNS to communicate with ONAP components + vlb_name_0: + type: string + label: vLoadBalancer name + description: Name of the vLoadBalancer + vdns_name_0: + type: string + label: vDNS name + description: Name of the vDNS + vnf_id: + type: string + label: VNF ID + description: The VNF ID is provided by ONAP + vf_module_id: + type: string + label: vFirewall module ID + description: The vLoadBalancer Module ID is provided by ONAP + dcae_collector_ip: + type: string + label: DCAE collector IP address + description: IP address of the DCAE collector + dcae_collector_port: + type: string + label: DCAE collector port + description: Port of the DCAE collector + key_name: + type: string + label: Key pair name + description: Public/Private key pair name + pub_key: + type: string + label: Public key + description: Public key to be installed on the compute instance + repo_url_blob: + type: string + label: Repository URL + description: URL of the repository that hosts the demo packages + 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 + description: Artifacts (jar, tar.gz) version used in demo vnfs + install_script_version: + type: string + label: Installation script version number + description: Version number of the scripts that install the vFW demo app + cloud_env: + type: string + label: Cloud environment + description: Cloud environment (e.g., openstack, rackspace) + +############# +# # +# RESOURCES # +# # +############# + +resources: + + random-str: + type: OS::Heat::RandomString + properties: + length: 4 + + my_keypair: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: base_rand + params: + base: { get_param: key_name } + rand: { get_resource: random-str } + public_key: { get_param: pub_key } + save_private_key: false + + vlb_private_network: + type: OS::Neutron::Net + properties: + name: { get_param: vlb_private_net_id } + + vlb_private_subnet: + type: OS::Neutron::Subnet + properties: + name: { get_param: vlb_private_net_id } + network_id: { get_resource: vlb_private_network } + cidr: { get_param: vlb_private_net_cidr } + +# vlb_private_network_for_floating: +# type: OS::Neutron::Net +# properties: +# name: { get_param: vlb_private_net_id_for_floating } + +# vlb_private_subnet_for_floating: +# type: OS::Neutron::Subnet +# properties: +# name: { get_param: vlb_private_net_id_for_floating } +# network_id: { get_resource: vlb_private_network_for_floating } +# network_id: { get_param: onap_private_net_id } +# cidr: { get_param: vlb_private_net_cidr_for_floating } + +# router_interface: +# type: OS::Neutron::RouterInterface +# properties: +# router_id: d6f7a5c3-8bae-4171-aebd-c53a8c85b2ee +# subnet_id: { get_resource: vlb_private_subnet_for_floating } + + vlb_private_0_port: + type: OS::Neutron::Port + properties: + network: { get_resource: vlb_private_network } + fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vlb_private_ip_0 }}] + + vlb_private_1_port: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vlb_private_ip_1 }}] + +# vlb_private_2_port_for_floating: +# type: OS::Neutron::Port +# properties: +# network: { get_param: onap_private_net_id } +# fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vlb_private_ip_2_for_floating }}] + + vlb_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: vlb_private_1_port } +# port_id: { get_resource: vlb_private_2_port_for_floating } + + vlb_0: + type: OS::Nova::Server + properties: + image: { get_param: vlb_image_name } + flavor: { get_param: vlb_flavor_name } + name: { get_param: vlb_name_0 } + key_name: { get_resource: my_keypair } + networks: + - port: { get_resource: vlb_private_2_port_for_floating } + - port: { get_resource: vlb_private_0_port } + - port: { get_resource: vlb_private_1_port } + metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} + user_data_format: RAW + user_data: + str_replace: + params: + __dcae_collector_ip__: { get_param: dcae_collector_ip } + __dcae_collector_port__: { get_param: dcae_collector_port } + __local_public_ipaddr__: { get_attr: [vlb_floating_ip, floating_ip_address] } + __local_private_ipaddr__: { get_param: vlb_private_ip_0 } + __oam_private_ipaddr__: { get_param: vlb_private_ip_1 } + __repo_url_blob__ : { get_param: repo_url_blob } + __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 } + template: | + #!/bin/bash + + # Create configuration files + mkdir /opt/config + echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt + echo "__dcae_collector_port__" > /opt/config/dcae_collector_port.txt + echo "__local_public_ipaddr__" > /opt/config/local_public_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_blob__" > /opt/config/repo_url_blob.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 + + # Download and run install script + curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vlb/__install_script_version__/v_lb_install.sh -o /opt/v_lb_install.sh + cd /opt + chmod +x v_lb_install.sh + ./v_lb_install.sh + + + vdns_private_0_port: + type: OS::Neutron::Port + properties: + network: { get_resource: vlb_private_network } + fixed_ips: [{"subnet": { get_resource: vlb_private_subnet }, "ip_address": { get_param: vdns_private_ip_0 }}] + + vdns_private_1_port: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] + + vdns_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: vdns_private_1_port } + + vdns_0: + type: OS::Nova::Server + properties: + image: { get_param: vlb_image_name } + flavor: { get_param: vlb_flavor_name } + name: { get_param: vdns_name_0 } + key_name: { get_resource: my_keypair } + networks: + - port: { get_resource: vdns_private_1_port } + - port: { get_resource: vdns_private_0_port } + metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} + user_data_format: RAW + user_data: + str_replace: + params: + __lb_oam_int__ : { get_param: vlb_private_ip_1 } + __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } + __local_private_ipaddr__: { get_param: vdns_private_ip_0 } + __repo_url_blob__ : { get_param: repo_url_blob } + __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 } + template: | + #!/bin/bash + + # Create configuration files + mkdir /opt/config + echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt + echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt + echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.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 + + # Download and run install script + curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vlb/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh + cd /opt + chmod +x v_dns_install.sh + ./v_dns_install.sh
\ No newline at end of file diff --git a/heat/vLB/base_vlb_rackspace.yaml b/heat/vLB/base_vlb_rackspace.yaml index f32bd29b..0bd138be 100644 --- a/heat/vLB/base_vlb_rackspace.yaml +++ b/heat/vLB/base_vlb_rackspace.yaml @@ -1,7 +1,37 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + heat_template_version: 2013-05-23 description: Heat template to deploy vLoadBalancer/vDNS demo app for ONAP +############## +# # +# PARAMETERS # +# # +############## + parameters: vlb_image_name: type: string @@ -104,6 +134,12 @@ parameters: label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) +############# +# # +# RESOURCES # +# # +############# + resources: random-str: diff --git a/heat/vLB/dnsscaling_openstack.env b/heat/vLB/dnsscaling_openstack.env new file mode 100644 index 00000000..dc9679ea --- /dev/null +++ b/heat/vLB/dnsscaling_openstack.env @@ -0,0 +1,21 @@ +parameters: + vlb_image_name: PUT THE IMAGE NAME HERE + vlb_flavor_name: PUT THE FLAVOR NAME HERE + public_net_id: PUT THE NETWORK ID HERE + vlb_private_net_id: zdfw1lb01_private + onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + vlb_private_ip_0: 192.168.10.111 + vlb_private_ip_1: PUT THE PRIVATE ADDRESS OF THE VLB IN THE ONAP NETWORK SPACE HERE + vdns_private_ip_0: 192.168.10.212 + vdns_private_ip_1: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE VDNS + vdns_name_0: zdfw1lb01dns02 + vnf_id: vLoadBalancer_demo_app + vf_module_id: vLoadBalancer + repo_url_blob: https://nexus.onap.org/content/sites/raw + repo_url_artifacts: https://nexus.onap.org/content/groups/staging + demo_artifacts_version: 1.1.0 + install_script_version: 1.1.0-SNAPSHOT + key_name: vlb_key_scaling + pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN + cloud_env: openstack diff --git a/heat/vLB/dnsscaling_openstack.yaml b/heat/vLB/dnsscaling_openstack.yaml new file mode 100644 index 00000000..b9dc41a2 --- /dev/null +++ b/heat/vLB/dnsscaling_openstack.yaml @@ -0,0 +1,201 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + +heat_template_version: 2013-05-23 + +description: Heat template to deploy a vDNS for ONAP (scaling-up scenario) + +############## +# # +# PARAMETERS # +# # +############## + +parameters: + vlb_image_name: + type: string + label: Image name or ID + description: Image to be used for compute instance + vlb_flavor_name: + type: string + label: Flavor + description: Type of instance (flavor) to be used + public_net_id: + type: string + label: Public network name or ID + description: Public network that enables remote connection to VNF + vlb_private_net_id: + type: string + label: vLoadBalancer private network name or ID + description: Private network that connects vLoadBalancer with vDNSs + onap_private_net_id: + type: string + label: ONAP management network name or ID + description: Private network that connects ONAP component and the VNF + onap_private_subnet_id: + type: string + label: ONAP management sub-network name or ID + description: Private sub-network that connects ONAP component and the VNF + vlb_private_ip_0: + type: string + label: vLoadBalancer private IP address towards the private network + description: Private IP address that is assigned to the vLoadBalancer to communicate with the vDNSs + vlb_private_ip_1: + type: string + label: vLoadBalancer private IP address towards the ONAP management network + description: Private IP address that is assigned to the vLoadBalancer to communicate with ONAP components + vdns_private_ip_0: + type: string + label: vDNS private IP address towards the private network + description: Private IP address that is assigned to the vDNS to communicate with the vLoadBalancer + vdns_private_ip_1: + type: string + label: vDNS private IP address towards the ONAP management network + description: Private IP address that is assigned to the vDNS to communicate with ONAP components + vdns_name_0: + type: string + label: vDNS name + description: Name of the vDNS + vnf_id: + type: string + label: VNF ID + description: The VNF ID is provided by ONAP + vf_module_id: + type: string + label: vFirewall module ID + description: The vLoadBalancer Module ID is provided by ONAP + key_name: + type: string + label: Key pair name + description: Public/Private key pair name + pub_key: + type: string + label: Public key + description: Public key to be installed on the compute instance + repo_url_blob: + type: string + label: Repository URL + description: URL of the repository that hosts the demo packages + 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 + description: Version number of the scripts that install the vFW demo app + demo_artifacts_version: + type: string + label: Artifacts version used in demo vnfs + description: Artifacts (jar, tar.gz) version used in demo vnfs + cloud_env: + type: string + label: Cloud environment + description: Cloud environment (e.g., openstack, rackspace) + +############# +# # +# RESOURCES # +# # +############# + +resources: + + random-str: + type: OS::Heat::RandomString + properties: + length: 4 + + my_keypair: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: base_rand + params: + base: { get_param: key_name } + rand: { get_resource: random-str } + public_key: { get_param: pub_key } + save_private_key: false + + vdns_private_0_port: + type: OS::Neutron::Port + properties: + network: { get_param: vlb_private_net_id } + fixed_ips: [{"subnet": { get_param: vlb_private_net_id }, "ip_address": { get_param: vdns_private_ip_0 }}] + + vdns_private_1_port: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vdns_private_ip_1 }}] + + vdns_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: vdns_private_1_port } + + vdns_0: + type: OS::Nova::Server + properties: + image: { get_param: vlb_image_name } + flavor: { get_param: vlb_flavor_name } + name: { get_param: vdns_name_0 } + key_name: { get_resource: my_keypair } + networks: + - port: { get_resource: vdns_private_1_port } + - port: { get_resource: vdns_private_0_port } + metadata: {vnf_id: { get_param: vnf_id }, vf_module_id: { get_param: vf_module_id }} + user_data_format: RAW + user_data: + str_replace: + params: + __lb_oam_int__ : { get_param: vlb_private_ip_1 } + __lb_private_ipaddr__: { get_param: vlb_private_ip_0 } + __local_private_ipaddr__: { get_param: vdns_private_ip_0 } + __repo_url_blob__ : { get_param: repo_url_blob } + __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 } + template: | + #!/bin/bash + + # Create configuration files + mkdir /opt/config + echo "__lb_oam_int__" > /opt/config/lb_oam_int.txt + echo "__lb_private_ipaddr__" > /opt/config/lb_private_ipaddr.txt + echo "__local_private_ipaddr__" > /opt/config/local_private_ipaddr.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.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 + + # Download and run install script + curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vlb/__install_script_version__/v_dns_install.sh -o /opt/v_dns_install.sh + cd /opt + chmod +x v_dns_install.sh + ./v_dns_install.sh
\ No newline at end of file diff --git a/heat/vLB/dnsscaling_rackspace.yaml b/heat/vLB/dnsscaling_rackspace.yaml index 966a5155..c2043dd5 100644 --- a/heat/vLB/dnsscaling_rackspace.yaml +++ b/heat/vLB/dnsscaling_rackspace.yaml @@ -1,7 +1,37 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + heat_template_version: 2013-05-23 description: Heat template to deploy a vDNS for ONAP (scaling-up scenario) +############## +# # +# PARAMETERS # +# # +############## + parameters: vlb_image_name: type: string @@ -84,6 +114,12 @@ parameters: label: Cloud environment description: Cloud environment (e.g., openstack, rackspace) +############# +# # +# RESOURCES # +# # +############# + resources: random-str: diff --git a/heat/vLB/packet_gen_vlb_openstack.env b/heat/vLB/packet_gen_vlb_openstack.env new file mode 100644 index 00000000..028dd58d --- /dev/null +++ b/heat/vLB/packet_gen_vlb_openstack.env @@ -0,0 +1,15 @@ +parameters: + vpg_image_name: PUT THE IMAGE NAME HERE + vpg_flavor_name: PUT THE FLAVOR NAME HERE + public_net_id: PUT THE NETWORK ID HERE + vpg_private_ip_0_for_floating: ASSIGN A PRIVATE ADDRESS IN THE ONAP NETWORK SPACE TO THE PACKET GENERATOR + vlb_ipaddr: 135.207.129.131 + vpg_name_0: ziad1vdnspg01pg01 + onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE + repo_url_blob: https://nexus.onap.org/content/sites/raw + repo_url_artifacts: https://nexus.onap.org/content/groups/staging + demo_artifacts_version: 1.1.0 + install_script_version: 1.1.0-SNAPSHOT + key_name: pgforvdnsdemo_key + pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN diff --git a/heat/vLB/packet_gen_vlb_openstack.yaml b/heat/vLB/packet_gen_vlb_openstack.yaml new file mode 100644 index 00000000..21fbc90d --- /dev/null +++ b/heat/vLB/packet_gen_vlb_openstack.yaml @@ -0,0 +1,162 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + +heat_template_version: 2013-05-23 +description: Heat template to deploy a packet generator for the vLoadBalancer/vDNS demo app for ONAP + +############## +# # +# PARAMETERS # +# # +############## + +parameters: + public_net_id: + type: string + label: Public network name or ID + description: Public network that enables remote connection to VNF + vpg_image_name: + type: string + label: Image name or ID + description: Image to be used for compute instance + vpg_flavor_name: + type: string + label: Flavor + description: Type of instance (flavor) to be used + vpg_name_0: + type: string + label: vPacketGenerator name + description: Name of the vPacketGenerator + key_name: + type: string + label: Key pair name + description: Public/Private key pair name + pub_key: + type: string + label: Public key + description: Public key to be installed on the compute instance + repo_url_blob: + type: string + label: Repository URL + description: URL of the repository that hosts the demo packages + repo_url_artifacts: + type: string + label: Repository URL + description: URL of the repository that hosts the demo packages + vlb_ipaddr: + type: string + label: Public IP of the vLoadBalancer to which we want to send traffic + description: Public IP of the vLoadBalancer to which we want to send traffic + demo_artifacts_version: + type: string + label: Artifacts version used in demo vnfs + description: Artifacts (jar, tar.gz) version used in demo vnfs + install_script_version: + type: string + label: Installation script version number + description: Version number of the scripts that install the vFW demo app + onap_private_net_id: + type: string + label: ONAP management network name or ID + description: Private network that connects ONAP component and the VNF + onap_private_subnet_id: + type: string + label: ONAP management sub-network name or ID + description: Private sub-network that connects ONAP component and the VNF + vpg_private_ip_0_for_floating: + type: string + label: vPG private IP address towards the OpenStack public network via floating IP + description: vPG private IP address towards the OpenStack public network via floating IP + +############# +# # +# RESOURCES # +# # +############# + +resources: + + random-str: + type: OS::Heat::RandomString + properties: + length: 4 + + my_keypair: + type: OS::Nova::KeyPair + properties: + name: + str_replace: + template: base_rand + params: + base: { get_param: key_name } + rand: { get_resource: random-str } + public_key: { get_param: pub_key } + save_private_key: false + + vpg_private_0_port_for_floating: + type: OS::Neutron::Port + properties: + network: { get_param: onap_private_net_id } + fixed_ips: [{"subnet": { get_param: onap_private_subnet_id }, "ip_address": { get_param: vpg_private_ip_0_for_floating }}] + + vpg_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: vpg_private_0_port_for_floating } + + vpg_0: + type: OS::Nova::Server + properties: + image: { get_param: vpg_image_name } + flavor: { get_param: vpg_flavor_name } + name: { get_param: vpg_name_0 } + key_name: { get_resource: my_keypair } + networks: + - port: { get_resource: vpg_private_0_port_for_floating } + user_data_format: RAW + user_data: + str_replace: + params: + __repo_url_blob__ : { get_param: repo_url_blob } + __repo_url_artifacts__ : { get_param: repo_url_artifacts } + __vlb_ipaddr__: { get_param: vlb_ipaddr } + __demo_artifacts_version__ : { get_param: demo_artifacts_version } + __install_script_version__ : { get_param: install_script_version } + template: | + #!/bin/bash + + # Create configuration files + mkdir /opt/config + echo "__vlb_ipaddr__" > /opt/config/vlb_ipaddr.txt + echo "__repo_url_blob__" > /opt/config/repo_url_blob.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 + + # Download and run install script + curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh + cd /opt + chmod +x v_packetgen_install.sh + ./v_packetgen_install.sh
\ No newline at end of file diff --git a/heat/vLB/packet_gen_vlb_rackspace.env b/heat/vLB/packet_gen_vlb_rackspace.env index 43d7dca7..91002fed 100644 --- a/heat/vLB/packet_gen_vlb_rackspace.env +++ b/heat/vLB/packet_gen_vlb_rackspace.env @@ -10,4 +10,3 @@ parameters: install_script_version: 1.1.0-SNAPSHOT key_name: dns_packetgen_key pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN - cloud_env: rackspace diff --git a/heat/vLB/packet_gen_vlb_rackspace.yaml b/heat/vLB/packet_gen_vlb_rackspace.yaml index 94776fc6..fea9a770 100644 --- a/heat/vLB/packet_gen_vlb_rackspace.yaml +++ b/heat/vLB/packet_gen_vlb_rackspace.yaml @@ -1,6 +1,37 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + heat_template_version: 2013-05-23 + description: Heat template to deploy a packet generator for the vLoadBalancer/vDNS demo app for ONAP +############## +# # +# PARAMETERS # +# # +############## + parameters: public_net_id: type: string @@ -46,11 +77,12 @@ parameters: type: string label: Artifacts version used in demo vnfs description: Artifacts (jar, tar.gz) version used in demo vnfs - cloud_env: - type: string - label: Cloud environment - description: Cloud environment (e.g., openstack, rackspace) +############# +# # +# RESOURCES # +# # +############# resources: @@ -90,7 +122,6 @@ resources: __vlb_ipaddr__: { get_param: vlb_ipaddr } __demo_artifacts_version__ : { get_param: demo_artifacts_version } __install_script_version__ : { get_param: install_script_version } - __cloud_env__ : { get_param: cloud_env } template: | #!/bin/bash @@ -101,7 +132,6 @@ resources: 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 # Download and run install script curl -k __repo_url_blob__/org.openecomp.demo/vnfs/vlb/__install_script_version__/v_packetgen_install.sh -o /opt/v_packetgen_install.sh diff --git a/vnfs/vLB/scripts/set_gre_tunnel.sh b/vnfs/vLB/scripts/set_gre_tunnel.sh index 2fa6c64e..aaad66c1 100644 --- a/vnfs/vLB/scripts/set_gre_tunnel.sh +++ b/vnfs/vLB/scripts/set_gre_tunnel.sh @@ -9,13 +9,14 @@ fi LB_PUBLIC_IP=$1 LB_PRIVATE_IP=$(cat /opt/config/lb_private_ipaddr.txt) MY_PRIVATE_IP=$(cat /opt/config/local_private_ipaddr.txt) +OLD_GW=$(route -n | grep "^0.0.0.0" | awk '{print $2}') sed -i "s/x.x.x.x/"$LB_PUBLIC_IP"/g" /etc/bind/named.conf.options ip tunnel add gre123 mode gre remote $LB_PRIVATE_IP local $MY_PRIVATE_IP ttl 255 ip link set gre123 up -ip addr add $LB_PUBLIC_IP"/24" dev gre123 -ifconfig eth0 down +ip addr add $LB_PUBLIC_IP"/32" dev gre123 +route del default gw $OLD_GW route add default dev gre123 service bind9 restart diff --git a/vnfs/vLB/scripts/v_dns_install.sh b/vnfs/vLB/scripts/v_dns_install.sh index be2c5ed3..5e1d55bf 100644 --- a/vnfs/vLB/scripts/v_dns_install.sh +++ b/vnfs/vLB/scripts/v_dns_install.sh @@ -6,6 +6,20 @@ DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) +# OpenStack network configuration +if [[ $CLOUD_ENV == "openstack" ]] +then + echo 127.0.0.1 $(hostname) >> /etc/hosts + + VDNS_PRIVATE_IP_O=$(cat /opt/config/local_private_ipaddr.txt) + echo "auto eth1" >> /etc/network/interfaces + echo "iface eth1 inet static" >> /etc/network/interfaces + echo " address $VDNS_PRIVATE_IP_O" >> /etc/network/interfaces + echo " netmask 255.255.255.0" >> /etc/network/interfaces + + ifup eth1 +fi + # Download required dependencies add-apt-repository -y ppa:openjdk-r/ppa apt-get update diff --git a/vnfs/vLB/scripts/v_lb_init.sh b/vnfs/vLB/scripts/v_lb_init.sh index d130c1ec..e41c4ef3 100755 --- a/vnfs/vLB/scripts/v_lb_init.sh +++ b/vnfs/vLB/scripts/v_lb_init.sh @@ -4,6 +4,30 @@ start vpp sleep 1 +# Compute the network CIDR from the Netmask +mask2cidr() { + nbits=0 + IFS=. + for dec in $1 ; do + case $dec in + 255) let nbits+=8;; + 254) let nbits+=7;; + 252) let nbits+=6;; + 248) let nbits+=5;; + 240) let nbits+=4;; + 224) let nbits+=3;; + 192) let nbits+=2;; + 128) let nbits+=1;; + 0);; + *) echo "Error: $dec is not recognized"; exit 1 + esac + done + echo "$nbits" +} + +IPADDR1_MASK=$(ifconfig eth0 | grep "Mask" | awk '{print $4}' | awk -F ":" '{print $2}') +IPADDR1_CIDR=$(mask2cidr $IPADDR1_MASK) + # Configure VPP for vPacketGenerator IPADDR1=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) IPADDR2=$(ifconfig eth1 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) @@ -11,14 +35,14 @@ HWADDR1=$(ifconfig eth0 | grep HWaddr | tr -s ' ' | cut -d' ' -f5) HWADDR2=$(ifconfig eth1 | grep HWaddr | tr -s ' ' | cut -d' ' -f5) FAKE_HWADDR1=$(echo -n 00; dd bs=1 count=5 if=/dev/urandom 2>/dev/null |hexdump -v -e '/1 ":%02X"') FAKE_HWADDR2=$(echo -n 00; dd bs=1 count=5 if=/dev/urandom 2>/dev/null |hexdump -v -e '/1 ":%02X"') -GW=$(route | grep default | awk '{print $2}') +GW=$(route -n | grep "^0.0.0.0" | awk '{print $2}') ifconfig eth0 down ifconfig eth0 hw ether $FAKE_HWADDR1 ip addr flush dev eth0 ifconfig eth0 up vppctl tap connect tappub hwaddr $HWADDR1 -vppctl set int ip address tap-0 $IPADDR1"/24" +vppctl set int ip address tap-0 $IPADDR1"/"$IPADDR1_CIDR vppctl set int state tap-0 up brctl addbr br0 brctl addif br0 tappub diff --git a/vnfs/vLB/scripts/v_lb_install.sh b/vnfs/vLB/scripts/v_lb_install.sh index 5b84f21e..254a4753 100644 --- a/vnfs/vLB/scripts/v_lb_install.sh +++ b/vnfs/vLB/scripts/v_lb_install.sh @@ -6,6 +6,27 @@ DEMO_ARTIFACTS_VERSION=$(cat /opt/config/demo_artifacts_version.txt) INSTALL_SCRIPT_VERSION=$(cat /opt/config/install_script_version.txt) CLOUD_ENV=$(cat /opt/config/cloud_env.txt) +# OpenStack network configuration +if [[ $CLOUD_ENV == "openstack" ]] +then + echo 127.0.0.1 $(hostname) >> /etc/hosts + + VLB_PRIVATE_IP_O=$(cat /opt/config/local_private_ipaddr.txt) + echo "auto eth1" >> /etc/network/interfaces + echo "iface eth1 inet static" >> /etc/network/interfaces + echo " address $VLB_PRIVATE_IP_O" >> /etc/network/interfaces + echo " netmask 255.255.255.0" >> /etc/network/interfaces + +# VLB_PRIVATE_IP_1=$(cat /opt/config/oam_private_ipaddr.txt) +# echo "auto eth2" >> /etc/network/interfaces +# echo "iface eth2 inet static" >> /etc/network/interfaces +# echo " address $VLB_PRIVATE_IP_1" >> /etc/network/interfaces +# echo " netmask 255.255.255.0" >> /etc/network/interfaces + + ifup eth1 +# ifup eth2 +fi + # Download required dependencies add-apt-repository -y ppa:openjdk-r/ppa apt-get update diff --git a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh b/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh index 0968b5fa..9e7879bc 100644 --- a/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh +++ b/vnfs/vLB/scripts/v_packetgen_for_dns_demo_init.sh @@ -4,19 +4,43 @@ start vpp sleep 1 +# Compute the network CIDR from the Netmask +mask2cidr() { + nbits=0 + IFS=. + for dec in $1 ; do + case $dec in + 255) let nbits+=8;; + 254) let nbits+=7;; + 252) let nbits+=6;; + 248) let nbits+=5;; + 240) let nbits+=4;; + 224) let nbits+=3;; + 192) let nbits+=2;; + 128) let nbits+=1;; + 0);; + *) echo "Error: $dec is not recognized"; exit 1 + esac + done + echo "$nbits" +} + +IPADDR1_MASK=$(ifconfig eth0 | grep "Mask" | awk '{print $4}' | awk -F ":" '{print $2}') +IPADDR1_CIDR=$(mask2cidr $IPADDR1_MASK) + # Configure VPP for vPacketGenerator IPADDR1=$(ifconfig eth0 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2) HWADDR1=$(ifconfig eth0 | grep HWaddr | tr -s ' ' | cut -d' ' -f5) FAKE_HWADDR1=$(echo -n 00; dd bs=1 count=5 if=/dev/urandom 2>/dev/null | hexdump -v -e '/1 ":%02X"') VLB_IPADDR=$(cat /opt/config/vlb_ipaddr.txt) -GW=$(route | grep default | awk '{print $2}') +GW=$(route -n | grep "^0.0.0.0" | awk '{print $2}') ifconfig eth0 down ifconfig eth0 hw ether $FAKE_HWADDR1 ip addr flush dev eth0 ifconfig eth0 up vppctl tap connect tap111 hwaddr $HWADDR1 -vppctl set int ip address tap-0 $IPADDR1"/24" +vppctl set int ip address tap-0 $IPADDR1"/"$IPADDR1_CIDR vppctl set int state tap-0 up brctl addbr br0 brctl addif br0 tap111 @@ -26,9 +50,9 @@ vppctl ip route add 0.0.0.0/0 via $GW sleep 1 -#Let's set br0 with public IP and valid MAC so that Linux will have public network access +# Set br0 with public IP and valid MAC so that Linux will have public network access ifconfig br0 hw ether $HWADDR1 -ifconfig br0 $IPADDR1 netmask 255.255.255.0 +ifconfig br0 $IPADDR1 netmask $IPADDR1_MASK route add default gw $GW #Adding static arp entry for VPP so that it will be able to send packets to default GW @@ -38,15 +62,15 @@ sleep 3 GW_MAC=$(arp -n | grep -w $GW | tr -s ' ' | cut -d' ' -f3) VLB_MAC=$(arp -n | grep -w $VLB_IPADDR | tr -s ' ' | cut -d' ' -f3) -#if VLB in our network, we will use its mac -if [ ! -z "$VLB_MAC" ]; then -vppctl set ip arp tap-0 $VLB_IPADDR $VLB_MAC +# If VLB is in our network, we will use its MAC +if [ ! -z "$VLB_MAC" ] +then + vppctl set ip arp tap-0 $VLB_IPADDR $VLB_MAC fi -# in any case let's add arp entry for default gw +# Add arp entry for default GW vppctl set ip arp tap-0 $GW $GW_MAC - # Install packet streams sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns1 sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns2 @@ -59,8 +83,6 @@ sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/ sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns9 sed -i -e "0,/UDP/ s/UDP:.*/UDP: "$IPADDR1" -> "$VLB_IPADDR"/" /opt/dns_streams/stream_dns10 -#sed -i -e "s/.*-> 53.*/ UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns* - sed -i -e "s/.*-> 53.*/ UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns1 sed -i -e "s/.*-> 53.*/ UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns2 sed -i -e "s/.*-> 53.*/ UDP: $RANDOM -> 53/" /opt/dns_streams/stream_dns3 diff --git a/vnfs/vLB/scripts/v_packetgen_install.sh b/vnfs/vLB/scripts/v_packetgen_install.sh index bf08f63e..34503491 100644 --- a/vnfs/vLB/scripts/v_packetgen_install.sh +++ b/vnfs/vLB/scripts/v_packetgen_install.sh @@ -4,7 +4,6 @@ REPO_URL_BLOB=$(cat /opt/config/repo_url_blob.txt) 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) -CLOUD_ENV=$(cat /opt/config/cloud_env.txt) # Download required dependencies add-apt-repository -y ppa:openjdk-r/ppa |