Added new properties NetworkIdentifier and ServiceEndpointConfig in Vnet/Subnet config for setting SNAT/VIP. (#25284)

* Added new property [-NetworkIdentifier <String>] on Subnet config

* updated the type of SENetworkIdentifier from string to PSServiceEndpoint object

* Added Fields to support networkidentifier

* Added helper file for code refactoring and reusability

* Added test Subnet Service Endpoint feature With NetworkIdentifier.

* added tests for serviceendpoint with networkidentifier

* Distinct to GroupBy fix.

* space added

---------

Co-authored-by: Bhupesh Bhatt <[email protected]>

Author: bhupeshbhatt1985

src/Network/Network.Test/ScenarioTests/VirtualNetworkTests.cs

@@ -146,6 +146,22 @@ public void TestVirtualNetworkSubnetServiceEndpoint()
             TestRunner.RunTestScript("Test-VirtualNetworkSubnetServiceEndpoint");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.wanrpdev_subset1)]
+        public void TestVirtualNetworkSubnetServiceEndpointWithNetworkIdentifier()
+        {
+            TestRunner.RunTestScript("Test-VirtualNetworkSubnetServiceEndpointWithNetworkIdentifier");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait(Category.Owner, NrpTeamAlias.wanrpdev_subset1)]
+        public void TestVirtualNetworkSubnetServiceEndpointConfig()
+        {
+            TestRunner.RunTestScript("Test-VirtualNetworkSubnetServiceEndpointConfig");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, NrpTeamAlias.wanrpdev_subset1)]

src/Network/Network.Test/ScenarioTests/VirtualNetworkTests.ps1

@@ -1205,6 +1205,115 @@ function Test-VirtualNetworkSubnetServiceEndpoint
     }
 }
 
+<#
+.SYNOPSIS
+Tests checking Virtual Network Subnet Service Endpoint feature With NetworkIdentifier.
+#>
+function Test-VirtualNetworkSubnetServiceEndpointWithNetworkIdentifier
+{
+    # Setup
+    $rgname = Get-ResourceGroupName
+    $vnetName = Get-ResourceName
+    $subnetName = Get-ResourceName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $resourceTypeParent = "Microsoft.Network/virtualNetworks"
+    $location = Get-ProviderLocation $resourceTypeParent
+    $publicIPAddressName = "PublicIPAddressName";
+    $publicIPAddressAllocationMethod = "Static";
+    $serviceEndpoint = "Microsoft.Storage"
+    
+    try
+    {
+        # Create the resource group
+        $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" };
+
+        # Create the publicip
+        $publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIPAddressName -location $location -AllocationMethod $publicIPAddressAllocationMethod    
+
+        # Create the $networkIdentifier
+        $networkIdentifier = @{ Id = $publicip.Id };
+        
+        # Create the Virtual Network
+        $subnet = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24 -ServiceEndpoint $serviceEndpoint -NetworkIdentifier $networkIdentifier ;
+        New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet;
+        $vnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname;
+
+        Assert-NotNull $vnet;
+        Assert-NotNull $vnet.Subnets;
+
+        $subnet = $vnet.Subnets[0];
+        Assert-AreEqual $serviceEndpoint $subnet.serviceEndpoints[0].Service;
+        Assert-AreEqual $networkIdentifier.Id $subnet.serviceEndpoints[0].networkIdentifier.Id;
+
+        
+        Set-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $vnet -AddressPrefix 10.0.1.0/24 -ServiceEndpoint $null;
+        $vnet = Set-AzVirtualNetwork -VirtualNetwork $vnet;
+        $subnet = $vnet.Subnets[0];
+
+        Assert-Null $subnet.serviceEndpoints;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
+<#
+.SYNOPSIS
+Tests checking Virtual Network Subnet Service Endpoint feature With NetworkIdentifier using ServiceEndpointConfig .
+#>
+function Test-VirtualNetworkSubnetServiceEndpointConfig
+{
+    # Setup
+    $rgname = Get-ResourceGroupName
+    $vnetName = Get-ResourceName
+    $subnetName = Get-ResourceName
+    $rglocation = Get-ProviderLocation ResourceManagement
+    $resourceTypeParent = "Microsoft.Network/virtualNetworks"
+    $location = Get-ProviderLocation $resourceTypeParent
+    $publicIPAddressName = "PublicIPAddressName";
+    $publicIPAddressAllocationMethod = "Static";
+    $serviceEndpoint = "Microsoft.Storage"
+    
+    try
+    {
+        # Create the resource group
+        $resourceGroup = New-AzResourceGroup -Name $rgname -Location $rglocation -Tags @{ testtag = "testval" };
+
+        # Create the publicip
+        $publicip = New-AzPublicIpAddress -ResourceGroupName $rgname -name $publicIPAddressName -location $location -AllocationMethod $publicIPAddressAllocationMethod    
+
+        # Create the $networkIdentifier
+        $networkIdentifier = @{ Id = $publicip.Id };
+        $serviceEndpointConfig = @( @{ Service = $ServiceEndpointServiceName; NetworkIdentifier = $NetworkIdentifier }) 
+    
+        # Create the Virtual Network
+        $subnet = New-AzVirtualNetworkSubnetConfig -Name $subnetName -AddressPrefix 10.0.1.0/24 -ServiceEndpointConfig $serviceEndpointConfig -NetworkIdentifier $networkIdentifier ;
+        New-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet;
+        $vnet = Get-AzVirtualNetwork -Name $vnetName -ResourceGroupName $rgname;
+
+        Assert-NotNull $vnet;
+        Assert-NotNull $vnet.Subnets;
+
+        $subnet = $vnet.Subnets[0];
+        Assert-AreEqual $serviceEndpoint $subnet.serviceEndpoints[0].Service;
+        Assert-AreEqual $networkIdentifier.Id $subnet.serviceEndpoints[0].networkIdentifier.Id;
+
+        
+        Set-AzVirtualNetworkSubnetConfig -Name $subnetName -VirtualNetwork $vnet -AddressPrefix 10.0.1.0/24 -ServiceEndpoint $null;
+        $vnet = Set-AzVirtualNetwork -VirtualNetwork $vnet;
+        $subnet = $vnet.Subnets[0];
+
+        Assert-Null $subnet.serviceEndpoints;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
 <#
 .SYNOPSIS
 Tests checking Virtual Network Subnet Service Endpoint Policies.