Merge pull request #6117 from junyezhu/juliet/feat/addprotocolconfig

Juliet/feat/addprotocolconfig

Author: cormacpayne

src/ResourceManager/Network/AzureRM.Network.psd1

@@ -320,6 +320,7 @@ CmdletsToExport = 'Add-AzureRmApplicationGatewayAuthenticationCertificate',
                'New-AzureRmDdosProtectionPlan',
                'Get-AzureRmDdosProtectionPlan',
                'Remove-AzureRmDdosProtectionPlan',
+               'New-AzureRMNetworkWatcherProtocolConfiguration',
                'Add-AzureRmExpressRouteCircuitConnectionConfig',
                'Get-AzureRmExpressRouteCircuitConnectionConfig',
                'Remove-AzureRmExpressRouteCircuitConnectionConfig'

src/ResourceManager/Network/ChangeLog.md

@@ -21,6 +21,8 @@
 ## Current Release
 
 * Bump up Network SDK version from 18.0.0-preview to 19.0.0-preview
+* Added cmdlet to create protocol configuration
+    - New-AzureRmNetworkWatcherProtocolConfiguration
 
 ## Version 6.0.0
 * Added cmdlet to add a new circuit connection to an existing express route circuit.

src/ResourceManager/Network/Commands.Network/Commands.Network.csproj

@@ -227,6 +227,7 @@
     <Compile Include="Models\PSConnectionMonitorSource.cs" />
     <Compile Include="Models\PSConnectionStateSnapshot.cs" />
     <Compile Include="Models\PSEndpointServiceResult.cs" />
+    <Compile Include="Models\PSNetworkWatcherProtocolConfiguration.cs" />
     <Compile Include="Models\PSServiceEndpoint.cs" />
     <Compile Include="Models\PSLoadBalancerSku.cs" />
     <Compile Include="Models\PSPublicIpAddressSku.cs" />
@@ -319,9 +320,9 @@
     <Compile Include="Models\PSSubnet.cs" />
     <Compile Include="Models\PSSubnetAssociation.cs" />
     <Compile Include="Models\PSTopLevelResource.cs" />
-    <Compile Include="Models\PSTroubleshootDetails.cs" />
-    <Compile Include="Models\PSTroubleshootRecommendedActions.cs" />
-    <Compile Include="Models\PSTroubleshootResult.cs" />
+    <Compile Include="Models\PSTroubleshootingDetails.cs" />
+    <Compile Include="Models\PSTroubleshootingRecommendedActions.cs" />
+    <Compile Include="Models\PSTroubleshootingResult.cs" />
     <Compile Include="Models\PSUsage.cs" />
     <Compile Include="Models\PSUsageCustom.cs" />
     <Compile Include="Models\PSUsageName.cs" />
@@ -371,6 +372,7 @@
     <Compile Include="NetworkWatcher\ConnectionMonitor\SetAzureNetworkWatcherConnectionMonitorCommand.cs" />
     <Compile Include="NetworkWatcher\ConnectionMonitor\StartAzureNetworkWatcherConnectionMonitorCommand.cs" />
     <Compile Include="NetworkWatcher\ConnectionMonitor\StopAzureNetworkWatcherConnectionMonitorCommand.cs" />
+    <Compile Include="NetworkWatcher\NewAzureNetworkWatcherProtocolConfiguration.cs" />
     <Compile Include="NetworkWatcher\TestAzureNetworkWatcherConnectivityCommand.cs" />
     <Compile Include="ProviderWideCmdlets\GetAzureBgpServiceCommunityCommand.cs" />
     <Compile Include="NetworkWatcher\GetAzureNetworkWatcherCommand.cs" />

src/ResourceManager/Network/Commands.Network/Common/NetworkResourceManagerProfile.cs

@@ -209,14 +209,14 @@ private static void Initialize()
 
                 // Troubleshoot
                 // CNM to MNM
-                cfg.CreateMap<CNM.PSTroubleshootResult, MNM.TroubleshootingResult>();
-                cfg.CreateMap<CNM.PSTroubleshootDetails, MNM.TroubleshootingDetails>();
-                cfg.CreateMap<CNM.PSTroubleshootRecommendedActions, MNM.TroubleshootingRecommendedActions>();
+                cfg.CreateMap<CNM.PSTroubleshootingResult, MNM.TroubleshootingResult>();
+                cfg.CreateMap<CNM.PSTroubleshootingDetails, MNM.TroubleshootingDetails>();
+                cfg.CreateMap<CNM.PSTroubleshootingRecommendedActions, MNM.TroubleshootingRecommendedActions>();
 
                 // MNM to CNM
