Updated Connection monitor endpoint cmdlet

src/Network/Network/Az.Network.psd1

@@ -257,9 +257,9 @@ CmdletsToExport = 'Add-AzApplicationGatewayAuthenticationCertificate',
                'Test-AzNetworkWatcherConnectivity', 
                'Get-AzNetworkWatcherReachabilityReport', 
                'Get-AzNetworkWatcherReachabilityProvidersList', 
-               'New-AzNetworkWatcherConnectionMonitorEndpointFilterItemObject', 
-               'New-AzNetworkWatcherConnectionMonitorObject', 
                'New-AzNetworkWatcherConnectionMonitorEndpointObject', 
+               'New-AzNetworkWatcherConnectionMonitorObject', 
+               'New-AzNetworkWatcherConnectionMonitorEndpointScopeItemObject', 
                'New-AzNetworkWatcherConnectionMonitorTestConfigurationObject', 
                'New-AzNetworkWatcherConnectionMonitorTestGroupObject', 
                'New-AzNetworkWatcherConnectionMonitorOutputObject', 

src/Network/Network/ChangeLog.md

@@ -28,6 +28,13 @@
     - Added parameter `-SkuName` and made Sku as Alias for this
     - Removed parameter `-Sku`
 * [Breaking Change] Made `Connectionlink` argument mandatory in `Start-AzVpnConnectionPacketCapture` and `Stop-AzVpnConnectionPacketCapture`
+* [Breaking Change] Updated `New-AzNetworkWatcherConnectionMonitorEndPointObject` to remove parameter `-Filter`
+* [Breaking Change] Replaced `New-AzNetworkWatcherConnectionMonitorEndpointFilterItemObject` cmdlet with `New-AzNetworkWatcherConnectionMonitorEndpointScopeItemObject`
+* Updated `New-AzNetworkWatcherConnectionMonitorEndPointObject` cmdlet:
+	- Added parameter `-Type`
+	- Added parameter `-CoverageLevel`
+	- Added parameter `-Scope`
+* Updated `New-AzNetworkWatcherConnectionMonitorProtocolConfigurationObject` cmdlet with new parameter `-DestinationPortBehavior`
 
 ## Version 3.5.0
 * Added Office365 Policy to VPNSite Resource

src/Network/Network/Common/NetworkResourceManagerProfile.cs

@@ -556,8 +556,8 @@ private static void Initialize()
                 cfg.CreateMap<CNM.PSConnectionMonitorQueryResult, MNM.ConnectionMonitorQueryResult>();
                 cfg.CreateMap<CNM.PSConnectionStateSnapshot, MNM.ConnectionStateSnapshot>();
                 cfg.CreateMap<CNM.PSNetworkWatcherConnectionMonitorEndpointObject, MNM.ConnectionMonitorEndpoint>();
-                cfg.CreateMap<CNM.PSNetworkWatcherConnectionMonitorEndpointFilter, MNM.ConnectionMonitorEndpointFilter>();
-                cfg.CreateMap<CNM.PSNetworkWatcherConnectionMonitorEndpointFilterItem, MNM.ConnectionMonitorEndpointFilterItem>();
+                cfg.CreateMap<CNM.PSNetworkWatcherConnectionMonitorEndpointScope, MNM.ConnectionMonitorEndpointScope>();
+                cfg.CreateMap<CNM.PSNetworkWatcherConnectionMonitorEndpointScopeItem, MNM.ConnectionMonitorEndpointScopeItem>();
                 cfg.CreateMap<CNM.PSNetworkWatcherConnectionMonitorTestConfigurationObject, MNM.ConnectionMonitorTestConfiguration>();
                 cfg.CreateMap<CNM.PSNetworkWatcherConnectionMonitorTcpConfiguration, MNM.ConnectionMonitorTcpConfiguration>();
                 cfg.CreateMap<CNM.PSNetworkWatcherConnectionMonitorIcmpConfiguration, MNM.ConnectionMonitorIcmpConfiguration>();
