Merge pull request #1980 from nuagenetworks/dev

5.4.0 Release
nuagenetworks · Dec 22, 2022 · 67cd8c8 · 67cd8c8
2 parents 40017cc + 4f44f2a
commit 67cd8c8
Show file tree

Hide file tree

Showing 103 changed files with 1,901 additions and 177 deletions.
diff --git a/Documentation/RELEASE_NOTES.md b/Documentation/RELEASE_NOTES.md
@@ -2,23 +2,21 @@
 
 ## Release info
 
-* MetroAE Version 5.3.0
+* MetroAE Version 5.4.0
 * Nuage Release Alignment 20.10.R1
-* Date of Release 05-September-2022
+* Date of Release 22-December-2022
 
 ## Release Contents
 
 ### Feature Enhancements
-* Add support for VSD upgrade to 20.10.R9 (METROAE-652)
-* Add support for VSTAT(ES) upgrade to 20.10.R8 (METROAE-659)
-* Allow users to shut down VMs (METROAE-629)
-* Add support for VSC CPU, memory  health check (METROAE-657) 
-* Enhance VSD health check report for CPU and memory (METROAE-656)
+* Add Support for TPM server Deployment (METROAE-461)
+* Add lowercase proxy env support (METROAE-662)
+* Remove {{ }} from when clauses in metro (METROAE-643)
 
 ### Resolved Issues
-* Update Documentation about SELinux and supported components (METROAE-660)
-* Investigate stats-out ES Upgrade from 20.10.R5 to 20.10.R7 (METROAE-608)
-* Fixed package 'Six' issue (METROAE-658)
+* Update the DevOps Website (devops.nuagenetworks.net) with the latest MetroAE container information (METROAE-627)
+* Fix internal network option for NUH deployment on OpenStack (METROAE-663)
+* Update the title for nsg_template_name to reflect the correct description (METROAE-501)
 
 ## Test Matrix
 

diff --git a/Documentation/SETUP.md b/Documentation/SETUP.md
@@ -13,7 +13,7 @@ Note that docker is required on the host in order to run MetroAE. All file paths
 * Locally available image files for VCS or VNS deployments within the git clone folder
 * Docker engine
 
-NOTE: SElinux must be disabled or set to permissive for MetroAE to work.
+##### NOTE: SElinux must be disabled or set to permissive for MetroAE to work.
 
 #### Steps
 
