From b8b48e40f806d7753c167e34375189d0dd3d69b7 Mon Sep 17 00:00:00 2001
From: William Lam <william2003@gmail.com>
Date: Thu, 14 Mar 2019 12:00:27 -0700
Subject: [PATCH 1/9] Add support for both Infra Group/Scopes related to CGW
 Edge Fireweall

---
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1 |   2 +-
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 | 195 ++++++++++++++++++-
 2 files changed, 194 insertions(+), 3 deletions(-)

diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1
index b74bad7..45e549d 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1
@@ -36,7 +36,7 @@ Description = 'PowerShell Module for Managing NSX-T on VMware Cloud on AWS'
 PowerShellVersion = '6.0'
 
 # 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 = 'Connect-NSXTProxy', 'Get-NSXTSegment', 'New-NSXTSegment', 'Remove-NSXTSegment', 'Get-NSXTGroup', 'New-NSXTGroup', 'Remove-NSXTGroup', 'Get-NSXTService', 'New-NSXTService', 'Get-NSXTFirewall', 'New-NSXTFirewall', 'Remove-NSXTFirewall', 'Get-NSXTDistFirewallSection', 'Get-NSXTDistFirewall', 'New-NSXTDistFirewall', 'Remove-NSXTDistFirewall', 'Get-NSXTRouteTable', 'Get-NSXTOverviewInfo'
+FunctionsToExport = 'Connect-NSXTProxy', 'Get-NSXTSegment', 'New-NSXTSegment', 'Remove-NSXTSegment', 'Get-NSXTGroup', 'New-NSXTGroup', 'Remove-NSXTGroup', 'Get-NSXTService', 'New-NSXTService', 'Get-NSXTFirewall', 'New-NSXTFirewall', 'Remove-NSXTFirewall', 'Get-NSXTDistFirewallSection', 'Get-NSXTDistFirewall', 'New-NSXTDistFirewall', 'Remove-NSXTDistFirewall', 'Get-NSXTRouteTable', 'Get-NSXTOverviewInfo', 'Get-NSXTInfraScope', 'Get-NSXTInfraGroup'
 # 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 = @()
 
diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index d120086..70e8ba1 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -403,6 +403,27 @@ Function Get-NSXTFirewall {
                     }
                 }
 