-                cfg.CreateMap<MNM.TroubleshootingResult, CNM.PSTroubleshootResult>();
-                cfg.CreateMap<MNM.TroubleshootingDetails, CNM.PSTroubleshootDetails>();
-                cfg.CreateMap<MNM.TroubleshootingRecommendedActions, CNM.PSTroubleshootRecommendedActions>();
+                cfg.CreateMap<MNM.TroubleshootingResult, CNM.PSTroubleshootingResult>();
+                cfg.CreateMap<MNM.TroubleshootingDetails, CNM.PSTroubleshootingDetails>();
+                cfg.CreateMap<MNM.TroubleshootingRecommendedActions, CNM.PSTroubleshootingRecommendedActions>();
 
                 // FlowLog
                 // CNM to MNM

src/ResourceManager/Network/Commands.Network/Models/PSNetworkWatcherProtocolConfiguration.cs

@@ -0,0 +1,34 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Newtonsoft.Json;
+using System.Collections;
+
+namespace Microsoft.Azure.Commands.Network.Models
+{
+    public class PSNetworkWatcherProtocolConfiguration
+    {
+        [JsonProperty(Order = 2)]
+        public string Protocol { get; set; }
+
+        [JsonProperty(Order = 2)]
+        public string Method { get; set; }
+
+        [JsonProperty(Order = 2)]
+        public IDictionary Header { get; set; }
+
+        [JsonProperty(Order = 2)]
+        public int[] ValidStatusCode { get; set; }
+    }
+}

src/ResourceManager/Network/Commands.Network/Models/PSTroubleshootDetails.cs renamed to src/ResourceManager/Network/Commands.Network/Models/PSTroubleshootingDetails.cs

@@ -17,15 +17,15 @@ namespace Microsoft.Azure.Commands.Network.Models
     using Newtonsoft.Json;
     using System.Collections.Generic;
 
-    public class PSTroubleshootDetails
+    public class PSTroubleshootingDetails
     {
         public string Detail { get; set; }
 
         public string Id { get; set; }
 
         public string ReasonType { get; set; }
 
-        public List<PSTroubleshootRecommendedActions> RecommendedActions { get; set; }
+        public List<PSTroubleshootingRecommendedActions> RecommendedActions { get; set; }
 
         public string Summary { get; set; }
 

src/ResourceManager/Network/Commands.Network/Models/PSTroubleshootRecommendedActions.cs renamed to src/ResourceManager/Network/Commands.Network/Models/PSTroubleshootingRecommendedActions.cs

@@ -16,7 +16,7 @@
 
 namespace Microsoft.Azure.Commands.Network.Models
 {
-    public class PSTroubleshootRecommendedActions
+    public class PSTroubleshootingRecommendedActions
     {
         public string ActionId { get; set; }
 

src/ResourceManager/Network/Commands.Network/Models/PSTroubleshootResult.cs renamed to src/ResourceManager/Network/Commands.Network/Models/PSTroubleshootingResult.cs

@@ -18,13 +18,13 @@ namespace Microsoft.Azure.Commands.Network.Models
     using System;
     using System.Collections.Generic;
 
-    public class PSTroubleshootResult : PSTopLevelResource
+    public class PSTroubleshootingResult : PSTopLevelResource
     {
         public string Code { get; set; }
 
         public DateTime? EndTime { get; set; }
 
-        public List<PSTroubleshootDetails> Results { get; set; }
+        public List<PSTroubleshootingDetails> Results { get; set; }
 
         public DateTime? StartTime { get; set; }
 

src/ResourceManager/Network/Commands.Network/NetworkWatcher/ConnectionMonitor/NewAzureNetworkWatcherConnectionMonitorCommand.cs

@@ -202,7 +202,7 @@ private PSConnectionMonitorResult CreateConnectionMonitor(string resourceGroupNa
             }
             else if (ParameterSetName.Contains("SetByName"))
             {
-                NetworkWatcher networkWatcher = this.NetworkClient.NetworkManagementClient.NetworkWatchers.Get(this.ResourceGroupName, this.NetworkWatcherName);
+                MNM.NetworkWatcher networkWatcher = this.NetworkClient.NetworkManagementClient.NetworkWatchers.Get(this.ResourceGroupName, this.NetworkWatcherName);
                 parameters.Location = networkWatcher.Location;
             }
             else

src/ResourceManager/Network/Commands.Network/NetworkWatcher/ConnectionMonitor/SetAzureNetworkWatcherConnectionMonitorCommand.cs

@@ -17,7 +17,6 @@
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Commands.ResourceManager.Common.Tags;
 using Microsoft.Azure.Management.Network;
-using Microsoft.Azure.Management.Network.Models;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -243,7 +242,7 @@ private PSConnectionMonitorResult UpdateConnectionMonitor(string resourceGroupNa
             }
             else
             {
-                NetworkWatcher networkWatcher = this.NetworkClient.NetworkManagementClient.NetworkWatchers.Get(resourceGroupName, networkWatcherName);
+                MNM.NetworkWatcher networkWatcher = this.NetworkClient.NetworkManagementClient.NetworkWatchers.Get(resourceGroupName, networkWatcherName);
                 parameters.Location = networkWatcher.Location;
             }