Merge branch 'main' of github.com:vmware/powershell-module-for-vmware-cloud-foundation-jsongenerator

Author: nathanthaler

.github/workflows/tests.yml

@@ -17,6 +17,8 @@ jobs:
         working-directory: ${{ github.workspace }}
         shell: pwsh
         run: |
+          Write-Output "INFO: Setting PowerShell Gallery as a trusted repository."
+          Set-PSRepository psgallery -InstallationPolicy trusted
           $moduleManifest = (Get-ChildItem -Path $env:GITHUB_WORKSPACE -Filter *.psd1).Name
           if ($moduleManifest) {
               Write-Output "SUCCESS: Manifest '$moduleManifest' found in '$env:GITHUB_WORKSPACE'."
@@ -31,31 +33,6 @@ jobs:
           }
           Write-Output "INFO: Reading module manifest '$moduleManifest'."
           $moduleManifestData = Import-PowerShellDataFile -Path $moduleManifest
-          $requiredModules = $moduleManifestData.RequiredModules
-          $requiredModules = $requiredModules | Where-Object { $_.ModuleName -ne 'VMware.vSphere.SsoAdmin' }
-          Write-Output "INFO: Required modules are $($requiredModules.ModuleName -join ', ')." 
-          foreach ($module in $requiredModules) {
-            $requiredModuleName = $module.ModuleName
-            $licenseUri = [System.Uri] (Find-Module -Name $requiredModuleName).LicenseUri
-            $gitUri = $licenseUri.AbsoluteUri.Split('/blob/')[0].TrimEnd('/') -replace '\.git$'
-            $requiredModuleFolder = Join-Path -Path $PSScriptRoot -ChildPath "dependencies/$requiredModuleName"
-            if (-not (Test-Path -Path $requiredModuleFolder -PathType Container)) {
-                Write-Output "INFO: Cloning module '$requiredModuleName' from '$gitUri' to '$requiredModuleFolder'."
-                git clone $gitUri $requiredModuleFolder | Out-Null
-                if (Test-Path -Path $requiredModuleFolder -PathType Container) {
-                    Write-Output "SUCCESS: Module '$requiredModuleName' was cloned."
-                } else {
-                    Write-Error "FAILED: Module '$requiredModuleName' was not cloned."
-                }
-            }
-            Write-Output "INFO: Importing module '$requiredModuleName' from '$requiredModuleFolder'."
-            Import-Module -Name (Join-Path -Path $requiredModuleFolder -ChildPath "$requiredModuleName.psd1") -Force
-            if (Get-Module -Name $requiredModuleName) {
-                Write-Output "SUCCESS: Module '$requiredModuleName' was imported."
-            } else {
-                Write-Error "FAILED: Module '$requiredModuleName' was not imported."
-            }
-          }
           Write-Output "INFO: Importing module '$moduleName' from '$moduleManifest'."
           Import-Module -Name (Resolve-Path $moduleManifest).Path -Force -ErrorAction Stop
           if (Get-Module -Name $moduleName) {
@@ -66,4 +43,4 @@ jobs:
           Write-Output "INFO: Installing module 'Pester' from PSGallery."
           Install-Module -Name Pester -confirm:$false -Force
           Write-Output "INFO: Invoking Pester tests."
-          Invoke-Pester -Path "./.ci/pester.tests.ps1" -Output Detailed -PassThru
+          Invoke-Pester -Path "./.ci/pester.tests.ps1" -Output Detailed -PassThru

CHANGELOG.md

@@ -1,55 +1,66 @@
-# Release History
-
-## [v9.0.0.1010]
-> Release Date: 2025-11-12
-- [Added] Support for auto-generated passwords in management domain
-- [Fixed] Bug in edge cluster deployment using ip pools for edges
-- [Fixed] Edge snat being to true for ACTIVE_ACTIVE clusters
-- [Fixed] 9.0.0.0 set as version for Day-N deployments, even when later versions is selected
-
-## [v9.0.0.1009]
-> Release Date: 2025-10-10
-- [Added] Support for VCF 9.0.1.0
-- [Changed] Changed default snat setting for edge json file
-- [Changed] Removed unneccessary wsan configuration on windows machine
-- [Changed] Supported P&P Workbook version updates to v1.9.0.006
-- [Fixed] Not gathering IP Pools spec correctly for management domain JSON
-- [Fixed] Not honouring CEIP setting for management domain JSON
-- [Fixed] Management domain network pool name now based off of provided domain name rather than internal value
-
-## [v9.0.0.1008]
-> Release Date: 2025-09-18
-- [Changed] Handle single DNS and NTP server entries for management domain bringup
-- [Fixed] FTT not being added in OSA management domains
-- [Fixed] vCenter and VCF Operations appliance sizes not being correctly retrieved
-
-## [v9.0.0.1007]
-> Release Date: 2025-09-02
-- [Fixed] Bug where HA Deployment Model was not being honoured correctly
-
-## [v9.0.0.1006]
-> Release Date: 2025-08-21
-- [Fixed] Bug where Edge JSON creation for workload domain was keying off management domain choice
-
-## [v9.0.0.1005]
-> Release Date: 2025-08-21
-- [Changed] Supported P&P Workbook version updates to v1.9.0.005
-- [Fixed] Menu items showing as enabled when should be disabled
-
-## [v9.0.0.1004]
-> Release Date: 2025-08-13
-- [Added] Tested on for Ubuntu, Debian and MacOS. May work with other linux variants, but untested
-- [Added] Generation of JSON for Single Operation of Stretched Compute Only Cluster
-- [Added] `Set-VCFJsonGenerationPrequisites` cmdlet that installs additional PowerShell Module dependencies
-- [Changed] Removed dependency on PowerVCF PowerShell Module
-- [Changed] Handling of DVS Datapath mode based on settings in P&P workbook
-- [Fixed] VCF Operations Appliance size being populated as `False`
-
-## [v9.0.0.1003]
-> Release Date: 2025-xx-xx
-- [Changed] Revert Console Title to original value on exit
-- [Changed] Display Module vs generic VCF Version
-
-## [v9.0.0.1002]
-> Release Date: 2025-07-01
+# Release History
+
+## [v9.0.0.1011]
+> Release Date: 2026-02-04
+- [Added] Support for onboard change control to increase range of versions the workbook content transfer process can support
+- [Added] Ability to transparently handle versions of P&P that do not impact automation
+- [Added] Support for LAG in VCF Installer Management Domain Bringup File
+- [Changed] Altered logic to handle situations where no excel files are present in folder more elegantly
+- [Fixed] Appliance size retrieval from P&P
+- [Fixed] References to outdated named cells
+- [Fixed] Workload datacenter name for workload domain deployment now calculated vs using Day-N configuration value
+- [Fixed] Issue in multi-az host commissioning
+
+## [v9.0.0.1010]
+> Release Date: 2025-11-12
+- [Added] Support for auto-generated passwords in management domain
+- [Fixed] Bug in edge cluster deployment using ip pools for edges
+- [Fixed] Edge snat being to true for ACTIVE_ACTIVE clusters
+- [Fixed] 9.0.0.0 set as version for Day-N deployments, even when later versions is selected
+
+## [v9.0.0.1009]
+> Release Date: 2025-10-10
+- [Added] Support for VCF 9.0.1.0
+- [Changed] Changed default snat setting for edge json file
+- [Changed] Removed unneccessary wsan configuration on windows machine
+- [Changed] Supported P&P Workbook version updates to v1.9.0.006
+- [Fixed] Not gathering IP Pools spec correctly for management domain JSON
+- [Fixed] Not honouring CEIP setting for management domain JSON
+- [Fixed] Management domain network pool name now based off of provided domain name rather than internal value
+
+## [v9.0.0.1008]
+> Release Date: 2025-09-18
+- [Changed] Handle single DNS and NTP server entries for management domain bringup
+- [Fixed] FTT not being added in OSA management domains
+- [Fixed] vCenter and VCF Operations appliance sizes not being correctly retrieved
+
+## [v9.0.0.1007]
+> Release Date: 2025-09-02
+- [Fixed] Bug where HA Deployment Model was not being honoured correctly
+
+## [v9.0.0.1006]
+> Release Date: 2025-08-21
+- [Fixed] Bug where Edge JSON creation for workload domain was keying off management domain choice
+
+## [v9.0.0.1005]
+> Release Date: 2025-08-21
+- [Changed] Supported P&P Workbook version updates to v1.9.0.005
+- [Fixed] Menu items showing as enabled when should be disabled
+
+## [v9.0.0.1004]
+> Release Date: 2025-08-13
+- [Added] Tested on for Ubuntu, Debian and MacOS. May work with other linux variants, but untested
+- [Added] Generation of JSON for Single Operation of Stretched Compute Only Cluster
+- [Added] `Set-VCFJsonGenerationPrequisites` cmdlet that installs additional PowerShell Module dependencies
+- [Changed] Removed dependency on PowerVCF PowerShell Module
+- [Changed] Handling of DVS Datapath mode based on settings in P&P workbook
+- [Fixed] VCF Operations Appliance size being populated as `False`
+
+## [v9.0.0.1003]
+> Release Date: 2025-xx-xx
+- [Changed] Revert Console Title to original value on exit
+- [Changed] Display Module vs generic VCF Version
+
+## [v9.0.0.1002]
+> Release Date: 2025-07-01
 - [Added] Initial Release

LICENSE.md

@@ -8,4 +8,3 @@ This copyright notice shall be included in all copies or substantial portions of
 
 **THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.**
 
-

README.md

@@ -1,15 +1,6 @@
-
 # VCF.JSONGenerator
 
-[![PS Version](https://img.shields.io/powershellgallery/v/VCF.JSONGenerator?label=Version)](https://www.powershellgallery.com/packages/VCF.JSONGenerator)
-[![PS Downloads](https://img.shields.io/powershellgallery/dt/VCF.JSONGenerator?label=Downloads)](https://www.powershellgallery.com/packages/VCF.JSONGenerator)
-[![GitHub Glone](https://img.shields.io/badge/dynamic/json?color=success&label=Clones&query=count&url=https://gist.githubusercontent.com/nathanthaler/cd078a6cd4cc8bbf8bcf859ad2dd4f18/raw/clone.json&logo=github)](https://gist.githubusercontent.com/nathanthaler/cd078a6cd4cc8bbf8bcf859ad2dd4f18/raw/clone.json)
-[![License](https://img.shields.io/badge/License-Broadcom-green.svg)](LICENSE.md)
-[![PowerShell](https://img.shields.io/badge/PowerShell-7.2%2B-blue.svg)](https://github.com/PowerShell/PowerShell)
-[![Changelog](https://img.shields.io/badge/Changelog-Read-blue)](CHANGELOG.md)
-
 ## Author
-
 Thank you for your interest in the project. Whether it's a bug report, enhancement, correction, or
 additional documentation, I greatly value feedback and contributions from our community.
 
@@ -19,7 +10,7 @@ Ken Gould       | Creator      | [:fontawesome-brands-github:](https://github.co
 
 ## Overview
 
-VCF.JSONGenerator is provided as is, as a companion tool for the VCF 9.0 Planning & Preparation (P&P) workbook. Its intent is to help automate the task of creation JSON payloads for submission to the VCF management components.
+VCF.JSONGenerator is provided as is, as a companion tool for the VCF 9.0 Planning & Preparation (P&P) workbook. Its intent is to help automate the task of creation JSON payloads for submission to the VCF management components. 
 
 ## Support Platforms
 - Windows (tested with Server 2022 Datacenter edition)
@@ -51,7 +42,7 @@ The following are the list of tested / supported permutations.
 - When P&P operation is configured to be `Deploy a new VCF fleet` or `Deploy a VCF Instance in an existing VCF fleet`
 - [Supported/Tested]
     - Deploy a new VCF Fleet
-    - Simple Deployment Model
+    - Simple Deployment Model 
     - Highly Available Deployment Model
     - Deployment of VCF Operations and VCF Automation Day-N
     - Deployment of VCF Operations with VCF Autuomation
@@ -72,11 +63,11 @@ The following are the list of tested / supported permutations.
         - [Supported/Tested]
             - Single-Rack / Layer-2 Multi-Rack HCI Cluster
             - Single-Rack / Layer-2 Multi-Rack Storage Cluster
-            - Single-Rack / Layer-2 Multi-Rack Compute Only Cluster
+            - Single-Rack / Layer-2 Multi-Rack Compute Only Cluster  
         - [Unsupported]
             - Multi-Rack / Layer-2 Multi-Rack HCI Cluster
             - Multi-Rack / Layer-2 Multi-Rack Storage Cluster
-            - Multi-Rack / Layer-2 Multi-Rack Compute Only Cluster
+            - Multi-Rack / Layer-2 Multi-Rack Compute Only Cluster  
 
 ### Workload Domains
 - First workload domain when P&P Operation is set to `Deploy a new VCF fleet` or `Deploy a VCF Instance in an existing VCF fleet`
@@ -132,4 +123,4 @@ The following are the list of tested / supported permutations.
         - NSX VLAN segment
 
 ## Troubleshooting
-- There is a very tight coupling between the version of the Planning & Preparation file you use and the version of the VCF.JSONGenerator Powershell Module. Bug resolution may involve a change to either or both of these elements. Please ensure that all required values in the Planning & Preparation workbook are populated in the desired format. In time, depending on the appetite for this module, I may introduce input format validation and cross-checking
+- There is a very tight coupling between the version of the Planning & Preparation file you use and the version of the VCF.JSONGenerator Powershell Module. Bug resolution may involve a change to either or both of these elements. Please ensure that all required values in the Planning & Preparation workbook are populated in the desired format. In time, depending on the appetite for this module, I may introduce input format validation and cross-checking