+                $scopeEntries = $rule.scope
+                $scopes = @()
+                foreach ($scopeEntry in $scopeEntries) {
+                    $scopeLabelURL = $global:nsxtProxyConnection.Server + "/policy/api/v1" + $scopeEntry
+                    if($Troubleshoot) {
+                        Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$scopeLabelURL`n"
+                    }
+                    try {
+                        if($PSVersionTable.PSEdition -eq "Core") {
+                            $requests = Invoke-WebRequest -Uri $scopeLabelURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+                        } else {
+                            $requests = Invoke-WebRequest -Uri $scopeLabelURL -Method $method -Headers $global:nsxtProxyConnection.headers
+                        }
+                    } catch {
+                        Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                        break
+                    }
+                    $scope = ($requests.Content | ConvertFrom-Json)
+                    $scopes += $scope.display_name
+                }
+
                 $tmp = [pscustomobject] @{
                     SequenceNumber = $rule.sequence_number;
                     Name = $rule.display_name;
@@ -410,6 +431,7 @@ Function Get-NSXTFirewall {
                     Source = $source;
                     Destination = $destination;
                     Services = $service;
+                    Scope = $scopes;
                     Action = $rule.action;
                 }
                 $results+=$tmp
@@ -446,6 +468,9 @@ Function New-NSXTFirewall {
         [Parameter(Mandatory=$True)]$DestinationGroup,
         [Parameter(Mandatory=$True)]$Service,
         [Parameter(Mandatory=$True)][ValidateSet("ALLOW","DENY")]$Action,
+        [Parameter(Mandatory=$false)]$InfraScope,
+        [Parameter(Mandatory=$false)]$SourceInfraGroup,
+        [Parameter(Mandatory=$false)]$DestinationInfraGroup,
         [Parameter(Mandatory=$false)][Boolean]$Logged=$false,
         [Switch]$Troubleshoot
     )
@@ -464,6 +489,13 @@ Function New-NSXTFirewall {
             }
         }
 
+        if(! $DestinationInfraGroup) {
+            foreach ($group in $SourceInfraGroup) {
+                $tmp = (Get-NSXTInfraGroup -Name $group).Path
+                $destinationGroups+= $tmp
+            }
+        }
+
         $sourceGroups = @()
         foreach ($group in $SourceGroup) {
             if($group -eq "ANY") {
@@ -474,6 +506,13 @@ Function New-NSXTFirewall {
             }
         }
 
+        if(! $SourceInfraGroup) {
+            foreach ($group in $SourceInfraGroup) {
+                $tmp = (Get-NSXTInfraGroup -Name $group).Path
+                $sourceGroups+= $tmp
+            }
+        }
+
         $services = @()
         foreach ($serviceName in $Service) {
             if($serviceName -eq "ANY") {
@@ -484,6 +523,16 @@ Function New-NSXTFirewall {
             }
         }
 
+        $scopeLabels = @()
+        if(! $InfraScope ) {
+            $scopeLabels = @("/infra/labels/$($GatewayType.toLower())")
+        } else {
+            foreach ($infraScopeName in $InfraScope) {
+                $scope = Get-NSXTInfraScope -Name $infraScopeName
+                $scopeLabels += $scope.Path
+            }
+        }
+
         $payload = @{
             display_name = $Name;
             resource_type = "CommunicationEntry";
@@ -491,7 +540,7 @@ Function New-NSXTFirewall {
             destination_groups = $destinationGroups;
             source_groups = $sourceGroups;
             logged = $Logged;
-            scope = @("/infra/labels/$($GatewayType.toLower())");
+            scope = $scopeLabels;
             services = $services;
             action = $Action;
         }
@@ -1495,4 +1544,146 @@ If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection f
         ($requests.Content | ConvertFrom-Json)
     }
 }
-}
\ No newline at end of file
+}
+
+Function Get-NSXTInfraScope {
+    <#
+        .NOTES
+        ===========================================================================
+        Created by:    William Lam
+        Date:          03/14/2019
+        Organization:  VMware
+        Blog:          http://www.virtuallyghetto.com
+        Twitter:       @lamw
+        ===========================================================================
+
+        .SYNOPSIS
+            Returns all NSX-T Infrastructure Scopes
+        .DESCRIPTION
+            This cmdlet retrieves all NSX-T Infrastructure Scopes
+        .EXAMPLE
+            Get-NSXTInfraScope
+        .EXAMPLE
+            Get-NSXTInfraGroup -Name "VPN Tunnel Interface"
+    #>
+    param(
+        [Parameter(Mandatory=$false)][String]$Name,
+        [Switch]$Troubleshoot
+    )
+
+    If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
+        $method = "GET"
+        $infraLabelURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/labels"
+
+        if($Troubleshoot) {
+            Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$infraLabelURL`n"
+        }
+
+        try {
+            if($PSVersionTable.PSEdition -eq "Core") {
+                $requests = Invoke-WebRequest -Uri $infraLabelURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+            } else {
+                $requests = Invoke-WebRequest -Uri $infraLabelURL -Method $method -Headers $global:nsxtProxyConnection.headers
+            }
+        } catch {
+            if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                break
+            } else {
+                Write-Error "Error in retrieving NSX-T Infrastructure Scopes"
+                Write-Error "`n($_.Exception.Message)`n"
+                break
+            }
+        }
+
+        if($requests.StatusCode -eq 200) {
+            $infraLables = ($requests.Content | ConvertFrom-Json).results
+
+            if ($PSBoundParameters.ContainsKey("Name")){
+                $infraLables = $infraLables | where {$_.display_name -eq $Name}
+            }
+
+            $results = @()
+            foreach ($infraLabel in $infraLables) {
+                $tmp = [pscustomobject] @{
+                    Name = $infraLabel.display_name;
+                    Id = $infraLabel.Id;
+                    Path = $infraLabel.Path;
+                }
+                $results+=$tmp
+            }
+            $results
+        }
+    }
+}
+
+Function Get-NSXTInfraGroup {
+    <#
+        .NOTES
+        ===========================================================================
+        Created by:    William Lam
+        Date:          03/14/2019
+        Organization:  VMware
+        Blog:          http://www.virtuallyghetto.com
+        Twitter:       @lamw
+        ===========================================================================
+
+        .SYNOPSIS
+            Returns all NSX-T Infrastructure Groups for CGW
+        .DESCRIPTION
+            This cmdlet retrieves all NSX-T Infrastructure Groups for CGW
+        .EXAMPLE
+            Get-NSXTInfraGroup
+        .EXAMPLE
+            Get-NSXTInfraGroup -Name "S3 Prefixes"
+    #>
+        param(
+            [Parameter(Mandatory=$false)][String]$Name,
+            [Switch]$Troubleshoot
+        )
+
+        If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
+            $method = "GET"
+            $infraGroupsURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/tier-0s/vmc/groups"
+
+            if($Troubleshoot) {
+                Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$infraGroupsURL`n"
+            }
+
+            try {
+                if($PSVersionTable.PSEdition -eq "Core") {
+                    $requests = Invoke-WebRequest -Uri $infraGroupsURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+                } else {
+                    $requests = Invoke-WebRequest -Uri $infraGroupsURL -Method $method -Headers $global:nsxtProxyConnection.headers
+                }
+            } catch {
+                if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                    Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                    break
+                } else {
+                    Write-Error "Error in retrieving NSX-T Infrastructure Groups"
+                    Write-Error "`n($_.Exception.Message)`n"
+                    break
+                }
+            }
+
+            if($requests.StatusCode -eq 200) {
+                $groups = ($requests.Content | ConvertFrom-Json).results
+
+                if ($PSBoundParameters.ContainsKey("Name")){
+                    $groups = $groups | where {$_.display_name -eq $Name}
+                }
+
+                $results = @()
+                foreach ($group in $groups) {
+                    $tmp = [pscustomobject] @{
+                        Name = $group.display_name;
+                        ID = $group.id;
+                        Path = $group.path;
+                    }
+                    $results+=$tmp
+                }
+                $results
+            }
+        }
+    }
\ No newline at end of file

From 29fbb5bc59d447981b71b9e5a116fdf0bd8ae10c Mon Sep 17 00:00:00 2001
From: William Lam <info.virtuallyghetto@gmail.com>
Date: Fri, 15 Mar 2019 05:13:37 -0700
Subject: [PATCH 2/9] Fixing optional for Source/Destination Groups + typo

---
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index 70e8ba1..de52816 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -464,8 +464,8 @@ Function New-NSXTFirewall {
         [Parameter(Mandatory=$True)]$Name,
         [Parameter(Mandatory=$true)][ValidateSet("MGW","CGW")][String]$GatewayType,
         [Parameter(Mandatory=$True)]$SequenceNumber,
-        [Parameter(Mandatory=$True)]$SourceGroup,
-        [Parameter(Mandatory=$True)]$DestinationGroup,
+        [Parameter(Mandatory=$False)]$SourceGroup,
+        [Parameter(Mandatory=$False)]$DestinationGroup,
         [Parameter(Mandatory=$True)]$Service,
         [Parameter(Mandatory=$True)][ValidateSet("ALLOW","DENY")]$Action,
         [Parameter(Mandatory=$false)]$InfraScope,
@@ -490,7 +490,7 @@ Function New-NSXTFirewall {
         }
 
         if(! $DestinationInfraGroup) {
-            foreach ($group in $SourceInfraGroup) {
+            foreach ($group in $DestinationInfraGroup) {
                 $tmp = (Get-NSXTInfraGroup -Name $group).Path
                 $destinationGroups+= $tmp
             }

From 72a55558609fb85f23befafc87d7a9648504af5d Mon Sep 17 00:00:00 2001
From: William Lam <info.virtuallyghetto@gmail.com>
Date: Fri, 15 Mar 2019 10:46:43 -0700
Subject: [PATCH 3/9] Fixing logic for SRC/DST Infra Group

---
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index de52816..eb54158 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -489,7 +489,7 @@ Function New-NSXTFirewall {
             }
         }
 
-        if(! $DestinationInfraGroup) {
+        if($DestinationInfraGroup) {
             foreach ($group in $DestinationInfraGroup) {
                 $tmp = (Get-NSXTInfraGroup -Name $group).Path
                 $destinationGroups+= $tmp
@@ -506,7 +506,7 @@ Function New-NSXTFirewall {
             }
         }
 
-        if(! $SourceInfraGroup) {
+        if($SourceInfraGroup) {
             foreach ($group in $SourceInfraGroup) {
                 $tmp = (Get-NSXTInfraGroup -Name $group).Path
                 $sourceGroups+= $tmp

From bda5a5a276ca016a4861ca53489203f5b14722f5 Mon Sep 17 00:00:00 2001
From: William Lam <info.virtuallyghetto@gmail.com>
Date: Mon, 18 Mar 2019 13:39:52 -0700
Subject: [PATCH 4/9] Fixing the default Scope label for CGW FW Rules

---
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index eb54158..fcfbe3c 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -524,8 +524,8 @@ Function New-NSXTFirewall {
         }
 
         $scopeLabels = @()
-        if(! $InfraScope ) {
-            $scopeLabels = @("/infra/labels/$($GatewayType.toLower())")
+        if(!$InfraScope) {
+            $scopeLabels = @("/infra/labels/$($GatewayType.toLower())-all")
         } else {
             foreach ($infraScopeName in $InfraScope) {
                 $scope = Get-NSXTInfraScope -Name $infraScopeName

From d95806ea2f2f91546c815ffaeb8ae3171a9d7fe4 Mon Sep 17 00:00:00 2001
From: William Lam <william2003@gmail.com>
Date: Tue, 19 Mar 2019 10:31:20 -0700
Subject: [PATCH 5/9] Fix CGW/MGW scope

---
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index fcfbe3c..d29abbc 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -525,7 +525,11 @@ Function New-NSXTFirewall {
 
         $scopeLabels = @()
         if(!$InfraScope) {
-            $scopeLabels = @("/infra/labels/$($GatewayType.toLower())-all")
+            if($GatewayType.toLower() -eq "cgw") {
+                $scopeLabels = @("/infra/labels/$($GatewayType.toLower())-all")
+            } else {
+                $scopeLabels = @("/infra/labels/$($GatewayType.toLower())")
+            }
         } else {
             foreach ($infraScopeName in $InfraScope) {
                 $scope = Get-NSXTInfraScope -Name $infraScopeName

From 423e752404c1d933bceda6b49df8f038b129f161 Mon Sep 17 00:00:00 2001
From: William Lam <william2003@gmail.com>
Date: Sat, 13 Apr 2019 13:41:51 -0700
Subject: [PATCH 6/9] Adding Route Based VPN functions

---
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1 |   2 +-
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 | 393 +++++++++++++++++--
 2 files changed, 371 insertions(+), 24 deletions(-)

diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1
index 45e549d..4b50bf0 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1
@@ -36,7 +36,7 @@ Description = 'PowerShell Module for Managing NSX-T on VMware Cloud on AWS'
 PowerShellVersion = '6.0'
 
 # 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 = 'Connect-NSXTProxy', 'Get-NSXTSegment', 'New-NSXTSegment', 'Remove-NSXTSegment', 'Get-NSXTGroup', 'New-NSXTGroup', 'Remove-NSXTGroup', 'Get-NSXTService', 'New-NSXTService', 'Get-NSXTFirewall', 'New-NSXTFirewall', 'Remove-NSXTFirewall', 'Get-NSXTDistFirewallSection', 'Get-NSXTDistFirewall', 'New-NSXTDistFirewall', 'Remove-NSXTDistFirewall', 'Get-NSXTRouteTable', 'Get-NSXTOverviewInfo', 'Get-NSXTInfraScope', 'Get-NSXTInfraGroup'
+FunctionsToExport = 'Connect-NSXTProxy', 'Get-NSXTSegment', 'New-NSXTSegment', 'Remove-NSXTSegment', 'Get-NSXTGroup', 'New-NSXTGroup', 'Remove-NSXTGroup', 'Get-NSXTService', 'New-NSXTService', 'Get-NSXTFirewall', 'New-NSXTFirewall', 'Remove-NSXTFirewall', 'Get-NSXTDistFirewallSection', 'Get-NSXTDistFirewall', 'New-NSXTDistFirewall', 'Remove-NSXTDistFirewall', 'Get-NSXTRouteTable', 'Get-NSXTOverviewInfo', 'Get-NSXTInfraScope', 'Get-NSXTInfraGroup', 'New-NSXTRouteBasedVPN', 'Get-NSXTRouteBasedVPN', 'Remove-NSXTRouteBasedVPN'
 # 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 = @()
 
diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index d29abbc..e5c7c06 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -1641,53 +1641,400 @@ Function Get-NSXTInfraGroup {
         .EXAMPLE
             Get-NSXTInfraGroup -Name "S3 Prefixes"
     #>
-        param(
-            [Parameter(Mandatory=$false)][String]$Name,
-            [Switch]$Troubleshoot
-        )
+    param(
+        [Parameter(Mandatory=$false)][String]$Name,
+        [Switch]$Troubleshoot
+    )
 
-        If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
-            $method = "GET"
-            $infraGroupsURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/tier-0s/vmc/groups"
+    If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
+        $method = "GET"
+        $infraGroupsURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/tier-0s/vmc/groups"
+
+        if($Troubleshoot) {
+            Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$infraGroupsURL`n"
+        }
+
+        try {
+            if($PSVersionTable.PSEdition -eq "Core") {
+                $requests = Invoke-WebRequest -Uri $infraGroupsURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+            } else {
+                $requests = Invoke-WebRequest -Uri $infraGroupsURL -Method $method -Headers $global:nsxtProxyConnection.headers
+            }
+        } catch {
+            if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                break
+            } else {
+                Write-Error "Error in retrieving NSX-T Infrastructure Groups"
+                Write-Error "`n($_.Exception.Message)`n"
+                break
+            }
+        }
+
+        if($requests.StatusCode -eq 200) {
+            $groups = ($requests.Content | ConvertFrom-Json).results
+
+            if ($PSBoundParameters.ContainsKey("Name")){
+                $groups = $groups | where {$_.display_name -eq $Name}
+            }
+
+            $results = @()
+            foreach ($group in $groups) {
+                $tmp = [pscustomobject] @{
+                    Name = $group.display_name;
+                    ID = $group.id;
+                    Path = $group.path;
+                }
+                $results+=$tmp
+            }
+            $results
+        }
+    }
+}
+
+Function New-NSXTRouteBasedVPN {
+    <#
+    .NOTES
+    ===========================================================================
+    Created by:    William Lam
+    Date:          04/13/2019
+    Organization:  VMware
+    Blog:          http://www.virtuallyghetto.com
+    Twitter:       @lamw
+    ===========================================================================
+
+    .SYNOPSIS
+        Returns all NSX-T Infrastructure Scopes
+    .DESCRIPTION
+        This cmdlet retrieves all NSX-T Infrastructure Scopes
+    .EXAMPLE
+        New-NSXTRouteBasedVPN -Name VPN3 `
+            -PublicIP 18.184.241.223 `
+            -RemotePublicIP 18.194.148.62 `
+            -BGPLocalIP 169.254.51.2 `
+            -BGPRemoteIP 169.254.51.1 `
+            -BGPLocalASN 65056 `
+            -BGPremoteASN 64512 `
+            -BGPNeighborID 60 `
+            -TunnelEncryption AES_256 `
+            -TunnelDigestEncryption SHA2_256 `
+            -IKEEncryption AES_256 `
+            -IKEDigestEncryption SHA2_256 `
+            -DHGroup GROUP14 `
+            -IKEVersion IKE_V1 `
+            -PresharedPassword VMware123. `
+            -Troubleshoot
+    #>
+    param(
+        [Parameter(Mandatory=$true)][String]$Name,
+        [Parameter(Mandatory=$true)][String]$PublicIP,
+        [Parameter(Mandatory=$true)][String]$RemotePublicIP,
+        [Parameter(Mandatory=$true)][String]$BGPLocalIP,
+        [Parameter(Mandatory=$true)][String]$BGPRemoteIP,
+        [Parameter(Mandatory=$false)][int]$BGPLocalPrefix=30,
+        [Parameter(Mandatory=$true)][ValidateRange(64512,65534)][int]$BGPLocalASN,
+        [Parameter(Mandatory=$true)][ValidateRange(64512,65534)][int]$RemoteBGPASN,
+        [Parameter(Mandatory=$true)][String]$BGPNeighborID,
+        [Parameter(Mandatory=$true)][String][ValidateSet("AES_128","AES_256","AES_GCM_128","AES_GCM_192","AES_GCM_256")]$TunnelEncryption,
+        [Parameter(Mandatory=$true)][String][ValidateSet("SHA1","SHA2_256")]$TunnelDigestEncryption,
+        [Parameter(Mandatory=$true)][String][ValidateSet("AES_128","AES_256","AES_GCM_128","AES_GCM_192","AES_GCM_256")]$IKEEncryption,
+        [Parameter(Mandatory=$true)][String][ValidateSet("SHA1","SHA2_256")]$IKEDigestEncryption,
+        [Parameter(Mandatory=$true)][String][ValidateSet("GROUP2","GROUP5","GROUP14","GROUP15","GROUP16")]$DHGroup,
+        [Parameter(Mandatory=$true)][String][ValidateSet("IKE_V1","IKE_V2","IKE_FLEX")]$IKEVersion,
+        [Parameter(Mandatory=$true)][String]$PresharedPassword,
+        [Switch]$Troubleshoot
+    )
+
+    If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
+
+        ## Configure BGP ASN
+
+        $payload = @{
+            local_as_num = $BGPLocalASN;
+        }
+        $body = $payload | ConvertTo-Json -Depth 5
+
+        $ASNmethod = "patch"
+        $bgpAsnURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/tier-0s/vmc/locale-services/default/bgp"
+
+        if($Troubleshoot) {
+            Write-Host -ForegroundColor cyan "`n[DEBUG] - $ASNmethod`n$bgpAsnURL`n"
+            Write-Host -ForegroundColor cyan "[DEBUG]`n$body`n"
+        }
+
+        try {
+            if($PSVersionTable.PSEdition -eq "Core") {
+                $requests = Invoke-WebRequest -Uri $bgpAsnURL -Body $body -Method $ASNmethod -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+            } else {
+                $requests = Invoke-WebRequest -Uri $bgpAsnURL -Body $body -Method $ASNmethod -Headers $global:nsxtProxyConnection.headers
+            }
+        } catch {
+            if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                break
+            } else {
+                Write-Error "Error in updating BGP ASN"
+                Write-Error "`n($_.Exception.Message)`n"
+                break
+            }
+        }
+
+        if($requests.StatusCode -eq 200) {
+            ## Configure BGP Neighbor
+
+            $payload = @{
+                resource_type = "BgpNeighborConfig";
+                id = $BGPNeighborID;
+                remote_as_num = $RemoteBGPASN;
+                neighbor_address = $BGPRemoteIP;
+            }
+            $body = $payload | ConvertTo-Json -Depth 5
+
+            $method = "put"
+            $bgpNeighborURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/tier-0s/vmc/locale-services/default/bgp/neighbors/$BGPNeighborID"
 
             if($Troubleshoot) {
-                Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$infraGroupsURL`n"
+                Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$bgpNeighborURL`n"
+                Write-Host -ForegroundColor cyan "[DEBUG]`n$body`n"
             }
 
             try {
                 if($PSVersionTable.PSEdition -eq "Core") {
-                    $requests = Invoke-WebRequest -Uri $infraGroupsURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+                    $requests = Invoke-WebRequest -Uri $bgpNeighborURL -Body $body -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
                 } else {
-                    $requests = Invoke-WebRequest -Uri $infraGroupsURL -Method $method -Headers $global:nsxtProxyConnection.headers
+                    $requests = Invoke-WebRequest -Uri $bgpNeighborURL -Body $body -Method $method -Headers $global:nsxtProxyConnection.headers
                 }
             } catch {
                 if($_.Exception.Response.StatusCode -eq "Unauthorized") {
                     Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
                     break
                 } else {
-                    Write-Error "Error in retrieving NSX-T Infrastructure Groups"
+                    Write-Error "Error in configuring BGP Neighbor"
                     Write-Error "`n($_.Exception.Message)`n"
                     break
                 }
             }
 
             if($requests.StatusCode -eq 200) {
-                $groups = ($requests.Content | ConvertFrom-Json).results
+                ## Configure Route Based Policy VPN
 
-                if ($PSBoundParameters.ContainsKey("Name")){
-                    $groups = $groups | where {$_.display_name -eq $Name}
+                $TunnelSubnets = @{
+                    ip_addresses = @("$BGPLocalIP");
+                    prefix_length = $BGPLocalPrefix;
                 }
 
-                $results = @()
-                foreach ($group in $groups) {
-                    $tmp = [pscustomobject] @{
-                        Name = $group.display_name;
-                        ID = $group.id;
-                        Path = $group.path;
+                $payload = @{
+                    display_name = $Name;
+                    enabled = $true;
+                    local_address = $PublicIP;
+                    remote_private_address = $RemotePublicIP;
+                    remote_public_address = $RemotePublicIP;
+                    passphrases = @("$PresharedPassword");
+                    tunnel_digest_algorithms = @("$TunnelDigestEncryption");
+                    ike_digest_algorithms = @("$IKEDigestEncryption");
+                    ike_encryption_algorithms = @("$IKEEncryption");
+                    enable_perfect_forward_secrecy = $true;
+                    dh_groups = @("$DHGroup");
+                    ike_version = $IKEVersion;
+                    l3vpn_session = @{
+                        resource_type = "RouteBasedL3VpnSession";
+                        tunnel_subnets = @($TunnelSubnets);
+                        default_rule_logging = $false;
+                        force_whitelisting = $false;
+                        routing_config_path = "/infra/tier-0s/vmc/locale-services/default/bgp/neighbors/$BGPNeighborID";
+                    };
+                    tunnel_encryption_algorithms = @("$TunnelEncryption");
+                }
+                $body = $payload | ConvertTo-Json -Depth 5
+
+                $routeBasedVPNURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/tier-0s/vmc/locale-services/default/l3vpns/$Name"
+
+                if($Troubleshoot) {
+                    Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$bgpNeighborURL`n"
+                    Write-Host -ForegroundColor cyan "[DEBUG]`n$body`n"
+                }
+
+                try {
+                    if($PSVersionTable.PSEdition -eq "Core") {
+                        $requests = Invoke-WebRequest -Uri $routeBasedVPNURL -Body $body -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+                    } else {
+                        $requests = Invoke-WebRequest -Uri $routeBasedVPNURL -Body $body -Method $method -Headers $global:nsxtProxyConnection.headers
+                    }
+                } catch {
+                    if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                        Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                        break
+                    } else {
+                        Write-Error "Error in configuring Route Based VPN"
+                        Write-Error "`n($_.Exception.Message)`n"
+                        break
                     }
-                    $results+=$tmp
                 }
-                $results
+
+                if($requests.StatusCode -eq 200) {
+                    Write-Host "Succesfully created Route Based VPN"
+                    ($requests.Content | ConvertFrom-Json)
+                }
             }
         }
-    }
\ No newline at end of file
+    }
+}
+
+Function Get-NSXTRouteBasedVPN {
+    <#
+    .NOTES
+    ===========================================================================
+    Created by:    William Lam
+    Date:          04/13/2019
+    Organization:  VMware
+    Blog:          http://www.virtuallyghetto.com
+    Twitter:       @lamw
+    ===========================================================================
+
+    .SYNOPSIS
+        Returns all NSX-T Route Based VPN Tunnels
+    .DESCRIPTION
+        This cmdlet retrieves all NSX-T Route Based VPN Tunnels description
+    .EXAMPLE
+        Get-NSXTRouteBasedVPN
+    .EXAMPLE
+        Get-NSXTRouteBasedVPN -Name "VPN-T1"
+    #>
+    param(
+        [Parameter(Mandatory=$false)][String]$Name,
+        [Switch]$Troubleshoot
+    )
+
+    If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
+        $method = "GET"
+        $routeBaseVPNURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/tier-0s/vmc/locale-services/default/l3vpns"
+
+        if($Troubleshoot) {
+            Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$routeBaseVPNURL`n"
+        }
+
+        try {
+            if($PSVersionTable.PSEdition -eq "Core") {
+                $requests = Invoke-WebRequest -Uri $routeBaseVPNURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+            } else {
+                $requests = Invoke-WebRequest -Uri $routeBaseVPNURL -Method $method -Headers $global:nsxtProxyConnection.headers
+            }
+        } catch {
+            if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                break
+            } else {
+                Write-Error "Error in retrieving NSX-T Route Based VPN Tunnels"
+                Write-Error "`n($_.Exception.Message)`n"
+                break
+            }
+        }
+
+        if($requests.StatusCode -eq 200) {
+            $groups = ($requests.Content | ConvertFrom-Json).results
+
+            if ($PSBoundParameters.ContainsKey("Name")){
+                $groups = $groups | where {$_.display_name -eq $Name}
+            }
+
+            $results = @()
+            foreach ($group in $groups) {
+                $tmp = [pscustomobject] @{
+                    Name = $group.display_name;
+                    ID = $group.id;
+                    Path = $group.path;
+                    RoutingConfigPath = $group.l3vpn_session.routing_config_path;
+                }
+                $results+=$tmp
+            }
+            $results
+        }
+    }
+}
+
+Function Remove-NSXTRouteBasedVPN {
+<#
+    .NOTES
+    ===========================================================================
+    Created by:    William Lam
+    Date:          04/13/2019
+    Organization:  VMware
+    Blog:          http://www.virtuallyghetto.com
+    Twitter:       @lamw
+    ===========================================================================
+
+    .SYNOPSIS
+        Removes a route based VPN Tunnel and it's associated BGP neighbor
+    .DESCRIPTION
+        This cmdlet removes a route based VPN Tunnel and it's associated BGP neighbor
+    .EXAMPLE
+        Remove-NSXTRouteBasedVPN -Name VPN1 -Troubleshoot
+#>
+    Param (
+        [Parameter(Mandatory=$True)]$Name,
+        [Switch]$Troubleshoot
+    )
+
+    If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
+        $TunnelId = (Get-NSXTRouteBasedVPN -Name $Name).ID
+        $path = (Get-NSXTRouteBasedVPN -Name $Name).RoutingConfigPath
+
+        # Delete IPSEC tunnel
+        $method = "DELETE"
+        $deleteVPNtunnelURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/tier-0s/vmc/locale-services/default/l3vpns/$TunnelId"
+
+        if($Troubleshoot) {
+            Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$deleteVPNtunnelURL`n"
+        }
+
+        try {
+            if($PSVersionTable.PSEdition -eq "Core") {
+                $requests = Invoke-WebRequest -Uri $deleteVPNtunnelURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+            } else {
+                $requests = Invoke-WebRequest -Uri $deleteVPNtunnelURL -Method $method -Headers $global:nsxtProxyConnection.headers
+            }
+        } catch {
+            if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                break
+            } else {
+                Write-Error "Error in removing NSX-T IPSEC Tunnel: $Name"
+                Write-Error "`n($_.Exception.Message)`n"
+                break
+            }
+        }
+
+        if($requests.StatusCode -eq 200) {
+            Write-Host "Succesfully removed NSX-T IPSEC Tunnel: $Name"
+        }
+
+        # Delete BGP Neighbor
+        $method = "DELETE"
+        $deleteBGPnbURL = $global:nsxtProxyConnection.Server + "/policy/api/v1$path"
+
+        if($Troubleshoot) {
+            Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$deleteBGPnbURL`n"
+        }
+
+        try {
+            if($PSVersionTable.PSEdition -eq "Core") {
+                $requests = Invoke-WebRequest -Uri $deleteBGPnbURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+            } else {
+                $requests = Invoke-WebRequest -Uri $deleteBGPnbURL -Method $method -Headers $global:nsxtProxyConnection.headers
+            }
+        } catch {
+            if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                break
+            } else {
+                Write-Error "Error in removing NSX-T BGP Neighbor"
+                Write-Error "`n($_.Exception.Message)`n"
+                break
+            }
+        }
+
+        if($requests.StatusCode -eq 200) {
+            Write-Host "Succesfully removed NSX-T BGP Neighbor"
+        }
+    }
+}
\ No newline at end of file