@@ -575,8 +575,8 @@ private static void Initialize()
                 cfg.CreateMap<MNM.ConnectionMonitorQueryResult, CNM.PSConnectionMonitorQueryResult>();
                 cfg.CreateMap<MNM.ConnectionStateSnapshot, CNM.PSConnectionStateSnapshot>();
                 cfg.CreateMap<MNM.ConnectionMonitorEndpoint, CNM.PSNetworkWatcherConnectionMonitorEndpointObject>();
-                cfg.CreateMap<MNM.ConnectionMonitorEndpointFilter, CNM.PSNetworkWatcherConnectionMonitorEndpointFilter>();
-                cfg.CreateMap<MNM.ConnectionMonitorEndpointFilterItem, CNM.PSNetworkWatcherConnectionMonitorEndpointFilterItem>();
+                cfg.CreateMap<MNM.ConnectionMonitorEndpointScope, CNM.PSNetworkWatcherConnectionMonitorEndpointScope>();
+                cfg.CreateMap<MNM.ConnectionMonitorEndpointScopeItem, CNM.PSNetworkWatcherConnectionMonitorEndpointScopeItem>();
                 cfg.CreateMap<MNM.ConnectionMonitorTestConfiguration, CNM.PSNetworkWatcherConnectionMonitorTestConfigurationObject>();
                 cfg.CreateMap<MNM.ConnectionMonitorTcpConfiguration, CNM.PSNetworkWatcherConnectionMonitorTcpConfiguration>();
                 cfg.CreateMap<MNM.ConnectionMonitorIcmpConfiguration, CNM.PSNetworkWatcherConnectionMonitorIcmpConfiguration>();

src/Network/Network/Models/PSConnectionMonitorEndPoint.cs

@@ -23,19 +23,25 @@ public class PSNetworkWatcherConnectionMonitorEndpointObject
         [Ps1Xml(Target = ViewControl.Table)]
         public string Name { get; set; }
 
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string Type { get; set; }
+
         [Ps1Xml(Target = ViewControl.Table)]
         public string ResourceId { get; set; }
 
         [Ps1Xml(Target = ViewControl.Table)]
         public string Address { get; set; }
 
         [Ps1Xml(Target = ViewControl.Table)]
-        public PSNetworkWatcherConnectionMonitorEndpointFilter Filter { get; set; }
+        public PSNetworkWatcherConnectionMonitorEndpointScope Scope { get; set; }
+
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string CoverageLevel { get; set; }
 
         [JsonIgnore]