@@ -98,4 +98,4 @@ Ask questions and contact us directly at [[email protected]](mailto:devop
 
 Report bugs you find and suggest new features and enhancements via the [GitHub Issues](https://github.com/nuagenetworks/nuage-metroae/issues "nuage-metroae issues") feature.
 
-You may also [contribute](../CONTRIBUTING.md) to MetroAE by submitting your own code to the project.
+You may also [contribute](../CONTRIBUTING.md) to MetroAE by submitting your own code to the project.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Nuage Networks Metro Automation Engine (MetroAE)
 
-Version: 5.3.0
+Version: 5.4.0
 
 MetroAE is an automation engine that can be used to
 

diff --git a/convert_excel_to_deployment.py b/convert_excel_to_deployment.py
@@ -184,8 +184,9 @@ def read_data_entry(self, worksheet, labels, entry_offset,
                         entry[label] = value
                         self.cell_positions[label] = cell.coordinate
                 else:
-                    self.record_error(worksheet.title, cell.coordinate,
-                                      "Data entry for unknown label")
+                    self.record_error(worksheet.title, cell.coordinate, "Data entry for unknown label")
+                    if (worksheet.title == 'Nsgvs' and cell.coordinate == "B49"):
+                        print("\nERROR: NSG Infra Profile Template Name has been changed to NSG Template Name. \nPlease update your excel spreadsheet to be compatible with latest metroae version. \nYou can find excel spreadsheet in the metro github repo in examples/excel/ folder. \nUpdate the following excel sheet: nsgv_bootstrap.xlsx\n")
             else:
                 self.cell_positions[label] = cell.coordinate
             if fields_by_col:

diff --git a/deployments/default/common.yml b/deployments/default/common.yml
@@ -447,6 +447,11 @@ dns_server_list: [ ]
 #
 # webfilter_ram: 8
 
+# < KVM TPM RAM >
+# Amount of TPM RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
+#
+# tpm_ram: 8
+
 # < KVM Portal RAM >
 # Amount of Portal RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
 #
@@ -500,6 +505,11 @@ dns_server_list: [ ]
 #
 # webfilter_cpu_cores: 2
 
+# < KVM TPM VM CPU cores >
+# Number of CPU's for TPM vm. Valid only for KVM deployments
+#
+# tpm_cpu_cores: 2
+
 #############
 
 ##### Authentication

diff --git a/docker/build-container b/docker/build-container
@@ -6,10 +6,18 @@ if [[ -n "$HTTP_PROXY" ]]
 then
     export buildproxy="--build-arg http_proxy=$HTTP_PROXY"
 fi
+if [[ -n "$http_proxy" ]]
+then
+    export buildproxy="--build-arg http_proxy=$http_proxy"
+fi
 if [[ -n "$HTTPS_PROXY" ]]
 then
     export buildproxy="$buildproxy --build-arg https_proxy=$HTTPS_PROXY"
 fi
+if [[ -n "$https_proxy" ]]
+then
+    export buildproxy="$buildproxy --build-arg https_proxy=$https_proxy"
+fi
 
 cp -f ../yum_requirements.txt ./
 cp -f ../pip_requirements.txt ./

diff --git a/examples/active_standby_vsds/common.yml b/examples/active_standby_vsds/common.yml
@@ -362,6 +362,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # webfilter_ram: 8
 
+# < KVM TPM RAM >
+# Amount of TPM RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
+#
+# tpm_ram: 8
+
 # < KVM Portal RAM >
 # Amount of Portal RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
 #
@@ -415,6 +420,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # webfilter_cpu_cores: 2
 
+# < KVM TPM VM CPU cores >
+# Number of CPU's for TPM vm. Valid only for KVM deployments
+#
+# tpm_cpu_cores: 2
+
 #############
 
 ##### Authentication

diff --git a/examples/blank_deployment/common.yml b/examples/blank_deployment/common.yml
@@ -447,6 +447,11 @@ dns_server_list: [ ]
 #
 # webfilter_ram: 8
 
+# < KVM TPM RAM >
+# Amount of TPM RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
+#
+# tpm_ram: 8
+
 # < KVM Portal RAM >
 # Amount of Portal RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
 #
@@ -500,6 +505,11 @@ dns_server_list: [ ]
 #
 # webfilter_cpu_cores: 2
 
+# < KVM TPM VM CPU cores >
+# Number of CPU's for TPM vm. Valid only for KVM deployments
+#
+# tpm_cpu_cores: 2
+
 #############
 
 ##### Authentication

diff --git a/examples/blank_deployment/nsgvs.yml b/examples/blank_deployment/nsgvs.yml
@@ -226,7 +226,7 @@
 
     ##### NSG Advanced Options
 
-    # < NSG Infra Profile Template Name >
+    # < NSG Template Name >
     # Name of the NSG infra profile template on the VSD
     #
     # nsg_template_name: ""

diff --git a/examples/blank_deployment/nuh_external_interfaces.yml b/examples/blank_deployment/nuh_external_interfaces.yml
@@ -67,6 +67,8 @@
 
     ######################
 
+    ##### OpenStack Parameters
+
     # < OpenStack External Network >
     # Name of external network on OpenStack for NUH
     #
@@ -77,3 +79,15 @@
     #
     # openstack_external_subnet: ""
 
+    # < OpenStack external Port Name >
+    # Name for external interface
+    #
+    # openstack_external_port_name: ""
+
+    # < OpenStack Port Security Groups >
+    # Set of security groups to associate with external interface
+    #
+    # openstack_external_port_security_groups: []
+
+    ##########################
+
diff --git a/examples/blank_deployment/nuhs.yml b/examples/blank_deployment/nuhs.yml
@@ -186,13 +186,23 @@
     #
     # openstack_mgmt_port_security_groups: []
 
-    # < OpenStack Port Name >
-    # Name for Mgmt interface
+    # < OpenStack Internal Network >
+    # Name of Internal network on OpenStack for NUH
+    #
+    # openstack_internal_network: ""
+
+    # < OpenStack Internal Subnet >
+    # Name of Internal subnet on OpenStack for NUH
+    #
+    # openstack_internal_subnet: ""
+
+    # < OpenStack Internal Port Name >
+    # Name for Internal interface
     #
     # openstack_internal_port_name: ""
 
-    # < OpenStack Port Security Groups >
-    # Set of security groups to associate with Mgmt interface
+    # < OpenStack Internal Port Security Groups >
+    # Set of security groups to associate with Internal interface
     #
     # openstack_internal_port_security_groups: []
 

diff --git a/examples/blank_deployment/tpms.yml b/examples/blank_deployment/tpms.yml
@@ -0,0 +1,118 @@
+###############################################################################
+# Nuage TPM VM
+#
+# Configuration for Nuage TPM VMs
+#
+
+#
+# TPM 1
+#
+-
+    ##### Management Interface
+
+    # < TPM VM IP or FQDN >
+    # TPM VM hostname or IP address
+    #
+    hostname: ""
+
+    # < Management IP Address >
+    # Management IP of TPM VM
+    #
+    mgmt_ip: ""
+
+    # < Management Network Prefix Length >
+    # Management network prefix length for TPM VM
+    #
+    mgmt_ip_prefix: 0
+
+    # < Management Network Gateway >
+    # Management network gateway for TPM VM
+    #
+    mgmt_gateway: ""
+
+    # < Management Network Bridge >
+    # Network Bridge used for the management interface of TPM. It is a Linux network bridge. This field can be overridden by defining the management network bridge separately in the component configuration. Defaults to the global setting
+    #
+    # mgmt_bridge: (global Bridge interface)
+
+    ##########################
+
+    ##### VM and Target Server
+
+    # < VM name >
+    # Name of the Virtual Machine on the Hypervisor
+    #
+    # vmname: (Hostname)
+
+    # < Target Server Type >
+    # Type of hypervisor environment into which the instance will be created
+    # (kvm, openstack) 
+    #
+    # target_server_type: ""
+
+    # < Target Server IP or FQDN >
+    # Hostname or IP address of the hypervisor where VM will be instantiated
+    #
+    # target_server: ""
+
+    # < KVM cpuset information >
+    # Cpuset information for cpu pinning on KVM. For example, TPM requires 2 cores and sample values will be of the form [1, 2]
+    #
+    # cpuset: []
+
+    ##########################
+
+    # < Preserve TPM VM >
+    # Shuts down the vm during destroy process, instead of actually deleting them.
+    #
+    # preserve_vm: true/false
+
+    ##### OpenStack Parameters
+
+    # < OpenStack Image >
+    # Name of image installed on OpenStack for VSD
+    #
+    # openstack_image: ""
+
+    # < OpenStack Flavor >
+    # Name of instance flavor installed on OpenStack for VSD
+    #
+    # openstack_flavor: ""
+
+    # < OpenStack Availability Zone >
+    # Name of availability zone on OpenStack for VSD
+    #
+    # openstack_availability_zone: ""
+
+    # < OpenStack Network >
+    # Name of network on OpenStack for VSD
+    #
+    # openstack_network: ""
+
+    # < OpenStack Subnet >
+    # Name of subnet on OpenStack for VSD
+    #
+    # openstack_subnet: ""
+
+    # < OpenStack Port Name >
+    # Name for Mgmt interface
+    #
+    # openstack_port_name: ""
+
+    # < OpenStack Port Security Groups >
+    # Set of security groups to associate with Mgmt interface
+    #
+    # openstack_port_security_groups: []
+
+    # < OpenStack Project Name >
+    # Project name for OpenStack
+    #
+    # openstack_project_name: ""
+
+    # < OpenStack Keystone URL >
+    # Keystone URL for OpenStack
+    #
+    # openstack_auth_url: ""
+
+    ##########################
+
diff --git a/examples/excel/active_standby_vsds.xlsx b/examples/excel/active_standby_vsds.xlsx
diff --git a/examples/excel/aws_sdwan_install.xlsx b/examples/excel/aws_sdwan_install.xlsx
diff --git a/examples/excel/aws_sdwan_upgrade.xlsx b/examples/excel/aws_sdwan_upgrade.xlsx
diff --git a/examples/excel/blank_deployment.xlsx b/examples/excel/blank_deployment.xlsx
diff --git a/examples/excel/kvm_datacenter_install.xlsx b/examples/excel/kvm_datacenter_install.xlsx
diff --git a/examples/excel/kvm_portal_install.xlsx b/examples/excel/kvm_portal_install.xlsx
diff --git a/examples/excel/kvm_sdwan_install.xlsx b/examples/excel/kvm_sdwan_install.xlsx
diff --git a/examples/excel/kvm_vsc_upgrade.xlsx b/examples/excel/kvm_vsc_upgrade.xlsx
diff --git a/examples/excel/kvm_vsd_install.xlsx b/examples/excel/kvm_vsd_install.xlsx
diff --git a/examples/excel/nsgv_bootstrap.xlsx b/examples/excel/nsgv_bootstrap.xlsx
diff --git a/examples/excel/openstack_install.xlsx b/examples/excel/openstack_install.xlsx
diff --git a/examples/excel/stats_out.xlsx b/examples/excel/stats_out.xlsx
diff --git a/examples/excel/upgrade_datacenter_vcenter.xlsx b/examples/excel/upgrade_datacenter_vcenter.xlsx
diff --git a/examples/excel/vcenter_datacenter_install.xlsx b/examples/excel/vcenter_datacenter_install.xlsx
diff --git a/examples/excel/vcenter_sdwan_install.xlsx b/examples/excel/vcenter_sdwan_install.xlsx
diff --git a/examples/kvm_datacenter_install/common.yml b/examples/kvm_datacenter_install/common.yml
@@ -362,6 +362,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # webfilter_ram: 8
 
+# < KVM TPM RAM >
+# Amount of TPM RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
+#
+# tpm_ram: 8
+
 # < KVM Portal RAM >
 # Amount of Portal RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
 #
@@ -415,6 +420,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # webfilter_cpu_cores: 2
 
+# < KVM TPM VM CPU cores >
+# Number of CPU's for TPM vm. Valid only for KVM deployments
+#
+# tpm_cpu_cores: 2
+
 #############
 
 ##### Authentication

diff --git a/examples/kvm_portal_install/common.yml b/examples/kvm_portal_install/common.yml
@@ -362,6 +362,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # webfilter_ram: 8
 
+# < KVM TPM RAM >
+# Amount of TPM RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
+#
+# tpm_ram: 8
+
 # < KVM Portal RAM >
 # Amount of Portal RAM to allocate, in GB. Valid only for KVM deployments. Note: Values smaller than the default are for lab and PoC only. Production deployments must use a value greater than or equal to the default.
 #
@@ -415,6 +420,11 @@ dns_server_list: [ "10.1.0.2", ]
 #
 # webfilter_cpu_cores: 2
 
+# < KVM TPM VM CPU cores >
+# Number of CPU's for TPM vm. Valid only for KVM deployments
+#
+# tpm_cpu_cores: 2
+
 #############
 
 ##### Authentication