From 0cfb39779ba66690bfd22e3dd0969f8a3a41595e Mon Sep 17 00:00:00 2001
From: William Lam <william2003@gmail.com>
Date: Sat, 13 Apr 2019 14:11:49 -0700
Subject: [PATCH 7/9] Fix "Successfully" typo

---
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index e5c7c06..3e73913 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -205,7 +205,7 @@ Function New-NSXTSegment {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully created new NSX-T Segment $Name"
+            Write-Host "Successfully created new NSX-T Segment $Name"
             ($requests.Content | ConvertFrom-Json) | select display_name, id
         }
     }
@@ -260,7 +260,7 @@ Function Remove-NSXTSegment {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully removed NSX-T Segment $Name"
+            Write-Host "Successfully removed NSX-T Segment $Name"
         }
     }
 }
@@ -577,7 +577,7 @@ Function New-NSXTFirewall {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully created new NSX-T Firewall Rule $Name"
+            Write-Host "Successfully created new NSX-T Firewall Rule $Name"
             ($requests.Content | ConvertFrom-Json) | select display_name, id
         }
     }
@@ -633,7 +633,7 @@ Function Remove-NSXTFirewall {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully removed NSX-T Firewall Rule"
+            Write-Host "Successfully removed NSX-T Firewall Rule"
         }
     }
 }