-        public string FilterText
+        public string ScopeText
         {
-            get { return JsonConvert.SerializeObject(this.Filter, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+            get { return JsonConvert.SerializeObject(this.Scope, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
     }
 }

src/Network/Network/Models/PSConnectionMonitorEndpointFilter.cs → src/Network/Network/Models/PSConnectionMonitorEndpointScope.cs

@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) Microsoft.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,17 +19,24 @@ namespace Microsoft.Azure.Commands.Network.Models
 
     using System.Collections.Generic;
 
-    public class PSNetworkWatcherConnectionMonitorEndpointFilter
+    public class PSNetworkWatcherConnectionMonitorEndpointScope
     {
-        public string Type { get; set; }
+        [Ps1Xml(Target = ViewControl.List)]
+        public List<PSNetworkWatcherConnectionMonitorEndpointScopeItem> Include { get; set; }
 
         [Ps1Xml(Target = ViewControl.List)]
-        public List<PSNetworkWatcherConnectionMonitorEndpointFilterItem> Items { get; set; }
+        public List<PSNetworkWatcherConnectionMonitorEndpointScopeItem> Exclude { get; set; }
+
+        [JsonIgnore]
+        public string IncludeText
+        {
+            get { return JsonConvert.SerializeObject(this.Include, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+        }
 
         [JsonIgnore]
-        public string ItemsText
+        public string ExcludeText
         {
-            get { return JsonConvert.SerializeObject(this.Items, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+            get { return JsonConvert.SerializeObject(this.Exclude, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
     }
 }

src/Network/Network/Models/PSConnectionMonitorEndpointFilterItem.cs → src/Network/Network/Models/PSConnectionMonitorEndpointScopeItem.cs

@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) Microsoft.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,17 +14,11 @@
 //
 
 using Microsoft.WindowsAzure.Commands.Common.Attributes;
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
 
 namespace Microsoft.Azure.Commands.Network.Models
 {
-    public class PSNetworkWatcherConnectionMonitorEndpointFilterItem
+    public class PSNetworkWatcherConnectionMonitorEndpointScopeItem
     {
-        [Ps1Xml(Target = ViewControl.Table)]
-        public string Type { get; set; }
-
         [Ps1Xml(Target = ViewControl.Table)]
         public string Address { get; set; }
     }

src/Network/Network/Models/PSConnectionMonitorTcpConfiguration.cs

@@ -10,5 +10,8 @@ public class PSNetworkWatcherConnectionMonitorTcpConfiguration : PSNetworkWatche
 
         [Ps1Xml(Target = ViewControl.Table)]
         public bool?  DisableTraceRoute { get; set; }
+
+        [Ps1Xml(Target = ViewControl.Table)]
+        public string DestinationPortBehavior { get; set; }
     }
 }

src/Network/Network/Network.format.ps1xml

@@ -333,6 +333,10 @@
                 <Label>Name</Label>
                 <PropertyName>Name</PropertyName>
               </ListItem>
+              <ListItem>
+                <Label>Type</Label>
+                <PropertyName>Type</PropertyName>
+              </ListItem>
               <ListItem>
                 <Label>ResourceId</Label>
                 <PropertyName>ResourceId</PropertyName>
@@ -342,49 +346,49 @@
                 <PropertyName>Address</PropertyName>
               </ListItem>
               <ListItem>
-                <Label>Filter</Label>
-                <PropertyName>FilterText</PropertyName>
+                <Label>Scope</Label>
+                <PropertyName>ScopeText</PropertyName>
+              </ListItem>
+              <ListItem>
+                <Label>CoverageLevel</Label>
+                <PropertyName>CoverageLevel</PropertyName>
               </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>
       </ListControl>
     </View>
     <View>
-      <Name>Microsoft.Azure.Commands.Network.Models.PSNetworkWatcherConnectionMonitorEndpointFilter</Name>
+      <Name>Microsoft.Azure.Commands.Network.Models.PSNetworkWatcherConnectionMonitorEndpointScope</Name>
       <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.Network.Models.PSNetworkWatcherConnectionMonitorEndpointFilter</TypeName>
+        <TypeName>Microsoft.Azure.Commands.Network.Models.PSNetworkWatcherConnectionMonitorEndpointScope</TypeName>
       </ViewSelectedBy>
       <ListControl>
         <ListEntries>
           <ListEntry>
             <ListItems>
               <ListItem>
-                <Label>Type</Label>
-                <PropertyName>Type</PropertyName>
+                <Label>Include</Label>
+                <PropertyName>IncludeText</PropertyName>
               </ListItem>
               <ListItem>
-                <Label>Items</Label>
-                <PropertyName>ItemsText</PropertyName>
+                <Label>Exclude</Label>
+                <PropertyName>ExcludeText</PropertyName>
               </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>
       </ListControl>
     </View>
     <View>
-      <Name>Microsoft.Azure.Commands.Network.Models.PSNetworkWatcherConnectionMonitorEndpointFilterItem</Name>
+      <Name>Microsoft.Azure.Commands.Network.Models.PSNetworkWatcherConnectionMonitorEndpointScopeItem</Name>
       <ViewSelectedBy>
-        <TypeName>Microsoft.Azure.Commands.Network.Models.PSNetworkWatcherConnectionMonitorEndpointFilterItem</TypeName>
+        <TypeName>Microsoft.Azure.Commands.Network.Models.PSNetworkWatcherConnectionMonitorEndpointScoperItem</TypeName>
       </ViewSelectedBy>
       <ListControl>
         <ListEntries>
           <ListEntry>
             <ListItems>
-              <ListItem>
-                <Label>Type</Label>
-                <PropertyName>Type</PropertyName>
-              </ListItem>
               <ListItem>
                 <Label>Address</Label>
                 <PropertyName>Address</PropertyName>
@@ -493,6 +497,10 @@
                 <Label>DisableTraceRoute</Label>
                 <PropertyName>DisableTraceRoute</PropertyName>
               </ListItem>
+              <ListItem>
+                <Label>DestinationPortBehavior</Label>
+                <PropertyName>DestinationPortBehavior</PropertyName>
+              </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>