Merge branch 'master' into master

Modules/ContentLibrary/ContentLibrary.psm1

@@ -20,12 +20,12 @@
         [Parameter(Mandatory=$false)][String]$LibraryName
     )
 
-    $contentLibaryService = Get-CisService com.vmware.content.library
+    $contentLibraryService = Get-CisService com.vmware.content.library
-    $libaryIDs = $contentLibaryService.list()
+    $LibraryIDs = $contentLibraryService.list()
 
     $results = @()
-    foreach($libraryID in $libaryIDs) {
+    foreach($libraryID in $LibraryIDs) {
-        $library = $contentLibaryService.get($libraryID)
+        $library = $contentLibraryService.get($libraryID)
 
         # Use vCenter REST API to retrieve name of Datastore that is backing the Content Library
         $datastoreService = Get-CisService com.vmware.vcenter.datastore
@@ -108,18 +108,18 @@ Function Get-ContentLibraryItems {
         [Parameter(Mandatory=$false)][String]$LibraryItemName
     )
 
-    $contentLibaryService = Get-CisService com.vmware.content.library
+    $contentLibraryService = Get-CisService com.vmware.content.library
-    $libaryIDs = $contentLibaryService.list()
+    $LibraryIDs = $contentLibraryService.list()
 
     $results = @()
-    foreach($libraryID in $libaryIDs) {
+    foreach($libraryID in $LibraryIDs) {
-        $library = $contentLibaryService.get($libraryId)
+        $library = $contentLibraryService.get($libraryId)
         if($library.name -eq $LibraryName) {
-            $contentLibaryItemService = Get-CisService com.vmware.content.library.item
+            $contentLibraryItemService = Get-CisService com.vmware.content.library.item
-            $itemIds = $contentLibaryItemService.list($libraryID)
+            $itemIds = $contentLibraryItemService.list($libraryID)
 
             foreach($itemId in $itemIds) {
-                $item = $contentLibaryItemService.get($itemId)
+                $item = $contentLibraryItemService.get($itemId)
 
                 if(!$LibraryItemName) {
                     $itemResult = [pscustomobject] @{
@@ -179,28 +179,40 @@ Function Get-ContentLibraryItemFiles {
         [Parameter(Mandatory=$false)][String]$LibraryItemName
     )
 
-    $contentLibaryService = Get-CisService com.vmware.content.library
+    $contentLibraryService = Get-CisService com.vmware.content.library
-    $libaryIDs = $contentLibaryService.list()
+    $libraryIDs = $contentLibraryService.list()
 
     $results = @()
-    foreach($libraryID in $libaryIDs) {
+    foreach($libraryID in $libraryIDs) {
-        $library = $contentLibaryService.get($libraryId)
+        $library = $contentLibraryService.get($libraryId)
         if($library.name -eq $LibraryName) {
-            $contentLibaryItemService = Get-CisService com.vmware.content.library.item
+            $contentLibraryItemService = Get-CisService com.vmware.content.library.item
-            $itemIds = $contentLibaryItemService.list($libraryID)
+            $itemIds = $contentLibraryItemService.list($libraryID)
+            $DatastoreID = $library.storage_backings.datastore_id.Value
+            $Datastore = get-datastore -id "Datastore-$DatastoreID"
             
             foreach($itemId in $itemIds) {
-                $itemName = ($contentLibaryItemService.get($itemId)).name
+                $itemName = ($contentLibraryItemService.get($itemId)).name
-                $contenLibraryItemFileSerice = Get-CisService com.vmware.content.library.item.file
+                $contentLibraryItemFileSerice = Get-CisService com.vmware.content.library.item.file
-                $files = $contenLibraryItemFileSerice.list($itemId)
+                $files = $contentLibraryItemFileSerice.list($itemId)
+                $contentLibraryItemStorageService = Get-CisService com.vmware.content.library.item.storage
 
                 foreach($file in $files) {
+                    if($contentLibraryItemStorageService.get($itemId, $($file.name)).storage_backing.type -eq "DATASTORE"){
+                        $filepath = $contentLibraryItemStorageService.get($itemId, $($file.name)).storage_uris.AbsolutePath.split("/")[5..7] -join "/"
+                        $fullfilepath = "[$($datastore.name)] $filepath"
+                    }
+                    else{
+                        $fullfilepath = "UNKNOWN"
+                    }
+                    
                     if(!$LibraryItemName) {
                         $fileResult = [pscustomobject] @{
                             Name = $file.name;
                             Version = $file.version;
                             Size = $file.size;
                             Stored = $file.cached;
+                            Path = $fullfilepath;
                         }
                         $results+=$fileResult
                     } else {
@@ -210,6 +222,7 @@ Function Get-ContentLibraryItemFiles {
                                 Version = $file.version;
                                 Size = $file.size;
                                 Stored = $file.cached;
+                                Path = $fullfilepath;
                             }
                             $results+=$fileResult
                         }
@@ -245,12 +258,12 @@ Function Set-ContentLibrary {
         [Parameter(Mandatory=$false)][Switch]$JSONPersistenceDisabled
     )
 
-    $contentLibaryService = Get-CisService com.vmware.content.library
+    $contentLibraryService = Get-CisService com.vmware.content.library
-    $libaryIDs = $contentLibaryService.list()
+    $LibraryIDs = $contentLibraryService.list()
 
     $found = $false
-    foreach($libraryID in $libaryIDs) {
+    foreach($libraryID in $LibraryIDs) {
-        $library = $contentLibaryService.get($libraryId)
+        $library = $contentLibraryService.get($libraryId)
         if($library.name -eq $LibraryName) {
             $found = $true
             break
@@ -361,12 +374,12 @@ Function Remove-SubscribedContentLibrary {
         [Parameter(Mandatory=$true)][String]$LibraryName
     )
 
-    $contentLibaryService = Get-CisService com.vmware.content.library
+    $contentLibraryService = Get-CisService com.vmware.content.library
-    $libaryIDs = $contentLibaryService.list()
+    $LibraryIDs = $contentLibraryService.list()
 
     $found = $false
-    foreach($libraryID in $libaryIDs) {
+    foreach($libraryID in $LibraryIDs) {
-        $library = $contentLibaryService.get($libraryId)
+        $library = $contentLibraryService.get($libraryId)
         if($library.name -eq $LibraryName) {
             $found = $true
             break
@@ -460,12 +473,12 @@ Function Remove-LocalContentLibrary {
         [Parameter(Mandatory=$true)][String]$LibraryName
     )
 
-    $contentLibaryService = Get-CisService com.vmware.content.library
+    $contentLibraryService = Get-CisService com.vmware.content.library
-    $libaryIDs = $contentLibaryService.list()
+    $LibraryIDs = $contentLibraryService.list()
 
     $found = $false
-    foreach($libraryID in $libaryIDs) {
+    foreach($libraryID in $LibraryIDs) {
-        $library = $contentLibaryService.get($libraryId)
+        $library = $contentLibraryService.get($libraryId)
         if($library.name -eq $LibraryName) {
             $found = $true
             break
@@ -493,49 +506,49 @@ Function Copy-ContentLibrary {
     ===========================================================================
     .DESCRIPTION
         This function copies all library items from one Content Library to another
-    .PARAMETER SourceLibaryName
+    .PARAMETER SourceLibraryName
         The name of the source Content Library to copy from
-    .PARAMETER DestinationLibaryName
+    .PARAMETER DestinationLibraryName
         The name of the desintation Content Library to copy to
     .PARAMETER DeleteSourceFile
         Whther or not to delete library item from the source Content Library after copy
     .EXAMPLE
-        Copy-ContentLibrary -SourceLibaryName Foo -DestinationLibaryName Bar
+        Copy-ContentLibrary -SourceLibraryName Foo -DestinationLibraryName Bar
     .EXAMPLE
-        Copy-ContentLibrary -SourceLibaryName Foo -DestinationLibaryName Bar -DeleteSourceFile $true
+        Copy-ContentLibrary -SourceLibraryName Foo -DestinationLibraryName Bar -DeleteSourceFile $true
 #>
     param(
-        [Parameter(Mandatory=$true)][String]$SourceLibaryName,
+        [Parameter(Mandatory=$true)][String]$SourceLibraryName,
-        [Parameter(Mandatory=$true)][String]$DestinationLibaryName,
+        [Parameter(Mandatory=$true)][String]$DestinationLibraryName,
         [Parameter(Mandatory=$false)][Boolean]$DeleteSourceFile=$false
     )
 
-    $sourceLibraryId = (Get-ContentLibrary -LibraryName $SourceLibaryName).Id
+    $sourceLibraryId = (Get-ContentLibrary -LibraryName $SourceLibraryName).Id
     if($sourceLibraryId -eq $null) {
-        Write-Host -ForegroundColor red "Unable to find Source Content Library named $SourceLibaryName"
+        Write-Host -ForegroundColor red "Unable to find Source Content Library named $SourceLibraryName"
         exit
     }
-    $destinationLibraryId = (Get-ContentLibrary -LibraryName $DestinationLibaryName).Id
+    $destinationLibraryId = (Get-ContentLibrary -LibraryName $DestinationLibraryName).Id
     if($destinationLibraryId -eq $null) {
-        Write-Host -ForegroundColor Red "Unable to find Destination Content Library named $DestinationLibaryName"
+        Write-Host -ForegroundColor Red "Unable to find Destination Content Library named $DestinationLibraryName"
         break
     }
 
-    $sourceItemFiles = Get-ContentLibraryItems -LibraryName $SourceLibaryName
+    $sourceItemFiles = Get-ContentLibraryItems -LibraryName $SourceLibraryName
     if($sourceItemFiles -eq $null) {
-        Write-Host -ForegroundColor red "Unable to retrieve Content Library Items from $SourceLibaryName"
+        Write-Host -ForegroundColor red "Unable to retrieve Content Library Items from $SourceLibraryName"
         break
     }
 
-    $contentLibaryItemService = Get-CisService com.vmware.content.library.item
+    $contentLibraryItemService = Get-CisService com.vmware.content.library.item
 
     foreach ($sourceItemFile in  $sourceItemFiles) {
         # Check to see if file already exists in destination Content Library
-        $result = Get-ContentLibraryItems -LibraryName $DestinationLibaryName -LibraryItemName $sourceItemFile.Name
+        $result = Get-ContentLibraryItems -LibraryName $DestinationLibraryName -LibraryItemName $sourceItemFile.Name
 
         if($result -eq $null) {
             # Create CopySpec
-            $copySpec = $contentLibaryItemService.Help.copy.destination_create_spec.Create()
+            $copySpec = $contentLibraryItemService.Help.copy.destination_create_spec.Create()
             $copySpec.library_id = $destinationLibraryId
             $copySpec.name = $sourceItemFile.Name
             $copySpec.description = $sourceItemFile.Description
@@ -545,7 +558,7 @@ Function Copy-ContentLibrary {
             # Perform Copy
             try {
                 Write-Host -ForegroundColor Cyan "Copying" $sourceItemFile.Name "..."
-                $copyResult = $contentLibaryItemService.copy($UniqueChangeId, $sourceItemFile.Id, $copySpec)
+                $copyResult = $contentLibraryItemService.copy($UniqueChangeId, $sourceItemFile.Id, $copySpec)
             } catch {
                 Write-Host -ForegroundColor Red "Failed to copy" $sourceItemFile.Name
                 $Error[0]
@@ -556,7 +569,7 @@ Function Copy-ContentLibrary {
             if($DeleteSourceFile) {
                 try {
                     Write-Host -ForegroundColor Magenta "Deleteing" $sourceItemFile.Name "..."
-                    $deleteResult = $contentLibaryItemService.delete($sourceItemFile.Id)
+                    $deleteResult = $contentLibraryItemService.delete($sourceItemFile.Id)
                 } catch {
                     Write-Host -ForegroundColor Red "Failed to delete" $sourceItemFile.Name
                     $Error[0]
@@ -570,7 +583,7 @@ Function Copy-ContentLibrary {
             if($DeleteSourceFile) {
                 try {
                     Write-Host -ForegroundColor Magenta "Deleteing" $sourceItemFile.Name "..."
-                    $deleteResult = $contentLibaryItemService.delete($sourceItemFile.Id)
+                    $deleteResult = $contentLibraryItemService.delete($sourceItemFile.Id)
                 } catch {
                     Write-Host -ForegroundColor Red "Failed to delete" $sourceItemFile.Name
                     break
@@ -597,7 +610,7 @@ Function New-VMTX {
         The name of the VM Template in Content Library
     .PARAMETER Description
         Description of the VM template
-    .PARAMETER LibaryName
+    .PARAMETER LibraryName
         The name of the Content Library to clone to
     .PARAMETER FolderName
         The name of vSphere Folder (Defaults to Workloads for VMC)

Modules/NSXT/NSXT.psd1

@@ -7,7 +7,35 @@
 	Copyright = '(c) 2017. All rights reserved.'
 	Description = 'Powershell Module for NSX-T REST API Functions'
 	PowerShellVersion = '5.0'
-    FunctionsToExport = 'Get-NSXTComputeManager','Get-NSXTFabricNode','Get-NSXTFirewallRule','Get-NSXTIPPool','Get-NSXTLogicalSwitch','Get-NSXTManager','Get-NSXTTransportZone','Get-NSXTController'
+    FunctionsToExport = 'Get-NSXTBGPNeighbors',
+                        'Get-NSXTComputeManager',
+                        'Get-NSXTController',
+                        'Get-NSXTEdgeCluster',
+                        'Get-NSXTFabricNode',
+                        'Get-NSXTFabricVM',
+                        'Get-NSXTFirewallRule',
+                        'Get-NSXTForwardingTable',
+                        'Get-NSXTIPPool',
+                        'Get-NSXTLogicalRouter',
+                        'Get-NSXTLogicalRouterPorts',
+                        'Get-NSXTLogicalSwitch',
+                        'Get-NSXTManager',
+                        'Get-NSXTNetworkRoutes',
+                        'Get-NSXTRoutingTable',
+                        'Get-NSXTTraceFlow',
+                        'Get-NSXTTraceFlowObservations',
+                        'Get-NSXTTransportNode',
+                        'Get-NSXTTransportZone',
+                        'Get-NSXTClusterNode',
+                        'Set-NSXTIPPool',
+                        'Set-NSXTLogicalRouter',
+                        'Set-NSXTLogicalSwitch',
+                        'Set-NSXTTraceFlow',
+                        'Get-NSXTIPAMIPBlock',
+                        'Set-NSXTIPAMIPBlock',
+                        'Remove-NSXTIPAMIPBlock'
+                        
+
 	PrivateData = @{
 		PSData = @{
 			Tags = @('NSX-T','REST')

Modules/VMware.Community.CISTag/VMware.Community.CISTag.psd1

@@ -0,0 +1,123 @@
+#
+# Module manifest for module 'VMware.Community.CISTag'
+#
+# Generated by: Kyle Ruddy
+#
+# Generated on: 12/14/18
+#
+
+@{
+
+# Script module or binary module file associated with this manifest.
+RootModule = 'VMware.Community.CISTag.psm1'
+
+# Version number of this module.
+ModuleVersion = '1.0.0'
+
+# Supported PSEditions
+# CompatiblePSEditions = @()
+
+# ID used to uniquely identify this module
+GUID = 'a0803efd-6017-4049-bfc9-5983a5a0c348'
+
+# Author of this module
+Author = 'Kyle Ruddy'
+
+# Company or vendor of this module
+CompanyName = 'VMware'
+
+# Copyright statement for this module
+Copyright = '(c) VMware. All rights reserved.'
+
+# Description of the functionality provided by this module
+Description = 'Community sourced PowerShell Module for managing vSphere Tags via the CIS Endpoint'
+
+# Minimum version of the PowerShell engine required by this module
+PowerShellVersion = '4.0'
+
+# Name of the PowerShell host required by this module
+# PowerShellHostName = ''
+
+# Minimum version of the PowerShell host required by this module
+# PowerShellHostVersion = ''
+
+# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
+# DotNetFrameworkVersion = ''
+
+# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
+# CLRVersion = ''
+
+# Processor architecture (None, X86, Amd64) required by this module
+# ProcessorArchitecture = ''
+
+# Modules that must be imported into the global environment prior to importing this module
+# RequiredModules = @()
+
+# Assemblies that must be loaded prior to importing this module
+# RequiredAssemblies = @()
+
+# Script files (.ps1) that are run in the caller's environment prior to importing this module.
+# ScriptsToProcess = @()
+
+# Type files (.ps1xml) to be loaded when importing this module
+# TypesToProcess = @()
+
+# Format files (.ps1xml) to be loaded when importing this module
+# FormatsToProcess = @()
+
+# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
+# NestedModules = @()
+
+# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
+FunctionsToExport = 'Get-CISTag', 'Get-CISTagCategory', 'Get-CISTagAssignment', 'New-CISTag', 'New-CISTagCategory', 'New-CISTagAssignment', 'Remove-CISTag', 'Remove-CISTagCategory', 'Remove-CISTagAssignment'
+
+# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
+# CmdletsToExport = '*'
+
+# Variables to export from this module
+# VariablesToExport = '*'
+
+# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
+# AliasesToExport = '*'
+
+# DSC resources to export from this module
+# DscResourcesToExport = @()
+
+# List of all modules packaged with this module
+# ModuleList = @()
+
+# List of all files packaged with this module
+# FileList = @()
+
+# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+PrivateData = @{
+
+    PSData = @{
+
+        # Tags applied to this module. These help with module discovery in online galleries.
+        # Tags = @()
+
+        # A URL to the license for this module.
+        # LicenseUri = ''
+
+        # A URL to the main website for this project.
+        # ProjectUri = ''
+
+        # A URL to an icon representing this module.
+        # IconUri = ''
+
+        # ReleaseNotes of this module
+        # ReleaseNotes = ''
+
+    } # End of PSData hashtable
+
+} # End of PrivateData hashtable
+
+# HelpInfo URI of this module
+# HelpInfoURI = ''
+
+# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
+# DefaultCommandPrefix = ''
+
+}
+

Modules/VMware.Community.CISTag/VMware.Community.CISTag.psm1

@@ -0,0 +1,705 @@
+function Get-CISTag {
+<#  
+.SYNOPSIS  
+    Gathers tag information from the CIS REST API endpoint
+.DESCRIPTION 
+    Will provide a list of tags
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy
+.PARAMETER Name
+    Tag name which should be retreived
+.PARAMETER Category
+    Tag category name which should be retreived
+.PARAMETER Id
+    Tag ID which should be retreived 
+.EXAMPLE
+	Get-CISTag
+    Retreives all tag information 
+.EXAMPLE
+	Get-CISTag -Name tagName
+    Retreives the tag information based on the specified name
+#>
+[CmdletBinding(SupportsShouldProcess = $True, ConfirmImpact = 'Low')] 
+	param(
+	[Parameter(Mandatory=$false,Position=0,ValueFromPipelineByPropertyName=$true)]
+    [String]$Name,
+    [Parameter(Mandatory=$false,Position=1,ValueFromPipelineByPropertyName=$true)]
+    [String]$Category,
+    [Parameter(Mandatory=$false,Position=2,ValueFromPipelineByPropertyName=$true)]
+    [String]$Id
+  	)
+
+    If (-Not $global:DefaultCisServers) { Write-error "No CIS Connection found, please use the Connect-CisServer to connect" } Else {
+        $tagSvc = Get-CisService -Name com.vmware.cis.tagging.tag 
+        if ($PSBoundParameters.ContainsKey("Id")) {
+            $tagOutput = $tagSvc.get($Id)
+        } else {
+            if ($global:DefaultVIServer -and $global:DefaultVIServer.Name -eq $global:DefaultCisServers.Name) {
+                [Boolean]$vCenterConn = $true
+                $vCTagList = Get-Tag
+            } else {
+                $tagArray = @()
+                $tagIdList = $tagSvc.list() | Select-Object -ExpandProperty Value
+                [integer]$counter = 1
+                foreach ($t in $tagIdList) {
+                    $tagArray += $tagSvc.get($t)
+                    $counter++
+                    if ($counter -gt 200) {Start-Sleep -Milliseconds 1; $counter = 1}
+                }
+            }
+            if ($PSBoundParameters.ContainsKey("Name")) {
+                if ($vCenterConn){
+                    $tagOutput = $vCTagList | where {$_.Name -eq $Name}
+                } else {$tagOutput = $tagArray | Where {$_.Name -eq $Name}}                
+            } elseif ($PSBoundParameters.ContainsKey("Category")) { 
+                if ($vCenterConn){ 
+                    $tagOutput = $vCTagList | where {$_.Category -eq $Category}
+                } else {
+                    $tagCatid = Get-CISTagCategory -Name $Category | Select-Object -ExpandProperty Id
+                    $tagIdList = $tagSvc.list_tags_for_category($tagCatid)
+                    $tagArray2 = @()
+                    foreach ($t in $tagIdList) {
+                        $tagArray2 += $tagSvc.get($t)
+                    }
+                    $tagOutput = $tagArray2
+                }
+            } else {
+                if ($vCenterConn){$tagOutput = $vCTagList}
+                else {$tagOutput = $tagArray}
+            }
+        }
+        $tagOutput | Select-Object Id, Name, Description
+    }
+
+}
+
+function New-CISTag {
+<#  
+.SYNOPSIS  
+    Creates a new tag from the CIS REST API endpoint
+.DESCRIPTION 
+    Will create a new tag
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy
+.PARAMETER Name
+    Tag name which should be created
+.PARAMETER Category
+    Category name where the new tag should be associated
+.PARAMETER Description
+    Description for the new tag
+.PARAMETER CategoryID
+    Category ID where the new tag should be associated
+.EXAMPLE
+    New-CISTag -Name tagName -Category categoryName -Description "Tag Descrition"
+    Creates a new tag based on the specified name
+#>
+[CmdletBinding(SupportsShouldProcess = $True, ConfirmImpact = 'Medium')] 
+    param(
+    [Parameter(Mandatory=$true,Position=0)]
+    [String]$Name,
+    [Parameter(Mandatory=$false,Position=1)]
+    [String]$Category,
+    [Parameter(Mandatory=$false,Position=2)]
+    [String]$Description,
+    [Parameter(Mandatory=$false,Position=3)]
+    [String]$CategoryID
+    )
+
+    If (-Not $global:DefaultCisServers) { Write-error "No CIS Connection found, please use the Connect-CisServer to connect" } Else {
+        $tagSvc = Get-CisService -Name com.vmware.cis.tagging.tag 
+        $tagCreateHelper = $tagSvc.Help.create.create_spec.Create()
+        $tagCreateHelper.name = $Name
+        if ($PSBoundParameters.ContainsKey("Category")) {
+            $tagCreateHelper.category_id = Get-CISTagCategory -Name $Category | Select-Object -ExpandProperty Id
+        } elseif ($PSBoundParameters.ContainsKey("CategoryId")) {
+            $tagCreateHelper.category_id = $CategoryID
+        } else {Write-Warning "No Category input found. Add a Category name or ID."; break}
+        if ($PSBoundParameters.ContainsKey("Description")) {
+            $tagCreateHelper.description = $Description
+        } else {
+            $tagCreateHelper.description = ""
+        }
+        $tagNewId = $tagSvc.create($tagCreateHelper)
+        Get-CISTag -Id $tagNewId
+    }
+
+}
+
+function Remove-CISTag {
+<#  
+.SYNOPSIS  
+    Removes a tag from the CIS REST API endpoint
+.DESCRIPTION 
+    Will delete a new tag
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy
+.PARAMETER Name
+    Tag name which should be removed
+.PARAMETER ID
+    Tag ID which should be removed
+.EXAMPLE
+    Remove-CISTag -Name tagName 
+    Removes a new tag based on the specified name
+#>
+[CmdletBinding(SupportsShouldProcess = $True, ConfirmImpact = 'High')] 
+    param(
+    [Parameter(Mandatory=$false,Position=0,ValueFromPipelineByPropertyName=$true)]
+    [String]$Name,
+    [Parameter(Mandatory=$false,Position=1,ValueFromPipelineByPropertyName=$true)]
+    [String]$ID
+    )
+
+    If (-Not $global:DefaultCisServers) { Write-error "No CIS Connection found, please use the Connect-CisServer to connect" } Else {
+        $tagSvc = Get-CisService -Name com.vmware.cis.tagging.tag 
+        if ($ID) {
+            $tagSvc.delete($ID)
+        } else {
+            $tagId = Get-CISTag -Name $Name | select -ExpandProperty Id
+            if ($tagId) {$tagSvc.delete($tagId)}
+            else {Write-Warning "No valid tag found."}
+        }
+    }
+}
+
+function Get-CISTagCategory {
+<#  
+.SYNOPSIS  
+    Gathers tag category information from the CIS REST API endpoint
+.DESCRIPTION 
+    Will provide a list of tag categories
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy
+.PARAMETER Name
+    Tag category name which should be retreived 
+.PARAMETER Id
+    Tag category ID which should be retreived
+.EXAMPLE
+    Get-CISTagCategory
+    Retreives all tag category information 
+.EXAMPLE
+    Get-CISTagCategory -Name tagCategoryName
+    Retreives the tag category information based on the specified name
+#>
+[CmdletBinding(SupportsShouldProcess = $True, ConfirmImpact = 'Low')] 
+    param(
+    [Parameter(Mandatory=$false,Position=0,ValueFromPipelineByPropertyName=$true)]
+    [String]$Name,
+    [Parameter(Mandatory=$false,Position=2,ValueFromPipelineByPropertyName=$true)]
+    [String]$Id
+    )
+
+    If (-Not $global:DefaultCisServers) { Write-error "No CIS Connection found, please use the Connect-CisServer to connect" } Else {
+        $tagCatSvc = Get-CisService -Name com.vmware.cis.tagging.category
+        if ($PSBoundParameters.ContainsKey("Id")) {
+            $tagCatOutput = $tagCatSvc.get($Id)
+        } else {
+            $tagCatArray = @()
+            $tagCatIdList = $tagCatSvc.list() | Select-Object -ExpandProperty Value
+            foreach ($tc in $tagCatIdList) {
+                $tagCatArray += $tagCatSvc.get($tc)
+            }
+            if ($PSBoundParameters.ContainsKey("Name")) {
+                $tagCatOutput = $tagCatArray | Where {$_.Name -eq $Name}
+            } else {
+                $tagCatOutput = $tagCatArray
+            }
+        }
+        $tagCatOutput | Select-Object Id, Name, Description, Cardinality
+    }
+
+}
+
+function New-CISTagCategory {
+<#  
+.SYNOPSIS  
+    Creates a new tag category from the CIS REST API endpoint
+.DESCRIPTION 
+    Will create a new tag category
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy
+.PARAMETER Name
+    Tag category name which should be created 
+.PARAMETER Description
+    Tag category ID which should be retreived
+.PARAMETER Cardinality
+    Tag category ID which should be retreived
+.PARAMETER AssociableTypes
+    Tag category ID which should be retreived    
+.EXAMPLE
+    New-CISTagCategory -Name NewTagCategoryName -Description "New Tag Category Description" -Cardinality "Single" -AssociableTypes    
+    Creates a new tag category with the specified information
+#>
+[CmdletBinding(SupportsShouldProcess = $True, ConfirmImpact = 'Medium')] 
+    param(
+    [Parameter(Mandatory=$true,Position=0)]
+    [String]$Name,
+    [Parameter(Mandatory=$false,Position=1)]
+    [String]$Description,
+    [Parameter(Mandatory=$false,Position=2)]
+    [ValidateSet("SINGLE","MULTIPLE")]
+    [String]$Cardinality = "SINGLE",
+    [Parameter(Mandatory=$false,Position=3)]
+    [ValidateSet("All", "Cluster", "Datacenter", "Datastore", "DatastoreCluster", "DistributedPortGroup", "DistributedSwitch", "Folder", "ResourcePool", "VApp", "VirtualPortGroup", "VirtualMachine", "VMHost")]
+    [String]$AssociableTypes = "All"
+    )
+
+    If (-Not $global:DefaultCisServers) { Write-error "No CIS Connection found, please use the Connect-CisServer to connect" } Else {
+        $tagCatSvc = Get-CisService -Name com.vmware.cis.tagging.category
+        $tagCatCreateHelper = $tagCatSvc.Help.create.create_spec.Create()
+        $tagCatCreateHelper.name = $Name
+        if ($PSBoundParameters.ContainsKey("Description")) {
+            $tagCatCreateHelper.description = $Description
+        } else {$tagCatCreateHelper.description = ""}
+        $tagCatCreateHelper.cardinality = $Cardinality
+        $tagCatCreateAssocTypeHelper = $tagCatSvc.help.create.create_spec.associable_types.create()
+        $tagCatCreateAssocTypeHelper.Add($AssociableTypes)
+        $tagCatCreateHelper.associable_types = $tagCatCreateAssocTypeHelper
+        $tagCatNewId = $tagCatSvc.create($tagCatCreateHelper)
+        Get-CISTagCategory -Id $tagCatNewId
+    }
+
+}
+
+function Remove-CISTagCategory {
+<#  
+.SYNOPSIS  
+    Removes tag category information from the CIS REST API endpoint
+.DESCRIPTION 
+    Will remove a tag category
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy
+.PARAMETER Name
+    Tag category name which should be removed 
+.PARAMETER Id
+    Tag category ID which should be removed
+.EXAMPLE
+    Remove-CISTagCategory -Name tagCategoryName
+    Removes the tag category information based on the specified name
+
+#>
+[CmdletBinding(SupportsShouldProcess = $True, ConfirmImpact = 'High')] 
+    param(
+    [Parameter(Mandatory=$false,Position=0,ValueFromPipelineByPropertyName=$true)]
+    [String]$Name,
+    [Parameter(Mandatory=$false,Position=2,ValueFromPipelineByPropertyName=$true)]
+    [String]$Id
+    )
+
+    If (-Not $global:DefaultCisServers) { Write-error "No CIS Connection found, please use the Connect-CisServer to connect" } Else {
+        $tagCatSvc = Get-CisService -Name com.vmware.cis.tagging.category
+        if ($PSBoundParameters.ContainsKey("Id")) {
+            $tagCatSvc.delete($Id)
+        } elseif ($PSBoundParameters.ContainsKey("Name")) {
+            $tagCatId = Get-CISTagCategory -Name $Name | Select-Object -ExpandProperty Id
+            $tagCatSvc.delete($tagCatId)
+        } else {Write-Warning "No tag category found."}
+    }
+}
+
+function Get-CISTagAssignment {
+<#  
+.SYNOPSIS  
+    Displays a list of the tag assignments from the CIS REST API endpoint
+.DESCRIPTION 
+    Will provide a list of the tag assignments
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy
+.PARAMETER Category
+    Tag category name which should be referenced
+.PARAMETER Entity
+    Object name which should be retreived
+.PARAMETER ObjectId
+    Object ID which should be retreived
+.EXAMPLE
+    Get-CISTagAssignment 
+    Retreives all tag assignment information
+.EXAMPLE
+    Get-CISTagAssignment -Entity VMName
+    Retreives all tag assignments for the VM name
+.EXAMPLE
+    Get-CISTagAssignment -ObjectId 'vm-11'
+    Retreives all tag assignments for the VM object
+#>
+[CmdletBinding(SupportsShouldProcess = $True, ConfirmImpact = 'Low')] 
+    param(
+    [Parameter(Mandatory=$false,Position=0)]
+    [String]$Category,
+    [Parameter(Mandatory=$false,Position=1)]
+    [String]$Entity,
+    [Parameter(Mandatory=$false,Position=2,ValueFromPipelineByPropertyName=$true)]
+    [String]$ObjectId
+    )
+
+    If (-Not $global:DefaultCisServers) { Write-error "No CIS Connection found, please use the Connect-CisServer to connect" } Else {
+        $tagOutput = @()
+        [Boolean]$vCenterConn = $false
+        $tagAssocSvc = Get-CisService -Name com.vmware.cis.tagging.tag_association
+        if ($PSBoundParameters.ContainsKey("ObjectId")) {
+            if ($ObjectId.split('-')[0] -eq 'vm') {
+                $objType = 'VirtualMachine'
+            } else {Write-Warning 'Only VirtualMachine types currently supported.'; break}
+            $objObject = $tagAssocSvc.help.list_attached_tags.object_id.create()
+            $objObject.id = $ObjectId
+            $objObject.type = $objType
+            $tagIdOutput = $tagAssocSvc.list_attached_tags($objObject)
+        } elseif ($PSBoundParameters.ContainsKey("Entity")) {
+            if ($global:DefaultVIServer -and $global:DefaultVIServer.Name -eq $global:DefaultCisServers.Name) {
+                [Boolean]$vCenterConn = $true
+                $viObject = (Get-Inventory -Name $Entity).ExtensionData.MoRef
+                $objObject = $tagAssocSvc.help.list_attached_tags.object_id.create()
+                $objObject.id = $viObject.Value
+                $objObject.type = $viObject.type
+            } else {
+                $vmSvc = Get-CisService -Name com.vmware.vcenter.vm
+                $filterVmNameObj = $vmsvc.help.list.filter.create()
+                $filterVmNameObj.names.add($Entity) | Out-Null
+                $objId = $vmSvc.list($filterVmNameObj) | Select-Object -ExpandProperty vm
+                if ($objId) {$objType = 'VirtualMachine'}
+                else {Write-Warning "No entities found."; break}
+                $objObject = $tagAssocSvc.help.list_attached_tags.object_id.create()
+                $objObject.id = $objId
+                $objObject.type = $objType
+            }
+            $tagIdOutput = $tagAssocSvc.list_attached_tags($objObject)
+        } else {
+            $tagSvc = Get-CisService -Name com.vmware.cis.tagging.tag 
+            $tagIdOutput = @()
+            $tagCategories = Get-CISTagCategory | Sort-Object -Property Name
+            if ($Category) {
+                $tagCatId = $tagCategories | where {$_.Name -eq $Category} | Select-Object -ExpandProperty Id
+                $tagIdOutput += $tagSvc.list_tags_for_category($tagCatId)
+            } else {
+                foreach ($tagCat in $tagCategories) {
+                    $tagIdOutput += $tagSvc.list_tags_for_category($tagCat.id)
+                }
+            }
+        }
+        $tagReference = Get-CISTag
+
+        if ($Entity -or $ObjectId) {
+            foreach ($tagId in $tagIdOutput) {
+                $tagAttObj = @()
+                if ($Entity) {
+                    $tagAttObj += $tagAssocSvc.list_attached_objects($tagId) | where {$_.type -eq $viObject.type -and $_.id -eq $viObject.Value}
+                } else {
+                    $tagAttObj += $tagAssocSvc.list_attached_objects($tagId) | where {$_.id -eq $ObjectId}
+                }
+                foreach ($obj in $tagAttObj) {
+                    if ($obj.type -eq "VirtualMachine") {
+                        if (-Not $vmSvc) {$vmSvc = Get-CisService -Name com.vmware.vcenter.vm}
+                        $filterVmObj = $vmsvc.help.list.filter.create()
+                        $filterVmObj.vms.add($obj.Id) | Out-Null
+                        $objName = $vmSvc.list($filterVmObj) | Select-Object -ExpandProperty Name
+                    }
+                    else {$objName = 'Object Not Found'}                
+                    $tempObject = "" | Select-Object Tag, Entity
+                    $tempObject.Tag = $tagReference | where {$_.id -eq $tagId} | Select-Object -ExpandProperty Name
+                    $tempObject.Entity = $objName
+                    $tagOutput += $tempObject
+                }
+            }
+        } else {
+            foreach ($tagId in $tagIdOutput) {
+                $tagAttObj = @()
+                $tagAttObj += $tagAssocSvc.list_attached_objects($tagId)
+                if ($global:DefaultVIServer -and $global:DefaultVIServer.Name -eq $global:DefaultCisServers.Name) {
+                    [Boolean]$vCenterConn = $true
+                }  elseif ($tagAttObj.Type -contains 'VirtualMachine') {
+                    if (-Not $vmSvc) {$vmSvc = Get-CisService -Name com.vmware.vcenter.vm}
+                }
+                foreach ($obj in $tagAttObj) {
+                    if ($vCenterConn) {
+                        $newViObj = New-Object -TypeName VMware.Vim.ManagedObjectReference
+                        $newViObj.Type = $obj.type
+                        $newViObj.Value = $obj.id
+                        $objName = Get-View -Id $newViObj -Property Name | Select-Object -ExpandProperty Name
+                    } elseif ($obj.type -eq "VirtualMachine") {
+                        $filterVmObj = $vmsvc.help.list.filter.create()
+                        $filterVmObj.vms.add($obj.Id) | Out-Null
+                        $objName = $vmSvc.list($filterVmObj) | Select-Object -ExpandProperty Name
+                    } else {$objName = 'Object Not Found'}                
+                    $tempObject = "" | Select-Object Tag, Entity
+                    $tempObject.Tag = $tagReference | where {$_.id -eq $tagId} | Select-Object -ExpandProperty Name
+                    $tempObject.Entity = $objName
+                    $tagOutput += $tempObject
+                }
+            }
+        }
+        return $tagOutput
+    }
+}
+
+function New-CISTagAssignment {
+<#  
+.SYNOPSIS  
+    Creates new tag assignments from the CIS REST API endpoint
+.DESCRIPTION 
+    Will create new tag assignments
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy
+.PARAMETER Tag
+    Tag name which should be referenced
+.PARAMETER Entity
+    Object name which should be retreived
+.PARAMETER TagId
+    Tag ID/s which should be referenced
+.PARAMETER ObjectId
+    Object ID which/s should be retreived
+.EXAMPLE
+    New-CISTagAssignment -Tag TagName -Entity VMName
+    Creates a tag assignment between the Tag name and the VM name
+.EXAMPLE
+    New-CISTagAssignment -TagId $tagId -ObjectId 'vm-11'
+    Creates a tag assignment between the Tag ID and the Object ID
+#>
+[CmdletBinding(SupportsShouldProcess = $True, ConfirmImpact = 'Medium')] 
+    param(
+    [Parameter(Mandatory=$false,Position=0)]
+    $Tag,
+    [Parameter(Mandatory=$false,Position=1)]
+    $Entity,
+    [Parameter(Mandatory=$false,Position=2)]
+    $TagId,
+    [Parameter(Mandatory=$false,Position=3)]
+    $ObjectId
+    )
+
+    If (-Not $global:DefaultCisServers) { Write-error "No CIS Connection found, please use the Connect-CisServer to connect" } Else {
+        $tagAssocSvc = Get-CisService -Name com.vmware.cis.tagging.tag_association
+        if ($PSBoundParameters.ContainsKey("Tag") -and $PSBoundParameters.ContainsKey("Entity")) {
+            if ($Tag -is [array] -and $Entity -isnot [array]) {
+                $tagIdList = $tagAssocSvc.help.attach_multiple_tags_to_object.tag_ids.create()
+                foreach ($t in $Tag) {
+                    $tempId = Get-CISTag -Name $t | Select-Object -ExpandProperty Id
+                    $tagIdList.add($tempId) | Out-Null
+                }
+                if ($global:DefaultVIServer -and $global:DefaultVIServer.Name -eq $global:DefaultCisServers.Name) {
+                    $viObject = (Get-Inventory -Name $Entity).ExtensionData.MoRef
+                    $objObject = $tagAssocSvc.help.list_attached_tags.object_id.create()
+                    $objObject.id = $viObject.Value
+                    $objObject.type = $viObject.type
+                } else {
+                    $vmSvc = Get-CisService -Name com.vmware.vcenter.vm
+                    $filterVmNameObj = $vmsvc.help.list.filter.create()
+                    $filterVmNameObj.names.add($Entity) | Out-Null
+                    $objId = $vmSvc.list($filterVmNameObj) | Select-Object -ExpandProperty vm
+                    if ($objId) {$objType = 'VirtualMachine'}
+                    else {Write-Warning "No entities found."; break}
+                    $objObject = $tagAssocSvc.help.list_attached_tags.object_id.create()
+                    $objObject.id = $objId
+                    $objObject.type = $objType
+                }
+                $tagAssocSvc.attach_multiple_tags_to_object($objObject,$tagIdList) | Out-Null
+            } elseif ($Tag -isnot [array] -and $Entity -is [array]) {
+                $tagId = Get-CISTag -Name $Tag | Select-Object -ExpandProperty Id
+                $objList = $tagAssocSvc.help.attach_tag_to_multiple_objects.object_ids.create()
+                foreach ($e in $Entity) {
+                    if ($global:DefaultVIServer -and $global:DefaultVIServer.Name -eq $global:DefaultCisServers.Name) {
+                        $viObject = (Get-Inventory -Name $e).ExtensionData.MoRef
+                        $objObject = $tagAssocSvc.help.list_attached_tags.object_id.create()
+                        $objObject.id = $viObject.Value
+                        $objObject.type = $viObject.type
+                    } else {
+                        $vmSvc = Get-CisService -Name com.vmware.vcenter.vm
+                        $filterVmNameObj = $vmsvc.help.list.filter.create()
+                        $filterVmNameObj.names.add($Entity) | Out-Null
+                        $objId = $vmSvc.list($filterVmNameObj) | Select-Object -ExpandProperty vm
+                        if ($objId) {$objType = 'VirtualMachine'}
+                        else {Write-Warning "No entities found."; break}
+                        $objObject = $tagAssocSvc.help.list_attached_tags.object_id.create()
+                        $objObject.id = $objId
+                        $objObject.type = $objType
+                    }
+                    $objList.add($objObject) | Out-Null
+                }
+                $tagAssocSvc.attach_tag_to_multiple_objects($TagId,$objList) | Out-Null
+            } elseif ($Tag -isnot [array] -and $Entity -isnot [array]) {
+                $tagId = Get-CISTag -Name $Tag | Select-Object -ExpandProperty Id
+                if ($global:DefaultVIServer -and $global:DefaultVIServer.Name -eq $global:DefaultCisServers.Name) {
+                    $viObject = (Get-Inventory -Name $Entity).ExtensionData.MoRef
+                    $objObject = $tagAssocSvc.help.list_attached_tags.object_id.create()
+                    $objObject.id = $viObject.Value
+                    $objObject.type = $viObject.type
+                } else {
+                    $vmSvc = Get-CisService -Name com.vmware.vcenter.vm
+                    $filterVmNameObj = $vmsvc.help.list.filter.create()
+                    $filterVmNameObj.names.add($Entity) | Out-Null
+                    $objId = $vmSvc.list($filterVmNameObj) | Select-Object -ExpandProperty vm
+                    if ($objId) {$objType = 'VirtualMachine'}
+                    else {Write-Warning "No entities found."; break}
+                    $objObject = $tagAssocSvc.help.list_attached_tags.object_id.create()
+                    $objObject.id = $objId
+                    $objObject.type = $objType
+                }
+                $tagAssocSvc.attach($TagId,$objObject) | Out-Null
+            }
+        } elseif ($PSBoundParameters.ContainsKey("TagId") -and $PSBoundParameters.ContainsKey("ObjectId")) {
+            if ($ObjectId.split('-')[0] -eq 'vm') {
+                $objType = 'VirtualMachine'
+            } else {Write-Warning 'Only VirtualMachine types currently supported.'; break}
+            if ($TagId -is [array] -and $ObjectId -isnot [array]) {
+                $objObject = $tagAssocSvc.help.attach_multiple_tags_to_object.object_id.create()
+                $objObject.id = $ObjectId
+                $objObject.type = $objType
+                $tagIdList = $tagAssocSvc.help.attach_multiple_tags_to_object.tag_ids.create()
+                foreach ($tId in $TagId) {
+                    $tagIdList.add($tId) | Out-Null
+                }
+                $tagAssocSvc.attach_multiple_tags_to_object($objObject,$tagIdList) | Out-Null
+            } elseif ($TagId -isnot [array] -and $ObjectId -is [array]) {
+                $objList = $tagAssocSvc.help.attach_tag_to_multiple_objects.object_ids.create()
+                foreach ($obj in $ObjectId) {
+                    $objObject = $tagAssocSvc.help.attach_tag_to_multiple_objects.object_ids.element.create()
+                    $objObject.id = $obj
+                    $objObject.type = $objType
+                    $objList.add($objObject) | Out-Null
+                }
+                $tagAssocSvc.attach_tag_to_multiple_objects($TagId,$objList) | Out-Null
+            } elseif ($TagId -isnot [array] -and $ObjectId -isnot [array]) {
+                $objObject = $tagAssocSvc.help.attach.object_id.create()
+                $objObject.id = $ObjectId
+                $objObject.type = $objType
+                $tagAssocSvc.attach($TagId,$objObject) | Out-Null
+            }
+        
+        } else {Write-Output "Multiple tags with multiple objects are not a supported call."}
+
+    }
+}
+
+function Remove-CISTagAssignment {
+<#  
+.SYNOPSIS  
+    Removes a tag assignment from the CIS REST API endpoint
+.DESCRIPTION 
+    Will remove provided tag assignments
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy
+.PARAMETER Tag
+    Tag name which should be removed
+.PARAMETER Entity
+    Object name which should be removed
+.PARAMETER TagId
+    Tag ID/s which should be removed
+.PARAMETER ObjectId
+    Object ID which/s should be removed
+.EXAMPLE
+    Remove-CISTagAssignment -TagId $tagId -ObjectId 'vm-11'
+    Removes the tag assignment between the Tag ID and the Object ID
+.EXAMPLE
+    Remove-CISTagAssignment -Tag TagName -Entity VMName
+    Removes the tag assignment between the Tag name and the Entity name
+#>
+[CmdletBinding(SupportsShouldProcess = $True, ConfirmImpact = 'High')] 
+    param(
+    [Parameter(Mandatory=$false,Position=0,ValueFromPipelineByPropertyName=$true)]
+    $Tag,
+    [Parameter(Mandatory=$false,Position=1,ValueFromPipelineByPropertyName=$true)]
+    $Entity,
+    [Parameter(Mandatory=$false,Position=2)]
+    $TagId,
+    [Parameter(Mandatory=$false,Position=3)]
+    $ObjectId
+    )
+
+    If (-Not $global:DefaultCisServers) { Write-error "No CIS Connection found, please use the Connect-CisServer to connect" } Else {
+        $tagAssocSvc = Get-CisService -Name com.vmware.cis.tagging.tag_association
+        if ($PSBoundParameters.ContainsKey("Tag") -and $PSBoundParameters.ContainsKey("Entity")) {
+            if ($Tag -is [array] -and $Entity -isnot [array]) {
+                $tagIdList = $tagAssocSvc.help.detach_multiple_tags_from_object.tag_ids.create()
+                foreach ($t in $Tag) {
+                    $tempId = Get-CISTag -Name $t | Select-Object -ExpandProperty Id
+                    $tagIdList.add($tempId) | Out-Null
+                }
+                if ($global:DefaultVIServer -and $global:DefaultVIServer.Name -eq $global:DefaultCisServers.Name) {
+                    $viObject = (Get-Inventory -Name $Entity).ExtensionData.MoRef
+                    $objObject = $tagAssocSvc.help.detach_multiple_tags_from_object.object_id.create()
+                    $objObject.id = $viObject.Value
+                    $objObject.type = $viObject.type
+                } else {
+                    $vmSvc = Get-CisService -Name com.vmware.vcenter.vm
+                    $filterVmNameObj = $vmsvc.help.list.filter.create()
+                    $filterVmNameObj.names.add($Entity) | Out-Null
+                    $objId = $vmSvc.list($filterVmNameObj) | Select-Object -ExpandProperty vm
+                    if ($objId) {$objType = 'VirtualMachine'}
+                    else {Write-Warning "No entities found."; break}
+                    $objObject = $tagAssocSvc.help.detach_multiple_tags_from_object.object_id.create()
+                    $objObject.id = $objId
+                    $objObject.type = $objType
+                }
+                $tagAssocSvc.detach_multiple_tags_from_object($objObject,$tagIdList) | Out-Null
+            } elseif ($Tag -isnot [array] -and $Entity -is [array]) {
+                $tagId = Get-CISTag -Name $Tag | Select-Object -ExpandProperty Id
+                $objList = $tagAssocSvc.help.detach_tag_from_multiple_objects.object_ids.create()
+                foreach ($e in $Entity) {
+                    if ($global:DefaultVIServer -and $global:DefaultVIServer.Name -eq $global:DefaultCisServers.Name) {
+                        $viObject = (Get-Inventory -Name $e).ExtensionData.MoRef
+                        $objObject = $tagAssocSvc.help.detach_tag_from_multiple_objects.object_ids.element.create()
+                        $objObject.id = $viObject.Value
+                        $objObject.type = $viObject.type
+                    } else {
+                        $vmSvc = Get-CisService -Name com.vmware.vcenter.vm
+                        $filterVmNameObj = $vmsvc.help.list.filter.create()
+                        $filterVmNameObj.names.add($Entity) | Out-Null
+                        $objId = $vmSvc.list($filterVmNameObj) | Select-Object -ExpandProperty vm
+                        if ($objId) {$objType = 'VirtualMachine'}
+                        else {Write-Warning "No entities found."; break}
+                        $objObject = $tagAssocSvc.help.detach_tag_from_multiple_objects.object_ids.element.create()
+                        $objObject.id = $objId
+                        $objObject.type = $objType
+                    }
+                    $objList.add($objObject) | Out-Null
+                }
+                $tagAssocSvc.detach_tag_from_multiple_objects($TagId,$objList) | Out-Null
+            } elseif ($Tag -isnot [array] -and $Entity -isnot [array]) {
+                $tagId = Get-CISTag -Name $Tag | Select-Object -ExpandProperty Id
+                if ($global:DefaultVIServer -and $global:DefaultVIServer.Name -eq $global:DefaultCisServers.Name) {
+                    $viObject = (Get-Inventory -Name $Entity).ExtensionData.MoRef
+                    $objObject = $tagAssocSvc.help.detach.object_id.create()
+                    $objObject.id = $viObject.Value
+                    $objObject.type = $viObject.type
+                } else {
+                    $vmSvc = Get-CisService -Name com.vmware.vcenter.vm
+                    $filterVmNameObj = $vmsvc.help.list.filter.create()
+                    $filterVmNameObj.names.add($Entity) | Out-Null
+                    $objId = $vmSvc.list($filterVmNameObj) | Select-Object -ExpandProperty vm
+                    if ($objId) {$objType = 'VirtualMachine'}
+                    else {Write-Warning "No entities found."; break}
+                    $objObject = $tagAssocSvc.help.detach.object_id.create()
+                    $objObject.id = $objId
+                    $objObject.type = $objType
+                }
+                $tagAssocSvc.detach($TagId,$objObject) | Out-Null
+            }
+        } elseif ($PSBoundParameters.ContainsKey("TagId") -and $PSBoundParameters.ContainsKey("ObjectId")) {
+            if ($ObjectId.split('-')[0] -eq 'vm') {
+                $objType = 'VirtualMachine'
+            } else {Write-Warning 'Only VirtualMachine types currently supported.'; break}
+            if ($TagId -is [array] -and $ObjectId -isnot [array]) {
+                $objObject = $tagAssocSvc.help.detach_multiple_tags_from_object.object_id.create()
+                $objObject.id = $ObjectId
+                $objObject.type = $objType
+                $tagIdList = $tagAssocSvc.help.detach_multiple_tags_from_object.tag_ids.create()
+                foreach ($tId in $TagId) {
+                    $tagIdList.add($tId) | Out-Null
+                }
+                $tagAssocSvc.detach_multiple_tags_from_object($objObject,$tagIdList) | Out-Null
+            } elseif ($TagId -isnot [array] -and $ObjectId -is [array]) {
+                $objList = $tagAssocSvc.help.detach_tag_from_multiple_objects.object_ids.create()
+                foreach ($obj in $ObjectId) {
+                    $objObject = $tagAssocSvc.help.detach_tag_from_multiple_objects.object_ids.element.create()
+                    $objObject.id = $obj
+                    $objObject.type = $objType
+                    $objList.add($objObject) | Out-Null
+                }
+                $tagAssocSvc.detach_tag_from_multiple_objects($TagId,$objList) | Out-Null
+            } elseif ($TagId -isnot [array] -and $ObjectId -isnot [array]) {
+                $objObject = $tagAssocSvc.help.detach.object_id.create()
+                $objObject.id = $ObjectId
+                $objObject.type = $objType
+                $tagAssocSvc.detach($TagId,$objObject) | Out-Null
+            }
+        } else {Write-Output "Multiple tags with multiple objects are not a supported call."}
+
+    }
+}

Modules/VMware.Hv.Helper/VMware.HV.Helper.psm1

@@ -1761,8 +1761,8 @@ function Get-HVQueryResult {
     Version                     : 1.1
 
     ===Tested Against Environment====
-    Horizon View Server Version : 7.0.2, 7.1.0
+    Horizon View Server Version : 7.0.2, 7.1.0,7.4
-    PowerCLI Version            : PowerCLI 6.5, PowerCLI 6.5.1
+    PowerCLI Version            : PowerCLI 6.5, PowerCLI 6.5.1, PowerCLI 10.1.1
     PowerShell Version          : 5.0
 #>
 
@@ -1775,7 +1775,7 @@ function Get-HVQueryResult {
       'FarmSummaryView','GlobalApplicationEntitlementInfo','GlobalEntitlementSummaryView',
       'MachineNamesView','MachineSummaryView','PersistentDiskInfo','PodAssignmentInfo',
       'RDSServerInfo','RDSServerSummaryView','RegisteredPhysicalMachineInfo','SampleInfo',
-      'SessionLocalSummaryView','TaskInfo','URLRedirectionInfo','UserHomeSiteInfo')]
+      'SessionLocalSummaryView','TaskInfo','URLRedirectionInfo','UserHomeSiteInfo','EventSummaryView','GlobalApplicationEntitlementInfo')]
     [string]$EntityType,
 
     [Parameter(Position = 1,Mandatory = $false)]
@@ -3568,30 +3568,35 @@ function New-HVPool {
     [string[]]
     $ConnectionServerRestrictions,
 
-    #desktopSpec.desktopSettings.logoffSettings.powerPloicy
+    #desktopSpec.desktopSettings.logoffSettings.powerPolicy
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [ValidateSet('TAKE_NO_POWER_ACTION', 'ALWAYS_POWERED_ON', 'SUSPEND', 'POWER_OFF')]
     [string]$PowerPolicy = 'TAKE_NO_POWER_ACTION',
 
-    #desktopSpec.desktopSettings.logoffSettings.powerPloicy
+    #desktopSpec.desktopSettings.logoffSettings.powerPolicy
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [ValidateSet('IMMEDIATELY', 'NEVER', 'AFTER')]
     [string]$AutomaticLogoffPolicy = 'NEVER',
 
     #desktopSpec.desktopSettings.logoffSettings.automaticLogoffMinutes
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [ValidateRange(1,[int]::MaxValue)]
     [int]$AutomaticLogoffMinutes = 120,
 
     #desktopSpec.desktopSettings.logoffSettings.allowUsersToResetMachines
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [boolean]$allowUsersToResetMachines = $false,
 
     #desktopSpec.desktopSettings.logoffSettings.allowMultipleSessionsPerUser
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [boolean]$allowMultipleSessionsPerUser = $false,
 
     #desktopSpec.desktopSettings.logoffSettings.deleteOrRefreshMachineAfterLogoff
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [ValidateSet('NEVER', 'DELETE', 'REFRESH')]
     [string]$deleteOrRefreshMachineAfterLogoff = 'NEVER',
@@ -3612,25 +3617,30 @@ function New-HVPool {
 
     #DesktopDisplayProtocolSettings
     #desktopSpec.desktopSettings.logoffSettings.supportedDisplayProtocols
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [ValidateSet('RDP', 'PCOIP', 'BLAST')]
     [string[]]$supportedDisplayProtocols = @('RDP', 'PCOIP', 'BLAST'),
 
     #desktopSpec.desktopSettings.logoffSettings.defaultDisplayProtocol
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [ValidateSet('RDP', 'PCOIP', 'BLAST')]
     [string]$defaultDisplayProtocol = 'PCOIP',
 
     #desktopSpec.desktopSettings.logoffSettings.allowUsersToChooseProtocol
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [int]$allowUsersToChooseProtocol = $true,
 
     #desktopSpec.desktopSettings.logoffSettings.enableHTMLAccess
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [boolean]$enableHTMLAccess = $false,
 
     # DesktopPCoIPDisplaySettings
     #desktopSpec.desktopSettings.logoffSettings.pcoipDisplaySettings.renderer3D
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = "LINKED_CLONE")]
     [ValidateSet('MANAGE_BY_VSPHERE_CLIENT', 'AUTOMATIC', 'SOFTWARE', 'HARDWARE', 'DISABLED')]
     [string]$renderer3D = 'DISABLED',
@@ -3980,7 +3990,8 @@ function New-HVPool {
     [string]
     $CustType,
 
-    #desktopSpec.automatedDesktopSpec.customizationSettings.reusePreExistingAccounts if LINKED_CLONE
+    #desktopSpec.automatedDesktopSpec.customizationSettings.reusePreExistingAccounts if LINKED_CLONE, INSTANT_CLONE
+    [Parameter(Mandatory = $false,ParameterSetName = 'INSTANT_CLONE')]
     [Parameter(Mandatory = $false,ParameterSetName = 'LINKED_CLONE')]
     [Boolean]
     $ReusePreExistingAccounts = $false,
@@ -4259,20 +4270,20 @@ function New-HVPool {
                 $redirectWindowsProfile = $false
             }
         }
-        if ($null -ne $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.viewStorageAcceleratorSettings) {
+        if ($null -ne $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.VirtualCenterStorageSettings.viewStorageAcceleratorSettings) {
-            $useViewStorageAccelerator = $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.viewStorageAcceleratorSettings.UseViewStorageAccelerator
+            $useViewStorageAccelerator = $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.VirtualCenterStorageSettings.viewStorageAcceleratorSettings.UseViewStorageAccelerator
             if ($useViewStorageAccelerator -and $LinkedClone) {
-                $viewComposerDiskTypes = $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.viewStorageAcceleratorSettings.ViewComposerDiskTypes
+                $viewComposerDiskTypes = $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.VirtualCenterStorageSettings.viewStorageAcceleratorSettings.ViewComposerDiskTypes
             }
             if (! $InstantClone -and $useViewStorageAccelerator) {
-                $regenerateViewStorageAcceleratorDays = $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.viewStorageAcceleratorSettings.RegenerateViewStorageAcceleratorDays
+                $regenerateViewStorageAcceleratorDays = $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.VirtualCenterStorageSettings.viewStorageAcceleratorSettings.RegenerateViewStorageAcceleratorDays
-                if ($null -ne $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.viewStorageAcceleratorSettings.blackoutTimes) {
+                if ($null -ne $jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.VirtualCenterStorageSettings.viewStorageAcceleratorSettings.blackoutTimes) {
-                    $blackoutTimesList =$jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.viewStorageAcceleratorSettings.blackoutTimes
+                    $blackoutTimesList =$jsonObject.AutomatedDesktopSpec.VirtualCenterProvisioningSettings.VirtualCenterStorageSettings.viewStorageAcceleratorSettings.blackoutTimes
                     foreach ($blackout in $blackoutTimesList) {
                         $blackoutObj  = New-Object VMware.Hv.DesktopBlackoutTime
                         $blackoutObj.Days = $blackout.Days
                         $blackoutObj.StartTime = $blackout.StartTime
-                        $blackoutObj.EndTime = $blackoutObj.EndTime
+                        $blackoutObj.EndTime = $blackout.EndTime
                         $blackoutTimes += $blackoutObj
                     }
                 }
@@ -5211,6 +5222,7 @@ function Get-HVPoolCustomizationSetting {
         throw "No Instant Clone Engine Domain Administrator found with netBiosName: [$netBiosName]"
       }
       $desktopSpecObj.AutomatedDesktopSpec.CustomizationSettings.CloneprepCustomizationSettings = Get-CustomizationObject
+      $desktopSpecObj.AutomatedDesktopSpec.CustomizationSettings.ReusePreExistingAccounts = $reusePreExistingAccounts      
       $desktopSpecObj.AutomatedDesktopSpec.CustomizationSettings.CloneprepCustomizationSettings.InstantCloneEngineDomainAdministrator = $instantCloneEngineDomainAdministrator
       $desktopSpecObj.AutomatedDesktopSpec.CustomizationSettings.CloneprepCustomizationSettings.powerOffScriptName = $powerOffScriptName
       $desktopSpecObj.AutomatedDesktopSpec.CustomizationSettings.CloneprepCustomizationSettings.powerOffScriptParameters = $powerOffScriptParameters
@@ -7161,7 +7173,6 @@ function Get-HVMachine {
   $machineList = Find-HVMachine -Param $PSBoundParameters
   if (!$machineList) {
     Write-Host "Get-HVMachine: No Virtual Machine(s) Found with given search parameters"
-    break
   }
   $queryResults = @()
   $desktop_helper = New-Object VMware.Hv.MachineService
@@ -8119,7 +8130,6 @@ function Get-HVEntitlement {
     }
     if (! $results) {
       Write-Host "Get-HVEntitlement: No entitlements found with given search parameters"
-      break
       }
     return $results
   }
@@ -9309,6 +9319,16 @@ function Set-HVApplicationIcon {
   }
 
   process {
+	if (!(Test-Path $IconPath)) {
+      Write-Error "File:[$IconPath] does not exist."
+      break
+    }
+
+    if ([IO.Path]::GetExtension($IconPath) -ne '.png') {
+      Write-Error "Unsupported file format:[$IconPath]. Only PNG image files are supported."
+      break
+    }
+
     try {
       $appInfo = Get-HVQueryResult -EntityType ApplicationInfo -Filter (Get-HVQueryFilter data.name -Eq $ApplicationName) -HvServer $HvServer
     } catch {
@@ -9322,11 +9342,6 @@ function Set-HVApplicationIcon {
       break
     }
 
-    if (!(Test-Path $IconPath)) {
-      Write-Error "File:[$IconPath] does not exists"
-      break
-    }
-
     $spec = New-Object VMware.Hv.ApplicationIconSpec
     $base = New-Object VMware.Hv.ApplicationIconBase
 
@@ -9989,7 +10004,7 @@ function Reset-HVMachine {
     $services.machine.Machine_ResetMachines($machine.id)
   }
 }
-function Remove-HVMachine(){
+function Remove-HVMachine {
 	<#
 	.Synopsis
 	    Remove a Horizon View desktop or desktops.
@@ -9998,21 +10013,30 @@ function Remove-HVMachine(){
 	    Deletes a VM or an array of VM's from Horizon. Utilizes an Or query filter to match machine names.
 
     .PARAMETER HVServer
-		The Horizon server where the machine to be deleted resides.Parameter is not mandatory, 
+		The Horizon server where the machine to be deleted resides. Parameter is not mandatory,
         but if you do not specify the server, than make sure you are connected to a Horizon server
         first with connect-hvserver.
 
 	.PARAMETER MachineNames
         The name or names of the machine(s) to be deleted. Accepts a single VM or an array of VM names.This is a mandatory parameter.
 
+    .PARAMETER DeleteFromDisk
+        Determines whether the Machine VM should be deleted from vCenter Server. This is only applicable for managed machines.
+        This must always be true for machines in linked and instant clone desktops.
+        This defaults to true for linked and instant clone machines and false for all other types.
+
 	.EXAMPLE
-	   remove-HVMachine -HVServer 'horizonserver123' -MachineNames 'LAX-WIN10-002'
+	    Remove-HVMachine -HVServer 'horizonserver123' -MachineNames 'LAX-WIN10-002'
 	    Deletes VM 'LAX-WIN10-002' from HV Server 'horizonserver123'
 
 	.EXAMPLE
-	   remove-HVMachine -HVServer 'horizonserver123' -MachineNames $machines
+	    Remove-HVMachine -HVServer 'horizonserver123' -MachineNames $machines
         Deletes VM's contained within an array of machine names from HV Server 'horizonserver123'
 
+    .EXAMPLE
+        Remove-HVMachine -HVServer 'horizonserver123' -MachineNames 'ManualVM01' -DeleteFromDisk:$false
+        Deletes VM 'ManualVM01' from Horizon inventory, but not from vSphere. Note this only works for Full Clone VMs.
+
 	.NOTES
 		Author                      : Jose Rodriguez
 		Author email                : jrodsguitar@gmail.com
@@ -10035,6 +10059,9 @@ function Remove-HVMachine(){
 		[array]
         $MachineNames,
 
+        [Parameter(Mandatory = $false)]
+        [switch]$DeleteFromDisk = $true,
+
 		[Parameter(Mandatory = $false)]
 		$HVServer = $null
 	)
@@ -10042,7 +10069,7 @@ function Remove-HVMachine(){
 #Connect to HV Server
 $services = Get-ViewAPIService -HVServer $HVServer
 
-  if ($null -eq $services) {
+if ($null -eq $services) {
 	Write-Error "Could not retrieve ViewApi services from connection object"
 		break
 	}
@@ -10144,11 +10171,11 @@ $trys = 0
 
 #Create delete spec for the DeleteMachines method
 $deleteSpec = [VMware.Hv.MachineDeleteSpec]::new()
-$deleteSpec.DeleteFromDisk = $true
+$deleteSpec.DeleteFromDisk = $DeleteFromDisk
 $deleteSpec.ArchivePersistentDisk = $false
 
 #Delete the machines
-write-host "Attempting to Delete:" 
+if($DeleteFromDisk){write-host "Attempting to Delete:"}else{write-host "Attempting to remove from inventory:"}
 Write-Output ($deleteMachine.base.Name -join "`n")
 $bye = $machineService.Machine_DeleteMachines($services,$deleteMachine.id,$deleteSpec)
 
@@ -10886,4 +10913,671 @@ function remove-hvsite {
     [System.gc]::collect()
 }
 
-Export-ModuleMember Add-HVDesktop,Add-HVRDSServer,Connect-HVEvent,Disconnect-HVEvent,Get-HVPoolSpec,Get-HVInternalName, Get-HVEvent,Get-HVFarm,Get-HVFarmSummary,Get-HVPool,Get-HVPoolSummary,Get-HVMachine,Get-HVMachineSummary,Get-HVQueryResult,Get-HVQueryFilter,New-HVFarm,New-HVPool,Remove-HVFarm,Remove-HVPool,Set-HVFarm,Set-HVPool,Start-HVFarm,Start-HVPool,New-HVEntitlement,Get-HVEntitlement,Remove-HVEntitlement, Set-HVMachine, New-HVGlobalEntitlement, Remove-HVGlobalEntitlement, Get-HVGlobalEntitlement, Set-HVApplicationIcon, Remove-HVApplicationIcon, Get-HVGlobalSettings, Set-HVGlobalSettings, Set-HVGlobalEntitlement, Get-HVResourceStructure, Get-hvlocalsession, Get-HVGlobalSession, Reset-HVMachine, Remove-HVMachine, Get-HVHealth, new-hvpodfederation, remove-hvpodfederation, get-hvpodfederation, register-hvpod, unregister-hvpod, set-hvpodfederation,get-hvsite,new-hvsite,set-hvsite,remove-hvsite
+function Get-HVHomeSite {
+	<#
+	.Synopsis
+	   Gets the configured Horizon View Homesites
+
+	.DESCRIPTION
+    Gets the configured Horizon View Homesites
+
+  .PARAMETER Group
+		User principal name of a group
+
+  .PARAMETER HvServer
+		Reference to Horizon View Server to query the virtual machines from. If the value is not passed or null then
+		first element from global:DefaultHVServers would be considered in-place of hvServer
+
+	.EXAMPLE
+     Get-HVHomeSite
+
+  .EXAMPLE
+    Get-HVHomeSite -group group@domain
+
+	.NOTES
+		Author                      : Wouter Kursten
+		Author email                : wouter@retouw.nl
+		Version                     : 1.0
+	
+		===Tested Against Environment====
+		Horizon View Server Version : 7.4
+		PowerCLI Version            : PowerCLI 10
+		PowerShell Version          : 5.0
+	#>
+	
+	[CmdletBinding(
+	    SupportsShouldProcess = $false,
+	    ConfirmImpact = 'High'
+	)]
+	
+	param(
+    [Parameter(Mandatory = $false)]
+    [ValidatePattern("^.+?[@\\].+?$")]
+    [String]
+    $Group,
+
+    [Parameter(Mandatory = $false)]
+    $HvServer = $null
+	)
+
+  begin{
+    $services = Get-ViewAPIService -hvServer $hvServer
+    if ($null -eq $services) {
+	    Write-Error "Could not retrieve ViewApi services from connection object"
+		  break
+    }
+  }
+
+  process{
+    $hsresults = Get-HVQueryResult -EntityType UserHomeSiteInfo  -HvServer $HvServer
+    $resultsoverview=@()
+
+    foreach ($hsresult in $hsresults){
+    if ($hsresult.Globalentitlement){
+      $Globalentitlement = ($services.GlobalEntitlement.GlobalEntitlement_Get($hsresult.base.GlobalEntitlement)).base.displayname
+    }
+    else{
+      $Globalentitlement=""
+    }
+
+    if (($hsresult.globalapplicationEntitlement)){
+      $GlobalApplicationEntitlement = ($services.GlobalApplicationEntitlement.GlobalApplicationEntitlement_Get($hsresult.base.GlobalApplicationEntitlement)).base.displayname
+    }
+    else{
+      $GlobalApplicationEntitlement=""
+    }
+
+    $resultsoverview+=New-Object PSObject -Property @{"id" = ($hsresult).id;
+      "Group" = ($services.ADUserOrGroup.ADUserOrGroup_Get(($hsresult.base).userorgroup)).base.displayname;
+      "Site" = ($services.site.site_Get($hsresult.base.site)).base.displayname;
+      "Globalentitlement" =$Globalentitlement;
+      "Globalapplicationentitlement" =$GlobalApplicationEntitlement;
+    }
+    }
+    if ($group){
+      $results=$resultsoverview | where-object {$_.Group -eq $group} | select-object id,Group,Site,Globalentitlement,GlobalApplicationEntitlement
+    }
+    else{
+      $results=$resultsoverview | select-object id,Group,Site,Globalentitlement,GlobalApplicationEntitlement
+    }
+    return $results
+    [System.gc]::collect()
+  }
+  
+}
+
+function New-HVHomeSite {
+	<#
+	.Synopsis
+    Defines a homesite within a Horizon View Cloud Pod architecture
+
+	.DESCRIPTION
+    Creates a new homesite within a Cloud Pod Archtitecture. By default it will be applied to everything 
+    but the choice can be made to only apply for a single global entitlement or singel global application entitlement
+
+  .PARAMETER Group
+    User principal name of a group
+
+  .PARAMETER Site
+    Name of the Horizon View Site
+
+  .PARAMETER globalEntitlement
+    Name of the global entitlement
+
+  .PARAMETER globalApplicationEntitlement
+    Name of the global application entitlement
+
+	.PARAMETER HvServer
+    Reference to Horizon View Server to query the virtual machines from. If the value is not passed or null then
+    first element from global:DefaultHVServers would be considered in-place of hvServer
+
+	.EXAMPLE
+    New-HVHomeSite -group group@domain -site SITE
+
+  .EXAMPLE
+    New-HVHomeSite -group group@domain -site SITE -globalapplicationentitlement ge-ap01
+
+  .EXAMPLE
+    New-HVHomeSite -group group@domain -site SITE -globalentitlement GE_Production
+
+	.NOTES
+		Author                      : Wouter Kursten
+		Author email                : wouter@retouw.nl
+		Version                     : 1.0
+	
+		===Tested Against Environment====
+		Horizon View Server Version : 7.4
+		PowerCLI Version            : PowerCLI 10.1.1
+		PowerShell Version          : 5.0
+	#>
+	
+
+  [CmdletBinding(DefaultParameterSetName="Default")]
+	param(
+    [Parameter(Mandatory = $true,ParameterSetName="Default")]
+    [Parameter(ParameterSetName = "globalEntitlement")]
+    [Parameter(ParameterSetName = "globalApplicationEntitlement")]
+    [ValidatePattern("^.+?[@\\].+?$")]
+    [String]
+    $Group,
+
+    [Parameter(Mandatory = $true,ParameterSetName="Default")]
+    [Parameter(ParameterSetName = "globalEntitlement")]
+    [Parameter(ParameterSetName = "globalApplicationEntitlement")]
+    [String]
+    $Site,
+
+    [Parameter(Mandatory = $false,ParameterSetName="globalEntitlement")]
+    [String]
+    $globalEntitlement ,
+
+    [Parameter(Mandatory = $false,ParameterSetName="globalApplicationEntitlement")]
+    [String]
+    $globalApplicationEntitlement ,
+
+    [Parameter(Mandatory = $false,ParameterSetName="Default")]
+    [Parameter(ParameterSetName = "globalEntitlement")]
+    [Parameter(ParameterSetName = "globalApplicationEntitlement")]
+    $HvServer = $null
+  )
+
+  begin{
+    $services = Get-ViewAPIService -hvServer $hvServer
+    if ($null -eq $services) {
+	    Write-Error "Could not retrieve ViewApi services from connection object"
+		  break
+    }
+  }
+
+  process {
+    $confirmFlag = Get-HVConfirmFlag -keys $PsBoundParameters.Keys
+    $groupinfo = Get-UserInfo -UserName $Group
+    $UserOrGroupName = $groupinfo.Name
+    $Domain = $groupinfo.Domain
+    $filter1 = Get-HVQueryFilter 'base.name' -Eq $UserOrGroupName
+    $filter2 = Get-HVQueryFilter 'base.domain' -Eq $Domain
+    $filter3 = Get-HVQueryFilter 'base.group' -Eq $true
+    $andFilter = Get-HVQueryFilter -And -Filters @($filter1, $filter2, $filter3)
+    $adresults = Get-HVQueryResult -EntityType ADUserOrGroupSummaryView -Filter $andFilter -HvServer $HvServer
+    
+    if ($adresults.length -ne 1) {
+      Write-host "Unable to find specific group with given search parameters"
+      break
+    }
+    $userhomesitebase=new-object VMware.Hv.UserHomeSiteBase
+    $userhomesitebase.UserOrGroup=$adresults.id
+    $userhomesitebase.site=($services.site.site_list() | where-object {$_.base.displayname -eq $site}).id
+    if ($globalEntitlement){
+      $geresults = Get-HVQueryResult -EntityType GlobalEntitlementSummaryView -HvServer $HvServer
+      $geid=$geresults | where-object {$_.base.displayname -eq $globalEntitlement}
+      $userhomesitebase.globalEntitlement=$geid.id
+    }
+    elseif($globalApplicationEntitlement){
+      $gaefilter1 = Get-HVQueryFilter 'data.name' -Eq $globalApplicationEntitlement
+      $gaeresults = Get-HVQueryResult -EntityType ApplicationInfo -Filter $gaefilter1 -HvServer $HvServer
+      $userhomesitebase.GlobalApplicationEntitlement=$gaeresults.id
+    }
+  $services.UserHomeSite.UserHomeSite_Create($userhomesitebase)
+  }
+}
+
+function Set-HVEventDatabase {
+	<#
+  .Synopsis
+    Registers or changes a Horizon View Event database.
+
+	.DESCRIPTION
+    Registers or changes a Horizon View Event database
+
+  .PARAMETER ServerName
+    Name of the database server (Required)
+
+  .PARAMETER Databasetype
+    Database type, possible options: MYSQL,SQLSERVER,ORACLE. Defaults to SQLSERVER
+
+  .PARAMETER DatabasePort
+    Port number on the database server to which View will send events. Defaults to 1433. 
+
+  .PARAMETER Databasename
+    Name of the Database (required)
+
+  .PARAMETER TablePrefix
+    Prefix to use for the Event Databse. Allowed characters are letters, numbers, and the characters @, $, #,  _, and may not be longer than 6 characters.
+
+  .PARAMETER UserName
+    UserName to connect to the database (required)
+
+  .PARAMETER Password
+    Password of the user connecting to the database in Securestring format.
+    Can be created with:  $password = Read-Host 'Domain Password' -AsSecureString
+
+  .PARAMETER eventtime
+    Time to show the events for. Possible options are ONE_WEEK, TWO_WEEKS, THREE_WEEKS, ONE_MONTH,TWO_MONTHS, THREE_MONTHS, SIX_MONTHS
+
+  .PARAMETER EventNewTime
+    Time in days to classify events for new. Range 1-3
+
+	.PARAMETER HvServer
+    Reference to Horizon View Server to query the virtual machines from. If the value is not passed or null then
+    first element from global:DefaultHVServers would be considered in-place of hvServer
+
+	.EXAMPLE
+    register-hveventdatabase -server SERVER@domain -database DATABASENAME -username USER@domain -password $password
+
+	.NOTES
+		Author                      : Wouter Kursten
+		Author email                : wouter@retouw.nl
+		Version                     : 1.0
+
+		===Tested Against Environment====
+		Horizon View Server Version : 7.4
+		PowerCLI Version            : PowerCLI 10
+		PowerShell Version          : 5.0
+	#>
+
+	[CmdletBinding(
+	    SupportsShouldProcess = $false,
+	    ConfirmImpact = 'High'
+	)]
+
+	param(
+    [Parameter(Mandatory = $true)]
+    [string]
+    $ServerName,
+
+    [Parameter(Mandatory = $false)]
+    [string]
+    $DatabaseType = "SQLSERVER",
+
+    [Parameter(Mandatory = $false)]
+    [int]
+    $DatabasePort = 1433,
+
+    [Parameter(Mandatory = $true)]
+    [string]
+    $DatabaseName,
+
+    [Parameter(Mandatory = $false)]
+    [string][ValidateLength(1,6)]
+    $TablePrefix,
+
+    [Parameter(Mandatory = $true)]
+
+    [String]
+    $UserName,
+
+    [Parameter(Mandatory = $true)]
+    [securestring]
+    $password,
+
+    [Parameter(Mandatory = $false)]
+    [ValidateSet('ONE_WEEK','TWO_WEEKS','THREE_WEEKS','ONE_MONTH','TWO_MONTHS','THREE_MONTHS','SIX_MONTHS')]
+    [string]
+    $eventtime="TWO_WEEKS",
+
+    [Parameter(Mandatory = $false)]
+    [ValidateRange(1,3)]
+    [int]
+    $eventnewtime = 2,
+
+    [Parameter(Mandatory = $false)]
+    $HvServer = $null
+  )
+
+    $services = Get-ViewAPIService -hvServer $hvServer
+    if ($null -eq $services) {
+	    Write-Error "Could not retrieve ViewApi services from connection object"
+		  break
+    }
+  $temppw = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($password)
+  $PlainevdbPassword = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($temppw)
+  $dbupassword = New-Object VMware.Hv.SecureString
+  $enc = [system.Text.Encoding]::UTF8
+  $dbupassword.Utf8String = $enc.GetBytes($PlainevdbPassword)
+
+  $eventservice=new-object vmware.hv.eventdatabaseservice
+  $eventservicehelper=$eventservice.getEventDatabaseInfoHelper()
+  $eventsettings=new-object VMware.Hv.EventDatabaseEventSettings
+  $eventdatabase=new-object VMware.Hv.EventDatabaseSettings
+  $eventsettings.ShowEventsForTime=$eventtime
+  $eventsettings.ClassifyEventsAsNewForDays=$eventnewtime
+  $eventdatabase.Server=$ServerName
+  $eventdatabase.type=$DatabaseType
+  $eventdatabase.port=$DatabasePort
+  $eventdatabase.name=$DatabaseName
+  $eventdatabase.username=$UserName
+  if($TablePrefix){
+    $eventdatabase.tablePrefix=$tableprefix
+  }
+
+  $eventdatabase.password=$dbupassword
+  $eventservicehelper.setDatabase($eventdatabase)
+  $eventservicehelper.setsettings($eventsettings)
+  $eventservice.update($services, $eventservicehelper)
+
+  [System.gc]::collect()
+}
+
+function Get-HVEventDatabase {
+	<#
+	.Synopsis
+	   Retreives information about the configured Event Database
+	
+	.DESCRIPTION
+    Collects information about the configured event database for aHorizon View pod
+  
+	.PARAMETER HvServer
+		Reference to Horizon View Server to query the virtual machines from. If the value is not passed or null then
+		first element from global:DefaultHVServers would be considered in-place of hvServer
+	
+	.EXAMPLE
+	   Get-HVEventDatabase
+
+	.NOTES
+		Author                      : Wouter Kursten
+		Author email                : wouter@retouw.nl
+		Version                     : 1.0
+	
+		===Tested Against Environment====
+		Horizon View Server Version : 7.4
+		PowerCLI Version            : PowerCLI 10
+		PowerShell Version          : 5.0
+	#>
+	
+	[CmdletBinding(
+	    SupportsShouldProcess = $false,
+	    ConfirmImpact = 'High'
+	)]
+	
+	param(
+    [Parameter(Mandatory = $false)]
+    $HvServer = $null
+	)
+
+  $services = Get-ViewAPIService -hvServer $hvServer
+  if ($null -eq $services) {
+    Write-Error "Could not retrieve ViewApi services from connection object"
+    break
+  }
+
+  $eventdatabase=$services.EventDatabase.EventDatabase_Get()
+  if ($eventdatabase.eventdatabaseset -eq $False){
+      write-output "No Event Database configuration found"
+  }
+  elseif ($eventdatabase.eventdatabaseset -eq $true){
+    $Eventdatabaseoverview=@()
+    $Eventdatabaseoverview+=New-Object PSObject -Property @{"Servername" = $eventdatabase.Database.Server;
+      "Type" = $eventdatabase.Database.Type;
+      "DatabaseName" = $eventdatabase.Database.Name;
+      "UserName" = $eventdatabase.Database.UserName;
+      "TablePrefix" = $eventdatabase.Database.TablePrefix;
+      "ShowEventsForTime" = $eventdatabase.settings.ShowEventsForTime;
+      "ClassifyEventsAsNewForDays" = $eventdatabase.settings.ClassifyEventsAsNewForDays;
+    } | select-object Servername,Type,DatabaseName,UserName,TablePrefix,ShowEventsForTime,ClassifyEventsAsNewForDays
+  }
+  return $Eventdatabaseoverview 
+  [System.gc]::collect()
+}
+
+function Clear-HVEventDatabase {
+	<#
+	.Synopsis
+	   Clears configurationof the configured Event Database
+	
+	.DESCRIPTION
+    Clears configurationof the configured Event Database
+  
+	.PARAMETER HvServer
+		Reference to Horizon View Server to query the virtual machines from. If the value is not passed or null then
+		first element from global:DefaultHVServers would be considered in-place of hvServer
+	
+	.EXAMPLE
+	   Clear-HVEventDatabase
+
+	.NOTES
+		Author                      : Wouter Kursten
+		Author email                : wouter@retouw.nl
+		Version                     : 1.0
+	
+		===Tested Against Environment====
+		Horizon View Server Version : 7.4
+		PowerCLI Version            : PowerCLI 10
+		PowerShell Version          : 5.0
+	#>
+	
+  [CmdletBinding(
+    SupportsShouldProcess = $true,
+    ConfirmImpact = 'High')]
+	
+	param(
+    [Parameter(Mandatory = $false)]
+    $HvServer = $null
+	)
+
+  PROCESS {
+
+  $services = Get-ViewAPIService -hvServer $hvServer
+  if ($null -eq $services) {
+    Write-Error "Could not retrieve ViewApi services from connection object"
+    break
+  }
+  if ($pscmdlet.ShouldProcess($($msg))) {
+      $services.EventDatabase.EventDatabase_Clear()
+  }
+  [System.gc]::collect()
+  }
+}
+
+function Set-HVlicense {
+	<#
+	.Synopsis
+	   Sets or changes the license for Horizon View
+	
+	.DESCRIPTION
+    Sets or changes the license for Horizon View
+   
+  .PARAMETER license
+    License key (string)
+
+	.PARAMETER HvServer
+		Reference to Horizon View Server to query the virtual machines from. If the value is not passed or null then
+		first element from global:DefaultHVServers would be considered in-place of hvServer
+	
+	.EXAMPLE
+	   set-hvlicense -license "LICENSE-KEY"
+	   Returns information about the sites within a Horizon View Pod Federation.
+
+	.NOTES
+		Author                      : Wouter Kursten
+		Author email                : wouter@retouw.nl
+		Version                     : 1.0
+	
+		===Tested Against Environment====
+		Horizon View Server Version : 7.4,7.5
+		PowerCLI Version            : PowerCLI 10
+		PowerShell Version          : 5.0
+	#>
+	
+	[CmdletBinding(
+	    SupportsShouldProcess = $false,
+	    ConfirmImpact = 'High'
+	)]
+	
+	param(
+    [Parameter(Mandatory = $true)]
+    [string]
+    $license,
+        
+    [Parameter(Mandatory = $false)]
+	  $HvServer = $null
+	)
+
+		
+  $services = Get-ViewAPIService -hvServer $hvServer
+  if ($null -eq $services) {
+	  Write-Error "Could not retrieve ViewApi services from connection object"
+		break
+  }
+  
+  try {
+	  $services.license.license_set($license)
+  }
+	catch {
+	  write-error $_.exception message
+	  break
+	}
+  $licenseresult=$services.license.license_get()
+  return $licenseresult
+  [System.gc]::collect()
+}
+
+
+function Get-HVlicense {
+	<#
+	.Synopsis
+	   Gets the license for Horizon View
+	
+	.DESCRIPTION
+    Gets the license for Horizon View
+   
+  
+	.PARAMETER HvServer
+		Reference to Horizon View Server to query the virtual machines from. If the value is not passed or null then
+		first element from global:DefaultHVServers would be considered in-place of hvServer
+	
+	.EXAMPLE
+	   get-hvlicense
+	   
+
+	.NOTES
+		Author                      : Wouter Kursten
+		Author email                : wouter@retouw.nl
+		Version                     : 1.0
+	
+		===Tested Against Environment====
+		Horizon View Server Version : 7.4,7.5
+		PowerCLI Version            : PowerCLI 10
+		PowerShell Version          : 5.0
+	#>
+	
+	[CmdletBinding(
+	    SupportsShouldProcess = $false,
+	    ConfirmImpact = 'High'
+	)]
+	
+	param(
+    [Parameter(Mandatory = $false)]
+	  $HvServer = $null
+	)
+
+		
+  $services = Get-ViewAPIService -hvServer $hvServer
+  if ($null -eq $services) {
+	  Write-Error "Could not retrieve ViewApi services from connection object"
+		break
+  }
+   
+	$license=$services.license.license_get()
+	return $license
+  [System.gc]::collect()
+}
+
+function Set-HVInstantCloneMaintenance {
+  <#
+  .Synopsis
+	  Enable or disable instant clone maintanence mode
+  
+  .DESCRIPTION
+    Toggles a host in instant clone maintanence mode. Specify the VMHost name and enable or disable to toggle.
+   
+  .PARAMETER VMHost
+	  ESXi Host name to modify the InstantClone.Maintenance attribute
+  
+  .PARAMETER Enable
+    Enable Instant Clone maintenance mode.
+     
+  .PARAMETER Disable
+    Disable Instant Clone maintenance mode
+     	
+  .EXAMPLE
+    Set-HvInstantCloneMaintenance -VMHost <hostname> -Enable $true
+    Set-HvInstantCloneMaintenance -VMHost <hostname> -Disable $true
+     
+  .NOTES
+    Author                      : Jack McMichael
+    Author email                : @jackwmc4 / jackwmc4@gmail.com
+    Version                     : 1.0
+	
+    ===Tested Against Environment====
+    Horizon View Server Version : 7.6
+    PowerCLI Version            : PowerCLI 11
+    PowerShell Version          : 5.1
+  #>
+  	
+  [CmdletBinding(
+    SupportsShouldProcess = $true,
+    ConfirmImpact = 'High')]
+
+	param(
+    [Parameter(Mandatory=$true, Position=0)]
+    [string]
+    $VMHost,
+
+    [Parameter(Mandatory = $false)]
+    [switch]
+    $Enable,
+
+    [Parameter(Mandatory = $false)]
+    [switch]
+    $Disable,
+
+    [Parameter(Mandatory = $false)]
+    $HvServer = $null
+  )
+
+  begin {
+    $services = Get-ViewAPIService -hvServer $hvServer
+    if ($null -eq $services) {
+      Write-Error "Could not retrieve ViewApi services from connection object"
+      break
+    }
+  }
+
+  process {
+    if ($Enable) {
+      if ((Get-Annotation -Entity (Get-VMHost -Name $VMHost) -CustomAttribute "InstantClone.Maintenance").Value -eq ""){
+        Set-Annotation -Entity (Get-VMHost -Name $VMHost) -CustomAttribute "InstantClone.Maintenance" -Value "1" | Out-Null
+        Write-Host "Instant Clone Maintenance Mode: Enabling for $VMHost...(This could take some time)"
+      }
+      while ((Get-Annotation -Entity (Get-VMHost -Name $VMHost) -CustomAttribute "InstantClone.Maintenance").Value -ne "2") {
+          Start-Sleep -Seconds 10
+      }
+    } elseif ($Disable) {
+      if (-not (Get-Annotation -Entity (Get-VMHost -Name $VMHost) -CustomAttribute "InstantClone.Maintenance").Value -eq "") {
+        Set-Annotation -Entity (Get-VMHost -Name $VMHost) -CustomAttribute "InstantClone.Maintenance" -Value "" | Out-Null
+        Write-Host "Instant Clone Maintenance Mode: Disabling for $VMHost"
+      }
+      Set-VMhost $VMHost -State Connected | Out-Null
+    }
+    [System.gc]::collect()  
+  }
+}
+# Object related
+Export-ModuleMember -Function Get-HVMachine, Get-HVMachineSummary, Get-HVQueryResult, Get-HVQueryFilter, Get-HVInternalName
+# RDS Farm related
+Export-ModuleMember -Function Get-HVFarmSummary, Start-HVFarm, Start-HVPool, New-HVFarm, Remove-HVFarm, Get-HVFarm, Set-HVFarm, Add-HVRDSServer
+# Desktop Pool related
+Export-ModuleMember -Function Get-HVPoolSummary, New-HVPool, Remove-HVPool, Get-HVPool, Set-HVPool, Get-HVPoolSpec, Add-HVDesktop
+# Entitlement related
+Export-ModuleMember -Function New-HVEntitlement,Get-HVEntitlement,Remove-HVEntitlement
+Export-ModuleMember -Function Set-HVMachine, Reset-HVMachine, Remove-HVMachine
+# Cloud Pod Architecture related
+Export-ModuleMember -Function New-HVGlobalEntitlement, Remove-HVGlobalEntitlement, Get-HVGlobalEntitlement, Set-HVGlobalEntitlement, New-HVPodFederation, Remove-HVPodFederation, Get-HVPodFederation, Set-HVPodFederation
+Export-ModuleMember -Function Get-HVSite, New-HVSite, New-HVHomeSite, Remove-HVSite, Get-HVHomeSite, Set-HVSite, Register-HVPod, Unregister-HVPod
+# Published App related
+Export-ModuleMember -Function Get-HVGlobalSettings, Set-HVApplicationIcon, Remove-HVApplicationIcon, Set-HVGlobalSettings
+Export-ModuleMember -Function Get-HVResourceStructure, Get-HVLocalSession, Get-HVGlobalSession
+# Event Database related
+Export-ModuleMember -Function Get-HVEventDatabase, Set-HVEventDatabase, Clear-HVEventDatabase, Get-HVEvent, Connect-HVEvent, Disconnect-HVEvent
+# Misc/other related
+Export-ModuleMember -Function Get-HVlicense, Set-HVlicense, Get-HVHealth, Set-HVInstantCloneMaintenance

Modules/VMware.VCGChecker/Get-VCGHWInfo.ps1

@@ -0,0 +1,310 @@
+<#
+Copyright 2018 VMware, Inc.  All rights reserved.
+#>
+
+# Class to manage Host resources
+Class HostResource {
+    [VMware.VimAutomation.Types.VMHost] $vmhost
+    [string] $vcname
+    [string] $clustername
+    [string] $dcname
+    [string] $hostname
+    [string] $apitype
+    [string] $powerstatus
+    [string] $productname
+    [string] $version
+    [string] $fullname
+    [string] $connectionstatus
+    [string] $checkRelease
+    [int] $port
+    [Array] $ComponentResource = @()
+    [Array] $JsonProperties = @('__type__', 'dcname', 'vcname','clustername','hostname', 'apitype',
+        'powerstatus', 'productname', 'version', 'fullname', 'connectionstatus','checkRelease')
+
+    HostResource(
+        [VMware.VimAutomation.Types.VMHost] $vmhost) {
+        $this.vmhost = $vmhost
+        $view =$vmhost|Get-View
+        $vCenter_IP = $view.Summary.ManagementServerIp
+        if($vCenter_IP){
+            $this.vcname =$vCenter_IP
+            $this.dcname = (Get-Datacenter -VMHost $vmhost).Name
+            $this.clustername = (Get-Cluster -VMHost $vmhost).Name
+        }else{
+            $this.vcname =$this.vmhost.Name
+        }
+        $this.hostname = $this.vmhost.Name
+        $summary = $this.vmhost.ExtensionData.Summary
+        $this.powerstatus = $summary.runtime.powerState
+        $this.connectionstatus = $summary.runtime.connectionState
+        $this.apitype = $summary.Config.Product.apiType
+        $this.fullname = $summary.Config.Product.FullName
+        $this.version = $summary.Config.Product.version
+        $this.productname = $summary.Config.Product.licenseProductName
+        $this.port = 443
+    }
+
+    [Array]  query_components() {
+        if ($this.ComponentResource.Count -eq 0) {
+            # Get server info
+            for($count_retry=0;$count_retry -lt 3;$count_retry ++){
+                try{
+                    $svrResoure = [ServerResource]::new()
+                    $svrResoure.set_data($this.vmhost)
+                    $this.ComponentResource += $svrResoure
+                    break
+                }catch{
+                    error('query components server for '+$this.vmhost.Name +' error, retry it ' +($count_retry+1) +' times')
+                }
+            }
+            # Get PCI devices
+            for($count_retry=0;$count_retry -lt 3;$count_retry ++){
+                try{
+                    $this.query_pcidevices()
+                    break
+                }catch{
+                    error('query components pcidevice for '+$this.vmhost.Name +' error, retry it ' +($count_retry+1) +' times')
+                    if($count_retry -eq 2){
+                        error('query components pcidevice for '+$this.vmhost.Name +' faild')
+                    }
+                }
+            }
+        }
+        return $this.ComponentResource
+    }
+
+    [void] query_pcidevices() {
+        $EsxCliV2 = Get-EsxCli -V2 -VMHost $this.vmhost
+        $AllPciDevice = $EsxCliV2.hardware.pci.list.invoke()
+        foreach ($Pci in $AllPciDevice) {
+            # Ignore USB controllers, iLO/iDRAC devices
+            if ($Pci.DeviceName -like "*USB*" -or $Pci.DeviceName -like "*iLO*" -or $Pci.DeviceName -like "*iDRAC*") {
+                continue
+            }
+            # Get the NICs and storage adapters.
+            # We found NIC and storage adapters usually have module ID other than 0 or 1
+            $pciDevice = [IoDeviceResource]::new()
+            if ($Pci.ModuleID -ne 0 -and $Pci.ModuleID -ne -1) {
+                if (!$this.is_pcidevice_exist($Pci)) {
+                    $pciDevice.set_data($Pci, $EsxCliV2)
+                    $this.ComponentResource += $pciDevice
+                }
+            }
+        }
+    }
+
+    [boolean] is_pcidevice_exist($device) {
+        foreach ($pci in $this.ComponentResource) {
+            if ($pci.psobject.TypeNames[0] -eq "IoDeviceResource") {
+                $vid = [String]::Format("{0:x4}", [int]$device.VendorID)
+                $did = [String]::Format("{0:x4}", [int]$device.DeviceID)
+                $svid = [String]::Format("{0:x4}", [int]$device.SubVendorID)
+                $ssid = [String]::Format("{0:x4}", [int]$device.SubDeviceID)
+                if ($pci.vid -eq $vid -and $pci.did -eq $did -and
+                    $pci.svid -eq $svid -and $pci.ssid -eq $ssid) {
+                    return $true
+                }
+            }
+        }
+        return $false
+    }
+
+    [object] to_jsonobj() {
+        $Json = $this | Select-Object -Property $this.JsonProperties
+        $ComponentChildren = @()
+        $this.ComponentResource | ForEach-Object {$ComponentChildren += $_.to_jsonobj()}
+        $Json | Add-Member -Name "ComponentResource" -Value $ComponentChildren -MemberType NoteProperty
+
+        return $Json
+    }
+
+    [string]  get_host_status() {
+        if ($this.powerstatus -and $this.powerstatus -ne 'unknown') {
+            return $this.powerstatus
+        }
+        if ($this.connectionstatus) {
+            return ("Server " + $this.connectionstatus)
+        }
+        else {
+            return "Server status is unknown"
+        }
+    }
+
+    [string]  get_prompt_name() {
+        if ($this.apitype) {
+            $start = $this.apitype
+        }
+        else {
+            $start = "Host"
+        }
+        return $start + " " + $this.hostname
+    }
+}
+
+
+# Class to manage server resources
+Class ServerResource {
+    [string] $type
+    [string] $model
+    [string] $vendor
+    [string] $biosversion
+    [string] $cpumodel
+    [string] $cpufeatureid
+    [string] $uuid
+    [string] $status
+    [array] $matchResult
+    [array] $warnings
+    [string] $vcgLink
+    [array] $updateRelease
+
+    [VMware.VimAutomation.Types.VMHost] $vmhost
+    [Array] $JsonProperties = @('__type__','type', 'model', 'vendor', 'biosversion',
+        'cpumodel', 'cpufeatureid', 'uuid','status','matchResult','warnings','vcgLink','updateRelease')
+
+
+    [void] set_data(
+        [VMware.VimAutomation.Types.VMHost] $vmhost) {
+        $this.vmhost = $vmhost
+        $this.type = "Server"
+        $this.model = $this.vmhost.Model
+        $this.vendor = $this.vmhost.Manufacturer
+        $this.biosversion = $this.vmhost.ExtensionData.Hardware.BiosInfo.BiosVersion
+        $this.cpumodel = $this.vmhost.ProcessorType
+        $cpuFeature = $this.vmhost.ExtensionData.Hardware.CpuFeature
+        if ($cpuFeature -and $cpuFeature.Count -gt 2) {
+            $this.cpufeatureid = $this.vmhost.ExtensionData.Hardware.CpuFeature[1].Eax
+        }
+        $this.uuid = $this.vmhost.ExtensionData.Hardware.systeminfo.uuid
+    }
+
+    [object] to_jsonobj() {
+        return $this | Select-Object -Property $this.JsonProperties
+    }
+
+}
+
+# Class to manage each IO device
+Class IoDeviceResource {
+
+    [string] $type
+    [string] $model
+    [string] $deviceid
+    [string] $device
+    [string] $comptype
+    [string] $vid
+    [string] $did
+    [string] $svid
+    [string] $ssid
+    [string] $pciid
+    [string] $vendor
+    [string] $driver
+    [string] $driverversion
+    [string] $firmware
+    [string] $status
+    [array] $matchResult
+    [array] $warnings
+    [string] $vcgLink
+    [array] $updateRelease
+
+    [Array] $JsonProperties = @('__type__','type', 'model', 'deviceid', 'device',
+        'comptype', 'vid', 'did', 'svid', 'ssid', 'pciid',
+        'vendor', 'driver', 'driverversion', 'firmware','status','matchResult','warnings','vcgLink','updateRelease')
+
+    [void] set_data(
+        [object] $pci,
+        [object] $EsxCli) {
+        $this.type = "IO Device"
+        $this.model = $Pci.DeviceName
+        $this.deviceid = $pci.Address
+        $this.device = $pci.VMKernelName
+        $this.vid = [String]::Format("{0:x4}", [int]$Pci.VendorID)
+        $this.did = [String]::Format("{0:x4}", [int]$Pci.DeviceID)
+        $this.svid = [String]::Format("{0:x4}", [int]$Pci.SubVendorID)
+        $this.ssid = [String]::Format("{0:x4}", [int]$Pci.SubDeviceID)
+        $this.pciid = $this.vid + ":" + $this.did + ":" + $this.svid + ":" + $this.ssid
+        $this.vendor = $pci.VendorName
+        $this.driver = $Pci.ModuleName
+        $this.driverversion = "N/A"
+        $this.firmware = "N/A"
+
+
+        # Set component type and driverversion, firmware
+        if ($this.device -match 'nic') {
+            $arg = @{}
+            $arg['nicname'] = $this.device
+            $nic = $EsxCli.network.nic.get.invoke($arg)
+            $this.comptype = "Physical NIC"
+            $this.driverversion = $nic.driverinfo.Version
+            $this.firmware = $nic.driverinfo.FirmwareVersion
+        }
+        elseif ($this.device -match 'hba') {
+            $arg = @{}
+            $arg['module'] = $this.driver
+            $module = $EsxCli.system.module.get.invoke($arg)
+            $this.comptype = "Storage Adapter"
+            $this.driverversion = $module.Version
+        }
+    }
+
+    [object] to_jsonobj() {
+        return $this | Select-Object -Property $this.JsonProperties
+    }
+
+    [string]  get_id_detail() {
+        return $this.driver + " (PCIId:" + $this.pciid + ")"
+    }
+}
+
+# Class to manage IO device group
+Class IoDeviceResourceGroup {
+    [Array] $iodevices = @()
+    [Array] $nics = @()
+    [Array] $adapters = @()
+
+    [void]  append_nic([IODeviceResource] $nic) {
+        $this.iodevices += $nic
+        $this.nics += $nic
+    }
+
+    [void]  append_storage_adapter([IODeviceResource] $adapter) {
+        $this.iodevices += $adapter
+        $this.adapters += $adapter
+    }
+
+    [boolean]  has_nics() {
+        return $this.nics.Count > 0
+    }
+
+    [boolean]  has_storage_adapters() {
+        return $this.adapters.Count > 0
+    }
+
+}
+
+
+#
+# Collect hardware inventory data from all the hosts
+#
+Function Get-VCGHWInfo {
+    Param(
+        [Parameter(Mandatory=$true)] $vmHosts
+    )
+    # Collect the hardware data
+    $Data = @()
+    foreach($vmHost in $vmHosts) {
+        $vm = [HostResource]::new($vmHost)
+        try {
+            info ("Collecting hardware data from " + $vm.hostname)
+            $null = $vm.query_components()
+            if($vm.powerstatus -eq 'poweredOn' -and $vm.connectionstatus -eq 'connected'){
+                $Data += $vm
+                info ("Collecting hardware data from " + $vm.hostname +' success')
+            }
+        }
+        catch {
+            error ("Failed to collect hardware data from " + $vm.hostname)
+        }
+    }
+
+    return $Data
+}

Modules/VMware.VCGChecker/Get-VCGStatus.ps1

@@ -0,0 +1,168 @@
+$Uuid = [guid]::NewGuid()
+$Headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+$Headers.add("x-request-id", $Uuid)
+$Headers.add("x-api-toolid", "180209100001")
+$Headers.add("x-api-key", "SJyb8QjK2L")
+$Url_Perfix = 'https://apigw.vmware.com/m4/compatibility/v1'
+$Url = $Url_Perfix + "/compatible/servers/search?"
+$UrlPci = $Url_Perfix + "/compatible/iodevices/search?"
+$apiQurryDict=@{}
+
+#
+# Ping remote api server.
+#
+Function PingApiServer(){
+    $apiServerIp='apigw.vmware.com'
+    $results =Test-Connection $apiServerIp -Quiet
+    if($results -ne $true){
+        error ("Failed to access VMware Compatibility API,
+        Unable to use comparison function, only view basic hardware information;
+        you can use 'Get-VCGHWInfo -g <fileName>' create hardware json,
+        then use 'Check-VCGStatus -f <fileName>' load hardware json file to comapre  when connect an available network")
+        Exit(1)
+    }
+}
+
+#
+# Get the web request.
+#
+Function Get-WebRequest($VCGurl) {
+    try {
+        $req = Invoke-WebRequest -Headers $Headers -Uri $VCGUrl -ErrorVariable $err -UseBasicParsing
+    }
+    catch {
+        if ($err[0].errorrecord.exception.response) {
+            error ("WebReponse code:" + $err[0].errorrecord.exception.response.statuscode.value__)
+            error ($exitScript)
+            Exit(1)
+        }
+        else {
+            error ("Failed to check " + $type + " data for " + $HostResource.hostname)
+            error ("Failed to access VMware Compatibility API, please check your Internet connection or contact VMware Compatibility API administrator")
+            error ("Exit the script")
+            Exit(1)
+        }
+    }
+    return $req
+}
+
+Function Get-RemoteApiTitleString([object]$device,$EsxiVersion){
+    if ($device.type -eq 'Server') {
+        $Title = $device.model + $device.vendor + $device.cpufeatureid + $device.biosversion +$EsxiVersion
+    }
+    else{
+        $Title = $device.vid +  $device.did + $device.Svid + $device.Ssid + $EsxiVersion
+    }
+    return $Title
+}
+
+Function Get-ResponseFromApi([object]$device,$EsxiVersion){
+    if ($device.type -eq 'Server') {
+        $VCGUrl = $Url + "model=" + $device.model + "&releaseversion=" + $EsxiVersion `
+            + "&vendor=" + $device.vendor + "&cpuFeatureId=" + $device.cpufeatureid `
+            + "&bios=" + $device.biosversion
+        debug ("Model:" + $device.model)
+        debug ("VCG Url:" + $VCGUrl)
+        $Headers.GetEnumerator() | ForEach-Object {debug ("Req Header:" + $_.key + ":" + $_.value)}
+        $request = Get-WebRequest $VCGUrl
+        $Response = ConvertFrom-Json -InputObject $request -Erroraction 'silentlycontinue'
+    }
+    elseif ($device.type -eq 'IO Device') {
+        $VCGUrl = $UrlPci + "vid=0X" + $device.vid + "&did=0X" + $device.did + "&svid=0X" + $device.Svid `
+            + "&ssid=0X" + $device.Ssid + "&releaseversion=" + $EsxiVersion `
+            + "&driver=" + $device.Driver + "&driverversion=" + $device.driverversion + "&firmware=N/A"
+        debug ("Model:" + $device.model)
+        debug ("VCG Url:" + $VCGUrl)
+        $Headers.GetEnumerator() | ForEach-Object {debug ("Req Header:" + $_.key + ":" + $_.value)}
+        $request = Get-WebRequest $VCGUrl
+        $Response = ConvertFrom-Json -InputObject $request -Erroraction 'silentlycontinue'
+    }
+    return $Response
+}
+#
+# Get the data from api
+#
+Function Get-VCGData($HostResource) {
+    foreach ($device in $HostResource.ComponentResource) {
+        if ($HostResource.checkRelease) {
+            $EsxiVersion = $HostResource.checkRelease
+        }
+        else {
+            $EsxiVersion = $HostResource.version
+        }
+        $temp=0
+        $title=Get-RemoteApiTitleString $device $EsxiVersion
+        if($apiQurryDict.Count -eq 0){
+            $Response= Get-ResponseFromApi $device $EsxiVersion
+            $apiQurryDict.Add($title,$Response)
+        }else{
+            foreach($onetitle in $apiQurryDict.keys){
+                if($onetitle -eq $title){
+                    $Response= $apiQurryDict[$onetitle]
+                    $temp=1
+                    break
+                }
+            }
+            if($temp -eq 0){
+                $Response= Get-ResponseFromApi $device $EsxiVersion
+                $apiQurryDict.Add($title,$Response)
+            }
+        }
+
+        if ($Response.matches) {
+            foreach ($match in $Response.matches) {
+                $device.vcgLink += [string]$match.vcgLink
+            }
+        }
+        else {
+            foreach ($potentialMatche in $Response.potentialMatches) {
+                $device.vcgLink += [string]$potentialMatche.vcgLink
+            }
+        }
+        $device.status = [string]$Response.searchResult.status
+        $device.matchResult = [string]$Response.searchResult.matchResult
+        $device.warnings = $Response.searchResult.warnings
+        $device.updateRelease = [string]$Response.searchOption.foundRelease
+    }
+}
+
+#
+# Send the hardware data to VCG API and handle returned result
+#
+Function Get-DataFromRemoteApi([object]$servers) {
+    info ("Checking hardware compatibility result with VMware Compatibility Guide API...")
+    info ("This may take a few minutes depending on your network.")
+    for ($idx = 0; $idx -lt $servers.Count; $idx++) {
+        $server = $servers[$idx]
+        $i = $idx + 1
+        info ([string]$i + "/" + [string]$servers.Count + " - Checking hardware compatibility results for " + $server.hostname)
+        if (!$server -or $server.ComponentResource.Count -eq 0) {
+            error('Failed to get the hardware info.')
+            Exit(1)
+        }
+        Get-VCGData $server
+    }
+    return $servers
+}
+
+Function Get-VCGStatus{
+    Param(
+        [Parameter(Mandatory=$true)]  $Data,
+        [Parameter(Mandatory=$false)] $Version
+    )
+    $checkRelease = $Version
+    PingApiServer
+
+    foreach ($vmHost in $Data) {
+        # $vmHost|add-member -Name "checkRelease" -value $checkRelease -MemberType NoteProperty -Force
+        $vmHost.checkRelease=$checkRelease
+    }
+
+    $results = Get-DataFromRemoteApi($Data)
+    if ($results.Count -eq 0) {
+        error ("Failed to get compatibility results. No report will be generated")
+        error ("Exit the script")
+        Exit(1)
+    }
+    return $results
+}

Modules/VMware.VCGChecker/README.md

@@ -0,0 +1,41 @@
+# About 
+This module is designed to ease the work of collecting hardware inventory data and compare it with VMware's official VCG data. Before deploying vSphere, it is required to validate your physical machines with VCG to make sure all the devices in your physical machines are compatible with the vSphere version you want to install. It is a time-consuming and painful experience to collect hardware/driver/firmware data from all of the machines, especially when you have a huge number of machines in your data center. 
+
+# How It Works
+By using this module, it will automate the data collection and comparison work. 
+
+When running the module, it will connect to the target vCenter or ESXi to read the hardware data. It is a read-only operation and nothing on the target hosts will be changed. There is almost no impact on the machine's performance as the read operation takes just few seconds. 
+
+The module will then send your hardware inventory data to VMware's offical website to conduct a compatibility check. The result will be 'Compatible', 'May not be compatible' or 'Not compatible'. 
+* Compatible: the hardware is compatible with the given vSphere release. Link to that VCG page will be provided.
+* May not be compatible: manual check is required to confirm the compatibility status of this hardware. A few potential matching VCG records will be provided.
+* Not compatible: the hardware is not compatible with the given vSphere release.
+
+After the checking is completed, the module will generate reports in different formats for your review and future use. A summary view in html will give you an overview of your machines compatibility status; an html file with device details to view each device/driver/firmware you have, their compatibility with vSphere version you specified and links to the corresponding VCG documents online; a csv file with device details to allow customization on report in Excel or by your own tool.
+
+# Usage
+Considering many data center may have control on internet access, we create 3 cmdlets to meet various situations. 
+* Get-VCGHWInfo: cmdlet to collect hardware info
+* Get-VCGStatus: cmdlet to check hardware compatibility by query VCG website
+* Export-VCGReport: cmdlet to export the summary/html/csv reports
+
+1. You need to first import this module after you import PowerCLI module  
+PS> Import-Module <path_to_VMware.VCGChecker.psd1>
+
+2. Connect to the target vSphere hosts using Connect-VIServer and get VMHosts  
+PS> Connect-VIServer -Server <server> -User <username> -Password <password>   
+PS> $vmhosts = Get-VMHost
+
+3. Collect the hardware data  
+PS> $hwdata = Get-VCGHWInfo -vmHosts $vmhosts  
+Note: if you don't have internet access, you need to connect your client to internet before proceeding to the next step.
+
+4. Specify the target vSphere release you want to check and submit the hardware data to VMware website  
+PS> $vcgdata= Get-VCGStatus -Data $hwdata -Version '<release>'
+
+5. Save the compatibility reports   
+PS> Export-VCGReport -Data $vcgdata -Dir <dir>
+
+# Known Limitation
+* The module is not able to get the firmware version for HBA devices. 
+* The module is not able to get the HDD/SSD data. 

Modules/VMware.VCGChecker/Save-VCGJsonFile.ps1

@@ -0,0 +1,17 @@
+Function Save-VCGJsonFile{
+    Param(
+        [Parameter(Mandatory=$true)] $FileName,
+        [Parameter(Mandatory=$true)] $Data,
+        [Parameter(Mandatory=$true)] $Dir
+    )
+    $json = @()
+    $Data | ForEach-Object { $json += $_.to_jsonobj()}
+
+    if (!(Test-Path $Dir)) {
+       New-Item -Type directory -Confirm:$false -Path $Dir -Force |Out-Null
+    }
+
+    $Path= $Dir + '\' + $FileName + '.json'
+    info ("Saving data to " + $Path)
+    ConvertTo-Json -Depth 10 -Compress $json | Out-File -encoding 'UTF8' -FilePath $Path
+}

Modules/VMware.VCGChecker/VMware.VCGChecker.psd1

@@ -0,0 +1,90 @@
+#
+# Module manifest for module 'VMware.VCGChecker'
+#
+# Generated by: fdai@vmware.com, zhangta@vmware.com, linweij@vmware.com
+#
+# Generated on: 11/15/18
+#
+
+@{
+
+    # Script module or binary module file associated with this manifest.
+    # RootModule = 'VMware.VCGChecker.psm1'
+    
+    # Version number of this module.
+    ModuleVersion = '1.0.0'
+    
+    # Supported PSEditions
+    # CompatiblePSEditions = @()
+    
+    # ID used to uniquely identify this module
+    # GUID = ''
+    
+    # Author of this module
+    Author = 'Frank Dai, Tao Zhang, Linwei Jiang'
+    
+    # Company or vendor of this module
+    CompanyName = 'VMware'
+    
+    # Copyright statement for this module
+    Copyright = '(c) 2018 VMware. All rights reserved.'
+    
+    # Description of the functionality provided by this module
+    Description = 'PowerShell Module for Checking Hardware Compatibility Status'
+    
+    RequiredModules = @('VMware.VimAutomation.Core')
+
+    # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
+    NestedModules = 'Get-VCGHWInfo.ps1','Get-VCGStatus.ps1','Export-VCGReport.ps1', 'Save-VCGJsonFile.ps1', 'logger.ps1'
+    
+    # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
+    FunctionsToExport = 'Get-VCGHWInfo', 'Get-VCGStatus', 'Export-VCGReport', 'Save-VCGJsonFile'
+    # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
+    CmdletsToExport = @()
+    
+    # Variables to export from this module
+    VariablesToExport = '*'
+    
+    # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
+    AliasesToExport = @()
+    
+    # DSC resources to export from this module
+    # DscResourcesToExport = @()
+    
+    # List of all modules packaged with this module
+    # ModuleList = @()
+    
+    # List of all files packaged with this module
+    # FileList = @()
+    
+    # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+    PrivateData = @{
+    
+        PSData = @{
+    
+            # Tags applied to this module. These help with module discovery in online galleries.
+            # Tags = @()
+    
+            # A URL to the license for this module.
+            # LicenseUri = ''
+    
+            # A URL to the main website for this project.
+            # ProjectUri = ''
+    
+            # A URL to an icon representing this module.
+            # IconUri = ''
+    
+            # ReleaseNotes of this module
+            # ReleaseNotes = ''
+    
+        } # End of PSData hashtable
+    
+    } # End of PrivateData hashtable
+    
+    # HelpInfo URI of this module
+    # HelpInfoURI = ''
+    
+    # Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
+    # DefaultCommandPrefix = ''
+    
+    }

Modules/VMware.VCGChecker/logger.ps1

@@ -0,0 +1,112 @@
+<#
+Copyright 2018 VMware, Inc.  All rights reserved.
+
+#>
+
+# Messages
+$HEADER_OK = "[OK]  "
+$HEADER_INFO = "[INFO]  "
+$HEADER_WARNING = "[WARNING]  "
+$HEADER_ERR = "[ERROR]  "
+
+Class DebugLog
+{
+    # Static variables of the logger class
+    static [string] $CAFILE_PATH = "./.certs/"
+
+    [boolean] $debug
+    [string] $logfile
+
+    DebugLog()
+    {
+        $this.debug = $false
+        $this.logfile = $null
+        if (!(Test-Path $this::CAFILE_PATH))
+	    {
+		    New-Item -Type directory -Confirm:$false -Path $this::CAFILE_PATH
+	    }
+    }
+
+    [void] SetDebug(
+        [boolean] $debug,
+        [string] $hostname
+    ){
+        if (!$hostname) {$hostname = ''}
+        $this.debug = $debug
+        if ($this.debug)
+        {
+            $this.logfile = $this::CAFILE_PATH + $hostname + [DateTime]::Now.ToString("_yyyy-MM-dd_HH-mm") + ".log"
+        }else{
+            $this.logfile = $null
+        }
+    }
+
+    [void] log_vars(
+        [string] $message,
+        [object] $var
+    ){
+        $this.log($message + $var)
+    }
+
+    [void] log(
+        [string] $message
+    ){
+        if (!$this.debug -or !$this.logfile) {return}
+        try
+        {
+            $message | Out-File $this.logfile -Append
+        }catch {
+            Out-Host -InputObject ("[Exception] Failed to write to a logfile: " + $this.logfile)
+            Out-Host -InputObject $_
+        }
+    }
+}
+
+Function debug_vars(
+    [string] $message,
+    [object] $var)
+{
+    $logger.log_vars($message, $var)
+}
+
+Function debug(
+    [string] $message)
+{
+    $logger.log($message)
+}
+
+Function vcglog(
+    [string] $message,
+    [string] $header="")
+{
+    $msg = $header + $message
+    $logger.log($msg)
+    Out-Host -InputObject $msg
+}
+
+Function ok(
+    [string] $message)
+{
+    vcglog $message $HEADER_OK
+}
+
+Function warning(
+    [string] $message)
+{
+    vcglog $message $HEADER_WARNING
+}
+
+Function info(
+    [string] $message)
+{
+    vcglog $message $HEADER_INFO
+}
+
+Function error(
+    [string] $message)
+{
+    vcglog $message $HEADER_ERR
+}
+
+$logger = [DebugLog]::new()
+$logger.SetDebug($true, "vcc-debug")

Modules/VMware.VMC/VMware.VMC.psm1

@@ -320,7 +320,6 @@ Function Get-VMCSDDCVersion {
         }
     }
 }
-
 Function Get-VMCFirewallRule {
     <#
         .NOTES
@@ -394,9 +393,8 @@ Function Get-VMCFirewallRule {
         }
         $results
     }
-
+Function Export-VMCFirewallRule {
-    Function Export-VMCFirewallRule {
+<#
-    <#
         .NOTES
         ===========================================================================
         Created by:     William Lam
@@ -479,10 +477,9 @@ Function Get-VMCFirewallRule {
         } else {
             $results | ConvertTo-Json
         }
-    }
+}
-
+Function Import-VMCFirewallRule {
-    Function Import-VMCFirewallRule {
+<#
-    <#
         .NOTES
         ===========================================================================
         Created by:     William Lam
@@ -636,10 +633,9 @@ Function Get-VMCFirewallRule {
 
     Write-host "Adding VMC Firewall Rules ..."
     $firewallRuleAdd = $firewallService.add($orgId,$sddcId,$EdgeId,$firewallRules)
-    }
+}
-
+Function Remove-VMCFirewallRule {
-    Function Remove-VMCFirewallRule {
+<#
-    <#
         .NOTES
         ===========================================================================
         Created by:     William Lam
@@ -686,8 +682,7 @@ Function Get-VMCFirewallRule {
     $firewallService = Get-VmcService com.vmware.vmc.orgs.sddcs.networks.edges.firewall.config.rules
     Write-Host "Removing VMC Firewall Rule Id $RuleId ..."
     $firewallService.delete($orgId,$sddcId,$EdgeId,$RuleId)
-    }
+}
-
 Function Get-VMCLogicalNetwork {
     <#
         .NOTES
@@ -727,9 +722,17 @@ Function Get-VMCLogicalNetwork {
         break
     }
 
-    $logicalNetworkService = Get-VmcService com.vmware.vmc.orgs.sddcs.networks.logical
+    # @LucD22 - 21/10/18 - Fix for issue #176 VMware.VMC module only lists firts 20 Logical networks
+    # Loop until entries (total_count) are returned
 
-    $logicalNetworks = ($logicalNetworkService.get_0($orgId, $sddcId)).data | Sort-Object -Property id
+    $index = [long]0
+
+    $logicalNetworks = do{
+        $netData = $logicalNetworkService.get_0($orgId,$sddcId,$pagesize,$index)
+        $netData.data | Sort-Object -Property id
+        $index = $index + $netdata.paging_info.page_size    
+    }
+    until($index -ge $netData.paging_info.total_count)
 
     if($LogicalNetworkName) {
         $logicalNetworks = $logicalNetworks | Where-Object {$_.Name -eq $LogicalNetworkName}
@@ -751,7 +754,6 @@ Function Get-VMCLogicalNetwork {
     }
     $results
 }
-
 Function Remove-VMCLogicalNetwork {
     <#
         .NOTES
@@ -799,9 +801,8 @@ Function Remove-VMCLogicalNetwork {
     $logicalNetworkService = Get-VmcService com.vmware.vmc.orgs.sddcs.networks.logical
     $logicalNetworkService.delete($orgId,$sddcId,$lsId)
 }
-
 Function New-VMCLogicalNetwork {
-    <#
+<#
     .NOTES
     ===========================================================================
     Created by:     Kyle Ruddy
@@ -817,7 +818,7 @@ Function New-VMCLogicalNetwork {
         Creates a new Logical Network
     .EXAMPLE
         New-VMCLogicalNetwork -OrgName <Org Name> -SDDCName <SDDC Name> -LogicalNetworkName <LogicalNetwork Name> -SubnetMask <Subnet Mask Prefix> -Gateway <Gateway IP Address>
-    #>
+#>
     [cmdletbinding(SupportsShouldProcess = $true,ConfirmImpact='High')]
     param(
         [Parameter(Mandatory=$true)][String]$SDDCName,
@@ -854,7 +855,6 @@ Function New-VMCLogicalNetwork {
     $logicalNetworkService.create($orgId, $sddcId, $logicalNetworkSpec)
     Get-VMCLogicalNetwork -OrgName $OrgName -SDDCName $SDDCName -LogicalNetworkName $LogicalNetworkName
 }
-
 Function Get-VMCSDDCSummary {
     <#
         .NOTES
@@ -899,7 +899,6 @@ Function Get-VMCSDDCSummary {
             $results
         }
 }
-
 Function Get-VMCPublicIP {
     <#
         .NOTES
@@ -1045,4 +1044,384 @@ Function Set-VMCSDDC {
     }
 }
 
-Export-ModuleMember -Function 'Get-VMCCommand', 'Connect-VMCVIServer', 'Get-VMCOrg', 'Get-VMCSDDC', 'Get-VMCTask', 'Get-VMCSDDCDefaultCredential', 'Get-VMCSDDCPublicIP', 'Get-VMCVMHost', 'Get-VMCSDDCVersion', 'Get-VMCFirewallRule', 'Export-VMCFirewallRule', 'Import-VMCFirewallRule', 'Remove-VMCFirewallRule', 'Get-VMCLogicalNetwork', 'Remove-VMCLogicalNetwork', 'New-VMCLogicalNetwork', 'Get-VMCSDDCSummary', 'Get-VMCPublicIP', 'New-VMCPublicIP', 'Remove-VMCPublicIP', 'Set-VMCSDDC'
+Function New-VMCPublicIP {
+<#
+    .NOTES
+    ===========================================================================
+    Created by:    William Lam
+    Date:          09/12/2018
+    Organization:  VMware
+    Blog:          http://www.virtuallyghetto.com
+    Twitter:       @lamw
+    ===========================================================================
+
+    .SYNOPSIS
+        Request a new public IP Address for a given SDDC
+    .DESCRIPTION
+        This cmdlet requests a new public IP Address for a given SDDC
+    .EXAMPLE
+        New-VMCPublicIP -OrgName $OrgName -SDDCName $SDDCName -Description "Test for Randy"
+#>
+    Param (
+        [Parameter(Mandatory=$True)]$OrgName,
+        [Parameter(Mandatory=$True)]$SDDCName,
+        [Parameter(Mandatory=$False)]$Description
+    )
+
+    If (-Not $global:DefaultVMCServers) { Write-error "No VMC Connection found, please use the Connect-VMC to connect" } Else {
+        $orgId = (Get-VMCOrg -Name $OrgName).Id
+        $sddcId = (Get-VMCSDDC -Name $SDDCName -Org $OrgName).Id
+
+        $publicIPService = Get-VmcService "com.vmware.vmc.orgs.sddcs.publicips"
+
+        $publicIPSpec = $publicIPService.Help.create.spec.Create()
+        $publicIPSpec.count = 1
+        $publicIPSpec.names = @($Description)
+
+        Write-Host "Requesting a new public IP Address for your SDDC ..."
+        $results = $publicIPService.create($orgId,$sddcId,$publicIPSpec)
+    }
+}
+
+Function Remove-VMCPublicIP {
+<#
+    .NOTES
+    ===========================================================================
+    Created by:    William Lam
+    Date:          09/12/2018
+    Organization:  VMware
+    Blog:          http://www.virtuallyghetto.com
+    Twitter:       @lamw
+    ===========================================================================
+
+    .SYNOPSIS
+        Removes a specific public IP Addresses for a given SDDC
+    .DESCRIPTION
+        This cmdlet removes a specific public IP Address for a given SDDC
+    .EXAMPLE
+        Remove-VMCPublicIP -OrgName $OrgName -SDDCName $SDDCName -AllocationId "eipalloc-0567acf34e436c01f"
+#>
+    Param (
+        [Parameter(Mandatory=$True)]$OrgName,
+        [Parameter(Mandatory=$True)]$SDDCName,
+        [Parameter(Mandatory=$True)]$AllocationId
+    )
+
+    If (-Not $global:DefaultVMCServers) { Write-error "No VMC Connection found, please use the Connect-VMC to connect" } Else {
+        $orgId = (Get-VMCOrg -Name $OrgName).Id
+        $sddcId = (Get-VMCSDDC -Name $SDDCName -Org $OrgName).Id
+
+        $publicIPService = Get-VmcService "com.vmware.vmc.orgs.sddcs.publicips"
+
+        Write-Host "Deleting public IP Address with ID $AllocationId ..."
+        $results = $publicIPService.delete($orgId,$sddcId,$AllocationId)
+    }
+}
+
+Function Get-VMCEdge {
+<#
+.NOTES
+===========================================================================
+Created by:    Luc Dekens
+Date:          23/10/2018
+Organization:  Community
+Blog:          http://lucd.info
+Twitter:       @LucD22
+===========================================================================
+
+.SYNOPSIS
+    Returns all the VMC Edges
+.DESCRIPTION
+    Returns all the VMC Edges
+.EXAMPLE
+    Get-VMCEdge -OrgName $orgName -SddcName $SDDCName -EdgeType gatewayServices
+#>
+    Param (
+        [Parameter(Mandatory=$True)]
+        [string]$OrgName,
+        [Parameter(Mandatory=$True)]
+        [string]$SDDCName,
+        [ValidateSet('gatewayServices','distributedRouter')]
+        [string]$EdgeType = ''
+    )
+
+    If (-Not $global:DefaultVMCServers) {
+        Write-error "No VMC Connection found, please use the Connect-VMC to connect"
+    }
+    Else {
+        $orgId = (Get-VMCOrg -Name $OrgName).Id
+        $sddcId = (Get-VMCSDDC -Name $SDDCName -Org $OrgName).Id
+
+        $edgeService = Get-VmcService -Name 'com.vmware.vmc.orgs.sddcs.networks.edges'
+        $index = [long]0
+        $edges = do{
+            $edgeData = $edgeService.get($orgId,$sddcId,$EdgeType,'',$index)
+            $edgeData.edge_page.data | Sort-Object -Property id
+            $index = $index + $edgeData.edge_page.paging_info.page_size    
+        }
+        until($index -ge $edgeData.paging_info.total_count)
+        $edges | %{
+            [pscustomobject]@{
+                Name = $_.Name
+                Id = $_.id
+                Type = $_.edge_type
+                State = $_.state
+                Status = $_.edge_status
+                VNics = $_.number_of_connected_vnics
+                TenantId = $_.tenant_id
+            }
+        }
+    }
+}
+
+Function Get-VMCEdgeStatus {
+<#
+.NOTES
+===========================================================================
+Created by:    Luc Dekens
+Date:          23/10/2018
+Organization:  Community
+Blog:          http://lucd.info
+Twitter:       @LucD22
+===========================================================================
+
+.SYNOPSIS
+    Returns the status of the gateway
+.DESCRIPTION
+     Retrieve the status of the specified management or compute gateway (NSX Edge).
+.EXAMPLE
+    Get-VMCEdgeStatus -OrgName $orgName -SddcName $SDDCName -Edge $EdgeName
+#>
+    Param (
+        [Parameter(Mandatory=$True)]
+        [string]$OrgName,
+        [Parameter(Mandatory=$True)]
+        [string]$SDDCName,
+        [Parameter(Mandatory=$True)]
+        [string]$EdgeName
+    )
+
+    If (-Not $global:DefaultVMCServers) {
+        Write-error "No VMC Connection found, please use the Connect-VMC to connect"
+    }
+    Else {
+        $orgId = (Get-VMCOrg -Name $OrgName).Id
+        $sddcId = (Get-VMCSDDC -Name $SDDCName -Org $OrgName).Id
+        $edgeId = Get-VMCEdge -SDDCName $SDDCName -Org $OrgName | where{$_.Name -eq $EdgeName} | select -ExpandProperty Id
+
+        $statusService = Get-VmcService -Name 'com.vmware.vmc.orgs.sddcs.networks.edges.status'
+        $status = $statusService.get($orgId,$sddcId,$edgeId)
+
+        $vmStatus = $status.edge_vm_status | %{
+            [pscustomobject]@{
+                Name = $_.name
+                State = $_.edge_VM_status
+                HAState = $_.ha_state
+                Index = $_.index
+            }        
+        }
+        $featureStatus = $status.feature_statuses | %{
+            [pscustomobject]@{
+                Service = $_.service
+                Status = $_.status
+            }
+        }
+        [pscustomobject]@{
+            Time = [timezone]::CurrentTimeZone.ToLocalTime(([datetime]'1/1/1970').AddSeconds($status.timestamp/1000))
+            Status = $status.edge_status
+            PublishStatus = $status.publish_status
+            SystemStatus = $_.system_status
+            NicInUse = $status.ha_vnic_in_use
+        }
+    }
+}
+
+Function Get-VMCEdgeNic {
+<#
+.NOTES
+===========================================================================
+Created by:    Luc Dekens
+Date:          23/10/2018
+Organization:  Community
+Blog:          http://lucd.info
+Twitter:       @LucD22
+===========================================================================
+
+.SYNOPSIS
+    Returns all interfaces for the gateway
+.DESCRIPTION
+    Retrieve all interfaces for the specified management or compute gateway (NSX Edge).
+.EXAMPLE
+    Get-VMCEdgeNic -OrgName $orgName -SddcName $SDDCName -Edge $EdgeName
+#>
+    Param (
+        [Parameter(Mandatory=$True)]
+        [string]$OrgName,
+        [Parameter(Mandatory=$True)]
+        [string]$SDDCName,
+        [Parameter(Mandatory=$True)]
+        [string]$EdgeName
+    )
+
+    If (-Not $global:DefaultVMCServers) {
+        Write-error "No VMC Connection found, please use the Connect-VMC to connect"
+    }
+    Else {
+        $orgId = (Get-VMCOrg -Name $OrgName).Id
+        $sddcId = (Get-VMCSDDC -Name $SDDCName -Org $OrgName).Id
+        $edgeId = Get-VMCEdge -SDDCName $SDDCName -Org $OrgName | where{$_.Name -eq $EdgeName} | select -ExpandProperty Id
+
+        $vnicService = Get-VmcService -Name 'com.vmware.vmc.orgs.sddcs.networks.edges.vnics'
+        $vnicService.get($orgId,$sddcId,$edgeId) | select -ExpandProperty vnics | %{
+            [pscustomobject]@{
+                Label = $_.label
+                Name = $_.Name
+                Type = $_.type
+                Index = $_.index
+                IsConnected = $_.is_connected
+                Portgroup = $_.portgroup_name
+            }
+        }
+    }
+}
+
+Function Get-VMCEdgeNicStat {
+<#
+.NOTES
+===========================================================================
+Created by:    Luc Dekens
+Date:          23/10/2018
+Organization:  Community
+Blog:          http://lucd.info
+Twitter:       @LucD22
+===========================================================================
+
+.SYNOPSIS
+    Returns statistics for the gateway interfaces
+.DESCRIPTION
+     Retrieve interface statistics for a management or compute gateway (NSX Edge).
+.EXAMPLE
+    Get-VMCEdgeNicStat -OrgName $orgName -SddcName $SDDCName -Edge $EdgeName
+#>
+    [CmdletBinding(DefaultParameterSetName='Default')]
+    Param (
+        [Parameter(Mandatory=$True)]
+        [string]$OrgName,
+        [Parameter(Mandatory=$True)]
+        [string]$SDDCName,
+        [Parameter(Mandatory=$True)]
+        [string]$EdgeName
+#        [DateTime]$Start,
+#        [DateTime]$Finish
+    )
+
+    If (-Not $global:DefaultVMCServers) {
+        Write-error "No VMC Connection found, please use the Connect-VMC to connect"
+    }
+    Else {
+        $orgId = (Get-VMCOrg -Name $OrgName).Id
+        $sddcId = (Get-VMCSDDC -Name $SDDCName -Org $OrgName).Id
+        $edgeId = Get-VMCEdge -SDDCName $SDDCName -Org $OrgName | where{$_.Name -eq $EdgeName} | select -ExpandProperty Id
+
+#        $epoch = Get-Date 01/01/1970
+#        
+#        if($start){
+#            $startEpoch = (New-TimeSpan -Start $epoch -End $Start.ToUniversalTime()).TotalMilliseconds
+#        }
+#        if($Finish){
+#            $finishEpoch = (New-TimeSpan -Start $epoch -End $Finish.ToUniversalTime()).TotalMilliseconds
+#        }
+
+        $vnicStatService = Get-VmcService -Name 'com.vmware.vmc.orgs.sddcs.networks.edges.statistics.interfaces'
+#        $stats = $vnicStatService.get($orgId,$sddcId,$edgeId,[long]$startEpoch,[long]$finishEpoch)
+        $stats = $vnicStatService.get($orgId,$sddcId,$edgeId)
+
+        $stats.data_dto | Get-Member -MemberType NoteProperty | where{$_.Name -ne 'Help'} | %{$_.Name} | %{
+            $stats.data_dto."$_" | %{
+                [pscustomobject]@{
+                    vNIC = $_.vnic
+                    Timestamp = [timezone]::CurrentTimeZone.ToLocalTime(([datetime]'1/1/1970').AddSeconds($_.timestamp))
+                    In = $_.in
+                    Out = $_.out
+                    Unit = 'Kbps'
+                    Interval = $stats.meta_dto.interval
+                }
+            }
+        }
+    }
+}
+
+Function Get-VMCEdgeUplinkStat {
+<#
+.NOTES
+===========================================================================
+Created by:    Luc Dekens
+Date:          23/10/2018
+Organization:  Community
+Blog:          http://lucd.info
+Twitter:       @LucD22
+===========================================================================
+
+.SYNOPSIS
+    Returns statistics for the uplink interfaces
+.DESCRIPTION
+     Retrieve uplink interface statistics for a management or compute gateway (NSX Edge).
+.EXAMPLE
+    Get-VMCEdgeUplinkStat -OrgName $orgName -SddcName $SDDCName -Edge $EdgeName
+#>
+    Param (
+        [Parameter(Mandatory=$True)]
+        [string]$OrgName,
+        [Parameter(Mandatory=$True)]
+        [string]$SDDCName,
+        [Parameter(Mandatory=$True)]
+        [string]$EdgeName
+#        [DateTime]$Start,
+#        [DateTime]$Finish
+    )
+
+    If (-Not $global:DefaultVMCServers) {
+        Write-error "No VMC Connection found, please use the Connect-VMC to connect"
+    }
+    Else {
+        $orgId = (Get-VMCOrg -Name $OrgName).Id
+        $sddcId = (Get-VMCSDDC -Name $SDDCName -Org $OrgName).Id
+        $edgeId = Get-VMCEdge -SDDCName $SDDCName -Org $OrgName | where{$_.Name -eq $EdgeName} | select -ExpandProperty Id
+
+#        $epoch = Get-Date 01/01/1970
+#        
+#        if($start){
+#            $startEpoch = (New-TimeSpan -Start $epoch -End $Start.ToUniversalTime()).TotalMilliseconds
+#        }
+#        if($Finish){
+#            $finishEpoch = (New-TimeSpan -Start $epoch -End $Finish.ToUniversalTime()).TotalMilliseconds
+#        }
+
+        $uplinkStatService = Get-VmcService -Name 'com.vmware.vmc.orgs.sddcs.networks.edges.statistics.interfaces.uplink'
+#        $stats = $uplinkStatService.get($orgId,$sddcId,$edgeId,[long]$startEpoch,[long]$finishEpoch)
+        $stats = $uplinkStatService.get($orgId,$sddcId,$edgeId)
+
+        $stats.data_dto | Get-Member -MemberType NoteProperty | where{$_.Name -ne 'Help'} | %{$_.Name} | %{
+            if($stats.data_dto."$_".Count -ne 0){
+                $stats.data_dto."$_" | %{
+                    [pscustomobject]@{
+                        vNIC = $_.vnic
+                        Timestamp = [timezone]::CurrentTimeZone.ToLocalTime(([datetime]'1/1/1970').AddSeconds($_.timestamp))
+                        In = $_.in
+                        Out = $_.out
+                        Unit = 'Kbps'
+                        Interval = $stats.meta_dto.interval
+                    }
+                }
+            }
+        }
+    }
+}
+
+Export-ModuleMember -Function 'Get-VMCCommand', 'Connect-VMCVIServer', 'Get-VMCOrg', 'Get-VMCSDDC',
+    'Get-VMCTask', 'Get-VMCSDDCDefaultCredential', 'Get-VMCSDDCPublicIP', 'Get-VMCVMHost',
+    'Get-VMCSDDCVersion', 'Get-VMCFirewallRule', 'Export-VMCFirewallRule', 'Import-VMCFirewallRule',
+    'Remove-VMCFirewallRule', 'Get-VMCLogicalNetwork', 'Remove-VMCLogicalNetwork', 'New-VMCLogicalNetwork',
+    'Get-VMCSDDCSummary', 'Get-VMCPublicIP', 'New-VMCPublicIP', 'Remove-VMCPublicIP', 'Set-VMCSDDC',
+    'Get-VMCEdge', 'Get-VMCEdgeNic', 'Get-VMCEdgeStatus', 'Get-VMCEdgeNicStat', 'Get-VMCEdgeUplinkStat'
+

Modules/VMware.VMEncryption/VMware.VMEncryption.psd1

@@ -49,7 +49,7 @@ Copyright = 'Copyright (c) 2016 VMware, Inc. All rights reserved.'
 
 # Modules that must be imported into the global environment prior to importing this module
 RequiredModules = @(
-@{"ModuleName"="VMware.VimAutomation.Core";"ModuleVersion"="10.1.0.8346946"}
+@{"ModuleName"="VMware.VimAutomation.Core";"ModuleVersion"="10.1.0.8344055"}
 )
 
 # Assemblies that must be loaded prior to importing this module

Modules/VMware.VsanEncryption/README.md

@@ -0,0 +1,7 @@
+Prerequisites/Steps to use this module:
+
+1. This module only works for vSphere products that support vSAN Encryption. E.g. vSAN 6.6 and later with a vSAN Enterprise license
+2. All the functions in this module only work for KMIP Servers.
+3. Install the latest version of Powershell and PowerCLI(11).
+4. Import this module by running: Import-Module -Name "location of this module"
+5. Get-Command -Module "This module Name" to list all available functions.

Modules/VMware.VsanEncryption/VMware.VsanEncryption.psm1

@@ -0,0 +1,341 @@
+# Script Module : VMware.VsanEncryption
+# Version       : 1.0
+# Author        : Jase McCarty, VMware Storage & Availability Business Unit
+
+# Copyright © 2018 VMware, Inc. All Rights Reserved.
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do
+# so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+
+# 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.
+
+
+Function Invoke-VsanEncryptionRekey {
+   <#
+   .SYNOPSIS
+      This function will initiate a ReKey of a vSAN Cluster. Shallow ReKeying (KEK Only) or Deep ReKeying (DEK Also) are supported, as well as Reduced Redundancy if necessary. 
+
+   .DESCRIPTION
+      This function will initiate a ReKey of a vSAN Cluster. Shallow ReKeying (KEK Only) or Deep ReKeying (DEK Also) are supported, as well as Reduced Redundancy if necessary. 
+
+   .PARAMETER Cluster
+      Specifies the Cluster to perform the rekey process on
+
+   .PARAMETER DeepRekey
+      Use to invoke a Deep Rekey ($true) or a Shallow ($false or omit)
+    
+   .PARAMETER ReducedRedundancy
+      For clusters that have 4 or more hosts, this will allow for reduced redundancy. 
+      For clusters that have 2 or 3 hosts, this does not need to be set (can be).
+
+   .EXAMPLE
+      C:\PS>Invoke-VsanEncryptionRekey -Cluster "ClusterName" -DeepRekey $true/$false -ReducedRedundancy $true/$false
+
+   #>
+
+    # Set our Parameters
+    [CmdletBinding()]Param(
+    [Parameter(Mandatory = $True)][String]$Cluster,
+    [Parameter(Mandatory = $False)][Boolean]$DeepRekey,
+    [Parameter(Mandatory = $False)][Boolean]$ReducedRedundancy
+    )
+
+    # Get the Cluster 
+    $VsanCluster = Get-Cluster -Name $Cluster
+
+    # Get the vSAN Cluster Configuration View
+    $VsanVcClusterConfig = Get-VsanView -Id "VsanVcClusterConfigSystem-vsan-cluster-config-system"
+
+    # Get Encryption State
+    $EncryptedVsan = $VsanVcClusterConfig.VsanClusterGetConfig($VsanCluster.ExtensionData.MoRef).DataEncryptionConfig
+
+    # If vSAN is enabled and it is Encrypted
+    If($VsanCluster.vSanEnabled -And $EncryptedVsan.EncryptionEnabled){
+
+    # Get a count of hosts to guarantee reduced redundancy for 2 and 3 node clusters
+    $HostCount = $VsanCluster | Select @{n="count";e={($_ | Get-VMHost).Count}}
+
+    # If reduced redundancy is specified, or there are less than 4 hosts, force reduced redundancy
+    If (($ReducedRedundancy -eq $true) -or ($HostCount.Value -lt 4)) {
+
+    }
+    # Determine Rekey Type for messaging
+    Switch ($DeepRekey) {
+        $true   { $ReKeyType = "deep"}
+        default { $ReKeyType = "shallow"}
+    }
+
+    # Determine Reduced Redundancy for messaging
+    Switch ($ReducedRedundancy) {
+        $true   { $RRMessage = "with reduced redundancy"}
+        default { $RRMessage = ""}
+    }
+
+    # Echo task being performed
+    Write-Host "Executing $ReKeyType rekey of vSAN Cluster $VsanCluster $RRMessage"
+
+    # Execute the rekeying task
+        $ReKeyTask = $VsanVcClusterConfig.VsanEncryptedClusterRekey_Task($VsanCluster.ExtensionData.MoRef,$DeepRekey,$ReducedRedundancy)
+    }
+}
+
+Function Set-VsanEncryptionKms {
+    <#
+    .SYNOPSIS
+       This function will set the KMS to be used with vSAN Encryption 
+ 
+    .DESCRIPTION
+       This function will set the KMS to be used with vSAN Encryption 
+ 
+    .PARAMETER Cluster
+       Specifies the Cluster to set the KMS server for
+ 
+    .PARAMETER KmsCluster
+       Use to set the KMS Cluster to be used with vSAN Encryption
+      
+    .EXAMPLE
+       C:\PS>Set-VsanEncryptionKms -Cluster "ClusterName" -KmsCluster "vCenter KMS Cluster Entry"
+ 
+    #>
+ 
+     # Set our Parameters
+     [CmdletBinding()]Param(
+     [Parameter(Mandatory = $True)][String]$Cluster,
+     [Parameter(Mandatory = $False)][String]$KmsCluster
+     )
+ 
+     # Get the Cluster 
+     $VsanCluster = Get-Cluster -Name $Cluster
+ 
+     # Get the list of KMS Servers that are included 
+     $KmsClusterList = Get-KmsCluster
+
+     # Was a KMS Cluster Specified? 
+     #     Specified: Is it in the list?
+     #                Is it not in the list?
+     # Not Specified: Present a list 
+     If ($KmsCluster) {
+        If ($KmsClusterList.Name.Contains($KmsCluster)) {
+            Write-Host "$KmsCluster In the list, proceeding" -ForegroundColor Green
+            $KmsClusterProfile = $KmsClusterList | Where-Object {$_.Name -eq $KmsCluster}
+        } else {
+            
+            $Count = 0
+            Foreach ($KmsClusterItem in $KmsClusterList) {
+                Write-Host "$Count) $KmsClusterItem "
+                $Count = $Count + 1
+            }
+            $KmsClusterEntry = Read-Host -Prompt "$KmsCluster is not valid, please select one of the existing KMS Clusters to use" 
+            Write-Host $KmsClusterList[$KmsClusterEntry]
+            $KmsClusterProfile = $KmsClusterList[$KmsClusterEntry]
+        }
+     } else {
+            
+        $Count = 0
+        Foreach ($KmsClusterItem in $KmsClusterList) {
+            Write-Host "$Count) $KmsClusterItem "
+            $Count = $Count + 1
+        }
+        $KmsClusterEntry = Read-Host -Prompt "No KMS provided, please select one of the existing KMS Clusters to use" 
+        Write-Host $KmsClusterList[$KmsClusterEntry]
+        $KmsClusterProfile = $KmsClusterList[$KmsClusterEntry]
+    }
+
+     # Get the vSAN Cluster Configuration View
+     $VsanVcClusterConfig = Get-VsanView -Id "VsanVcClusterConfigSystem-vsan-cluster-config-system"
+ 
+     # Get Encryption State
+     $EncryptedVsan = $VsanVcClusterConfig.VsanClusterGetConfig($VsanCluster.ExtensionData.MoRef).DataEncryptionConfig
+ 
+     # If vSAN is enabled and it is Encrypted
+     If($VsanCluster.vSanEnabled -And $EncryptedVsan.EncryptionEnabled){
+
+        If ($EncryptedVsan.KmsProviderId.Id -eq $KmsClusterProfile.Name) {
+            # If the Specified KMS Profile is the KMS Profile being used, then don't do anything
+            Write-Host $EncryptedVsan.KmsProviderId.Id "is already the assigned KMS Cluster Profile, exiting"
+        } else {
+            Write-Host "Changing the KMS Profile to $KmsClusterProfile on Cluster $VsanCluster"
+
+            # Setup the KMS Provider Id Specification
+            $KmsProviderIdSpec = New-Object VMware.Vim.KeyProviderId
+            $KmsProviderIdSpec.Id = $KmsClusterProfile.Name
+
+            # Setup the Data Encryption Configuration Specification
+            $DataEncryptionConfigSpec = New-Object VMware.Vsan.Views.VsanDataEncryptionConfig
+            $DataEncryptionConfigSpec.KmsProviderId = $KmsProviderIdSpec
+            $DataEncryptionConfigSpec.EncryptionEnabled = $true
+
+            # Set the Reconfigure Specification to use the Data Encryption Configuration Spec
+            $vsanReconfigSpec = New-Object VMware.Vsan.Views.VimVsanReconfigSpec
+            $vsanReconfigSpec.DataEncryptionConfig = $DataEncryptionConfigSpec
+            
+            # Execute the task of changing the KMS Cluster Profile Being Used
+            $ChangeKmsTask = $VsanVcClusterConfig.VsanClusterReconfig($VsanCluster.ExtensionData.MoRef,$vsanReconfigSpec)
+        }
+
+     }
+ }
+
+ Function Get-VsanEncryptionKms {
+    <#
+    .SYNOPSIS
+       This function will set the KMS to be used with vSAN Encryption 
+ 
+    .DESCRIPTION
+       This function will set the KMS to be used with vSAN Encryption 
+ 
+    .PARAMETER Cluster
+       Specifies the Cluster to set the KMS server for
+       
+    .EXAMPLE
+       C:\PS>Get-VsanEncryptionKms -Cluster "ClusterName"
+    #>
+ 
+    # Set our Parameters
+    [CmdletBinding()]Param([Parameter(Mandatory = $True)][String]$Cluster)
+ 
+    # Get the Cluster 
+    $VsanCluster = Get-Cluster -Name $Cluster
+ 
+    # Get the vSAN Cluster Configuration View
+    $VsanVcClusterConfig = Get-VsanView -Id "VsanVcClusterConfigSystem-vsan-cluster-config-system"
+ 
+    # Get Encryption State
+    $EncryptedVsan = $VsanVcClusterConfig.VsanClusterGetConfig($VsanCluster.ExtensionData.MoRef).DataEncryptionConfig
+ 
+    # If vSAN is enabled and it is Encrypted
+    If($VsanCluster.vSanEnabled -And $EncryptedVsan.EncryptionEnabled){
+
+        $EncryptedVsan.KmsProviderId.Id 
+    }
+}
+
+Function Set-VsanEncryptionDiskWiping {
+    <#
+    .SYNOPSIS
+       This function will update the Disk Wiping option in vSAN Encryption 
+ 
+    .DESCRIPTION
+       This function will update the Disk Wiping option in vSAN Encryption 
+ 
+    .PARAMETER Cluster
+       Specifies the Cluster set the Disk Wiping Setting on
+ 
+    .PARAMETER DiskWiping
+       Use to set the Disk Wiping setting for vSAN Encryption
+      
+    .EXAMPLE
+       C:\PS>Set-VsanEncryptionDiskWiping -Cluster "ClusterName" -DiskWiping $true
+
+    .EXAMPLE 
+       C:\PS>Set-VsanEncryptionDiskWiping -Cluster "ClusterName" -DiskWiping $false
+ 
+    #>
+ 
+    # Set our Parameters
+    [CmdletBinding()]Param(
+    [Parameter(Mandatory = $True)][String]$Cluster,
+    [Parameter(Mandatory = $True)][Boolean]$DiskWiping
+    )
+ 
+    # Get the Cluster 
+    $VsanCluster = Get-Cluster -Name $Cluster
+
+    # Get the vSAN Cluster Configuration View
+    $VsanVcClusterConfig = Get-VsanView -Id "VsanVcClusterConfigSystem-vsan-cluster-config-system"
+ 
+    # Get Encryption State
+    $EncryptedVsan = $VsanVcClusterConfig.VsanClusterGetConfig($VsanCluster.ExtensionData.MoRef).DataEncryptionConfig
+ 
+    # If vSAN is enabled and it is Encrypted
+    If($VsanCluster.vSanEnabled -And $EncryptedVsan.EncryptionEnabled){
+
+        # Determine Rekey Type for messaging
+        Switch ($DiskWiping) {
+            $true   { $DiskWipingSetting = "enabled" }
+            default { $DiskWipingSetting = "disabled" }
+        }
+
+        # Check to see the current Disk Wiping value
+        If ($DiskWiping -eq $EncryptedVsan.EraseDisksBeforeUse) {
+            Write-Host "Disk Wiping is already $DiskWipingSetting" -ForegroundColor "Green"
+            Write-Host "No action necessary" -ForegroundColor "Green"
+
+        } else {
+
+            Write-Host "Disk Wiping is not set to $DiskWipingSetting" -ForegroundColor "Yellow"
+            Write-Host "Changing Disk Wiping setting on Cluster $VsanCluster" -ForegroundColor "Blue"
+
+                # Setup the Data Encryption Configuration Specification
+                $DataEncryptionConfigSpec = New-Object VMware.Vsan.Views.VsanDataEncryptionConfig
+                $DataEncryptionConfigSpec.EncryptionEnabled = $true
+                $DataEncryptionConfigSpec.EraseDisksBeforeUse = $DiskWiping
+
+                # Set the Reconfigure Specification to use the Data Encryption Configuration Spec
+                $vsanReconfigSpec = New-Object VMware.Vsan.Views.VimVsanReconfigSpec
+                $vsanReconfigSpec.DataEncryptionConfig = $DataEncryptionConfigSpec
+                
+                # Execute the task of changing the KMS Cluster Profile Being Used
+                $VsanVcClusterConfig.VsanClusterReconfig($VsanCluster.ExtensionData.MoRef,$vsanReconfigSpec)
+
+            }
+        }
+}
+
+Function Get-VsanEncryptionDiskWiping {
+    <#
+    .SYNOPSIS
+       This function will retrieve the Disk Wiping option setting in vSAN Encryption 
+ 
+    .DESCRIPTION
+       This function will retrieve the Disk Wiping option setting in vSAN Encryption 
+ 
+    .PARAMETER Cluster
+       Specifies the Cluster set the Disk Wiping Setting on
+      
+    .EXAMPLE
+       C:\PS>Get-VsanEncryptionDiskWiping -Cluster "ClusterName"
+ 
+    #>
+ 
+    # Set our Parameters
+    [CmdletBinding()]Param([Parameter(Mandatory = $True)][String]$Cluster)
+ 
+    # Get the Cluster 
+    $VsanCluster = Get-Cluster -Name $Cluster
+
+    # Get the vSAN Cluster Configuration View
+    $VsanVcClusterConfig = Get-VsanView -Id "VsanVcClusterConfigSystem-vsan-cluster-config-system"
+ 
+    # Get Encryption State
+    $EncryptedVsan = $VsanVcClusterConfig.VsanClusterGetConfig($VsanCluster.ExtensionData.MoRef).DataEncryptionConfig
+ 
+    # If vSAN is enabled and it is Encrypted
+    If($VsanCluster.vSanEnabled -And $EncryptedVsan.EncryptionEnabled){
+
+        # Change the setting
+        $EncryptedVsan.EraseDisksBeforeUse
+    }
+}
+
+
+
+# Export Function for vSAN Rekeying
+Export-ModuleMember -Function Invoke-VsanEncryptionRekey
+Export-ModuleMember -Function Set-VsanEncryptionKms
+Export-ModuleMember -Function Get-VsanEncryptionKms
+Export-ModuleMember -Function Set-VsanEncryptionDiskWiping
+Export-ModuleMember -Function Get-VsanEncryptionDiskWiping

Modules/Validate-ESXiPackages/Validate-ESXiPackages.psm1

@@ -0,0 +1,82 @@
+function Validate-ESXiPackages {
+    <#
+    .DESCRIPTION
+        Compares all ESXi Host VIBs within a vSphere with a reference Hosts.
+
+    .NOTES
+        File Name  : Validate-ESXiPackages.ps1
+        Author     : Markus Kraus
+        Version    : 1.0
+        State      : Ready
+
+        Tested Against Environment:
+
+        vSphere Version: 6.0 U2, 6.5 U1
+        PowerCLI Version: PowerCLI 10.0.0 build 7895300
+        PowerShell Version: 4.0
+        OS Version: Windows Server 2012 R2
+
+    .LINK
+        https://mycloudrevolution.com/
+
+    .EXAMPLE
+        Validate-ESXiPackages -Cluster (Get-Cluster) -RefernceHost (Get-VMHost | Select-Object -First 1)
+
+    .PARAMETER Cluster
+        vSphere Cluster to verify
+
+    .PARAMETER RefernceHost
+        The VIB Reference ESXi Host
+    #>
+    
+    [CmdletBinding()]
+    param( 
+        [Parameter(Mandatory=$True, ValueFromPipeline=$True, HelpMessage="vSphere Cluster to verify")]
+        [ValidateNotNullorEmpty()]
+            [VMware.VimAutomation.ViCore.Impl.V1.Inventory.ComputeResourceImpl] $Cluster,
+        [Parameter(Mandatory=$True, ValueFromPipeline=$false, HelpMessage="The VIB Reference ESXi Host")]
+        [ValidateNotNullorEmpty()]
+            [VMware.VimAutomation.ViCore.Impl.V1.Inventory.InventoryItemImpl] $RefernceHost
+    )
+        
+    Process {
+        
+        #region: Get reference VIBs
+        $EsxCli2 = Get-ESXCLI -VMHost $RefernceHost -V2
+        $RefernceVibList = $esxcli2.software.vib.list.invoke()
+        #endregion
+        
+        #region: Compare reference VIBs
+        $MyView = @()    
+        foreach ($VmHost in ($Cluster | Get-VMHost)) {
+    
+            $EsxCli2 = Get-ESXCLI -VMHost $VmHost -V2
+            $VibList = $esxcli2.software.vib.list.invoke()
+            [Array]$VibDiff = Compare-Object -ReferenceObject $RefernceVibList.ID -DifferenceObject $VibList.ID
+
+            if($VibDiff.Count -gt 0) {
+                $VibDiffSideIndicator = @() 
+                foreach ($Item in $VibDiff) {
+                    $VibDiffSideIndicator += $($Item.SideIndicator + " " + $Item.InputObject)
+                }
+            }
+            else {
+                $VibDiffSideIndicator = $null
+            }
+
+            $Report = [PSCustomObject] @{
+                    Host = $VmHost.Name
+                    Version = $VmHost.Version
+                    Build = $VmHost.Build
+                    VibDiffCount = $VibDiff.Count
+                    VibDiff = $VibDiff.InputObject
+                    VibDiffSideIndicator = $VibDiffSideIndicator
+                    }
+            $MyView += $Report
+    
+        }
+        #region: Compare reference VIBs
+
+        $MyView
+    }
+}

README.md

@@ -20,8 +20,8 @@
   * [Security](https://github.com/vmware/PowerCLI-Example-Scripts#security)
 * [Resource Maintenance](https://github.com/vmware/PowerCLI-Example-Scripts#resource-maintenance)
   * [Maintenance Ownership](https://github.com/vmware/PowerCLI-Example-Scripts#maintenance-ownership)
-  * [Filing issues](https://github.com/vmware/PowerCLI-Example-Scripts#filing-isssues)
+  * [Filing Issues](https://github.com/vmware/PowerCLI-Example-Scripts#filing-isssues)
-  * [Resolving issues](https://github.com/vmware/PowerCLI-Example-Scripts#resolving-issues)
+  * [Resolving Issues](https://github.com/vmware/PowerCLI-Example-Scripts#resolving-issues)
 * [Additional Resources](https://github.com/vmware/PowerCLI-Example-Scripts#additional-resources)
   * [Discussions](https://github.com/vmware/PowerCLI-Example-Scripts#discussions)
   * [VMware Sample Exchange](https://github.com/vmware/PowerCLI-Example-Scripts#vmware-sample-exchange)

Scripts/ReadVMSnapshotConfig.ps1

@@ -0,0 +1,104 @@
+function Get-VMSnapshotConfigContent {
+<#
+   .SYNOPSIS
+      Reads <vm name>.vmsd file content
+
+   .DESCRIPTION
+      Build the vmsd file http URI following https://code.vmware.com/apis/358/vsphere#/doc/vim.FileManager.html
+      and reads its content with the session established by Connect-VIServer
+
+   .INPUTS
+      VirtualMachine
+
+   .OUTPUTS
+      String - the content of the vmsd file
+
+   .NOTES
+      Author: Dimitar Milov
+      Version: 1.0
+
+   .EXAMPLE
+      Get-VM <MyVM> | Get-VMSnapshotConfigContent
+#>
+
+[CmdletBinding()]
+param(
+   [Parameter(Mandatory=$true, ValueFromPipeline=$true)]
+   [ValidateNotNull()]
+   [VMware.VimAutomation.Types.VirtualMachine]
+   $VM
+)
+
+PROCESS {
+   # Create web client from current session
+   $sessionKey = $vm.GetClient().ConnectivityService.CurrentUserSession.SoapSessionKey
+   $certValidationHandler = $vm.GetClient().ConnectivityService.GetValidationHandlerForCurrentServer()
+   $webClient = [vmware.vimautomation.common.util10.httpclientUtil]::CreateHttpClientWithSessionReuse($certValidationHandler, $sessionKey, $null)
+
+   # Build VMSD file http URI
+   # https://code.vmware.com/apis/358/vsphere#/doc/vim.FileManager.html
+   $vmName = $vm.Name
+   $datastoreName = ($vm | Get-Datastore).Name
+   $dcName = ($vm | Get-Datacenter).Name
+   $serverAddress = $vm.GetClient().ConnectivityService.ServerAddress
+   $vmsdUri = [uri]"https://$serverAddress/folder/$vmName/$vmName.vmsd?dcPath=$dcName&dsName=$datastoreName"
+
+   # Get VMSD content as string
+   $task = $webClient.GetAsync($vmsdUri)
+   $task.Wait()
+   $vmsdContent = $task.Result.Content.ReadAsStringAsync().Result
+
+   # Dispose web client
+   $webClient.Dispose()
+
+   # Result
+   $vmsdContent
+}
+
+}
+
+function Get-VMSnapshotConfigSetting {
+<#
+   .SYNOPSIS
+      Gets the value of a specified key from the snapshot config file content
+
+   .DESCRIPTION
+      Reads the VM's snapshot config file and searches for specified key. 
+      If key is found its value is returned as an output
+
+   .INPUTS
+      VirtualMachine and key
+
+   .OUTPUTS
+      String - config value for the specified key
+
+   .NOTES
+      Author: Dimitar Milov
+      Version: 1.0
+
+   .EXAMPLE
+      Get-VM <MyVM> | Get-VMSnapshotConfigSetting -Key "numSentinels"
+#>
+[CmdletBinding()]
+param(
+   [Parameter(Mandatory=$true, ValueFromPipeline=$true)]
+   [ValidateNotNull()]
+   [VMware.VimAutomation.Types.VirtualMachine]
+   $VM,
+
+   [Parameter(Mandatory=$true)]
+   [ValidateNotNull()]
+   [string]
+   $Key
+)
+
+PROCESS {
+   $content = Get-VMSnapshotConfigContent -vm $vm
+
+   $keyMatch = $content | Select-String ('{0} = "(?<value>.*)"' -f $key)
+
+   if ($keyMatch.Matches -ne $null) {
+      $keyMatch.Matches[0].Groups["value"].Value
+   }
+}
+}

Scripts/Save-PowerCLI.ps1

@@ -0,0 +1,147 @@
+function Save-PowerCLI {
+    <#  
+    .SYNOPSIS  
+        Advanced function which can be used to easily download specific versions of PowerCLI from an online gallery
+    .DESCRIPTION 
+        Downloads a specific version of PowerCLI and all the dependencies at the appropriate version
+    .NOTES  
+        Author: 1.0 - Dimitar Milov 
+        Author: 2.0 - Kyle Ruddy, @kmruddy
+    .PARAMETER RequiredVersion
+        Dynamic parameter used to specify the PowerCLI version
+    .PARAMETER Path
+        Directory path where the modules should be downloaded
+    .PARAMETER Repository
+        Repository to access the PowerCLI modules
+    .PARAMETER Simple
+        Switch used to specify the nested version folders should be removed (therefore adding PowerShell 3/4 compatibility)
+    .EXAMPLE
+        Save-PowerCLI -RequiredVersion '10.0.0.7895300' -Path .\Downloads\ 
+        Downloads PowerCLI 10.0.0 to the Downloads folder 
+    .EXAMPLE
+        Save-PowerCLI -RequiredVersion '6.5.2.6268016' -Path .\Downloads\ -Simple
+        Downloads PowerCLI 6.5.2 to the Downloads folder and removes the nested version folders
+    #>
+        [CmdletBinding(SupportsShouldProcess = $True)] 
+        param(
+            [Parameter(Mandatory = $true, Position = 1)]
+            [ValidateScript( { Test-Path $_} )]
+            $Path,
+            [Parameter(Mandatory = $false, Position = 2)]
+            [string]$Repository = 'PSGallery',
+            [Parameter(Mandatory = $false, Position = 3)]
+            [Switch]$Simple
+        )
+        DynamicParam
+        {
+            # Set the dynamic parameters name
+            $ParameterName = 'RequiredVersion'
+     
+            # Create the dictionary
+            $RuntimeParameterDictionary = New-Object System.Management.Automation.RuntimeDefinedParameterDictionary
+     
+            # Create the collection of attributes
+            $AttributeCollection = New-Object System.Collections.ObjectModel.Collection[System.Attribute]
+     
+            # Create and set the parameters' attributes
+            $ParameterAttribute = New-Object System.Management.Automation.ParameterAttribute
+            $ParameterAttribute.ValueFromPipeline = $true
+            $ParameterAttribute.ValueFromPipelineByPropertyName = $true
+            $ParameterAttribute.Mandatory = $true
+            $ParameterAttribute.Position = 0
+     
+            # Add the attributes to the attributes collection
+            $AttributeCollection.Add($ParameterAttribute)
+     
+            # Generate and set the ValidateSet
+            $pcliVersions = Find-Module -Name 'VMware.PowerCLI' -AllVersions
+            $arrSet = $pcliVersions | select-Object -ExpandProperty Version
+            $ValidateSetAttribute = New-Object System.Management.Automation.ValidateSetAttribute($arrSet)
+     
+            # Add the ValidateSet to the attributes collection
+            $AttributeCollection.Add($ValidateSetAttribute)
+     
+            # Create and return the dynamic parameter
+            $RuntimeParameter = New-Object System.Management.Automation.RuntimeDefinedParameter($ParameterName, [string], $AttributeCollection)
+            $RuntimeParameterDictionary.Add($ParameterName, $RuntimeParameter)
+            return $RuntimeParameterDictionary
+        }
+    
+        begin {
+            $powercliModuleName = 'VMware.PowerCLI'
+            $desiredPowerCLIModule = Find-Module -Name $powercliModuleName -RequiredVersion $RequiredVersion -Repository $Repository
+    
+            $depsOrder = 'VMware.VimAutomation.Sdk', 'VMware.VimAutomation.Common', 'VMware.Vim', 'VMware.VimAutomation.Cis.Core', 'VMware.VimAutomation.Core', 'VMware.VimAutomation.Nsxt', 'VMware.VimAutomation.Vmc', 'VMware.VimAutomation.Vds', 'VMware.VimAutomation.Srm', 'VMware.ImageBuilder', 'VMware.VimAutomation.Storage', 'VMware.VimAutomation.StorageUtility', 'VMware.VimAutomation.License', 'VMware.VumAutomation', 'VMware.VimAutomation.HorizonView', 'VMware.DeployAutomation', 'VMware.VimAutomation.vROps', 'VMware.VimAutomation.PCloud'
+            $orderedDependencies = @()
+            foreach ($depModuleName in $depsOrder) {
+                $orderedDependencies +=  $desiredPowerCLIModule.Dependencies | Where-Object {$_.Name -eq $depModuleName}
+            }
+    
+            foreach ($remainingDep in $desiredPowerCLIModule.Dependencies) {
+                if ($orderedDependencies.Name -notcontains $remainingDep.Name) {
+                    $orderedDependencies +=  $remainingDep
+                }
+        
+            }
+        }
+    
+        process {
+            # Save PowerCLI Module Version
+            $desiredPowerCLIModule | Save-Module -Path $Path
+    
+            # Working with the depenent modules 
+            foreach ($dependency in $orderedDependencies) {
+                if (Get-ChildItem -Path (Join-Path $path $dependency.Name) | Where-Object {$_.Name -ne $dependency.MinimumVersion}) {
+                    # Save dependencies with minimum version
+                    Find-Module $dependency.Name -RequiredVersion $dependency.MinimumVersion | Save-Module -Path $Path
+    
+                    # Remove newer dependencies version
+                    Get-ChildItem -Path (Join-Path $path $dependency.Name) | Where-Object {$_.Name -ne $dependency.MinimumVersion} | Remove-Item -Confirm:$false -Force -Recurse
+                }
+            }
+        }
+    
+        end {
+            if ($Simple) {
+    
+                function FolderCleanup {
+                    param(
+                        [Parameter(Mandatory = $true, Position = 0)]
+                        [ValidateScript( { Test-Path $_} )]
+                        $ParentFolder,
+                        [Parameter(Mandatory = $true, Position = 1)]
+                        [String]$ModuleName,
+                        [Parameter(Mandatory = $true, Position = 2)]
+                        $Version
+                    )
+                
+                
+                    $topFolder = Get-Item -Path (Join-Path $ParentFolder $ModuleName)
+                    $versionFolder = $topFolder | Get-ChildItem -Directory | Where-Object {$_.Name -eq $Version} 
+                    $versionFolder | Get-ChildItem | Copy-Item -Destination $topFolder
+                
+                    # Checking for any nested folders within the PowerCLI module version folder
+                    if ($versionFolder| Get-ChildItem -Directory) {
+                
+                        # Obtaining and storing the child items to a variable, then copying the items to the parent folder's nested folder
+                        $nestFolder = $versionFolder| Get-ChildItem -Directory
+                        foreach ($nestDir in $nestFolder) {
+                            $nestDir | Get-ChildItem | Copy-Item -Destination (Join-Path $topFolder $nestDir.Name)
+                        }
+                
+                    }
+                
+                    # Removing any of the former, no longer needed, directory structure
+                    $versionFolder| Remove-Item -Recurse -Force
+                }
+    
+                FolderCleanup -ParentFolder $Path -ModuleName $desiredPowerCLIModule.Name -Version $desiredPowerCLIModule.Version
+                foreach ($cleanUp in $orderedDependencies) {
+    
+                    FolderCleanup -ParentFolder $Path -ModuleName $cleanUp.Name -Version $cleanUp.MinimumVersion    
+                }
+    
+            }
+    
+        }
+    }

Scripts/Set-CustomAttributesInGuestinfo.ps1

@@ -0,0 +1,84 @@
+<#
+.NOTES
+  Script name: Set-CustomAttributesInGuestinfo.ps1
+  Created on: 10/04/2018
+  Author: Doug Taliaferro, @virtually_doug
+  Description: Gets Custom Attributes assigned to a VM and makes them available to the guest OS.
+  Dependencies: None known
+
+  ===Tested Against Environment====
+  vSphere Version: 6.5
+  PowerCLI Version: 10.0.0.7893909
+  PowerShell Version: 5.1.14409.1005
+  OS Version: Windows 7, 10
+  Keyword: VM, Attributes, Guestinfo
+
+.SYNOPSIS
+  Gets Custom Attributes assigned to a VM and makes them available to the guest OS.
+
+.DESCRIPTION
+  Gets the custom attributes assigned to one or more VMs and sets their values in the 
+  VM's 'guestinfo' advanced settings.  This makes the attributes available within the 
+  guest OS using VM tools (vmtoolsd.exe) and allows the attributes to be used as metadata 
+  for applications or management agents that run inside the guest.  If the attribute name
+  contains spaces they are removed in naming the advanced setting.
+  
+  For example, if a VM has a custom attribute named 'Created On', the advanced setting 
+  becomes:
+    'guestinfo.CreatedOn' = '08/08/2018 14:24:17'
+  
+  This can be retrieved in the guest OS by running:
+    vmtoolsd.exe --cmd "info-get guestinfo.CreatedOn"
+
+.PARAMETER VMs
+  One or more VMs returned from the Get-VM cmdlet.
+
+.PARAMETER Attributes
+  The names of the Custom Attributes to get.  If the names contain spaces they must be
+  enclosed in quotes.  The spaces will be removed to name the advanced setting.
+  
+.PARAMETER vCenter
+  The vCenter server to connect to.  Optional if you are already connected.
+
+.EXAMPLE
+  .\Set-CustomAttributesInGuestInfo.ps1 -VM (get-vm testvm01) -Attributes 'Created On', 'Created By'
+  
+  Gets the custom attributes 'Created On' and 'Created By' for 'testvm01' and sets their 
+  values in 'guestinfo.CreatedOn' and 'guestinfo.CreatedBy'.
+
+.EXAMPLE
+  .\Set-CustomAttributesInGuestInfo.ps1-VM (get-cluster Dev-01 | get-vm) -Attributes 'Created On'
+  
+  Gets the custom attribute 'Created On' for all VMs in the Dev-01 cluster and sets 'guestinfo.CreatedOn'
+  on each VM.
+#>
+#Requires -modules VMware.VimAutomation.Core
+[CmdletBinding()]
+param (
+  [Parameter(Mandatory=$true,Position=0)]
+  $VMs,
+  [Parameter(Mandatory=$true,Position=1)]
+  [string[]]$Attributes,
+  [string]$vCenter
+)
+if ($vCenter) {
+  Connect-VIServer $vCenter
+}
+
+ForEach ($vm in $VMs) {
+  ForEach ($attributeName in $Attributes) {
+    # Get the custom attribute with a matcing key name
+    $customField = $vm.CustomFields | Where-Object Key -eq $attributeName
+    if ($customField) {
+      # Remove white space from the attribute name because the advanced 
+      # setting name cannot contain spaces
+      $attributeNameNoSpaces = $customField.Key -replace '\s',''
+      $guestinfoName = "guestinfo.$attributeNameNoSpaces"
+      $guestinfoValue = $customField.Value
+      Write-Host "$($vm): setting '$guestinfoName' = '$guestinfoValue'"
+      New-AdvancedSetting -Entity $vm -Name $guestinfoName -Value $guestinfoValue -Confirm:$false -Force | Out-Null
+    } else {
+      Write-Host "$($vm): custom attribute '$attributeName' not set on this VM"
+    }
+  }
+}

Scripts/Set-TagsInGuestinfo.ps1

@@ -0,0 +1,98 @@
+<#
+.NOTES
+  Script name: Set-TagsInGuestinfo.ps1
+  Created on: 10/02/2018
+  Author: Doug Taliaferro, @virtually_doug
+  Description: Gets the vSphere Tags assigned to a VM and makes them available to the guest OS.
+  Dependencies: None known
+
+  ===Tested Against Environment====
+  vSphere Version: 6.5
+  PowerCLI Version: 10.0.0.7893909
+  PowerShell Version: 5.1.14409.1005
+  OS Version: Windows 7, 10
+  Keyword: VM, Tags, Guestinfo
+
+.SYNOPSIS
+  Gets the vSphere Tags assigned to a VM and makes them available to the guest OS.
+
+.DESCRIPTION
+  Gets the tags assigned to one or more VMs from one or more categories and sets the tag values
+  in the VM's 'guestinfo' advanced settings.  This makes the tags available within the guest OS
+  using VM tools (vmtoolsd.exe) and allows the tags to be used as metadata for applications or
+  management agents that run inside the guest.
+  
+  For example, if a VM has a tag named 'Accounting' from the
+  category 'Departments', the advanced setting becomes:
+    guestinfo.Departments = Accounting
+  
+  This can be retrieved in the guest OS by running:
+    vmtoolsd.exe --cmd "info-get guestinfo.Departments"
+
+  If multiple tags are assigned from the same category, they are joined using the specified
+  delimter (a semicolon by default):
+    guestinfo.Departments = Accounting;Sales
+
+.PARAMETER VMs
+  One or more VMs returned from the Get-VM cmdlet.
+
+.PARAMETER Categories
+  The names of tag categories that should be set in the advanced settings.
+ 
+ .PARAMETER Delimiter
+  The delimiting character used for multiple tags of the same category.  Defaults to a
+  semicolon.
+
+.PARAMETER vCenter
+  The vCenter server to connect to.  Optional if you are already connected.
+
+.EXAMPLE
+  .\Set-TagsInGuestInfo.ps1 -VM (get-vm testvm01) -Categories Departments, Environment
+  
+  Gets tags assigned to 'testvm01' in the Departments and Environment categories and
+  sets their values in 'guestinfo.Departments' and 'guestinfo.Environment'.
+
+.EXAMPLE
+  .\Set-TagsInGuestInfo.ps1 -VM (get-cluster Dev-01 | get-vm) -Categories Departments
+  
+  Gets tags assigned to all VMs in the Dev-01 cluster and sets 'guestinfo.Departments'
+  on each VM.
+#>
+#Requires -modules VMware.VimAutomation.Core
+[CmdletBinding()]
+param (
+  [Parameter(Mandatory=$true,Position=0)]
+  $VMs,
+  [Parameter(Mandatory=$true,Position=1)]
+  [string[]]$Categories,
+  [string]$Delimiter = ';',
+  [string]$vCenter
+)
+if ($vCenter) {
+  Connect-VIServer $vCenter
+}
+
+ForEach ($categoryName in $Categories) {
+  $category = Get-TagCategory -Name  $categoryName
+  if ($category) {
+    $guestinfoName = "guestinfo.$category"
+
+    # Get Tag assignments for the VMs
+    $tags = Get-TagAssignment -Entity $VMs -Category $category
+    
+    # Group the tags by VM (in this case the Entity property of Group-Object)
+    $groups = $tags | Group-Object -Property Entity
+    
+    # Get each VM and set the guestinfo
+    ForEach ($item in $groups) {
+      $vm = get-vm $item.Name
+      # Multiple tags of the same category are joined
+      $guestinfoValue = $item.Group.Tag.Name -join $Delimiter
+      
+      Write-Host "$($vm): setting '$guestinfoName' = '$guestinfoValue'"
+      New-AdvancedSetting -Entity $vm -Name $guestinfoName -Value $guestinfoValue -Confirm:$false -Force | Out-Null
+    }
+  } else {
+      Write-Host "Category '$categoryName' was not found."
+  }
+}

Scripts/VMware_Cloud_on_AWS/VMWonAWS_1nodeDeployment.ps1

@@ -7,9 +7,10 @@
 
 # Set details for SDDC
 $oauthToken = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx"
-$sddcName = "PowerCLI-1Node-SDDC"
+$sddcName = "PowerCLI-1Host-SDDC"
 $hostCount = "1"
 $awsRegion = "US_WEST_2"
+$useAwsAccount = $false
 
 # --- Deployment code  ---
 # Connect to VMware Cloud Service
@@ -18,19 +19,25 @@ Connect-Vmc -RefreshToken $oauthToken | Out-Null
 # Get ORG ID
 $orgSvc = Get-VmcService -Name com.vmware.vmc.orgs
 $org = $orgSvc.List()
-Write-Host "Org:"$org.display_name" ID:"$org.id
+Write-Output -InputObject "Org: $($org.display_name) ID: $($org.id)"
 
-# Get Linked Account ID
+# Check to use the already existing AWS account connection
-$connAcctSvc = Get-VmcService -Name com.vmware.vmc.orgs.account_link.connected_accounts
+if ($useAwsAccount -eq $true) {
-$connAcctId = $connAcctSvc.get($org.id) | Select-Object -ExpandProperty id
+    # Get Linked Account ID
-Write-Host "Account ID: $connAcctId"
+    $connAcctSvc = Get-VmcService -Name com.vmware.vmc.orgs.account_link.connected_accounts
+    $connAcctId = $connAcctSvc.get($org.id) | Select-Object -ExpandProperty id
+    Write-Output -InputObject "Account ID: $connAcctId"
 
-# Get Subnet ID
+    # Get Subnet ID
-$compSubnetSvc = Get-VmcService -Name com.vmware.vmc.orgs.account_link.compatible_subnets
+    $compSubnetSvc = Get-VmcService -Name com.vmware.vmc.orgs.account_link.compatible_subnets
-$vpcMap = $compSubnetSvc.Get($org.id, $connAcctId, $region) | Select-Object -ExpandProperty vpc_map 
+    $vpcMap = $compSubnetSvc.Get($org.id, $connAcctId, $region) | Select-Object -ExpandProperty vpc_map 
-$compSubnets = $vpcMap | Select-Object -ExpandProperty Values | Select-Object -ExpandProperty subnets
+    $compSubnets = $vpcMap | Select-Object -ExpandProperty Values | Select-Object -ExpandProperty subnets
-$compSubnet = $compSubnets | where {$_.name -ne $null} | Select-Object -first 1
+    $compSubnet = $compSubnets | where {$_.name -ne $null} | Select-Object -first 1
-Write-Host "Subnet CIDR"$compSubnet.subnet_cidr_block"ID:"$compSubnet.subnet_id
+    Write-Output -InputObject "Subnet CIDR $($compSubnet.subnet_cidr_block) ID: $($compSubnet.subnet_id)"
+}
+elseif ($useAwsAccount -eq $false) {
+    Write-Output -InputObject "AWS Account Not Configured - you must connect to an AWS account within 14 days of creating this SDDC"
+}
 
 # Deploy the SDDC
 $sddcSvc = Get-VmcService com.vmware.vmc.orgs.sddcs
@@ -40,12 +47,20 @@ $sddcCreateSpec.Name = $sddcName
 $sddcCreateSpec.num_hosts = $hostCount
 if ($org.properties.values.sddcTypes) {$sddcCreateSpec.sddc_type = "1NODE"}
 $sddcCreateSpec.Provider = "AWS"
-$accountLinkSpec = $sddcSvc.Help.create.sddc_config.account_link_sddc_config.Element.Create()
+
-$accountLinkSpec.connected_account_id = $connAcctId
+if ($useAwsAccount -eq $true) {
-$custSubId0 = $sddcSvc.Help.create.sddc_config.account_link_sddc_config.Element.customer_subnet_ids.Element.Create()
+    $accountLinkSpec = $sddcSvc.Help.create.sddc_config.account_link_sddc_config.Element.Create()
-$custSubId0 = $compSubnet.subnet_id
+    $accountLinkSpec.connected_account_id = $connAcctId
-$accountLinkSpec.customer_subnet_ids.Add($custSubId0) | Out-Null
+    $custSubId0 = $sddcSvc.Help.create.sddc_config.account_link_sddc_config.Element.customer_subnet_ids.Element.Create()
-$sddcCreateSpec.account_link_sddc_config.Add($accountLinkSpec) | Out-Null
+    $custSubId0 = $compSubnet.subnet_id
-$sddcCreateSpec
+    $accountLinkSpec.customer_subnet_ids.Add($custSubId0) | Out-Null
+    $sddcCreateSpec.account_link_sddc_config.Add($accountLinkSpec) | Out-Null
+}
+elseif ($useAwsAccount -eq $false) {
+    $accountLinkDelaySpec = $sddcSvc.Help.create.sddc_config.account_link_config.delay_account_link.Create()
+    $accountLinkDelaySpec = $true
+    $sddcCreateSpec.account_link_config.delay_account_link = $accountLinkDelaySpec
+}
+
 $newSddc = $sddcSvc.create($org.Id, $sddcCreateSpec)
-$newSddc
+$newSddc | Select-Object resource_id,status,task_type,start_time,task_id

Scripts/VMware_Cloud_on_AWS/VMWonAWS_FirewallRuleAccelerator.ps1

@@ -0,0 +1,209 @@
+# Author: Kyle Ruddy
+# Product: VMware Cloud on AWS
+# Description: VMware Cloud on AWS Firewall Rule Accelerator for PowerCLI
+# Requirements:
+#  - PowerShell 3.x or newer
+#  - PowerCLI 6.5.4 or newer
+#  - Use Default IP Addresses
+#  - Use NSX-V on VMware Cloud on AWS
+
+#---------- USER VARIABLES ----------------------------------------
+
+$oauthToken = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx"
+$orgId = 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx'
+$sddcId = 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxx'
+
+# ---------- DO NOT MODIFY BELOW THIS ------------------------------
+
+
+Connect-Vmc -RefreshToken $oauthToken | Out-Null
+
+$orgSvc = Get-VmcService -Name com.vmware.vmc.orgs
+
+if ($orgId) {
+    $org = $orgSvc.List() | where {$_.id -eq $orgId}
+}
+else {$org = $orgSvc.List()}
+
+if ($org -eq $null) {Write-Output "No Org Found. Exiting."; break}
+
+$sddcSvc = Get-VmcService -Name com.vmware.vmc.orgs.sddcs
+
+if ($sddcId) {
+    $sddc = $sddcSvc.Get($org.id, $sddcId)
+}
+else {$sddc = $sddcSvc.List($org.id)}
+
+if ($sddc -eq $null) {Write-Output "No SDDC Found. Exiting."; break}
+elseif ($sddc -is [array]) {Write-Output "Multiple SDDCs Found. Please Specify an SDDC ID. Exiting."; break}
+
+$edgeSvc = Get-VmcService com.vmware.vmc.orgs.sddcs.networks.edges
+$mgwEdge = ($edgeSvc.Get($org.id,$sddcId,'gatewayServices') | Select-Object -ExpandProperty edge_page).data | where {$_.id -eq 'edge-1'}
+
+$ipsecSvc = Get-VmcService com.vmware.vmc.orgs.sddcs.networks.edges.ipsec.config
+$ipsecVPN = $ipsecSvc.Get($org.id, $sddcId, $mgwEdge.id)
+
+$localSubnet = $ipsecVPN.sites.sites.local_subnets.subnets
+$vpnSubnet = $ipsecVPN.sites.sites.peer_subnets.subnets
+$vcMgmtIP = $sddc.resource_config.vc_management_ip
+$vcPublicIP = $sddc.resource_config.vc_public_ip
+$esxSubnet = $sddc.resource_config.esx_host_subnet
+$ipsecVPNname = $ipsecVPN.sites.sites.name 
+
+function Add-VMCFirewallRule {
+    <#
+        .NOTES
+        ===========================================================================
+        Created by:    Kyle Ruddy
+        Date:          08/22/2018
+        Organization:  VMware
+        Blog:          https://www.kmruddy.com
+        Twitter:       @kmruddy
+        ===========================================================================
+        .SYNOPSIS
+            Creates a Firewall Rule for a given SDDC
+        .DESCRIPTION
+            Creates a Firewall Rule for a given SDDC
+        .EXAMPLE
+            Add-VMCFirewallRule -OrgId <org id> -sddcId <sddc id> -FwRuleName <firewall rule name> -SourceIpAddress <source ip address> -DestIpAddress <destination ip address> -Service <service>
+
+    #>
+    param(
+        [Parameter(Mandatory=$true)]
+        [String]$OrgId,
+        [Parameter(Mandatory=$true)]
+        [String]$SddcId,
+        [Parameter(Mandatory=$false)]
+        [ValidateSet('Management Gateway','Compute Gateway')]
+        [String]$Edge = 'Management Gateway',
+        [Parameter(Mandatory=$true)]
+        [String]$FwRuleName,
+        [Parameter(Mandatory=$false)]
+        $SourceIpAddress,
+        [Parameter(Mandatory=$false)]
+        $DestIpAddress,
+        [Parameter(Mandatory=$true)]
+        [ValidateSet('HTTPS','ICMP','SSO','Provisioning','Any','Remote Console')]
+        [String]$Service,
+        [Parameter(Mandatory=$false)]
+        [ValidateSet('accept')]
+        $FwAction = 'accept'
+
+    )
+
+    if ($edge -eq 'Management Gateway') {$EdgeId = 'edge-1'}
+    elseif ($edge -eq 'Compute Gateway') {$EdgeId = 'edge-2'}
+    else {Write-Output "No Valid Edge Input Found."}
+
+    $fwRuleSvc = Get-VmcService com.vmware.vmc.orgs.sddcs.networks.edges.firewall.config.rules
+    
+    $ruleElementSpec = $fwRuleSvc.Help.add.firewall_rules.firewall_rules.Element.Create()
+    $fwRules = $fwRuleSvc.Help.add.firewall_rules.Create()
+    $ruleSpec = $fwRuleSvc.Help.add.firewall_rules.firewall_rules.Create()
+
+    # AppSpec
+    $appSpec = $fwRuleSvc.Help.add.firewall_rules.firewall_rules.Element.application.Create()
+    # ServiceSpec
+    $serviceSpec = $fwRuleSvc.Help.add.firewall_rules.firewall_rules.Element.application.service.Element.Create()
+
+    if ($Service -eq 'HTTPS') {
+        $protocol = 'TCP'
+        $port = @("443")
+    }
+    elseif ($Service -eq 'ICMP') {
+        $protocol = 'ICMP'
+        $icmpType = 'any'
+
+    }
+    elseif ($Service -eq 'SSO') {
+        $protocol = 'TCP'
+        $port = @("7444")
+    }
+    elseif ($Service -eq 'Provisioning') {
+        $protocol = 'TCP'
+        $port = @("902")
+    }
+    elseif ($Service -eq 'Any') {
+        $protocol = 'Any'
+        $port = $null
+    }
+    elseif ($Service -eq 'Remote Console') {
+        $protocol = 'TCP'
+        $port = @("903")
+    }
+    else {Write-Output "No Protocol Found."; break}
+
+    $serviceSpec.protocol = $protocol
+
+    # Process ICMP Type from JSON
+    $icmpType = $null
+    if($protocol -eq 'ICMP') {
+        $icmpType = 'any'
+    }
+    
+    if ($icmpType) {
+        $serviceSpec.icmp_type = $icmpType}
+    if ($port) {
+        $serviceSpec.port = $port
+        $serviceSpec.source_port = @("any")
+    }
+
+    $addSpec = $ruleElementSpec.application.service.Add($serviceSpec)
+
+
+    # Create Source Spec
+    if($SourceIpAddress) {
+        $srcSpec = $fwRuleSvc.Help.add.firewall_rules.firewall_rules.Element.source.Create()
+        $srcSpec.exclude = $false
+        $srcSpec.ip_address = @($SourceIpAddress)
+        $ruleElementSpec.source = $srcSpec
+    }
+    
+
+    # Create Destination Spec
+    if($DestIpAddress) {        
+        $destSpec = $fwRuleSvc.Help.add.firewall_rules.firewall_rules.Element.destination.Create()
+        $destSpec.exclude = $false
+        $destSpec.ip_address = @($DestIpAddress)
+        $ruleElementSpec.destination = $destSpec
+
+    }
+
+    
+    $ruleElementSpec.rule_type = "user"
+    $ruleElementSpec.enabled = $true
+    $ruleElementSpec.logging_enabled = $false
+
+    $ruleElementSpec.action = $FwAction
+    $ruleElementSpec.name = $FwRuleName
+
+    # Add the individual FW rule spec into our overall firewall rules array
+    Write-Output "Creating VMC Firewall Rule: $FwRuleName"
+    $ruleSpecAdd = $ruleSpec.Add($ruleElementSpec)
+
+    $fwRules.firewall_rules = $ruleSpec
+    $fwRuleAdd = $fwRuleSvc.add($orgId,$sddcId,$EdgeId,$fwRules)
+
+}
+
+
+# vCenter (ANY) to VPN
+Add-VMCFirewallRule -OrgId $org.Id -sddcId $sddc.id -FwRuleName "vCenter (ANY) to $ipsecVPNname" -SourceIpAddress $vcMgmtIP -DestIpAddress $vpnSubnet -Service 'Any'
+
+# ESXi (ANY) to VPN
+Add-VMCFirewallRule -OrgId $org.Id -sddcId $sddc.id -FwRuleName "ESXi (ANY) to $ipsecVPNname" -SourceIpAddress $esxSubnet,'10.2.16.0/20' -DestIpAddress $vpnSubnet -Service 'Any'
+
+# VPN to vCenter (HTTPS)
+Add-VMCFirewallRule -OrgId $org.Id -sddcId $sddc.id -FwRuleName "$ipsecVPNname to vCenter (HTTPS)" -SourceIpAddress $vpnSubnet -DestIpAddress $vcMgmtIP -Service 'HTTPS'
+
+# VPN to vCenter (ICMP)
+Add-VMCFirewallRule -OrgId $org.Id -sddcId $sddc.id -FwRuleName "$ipsecVPNname to vCenter (ICMP)" -SourceIpAddress $vpnSubnet -DestIpAddress $vcMgmtIP -Service 'ICMP'
+
+# VPN to ESXi (Provisioning)
+Add-VMCFirewallRule -OrgId $org.Id -sddcId $sddc.id -FwRuleName "$ipsecVPNname to ESXi (Provisioning)" -SourceIpAddress $vpnSubnet -DestIpAddress $esxSubnet,'10.2.16.0/20' -Service 'Provisioning'
+
+# VPN to ESXi (Remove Console)
+Add-VMCFirewallRule -OrgId $org.Id -sddcId $sddc.id -FwRuleName "$ipsecVPNname to ESXi (Remote Console)" -SourceIpAddress $vpnSubnet -DestIpAddress $esxSubnet,'10.2.16.0/20' -Service 'Remote Console'
+
+# VPN to ESXi (ICMP)
+Add-VMCFirewallRule -OrgId $org.Id -sddcId $sddc.id -FwRuleName "$ipsecVPNname to ESXi (ICMP)" -SourceIpAddress $vpnSubnet -DestIpAddress $esxSubnet,'10.2.16.0/20' -Service 'ICMP'

Scripts/VMware_Cloud_on_AWS/VMWonAWS_InviteUsers.ps1

@@ -0,0 +1,114 @@
+<#  
+.SYNOPSIS  
+    Takes email address input in order to create VMware Cloud on AWS invites for the desired Organization
+.DESCRIPTION 
+    Script which can be used to automate the process of adding new users to a specified VMware Cloud on AWS Organization
+.NOTES  
+    Author:  Kyle Ruddy, @kmruddy, kmruddy.com
+.PARAMETER newUserEmail
+	Plain text email address or array of email addresses
+.PARAMETER roleName
+	Desired role name of the new users, default is Organization Member
+.EXAMPLE
+   PS > ./VMWonAWS_InviteUsers.ps1 -newUserEmail 'testuser@vmware.com'
+.EXAMPLE 
+   PS > ./VMWonAWS_InviteUsers.ps1 -newUserEmail $arrayOfEmailAddresses
+#>
+[CmdletBinding(SupportsShouldProcess=$True)] 
+    param (
+
+        [Parameter (Mandatory = $True, Position=0)]
+        $newUserEmail,
+        [Parameter (Mandatory = $False, Position=1)]
+        [ValidateSet("Organization Member","Organization Owner","Support User")]
+        [string]$roleName = "Organization Member"
+    )
+
+    # Set Static Variables for your environment 
+    $oauthToken = 'xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+    $orgID = 'xxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+    
+    ### DO NOT MODIFY CODE BELOW THIS LINE ###
+    $inviteReport = @()
+    $userEmail = @()
+
+    # Email Validation Testing
+    if ($newUserEmail -is [array]) {
+        foreach ($email in $newUserEmail) {
+            try {
+				$userEmail += [mailAddress]$email | select-object -ExpandProperty Address
+			}
+			catch {
+				Write-Warning "$email is not a valid email address"
+			}
+        }
+    }
+    else {
+		try {
+			$userEmail += [mailAddress]$newUserEmail | select-object -ExpandProperty Address
+		}
+		catch {
+			Write-Warning "$newUserEmail is not a valid email address"
+		}
+    }
+    
+	if ($userEmail.Count -eq 0) {
+        Write-Warning "No valid email addresses found."
+		Break
+    }
+
+    # Validation and translation of the role name to the role ID
+    if ($roleName -eq 'Organization Member') {
+        $orgRoleNames = @("org_member")
+    }
+    elseif ($roleName -eq 'Organization Owner') {
+        $orgRoleNames = @("org_owner")
+    }
+    elseif ($roleName -eq 'Support User') {
+        $orgRoleNames = @("support_user")
+    }
+
+    # Creating custom objects to start building out the body input
+    $bodyObj = new-object -TypeName System.Object      
+    $SvcRoleNames = @("vmc-user:full")
+    $SvcDefinitionLink = '/csp/gateway/slc/api/definitions/external/ybUdoTC05kYFC9ZG560kpsn0I8M_'
+    $bodyObj | Add-Member -Name 'orgRoleNames' -MemberType Noteproperty -Value $orgRoleNames
+    $serviceRolesDtos = New-Object -TypeName System.Object
+    $serviceRolesDtos | Add-Member -Name 'serviceDefinitionLink' -MemberType Noteproperty -Value $SvcDefinitionLink
+    $serviceRolesDtos | Add-Member -Name 'serviceRoleNames' -MemberType Noteproperty -Value $SvcRoleNames
+    $bodyObj | Add-Member -Name 'serviceRolesDtos' -MemberType Noteproperty -Value @($serviceRolesDtos)
+    $bodyObj | Add-Member -Name 'usernames' -MemberType Noteproperty -Value $userEmail
+    $body = $bodyObj | ConvertTo-Json -Depth 100
+
+    # Connecting to the REST API service for authentication and then to perform the POST method 
+    $connection = Invoke-WebRequest -Uri "https://console.cloud.vmware.com/csp/gateway/am/api/auth/api-tokens/authorize?refresh_token=$oauthToken" -Method Post
+    $accesskey = ($connection.content | Convertfrom-json).access_token
+    $inviteUsers = Invoke-WebRequest -Uri "https://console.cloud.vmware.com/csp/gateway/am/api/orgs/$orgID/invitations" -headers @{"csp-auth-token"="$accesskey"} -Method Post -Body $body -ContentType "application/json"
+
+    # Outputting the successful invite which was just created
+    $orgInviteRefResponse = Invoke-WebRequest -Uri "https://console.cloud.vmware.com/csp/gateway/am/api/orgs/$orgid/invitations" -headers @{"csp-auth-token"="$accessKey"} -Method Get
+    if ($orgInviteRefResponse) {
+        $orgInviteRefObject = $orgInviteRefResponse | ConvertFrom-Json
+
+        foreach ($inviteRef in $orgInviteRefObject) {
+            $link = $inviteRef.refLink
+            $orgInviteResponse = Invoke-WebRequest -Uri "https://console.cloud.vmware.com$link" -headers @{"csp-auth-token"="$accessKey"} -Method Get
+
+            $orgInviteObject = $orgInviteResponse.content | ConvertFrom-Json
+
+            foreach ($emailInput in $userEmail) {
+
+                if ($orgInviteObject.username -eq $emailInput) {
+                    $i = New-Object System.Object
+                    $i | Add-Member -Type NoteProperty -Name InviteID -Value $orgInviteObject.refLink.Substring($orgInviteObject.refLink.Length - 36)
+                    $i | Add-Member -Type NoteProperty -Name Username -Value $orgInviteObject.username
+                    $i | Add-Member -Type NoteProperty -Name Status -Value $orgInviteObject.status
+                    $i | Add-Member -Type NoteProperty -Name OrgRoles -Value ($orgInviteObject.OrgRoleNames -join ", ")
+                    $i | Add-Member -Type NoteProperty -Name Requester -Value $orgInviteObject.generatedBy
+                    $inviteReport += $i
+                }
+            }
+        }
+    }
+
+    return $inviteReport

Scripts/VMware_Cloud_on_AWS/XRef-VMC-Services.ps1

@@ -0,0 +1,37 @@
+$refreshToken = 'your-refresh-token'
+
+$reportPath = '.\VMC-services.xlsx'
+
+Connect-Vmc -RefreshToken $refreshToken > $null
+
+$columns = @{}
+$services = Get-VmcService |  Sort-Object -Property Name
+$services | ForEach-Object -Process {
+    $_.Help | Get-Member -MemberType NoteProperty | where{'Constants','Documentation' -notcontains $_.Name} |
+    ForEach-Object -Process {
+        if(-not $columns.ContainsKey($_.Name)){
+            $columns.Add($_.Name,'')
+        }
+    }
+}
+$columns = $columns.Keys | Sort-Object
+$report = @()
+foreach($service in $services){
+    $obj = [ordered]@{
+        Name = $service.Name
+    }
+    $columns | ForEach-Object -Process {
+        $obj.Add($_,'')
+    }
+
+    $service.Help | Get-Member -MemberType NoteProperty | where{'Constants','Documentation' -notcontains $_.Name} |
+    ForEach-Object -Process {
+#        $obj.Item($_.Name) = "$($service.Help.$($_.Name).Documentation)"
+        $obj.Item($_.Name) = "X"
+    }
+    $report += New-Object PSObject -Property $obj
+}
+$report | Export-Excel -Path $reportPath -WorksheetName 'Services' -FreezeTopRow -BoldTopRow -AutoSize -Show
+
+Disconnect-Vmc -Confirm:$false
+

Scripts/backup-esxi-host-configuration.ps1

@@ -0,0 +1,22 @@
+<#
+Script name: backup-esxi-host-configuration.ps1
+Created on: 09/10/2018
+Author: Gerasimos Alexiou, @jerrak0s
+Description: The purpose of the script is to backup esxi host configuration for restore purposes.
+Dependencies: None known
+
+===Tested Against Environment====
+vSphere Version: 6.5 U2
+PowerCLI Version: PowerCLI 10.1.1
+PowerShell Version: 5.1
+OS Version: Windows 10
+Keyword: Backup Configuration ESXi Host
+#>
+
+
+$serverIp = Read-Host 'What is the server ip address:'
+$path = Read-Host 'Give path where backup configuration will be stored:'
+$serverPass = Read-Host 'What is the server root password:' -AsSecureString
+Set-PowerCLIConfiguration -InvalidCertificateAction Ignore -Confirm:$false
+Connect-VIServer serverip -user "root" -password $serverPass
+Get-VMHostFirmware -vmhost serverip -BackupConfiguration -DestinationPath $path