@@ -791,7 +791,7 @@ Function New-NSXTGroup {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully created new NSX-T Group $Name"
+            Write-Host "Successfully created new NSX-T Group $Name"
             ($requests.Content | ConvertFrom-Json) | select display_name, id
         }
     }
@@ -847,7 +847,7 @@ Function Remove-NSXTGroup {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully removed NSX-T Group $Name"
+            Write-Host "Successfully removed NSX-T Group $Name"
         }
     }
 }
@@ -997,7 +997,7 @@ Function New-NSXTService {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully created new NSX-T Service $Name"
+            Write-Host "Successfully created new NSX-T Service $Name"
             ($requests.Content | ConvertFrom-Json) | select display_name, id
         }
     }
@@ -1352,7 +1352,7 @@ Function New-NSXTDistFirewall {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully created new NSX-T Distributed Firewall Rule $Name"
+            Write-Host "Successfully created new NSX-T Distributed Firewall Rule $Name"
             ($requests.Content | ConvertFrom-Json) | select display_name, id
         }
     }
@@ -1411,7 +1411,7 @@ Function Remove-NSXTDistFirewall {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully removed NSX-T Distributed Firewall Rule"
+            Write-Host "Successfully removed NSX-T Distributed Firewall Rule"
         }
     }
 }
