Adding new endpoint AzureArcVM in ConnectionMonitor (#19626)

Author: kumaam

src/Network/Network/ChangeLog.md

@@ -19,6 +19,8 @@
 --->
 
 ## Upcoming Release
+* Added a new endpoint swtich `AzureArcVM` in Networkwatcher ConnectionMonitor
+    - `New-AzNetworkWatcherConnectionMonitor`
 * Updated commandlet to support bypassing the ExpressRoute gateway when accessing private-links.
     - `New-AzVirtualNetworkGatewayConnection`
 * Updated commandlet to support no-internet advertise CustomIpPrefix.

src/Network/Network/NetworkWatcher/ConnectionMonitor/ConnectionMonitorBaseCmdlet.cs

@@ -802,7 +802,7 @@ private void ValidateEndpointType(PSNetworkWatcherConnectionMonitorEndpointObjec
             if (!string.Equals(endpoint.Type, "AzureVM", StringComparison.OrdinalIgnoreCase) && !string.Equals(endpoint.Type, "AzureVNet", StringComparison.OrdinalIgnoreCase)
                 && !string.Equals(endpoint.Type, "AzureSubnet", StringComparison.OrdinalIgnoreCase) && !string.Equals(endpoint.Type, "MMAWorkspaceMachine", StringComparison.OrdinalIgnoreCase)
                 && !string.Equals(endpoint.Type, "MMAWorkspaceNetwork", StringComparison.OrdinalIgnoreCase) && !string.Equals(endpoint.Type, "ExternalAddress", StringComparison.OrdinalIgnoreCase)
-                && !string.Equals(endpoint.Type, "AzureVMSS", StringComparison.OrdinalIgnoreCase))
+                && !string.Equals(endpoint.Type, "AzureVMSS", StringComparison.OrdinalIgnoreCase) && !string.Equals(endpoint.Type, "AzureArcVM", StringComparison.OrdinalIgnoreCase))
             {
                 throw new PSArgumentException(Properties.Resources.InvalidEndpointType, endpoint.Name);
             }
@@ -827,7 +827,8 @@ private void ValidateEndpointResourceId(PSNetworkWatcherConnectionMonitorEndpoin
             if (string.IsNullOrEmpty(resourceType) || (!resourceType.Equals("virtualMachines", StringComparison.OrdinalIgnoreCase)
                 && !resourceType.Equals("workspaces", StringComparison.OrdinalIgnoreCase)
                 && !resourceType.Equals("virtualNetworks", StringComparison.OrdinalIgnoreCase)
-                && !resourceType.Equals("virtualMachineScaleSets", StringComparison.OrdinalIgnoreCase)))
+                && !resourceType.Equals("virtualMachineScaleSets", StringComparison.OrdinalIgnoreCase))
+                && !resourceType.Equals("machines", StringComparison.OrdinalIgnoreCase))
             {
                 throw new PSArgumentException(Properties.Resources.InvalidEndpointResourceType);
             }
@@ -865,6 +866,12 @@ private void ValidateEndpointResourceId(PSNetworkWatcherConnectionMonitorEndpoin
                 {
                     throw new PSArgumentException(Properties.Resources.InvalidEndpointResourceIdForSpecifiedType, endpoint.Type);
                 }
+            } else if (string.Equals(endpoint.Type, "AzureArcVM", StringComparison.OrdinalIgnoreCase))
+            {
+                if (!resourceType.Equals("machines", StringComparison.OrdinalIgnoreCase))
+                {
+                    throw new PSArgumentException(Properties.Resources.InvalidEndpointResourceIdForSpecifiedType, endpoint.Type);
+                }
             }
         }
 

src/Network/Network/NetworkWatcher/ConnectionMonitor/NewAzureNetworkWatcherConnectionMonitorEndPointObjectCommand.cs

@@ -72,6 +72,12 @@ public class NewAzureNetworkWatcherConnectionMonitorEndpointObjectCommand : Conn
             ParameterSetName = "AzureVMSS")]
         public SwitchParameter AzureVMSS { get; set; }
 
+        [Parameter(
+            Mandatory = true,
+            HelpMessage = "Azure ArcVM endpoint switch.",
+            ParameterSetName = "AzureArcVM")]
+        public SwitchParameter AzureArcVM { get; set; }
+
         [Parameter(
             Mandatory = true,
             HelpMessage = "Resource ID of the connection monitor endpoint.",
@@ -96,6 +102,10 @@ public class NewAzureNetworkWatcherConnectionMonitorEndpointObjectCommand : Conn
             Mandatory = true,
             HelpMessage = "Azure VMSS endpoint.",
             ParameterSetName = "AzureVMSS")]
+        [Parameter(
+            Mandatory = true,
+            HelpMessage = "Azure ArcVM endpoint.",
+            ParameterSetName = "AzureArcVM")]
         [ValidateNotNullOrEmpty]
         public string ResourceId { get; set; }
 
@@ -249,6 +259,10 @@ private string GetEndpointType()
             {
                 return "AzureVMSS";
             }
+            else if (AzureArcVM.IsPresent)
+            {
+                return "AzureArcVM";
+            }
 
             return string.Empty;
         }

src/Network/Network/help/New-AzNetworkWatcherConnectionMonitorEndpointObject.md

@@ -62,6 +62,12 @@ New-AzNetworkWatcherConnectionMonitorEndpointObject -Name <String> [-AzureVMSS]
  [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
+### AzureArcVM
+```
+New-AzNetworkWatcherConnectionMonitorEndpointObject -Name <String> [-AzureArcVM] -ResourceId <String>
+ [-DefaultProfile <IAzureContextContainer>] [-WhatIf] [-Confirm] [<CommonParameters>]
+```
+
 ## DESCRIPTION
 New-AzNetworkWatcherConnectionMonitorEndpointObject cmdlet creates connection monitor endpoint.
 
@@ -294,6 +300,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AzureArcVM
+AzureArc VM endpoint switch
+
+```yaml
+Type: System.Management.Automation.SwitchParameter
+Parameter Sets: AzureArcVM
+Aliases:
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Name
 The name of the connection monitor endpoint.