@@ -1477,7 +1477,7 @@ Function Get-NSXTRouteTable {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully retrieved NSX-T Routing Table`n"
+            Write-Host "Successfully retrieved NSX-T Routing Table`n"
             $routeTables = ($requests.Content | ConvertFrom-Json).results
 
             foreach ($routeTable in $routeTables) {
@@ -1544,7 +1544,7 @@ If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection f
     }
 
     if($requests.StatusCode -eq 200) {
-        Write-Host "Succesfully retrieved NSX-T Overview Information"
+        Write-Host "Successfully retrieved NSX-T Overview Information"
         ($requests.Content | ConvertFrom-Json)
     }
 }
@@ -1872,7 +1872,7 @@ Function New-NSXTRouteBasedVPN {
                 }
 
                 if($requests.StatusCode -eq 200) {
-                    Write-Host "Succesfully created Route Based VPN"
+                    Write-Host "Successfully created Route Based VPN"
                     ($requests.Content | ConvertFrom-Json)
                 }
             }
@@ -2005,7 +2005,7 @@ Function Remove-NSXTRouteBasedVPN {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully removed NSX-T IPSEC Tunnel: $Name"
+            Write-Host "Successfully removed NSX-T IPSEC Tunnel: $Name"
         }
 
         # Delete BGP Neighbor
@@ -2034,7 +2034,7 @@ Function Remove-NSXTRouteBasedVPN {
         }
 
         if($requests.StatusCode -eq 200) {
-            Write-Host "Succesfully removed NSX-T BGP Neighbor"
+            Write-Host "Successfully removed NSX-T BGP Neighbor"
         }
     }
 }
\ No newline at end of file

From 25450e9003f90dbb3dbfb7fb5b33ea556a00ccd9 Mon Sep 17 00:00:00 2001
From: William Lam <william2003@gmail.com>
Date: Mon, 15 Apr 2019 09:15:40 -0700
Subject: [PATCH 8/9] Fix No DHCP NSX-T Segment creation

---
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index 3e73913..1f34f3d 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -152,6 +152,8 @@ Function New-NSXTSegment {
         This cmdlet creates a new NSX-T Segment (Logical Networks)
     .EXAMPLE
         New-NSXTSegment -Name "sddc-cgw-network-4" -Gateway "192.168.4.1/24" -DHCP -DHCPRange "192.168.4.2-192.168.4.254"
+    .EXAMPLE
+        New-NSXTSegment -Name "sddc-cgw-network-5" -Gateway "192.168.5.1/24"
 #>
     Param (
         [Parameter(Mandatory=$True)]$Name,
@@ -163,14 +165,14 @@ Function New-NSXTSegment {
 
     If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
         if($DHCP) {
-            $dhcpConf = @($DHCPRange)
+            $subnets = @{
+                gateway_address = $gateway;
+                dhcp_ranges = @($DHCPRange)
+            }
         } else {
-            $dhcpConf = @($null)
-        }
-
-        $subnets = @{
-            gateway_address = $gateway;
-            dhcp_ranges = $dhcpConf;
+            $subnets = @{
+                gateway_address = $gateway;
+            }
         }
 
         $payload = @{

From 2cebd97c014c3fe736ef9f783db7699864fa16a6 Mon Sep 17 00:00:00 2001
From: William Lam <william2003@gmail.com>
Date: Fri, 19 Apr 2019 16:24:19 -0700
Subject: [PATCH 9/9] Fixed Distributed Firewall Rule Section + Remove NSX-T
 Service

---
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1 |   2 +-
 Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 | 169 +++++++++++++++----
 2 files changed, 136 insertions(+), 35 deletions(-)

diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1
index 4b50bf0..c18be71 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psd1
@@ -36,7 +36,7 @@ Description = 'PowerShell Module for Managing NSX-T on VMware Cloud on AWS'
 PowerShellVersion = '6.0'
 
 # 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 = 'Connect-NSXTProxy', 'Get-NSXTSegment', 'New-NSXTSegment', 'Remove-NSXTSegment', 'Get-NSXTGroup', 'New-NSXTGroup', 'Remove-NSXTGroup', 'Get-NSXTService', 'New-NSXTService', 'Get-NSXTFirewall', 'New-NSXTFirewall', 'Remove-NSXTFirewall', 'Get-NSXTDistFirewallSection', 'Get-NSXTDistFirewall', 'New-NSXTDistFirewall', 'Remove-NSXTDistFirewall', 'Get-NSXTRouteTable', 'Get-NSXTOverviewInfo', 'Get-NSXTInfraScope', 'Get-NSXTInfraGroup', 'New-NSXTRouteBasedVPN', 'Get-NSXTRouteBasedVPN', 'Remove-NSXTRouteBasedVPN'
+FunctionsToExport = 'Connect-NSXTProxy', 'Get-NSXTSegment', 'New-NSXTSegment', 'Remove-NSXTSegment', 'Get-NSXTGroup', 'New-NSXTGroup', 'Remove-NSXTGroup', 'Get-NSXTService', 'New-NSXTService', 'Get-NSXTFirewall', 'New-NSXTFirewall', 'Remove-NSXTFirewall', 'Get-NSXTDistFirewallSection', 'Get-NSXTDistFirewall', 'New-NSXTDistFirewall', 'Remove-NSXTDistFirewall', 'Get-NSXTRouteTable', 'Get-NSXTOverviewInfo', 'Get-NSXTInfraScope', 'Get-NSXTInfraGroup', 'New-NSXTRouteBasedVPN', 'Get-NSXTRouteBasedVPN', 'Remove-NSXTRouteBasedVPN', 'Remove-NSXTService', 'New-NSXTDistFirewallSection', 'Get-NSXTDistFirewallSection'
 # 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 = @()
 
diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index 1f34f3d..59606b5 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -520,7 +520,7 @@ Function New-NSXTFirewall {
             if($serviceName -eq "ANY") {
                 $services = @("ANY")
             } else {
-                $tmp = "/infra/services/$serviceName"
+                $tmp = (Get-NSXTService -Name "$serviceName").Path
                 $services+=$tmp
             }
         }
@@ -924,6 +924,7 @@ Function Get-NSXTService {
                     Protocol = $serviceProtocol;
                     Source = $serviceSourcePorts;
                     Destination = $serviceDestinationPorts;
+                    Path = $service.path;
                 }
                 $results += $tmp
             }
@@ -932,6 +933,60 @@ Function Get-NSXTService {
     }
 }
 
+Function Remove-NSXTService {
+<#
+    .NOTES
+    ===========================================================================
+    Created by:    William Lam
+    Date:          04/10/2019
+    Organization:  VMware
+    Blog:          http://www.virtuallyghetto.com
+    Twitter:       @lamw
+    ===========================================================================
+
+    .SYNOPSIS
+        Removes an NSX-T Service
+    .DESCRIPTION
+        This cmdlet removes an NSX-T Service
+    .EXAMPLE
+        Remove-NSXTService -Id VMware-Blast -Troubleshoot
+#>
+    Param (
+        [Parameter(Mandatory=$True)]$Id,
+        [Switch]$Troubleshoot
+    )
+
+    If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection  found, please use Connect-NSXTProxy" } Else {
+        $method = "DELETE"
+        $deleteServiceURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/services/$Id"
+
+        if($Troubleshoot) {
+            Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$deleteServiceURL`n"
+        }
+
+        try {
+            if($PSVersionTable.PSEdition -eq "Core") {
+                $requests = Invoke-WebRequest -Uri $deleteServiceURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+            } else {
+                $requests = Invoke-WebRequest -Uri $deleteServiceURL -Method $method -Headers $global:nsxtProxyConnection.headers
+            }
+        } catch {
+            if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                break
+            } else {
+                Write-Error "Error in removing NSX-T Service"
+                Write-Error "`n($_.Exception.Message)`n"
+                break
+            }
+        }
+
+        if($requests.StatusCode -eq 200) {
+            Write-Host "Successfully removed NSX-T Service $Id"
+        }
+    }
+}
+
 Function New-NSXTService {
 <#
     .NOTES
@@ -1005,27 +1060,23 @@ Function New-NSXTService {
     }
 }
 
-Function Get-NSXTDistFirewallSection {
+Function New-NSXTDistFirewallSection {
 <#
     .NOTES
     ===========================================================================
     Created by:    William Lam
-    Date:          01/01/2019
+    Date:          04/19/2019
     Organization:  VMware
     Blog:          http://www.virtuallyghetto.com
     Twitter:       @lamw
     ===========================================================================
 
     .SYNOPSIS
-        Returns all NSX-T Distributed Firewall Groups
+        Creates new NSX-T Distributed Firewall Section
     .DESCRIPTION
-        This cmdlet retrieves all NSX-T Distributed Firewall Sections
+        This cmdlet to create new NSX-T Distributed Firewall Section
     .EXAMPLE
-        Get-NSXTDistFirewallSection
-    .EXAMPLE
-        Get-NSXTDistFirewallSection -Name "App Section 1"
-    .EXAMPLE
-        et-NSXTDistFirewallSection -Category Emergency
+        Get-NSXTDistFirewallSection -Name "App Section 1" -Category Application
 #>
     param(
         [Parameter(Mandatory=$false)][String]$Name,
@@ -1034,52 +1085,102 @@ Function Get-NSXTDistFirewallSection {
     )
 
     If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
-        $method = "GET"
-        $distFirewallGroupURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/domains/cgw/communication-maps"
+        $payload = @{
+            display_name = $Name;
+            category = $Category;
+            resource_type = "CommunicationMap";
+        }
+
+        $body = $payload | ConvertTo-Json -depth 5
+
+        $method = "PUT"
+        $generatedId = (New-Guid).Guid
+        $distFirewallSectionURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/domains/cgw/communication-maps/$generatedId"
 
         if($Troubleshoot) {
-            Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$distFirewallGroupURL`n"
+            Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$distFirewallSectionURL`n"
         }
 
         try {
             if($PSVersionTable.PSEdition -eq "Core") {
-                $requests = Invoke-WebRequest -Uri $distFirewallGroupURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+                $requests = Invoke-WebRequest -Uri $distFirewallSectionURL -Method $method -Body $body -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
             } else {
-                $requests = Invoke-WebRequest -Uri $distFirewallGroupURL -Method $method -Headers $global:nsxtProxyConnection.headers
+                $requests = Invoke-WebRequest -Uri $distFirewallSectionURL -Method $method -Body $body -Headers $global:nsxtProxyConnection.headers
             }
         } catch {
             if($_.Exception.Response.StatusCode -eq "Unauthorized") {
                 Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
                 break
             } else {
-                Write-Error "Error in retrieving NSX-T Distributed Firewall Sections"
+                Write-Error "Error in creating NSX-T Distributed Firewall Section"
                 Write-Error "`n($_.Exception.Message)`n"
                 break
             }
         }
 
         if($requests.StatusCode -eq 200) {
-            $groups = ($requests.Content | ConvertFrom-Json).results
+            Write-Host "Successfully created new NSX-T Distributed Firewall Section $Section"
+            ($requests.Content | ConvertFrom-Json) | select display_name, id
+        }
+    }
+}
+
+Function Get-NSXTDistFirewallSection {
+<#
+    .NOTES
+    ===========================================================================
+    Created by:    William Lam
+    Date:          04/19/2019
+    Organization:  VMware
+    Blog:          http://www.virtuallyghetto.com
+    Twitter:       @lamw
+    ===========================================================================
+
+    .SYNOPSIS
+        Returns all NSX-T Distributed Firewall Sections
+    .DESCRIPTION
+        This cmdlet retrieves all NSX-T Distributed Firewall Sections
+    .EXAMPLE
+        Get-NSXTDistFirewallSection
+#>
+    param(
+        [Parameter(Mandatory=$true)][String]$Name,
+        [Switch]$Troubleshoot
+    )
+
+    If (-Not $global:nsxtProxyConnection) { Write-error "No NSX-T Proxy Connection found, please use Connect-NSXTProxy" } Else {
+        $method = "GET"
+        $distFirewallSectionURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/domains/cgw/communication-maps"
+
+        if($Troubleshoot) {
+            Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$distFirewallSectionURL`n"
+        }
+
+        try {
+            if($PSVersionTable.PSEdition -eq "Core") {
+                $requests = Invoke-WebRequest -Uri $distFirewallSectionURL -Method $method -Headers $global:nsxtProxyConnection.headers -SkipCertificateCheck
+            } else {
+                $requests = Invoke-WebRequest -Uri $distFirdistFirewallSectionURLwallURL -Method $method -Headers $global:nsxtProxyConnection.headers
+            }
+        } catch {
+            if($_.Exception.Response.StatusCode -eq "Unauthorized") {
+                Write-Host -ForegroundColor Red "`nThe NSX-T Proxy session is no longer valid, please re-run the Connect-NSXTProxy cmdlet to retrieve a new token`n"
+                break
+            } else {
+                Write-Error "Error in retrieving NSX-T Distributed Firewall Section"
+                Write-Error "`n($_.Exception.Message)`n"
+                break
+            }
+        }
+
+        if($requests.StatusCode -eq 200) {
+            $sections = ($requests.Content | ConvertFrom-Json).results
 
             if ($PSBoundParameters.ContainsKey("Name")){
-                $groups = $groups | where {$_.display_name -eq $Name}
+                $sections = $sections | where {$_.display_name -eq $Name}
             }
 
-            if ($PSBoundParameters.ContainsKey("Category")){
-                $groups = $groups | where {$_.category -eq $Category}
-            }
-
-            $results = @()
-            foreach ($group in $groups | Sort-Object -Property category) {
-                $tmp = [pscustomobject] @{
-                    Id = $group.id;
-                    Section = $group.display_name;
-                    Category = $group.category;
-                    Precedence = $group.precedence;
-                }
-                $results+=$tmp
-            }
-            $results
+            $sections | Sort-Object -Propert display_name | select display_name, id
         }
     }
 }
@@ -1329,7 +1430,7 @@ Function New-NSXTDistFirewall {
 
         $method = "PUT"
         $generatedId = (New-Guid).Guid
-        $newDistFirewallURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/domains/cgw/communication-maps/$sectionId/communication-entries/$generatedId"
+        $newDistFirewallURL = $global:nsxtProxyConnection.Server + "/policy/api/v1/infra/domains/cgw/communication-maps/$($sectionId)/communication-entries/$generatedId"
 
         if($Troubleshoot) {
             Write-Host -ForegroundColor cyan "`n[DEBUG] - $method`n$newDistFirewallURL`n"