addressed the revew comments

Author: micongjie

src/ResourceManager/Insights/Commands.Insights.Test/ActionGroups/GetAzureRmActionGroupCommandTests.cs

@@ -93,7 +93,7 @@ public void GetActionGroupCommandParametersProcessing()
             cmdlet.ExecuteCmdlet();
 
             // Get by resource group
-            cmdlet.ResourceGroup = Utilities.ResourceGroup;
+            cmdlet.ResourceGroupName = Utilities.ResourceGroup;
             cmdlet.ExecuteCmdlet();
 
             Assert.Equal(Utilities.ResourceGroup, this.resourceGroup);
@@ -107,7 +107,7 @@ public void GetActionGroupCommandParametersProcessing()
             Assert.Equal(Utilities.Name, this.name);
 
             // Error
-            cmdlet.ResourceGroup = "   ";
+            cmdlet.ResourceGroupName = "   ";
             cmdlet.Name = Utilities.Name;
             Assert.Throws<PSArgumentException>(() => cmdlet.ExecuteCmdlet());
         }

src/ResourceManager/Insights/Commands.Insights.Test/ActionGroups/NewAzureRmActionGroupReceiverCommandTests.cs

@@ -20,6 +20,9 @@
 
 namespace Microsoft.Azure.Commands.Insights.Test.ActionGroups
 {
+    using System;
+
+    using Microsoft.Azure.Commands.Insights.OutputClasses;
     using Microsoft.Azure.Management.Monitor.Management.Models;
 
     public class NewAzureRmActionGroupReceiverTests
@@ -41,30 +44,59 @@ public NewAzureRmActionGroupReceiverTests(Xunit.Abstractions.ITestOutputHelper o
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void NewAzureRmReceiverCommandEmailParametersProcessing()
         {
-            Cmdlet.Type = "email";
+            Cmdlet.EmailReceiver = true;
             Cmdlet.Name = "email1";
             Cmdlet.EmailAddress = "[email protected]";
             Cmdlet.ExecuteCmdlet();
+
+            Func<PSEmailReceiver, bool> verify = r =>
+            {
+                Assert.Equal("[email protected]", r.EmailAddress);
+                Assert.Equal("email1", r.Name);
+                return true;
+            };
+
+            this.commandRuntimeMock.Verify(o => o.WriteObject(It.Is<PSEmailReceiver>(r => verify(r))), Times.Once);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void NewAzureRmReceiverCommandSmsParametersProcessing()
         {
-            Cmdlet.Type = "sms";
+            Cmdlet.SmsReceiver = true;
             Cmdlet.Name = "sms1";
             Cmdlet.CountryCode = "1";
             Cmdlet.PhoneNumber = "4254251234";
+            Cmdlet.ExecuteCmdlet();
+
+            Func<PSSmsReceiver, bool> verify = r =>
+            {
+                Assert.Equal("1", r.CountryCode);
+                Assert.Equal("4254251234", r.PhoneNumber);
+                Assert.Equal("sms1", r.Name);
+                return true;
+            };
+
+            this.commandRuntimeMock.Verify(o => o.WriteObject(It.Is<PSSmsReceiver>(r => verify(r))), Times.Once);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void NewAzureRmReceiverCommandWebhookParametersProcessing()
         {
-            Cmdlet.Type = "webhook";
+            Cmdlet.WebhookReceiver = true;
             Cmdlet.Name = "webhook1";
             Cmdlet.ServiceUri = "http://test.com";
             Cmdlet.ExecuteCmdlet();
+
+            Func<PSWebhookReceiver, bool> verify = r =>
+            {
+                Assert.Equal("http://test.com", r.ServiceUri);
+                Assert.Equal("webhook1", r.Name);
+                return true;
+            };
+
+            this.commandRuntimeMock.Verify(o => o.WriteObject(It.Is<PSWebhookReceiver>(r => verify(r))), Times.Once);
         }
     }
 }

src/ResourceManager/Insights/Commands.Insights.Test/ActionGroups/RemoveAzureRmActionGroupCommandTests.cs

@@ -69,7 +69,7 @@ public RemoveAzureRmActionGroupTests(Xunit.Abstractions.ITestOutputHelper output
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void RemoveActionGroupCommandParametersProcessing()
         {
-            cmdlet.ResourceGroup = Utilities.ResourceGroup;
+            cmdlet.ResourceGroupName = Utilities.ResourceGroup;
             cmdlet.Name = "group1";
             cmdlet.ExecuteCmdlet();
 

src/ResourceManager/Insights/Commands.Insights.Test/ActionGroups/SetAzureRmActionGroupCommandTests.cs

@@ -81,7 +81,7 @@ public AddAzureRmActionGroupTests(Xunit.Abstractions.ITestOutputHelper output)
         public void SetActionGroupCommandParametersProcessing()
         {
             cmdlet.Name = "ActionGroupName";
-            cmdlet.ResourceGroup = Utilities.ResourceGroup;
+            cmdlet.ResourceGroupName = Utilities.ResourceGroup;
             cmdlet.ShortName = "AgShortName";
             cmdlet.Receiver = new List<PSActionGroupReceiverBase>
             {
@@ -121,7 +121,7 @@ public void SetActionGroupCommandParametersProcessing()
             Assert.Null(this.createOrUpdatePrms.Tags);
 
             cmdlet.DisableGroup = true;
-            cmdlet.Tags = new Dictionary<string, string>();
+            cmdlet.Tag = new Dictionary<string, string>();
             cmdlet.ExecuteCmdlet();
 
             Assert.False(this.createOrUpdatePrms.Enabled);

src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/ActionGroupsTests.ps1

@@ -28,20 +28,20 @@ function Test-AddGetListSetRemoveActionGroup
 	try
 	{
 		Write-Verbose " ****** Creating a new email receiver"
-		$email1 = New-AzureRmActionGroupReceiver -Type 'email' -Name 'emailreceiver' -EmailAddress '[email protected]'
+		$email1 = New-AzureRmActionGroupReceiver -EmailReceiver -Name 'emailreceiver' -EmailAddress '[email protected]'
 		Assert-NotNull $email1
 		Assert-AreEqual 'emailreceiver' $email1.Name
 		Assert-AreEqual '[email protected]' $email1.EmailAddress
 
 		Write-Verbose " ****** Creating a new sms receiver"
-		$sms1 = New-AzureRmActionGroupReceiver -Type 'sms' -Name 'smsreceiver' -CountryCode '1' -PhoneNumber '7817386781'
+		$sms1 = New-AzureRmActionGroupReceiver -SmsReceiver -Name 'smsreceiver' -CountryCode '1' -PhoneNumber '4254251234'
 		Assert-NotNull $sms1
 		Assert-AreEqual 'smsreceiver' $sms1.Name
 		Assert-AreEqual '1' $sms1.CountryCode
-		Assert-AreEqual '7817386781' $sms1.PhoneNumber
+		Assert-AreEqual '4254251234' $sms1.PhoneNumber
 
 		Write-Verbose " ****** Creating a new webhook receiver"
-		$webhook1 = New-AzureRmActionGroupReceiver -Type 'webhook' -Name 'webhookreceiver' -ServiceUri 'http://test.com'
+		$webhook1 = New-AzureRmActionGroupReceiver -WebhookReceiver -Name 'webhookreceiver' -ServiceUri 'http://test.com'
 		Assert-NotNull $webhook1
 		Assert-AreEqual 'webhookreceiver' $webhook1.Name
 		Assert-AreEqual 'http://test.com' $webhook1.ServiceUri
@@ -64,7 +64,7 @@ function Test-AddGetListSetRemoveActionGroup
 		Assert-AreEqual $actionGroupName $retrieved[0].Name
 
 		Write-Verbose " ****** Getting the action group by resource group"
-		$retrieved = Get-AzureRmActionGroup -ResourceGroup $resourceGroupName
+		$retrieved = Get-AzureRmActionGroup -ResourceGroupName $resourceGroupName
 		Assert-NotNull $retrieved
 		Assert-AreEqual 1 $retrieved.Length
 		Assert-AreEqual $actionGroupName $retrieved[0].Name

src/ResourceManager/Insights/Commands.Insights.Test/SessionRecords/Microsoft.Azure.Commands.Insights.Test.ScenarioTests.ActionGroupsTests/TestAddGetListSetRemoveActionGroup.json

@@ -58,7 +58,7 @@
       "RequestUri": "/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/actionGroups/andygroup-donotuse?api-version=2017-04-01",
       "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMDdjMGIwOWQtOWY2OS00ZTZlLThkMDUtZjU5ZjY3Mjk5Y2IyL3Jlc291cmNlR3JvdXBzL0RlZmF1bHQtQWN0aXZpdHlMb2dBbGVydHMvcHJvdmlkZXJzL21pY3Jvc29mdC5pbnNpZ2h0cy9hY3Rpb25Hcm91cHMvYW5keWdyb3VwLWRvbm90dXNlP2FwaS12ZXJzaW9uPTIwMTctMDQtMDE=",
       "RequestMethod": "PUT",
-      "RequestBody": "{\r\n  \"properties\": {\r\n    \"groupShortName\": \"andygroup\",\r\n    \"enabled\": false,\r\n    \"emailReceivers\": [\r\n      {\r\n        \"name\": \"emailreceiver\",\r\n        \"emailAddress\": \"[email protected]\"\r\n      }\r\n    ],\r\n    \"smsReceivers\": [\r\n      {\r\n        \"name\": \"smsreceiver\",\r\n        \"countryCode\": \"1\",\r\n        \"phoneNumber\": \"7817386781\"\r\n      }\r\n    ]\r\n  },\r\n  \"location\": \"Global\",\r\n  \"tags\": {}\r\n}",
+      "RequestBody": "{\r\n  \"properties\": {\r\n    \"groupShortName\": \"andygroup\",\r\n    \"enabled\": false,\r\n    \"emailReceivers\": [\r\n      {\r\n        \"name\": \"emailreceiver\",\r\n        \"emailAddress\": \"[email protected]\"\r\n      }\r\n    ],\r\n    \"smsReceivers\": [\r\n      {\r\n        \"name\": \"smsreceiver\",\r\n        \"countryCode\": \"1\",\r\n        \"phoneNumber\": \"4254251234\"\r\n      }\r\n    ]\r\n  },\r\n  \"location\": \"Global\",\r\n  \"tags\": {}\r\n}",
       "RequestHeaders": {
         "Content-Type": [
           "application/json; charset=utf-8"
@@ -79,7 +79,7 @@
           "Microsoft.Azure.Management.Monitor.Management.MonitorManagementClient/0.17.0.0"
         ]
       },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/actionGroups/andygroup-donotuse\",\r\n  \"type\": \"Microsoft.Insights/ActionGroups\",\r\n  \"name\": \"andygroup-donotuse\",\r\n  \"location\": \"Global\",\r\n  \"kind\": null,\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"groupShortName\": \"andygroup\",\r\n    \"enabled\": false,\r\n    \"emailReceivers\": [\r\n      {\r\n        \"name\": \"emailreceiver\",\r\n        \"emailAddress\": \"[email protected]\",\r\n        \"status\": \"Enabled\"\r\n      }\r\n    ],\r\n    \"smsReceivers\": [\r\n      {\r\n        \"name\": \"smsreceiver\",\r\n        \"countryCode\": \"1\",\r\n        \"phoneNumber\": \"7817386781\",\r\n        \"status\": \"Enabled\"\r\n      }\r\n    ],\r\n    \"webhookReceivers\": [\r\n      {\r\n        \"name\": \"webhookreceiver\",\r\n        \"serviceUri\": \"http://test.com\"\r\n      }\r\n    ]\r\n  },\r\n  \"identity\": null\r\n}",
+      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/actionGroups/andygroup-donotuse\",\r\n  \"type\": \"Microsoft.Insights/ActionGroups\",\r\n  \"name\": \"andygroup-donotuse\",\r\n  \"location\": \"Global\",\r\n  \"kind\": null,\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"groupShortName\": \"andygroup\",\r\n    \"enabled\": false,\r\n    \"emailReceivers\": [\r\n      {\r\n        \"name\": \"emailreceiver\",\r\n        \"emailAddress\": \"[email protected]\",\r\n        \"status\": \"Enabled\"\r\n      }\r\n    ],\r\n    \"smsReceivers\": [\r\n      {\r\n        \"name\": \"smsreceiver\",\r\n        \"countryCode\": \"1\",\r\n        \"phoneNumber\": \"4254251234\",\r\n        \"status\": \"Enabled\"\r\n      }\r\n    ],\r\n    \"webhookReceivers\": [\r\n      {\r\n        \"name\": \"webhookreceiver\",\r\n        \"serviceUri\": \"http://test.com\"\r\n      }\r\n    ]\r\n  },\r\n  \"identity\": null\r\n}",
       "ResponseHeaders": {
         "Content-Length": [
           "578"
@@ -139,7 +139,7 @@
           "Microsoft.Azure.Management.Monitor.Management.MonitorManagementClient/0.17.0.0"
         ]
       },
-      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/actionGroups/andygroup-donotuse\",\r\n  \"type\": \"Microsoft.Insights/ActionGroups\",\r\n  \"name\": \"andygroup-donotuse\",\r\n  \"location\": \"Global\",\r\n  \"kind\": null,\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"groupShortName\": \"andygroup\",\r\n    \"enabled\": false,\r\n    \"emailReceivers\": [\r\n      {\r\n        \"name\": \"emailreceiver\",\r\n        \"emailAddress\": \"[email protected]\",\r\n        \"status\": \"Enabled\"\r\n      }\r\n    ],\r\n    \"smsReceivers\": [\r\n      {\r\n        \"name\": \"smsreceiver\",\r\n        \"countryCode\": \"1\",\r\n        \"phoneNumber\": \"7817386781\",\r\n        \"status\": \"Enabled\"\r\n      }\r\n    ],\r\n    \"webhookReceivers\": []\r\n  },\r\n  \"identity\": null\r\n}",
+      "ResponseBody": "{\r\n  \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/actionGroups/andygroup-donotuse\",\r\n  \"type\": \"Microsoft.Insights/ActionGroups\",\r\n  \"name\": \"andygroup-donotuse\",\r\n  \"location\": \"Global\",\r\n  \"kind\": null,\r\n  \"tags\": {},\r\n  \"properties\": {\r\n    \"groupShortName\": \"andygroup\",\r\n    \"enabled\": false,\r\n    \"emailReceivers\": [\r\n      {\r\n        \"name\": \"emailreceiver\",\r\n        \"emailAddress\": \"[email protected]\",\r\n        \"status\": \"Enabled\"\r\n      }\r\n    ],\r\n    \"smsReceivers\": [\r\n      {\r\n        \"name\": \"smsreceiver\",\r\n        \"countryCode\": \"1\",\r\n        \"phoneNumber\": \"4254251234\",\r\n        \"status\": \"Enabled\"\r\n      }\r\n    ],\r\n    \"webhookReceivers\": []\r\n  },\r\n  \"identity\": null\r\n}",
       "ResponseHeaders": {
         "Content-Length": [
           "578"
@@ -199,7 +199,7 @@
           "Microsoft.Azure.Management.Monitor.Management.MonitorManagementClient/0.17.0.0"
         ]
       },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/actionGroups/andygroup-donotuse\",\r\n      \"type\": \"Microsoft.Insights/ActionGroups\",\r\n      \"name\": \"andygroup-donotuse\",\r\n      \"location\": \"Global\",\r\n      \"kind\": null,\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"groupShortName\": \"andygroup\",\r\n        \"enabled\": false,\r\n        \"emailReceivers\": [\r\n          {\r\n            \"name\": \"emailreceiver\",\r\n            \"emailAddress\": \"[email protected]\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"smsReceivers\": [\r\n          {\r\n            \"name\": \"smsreceiver\",\r\n            \"countryCode\": \"1\",\r\n            \"phoneNumber\": \"7817386781\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"webhookReceivers\": []\r\n      },\r\n      \"identity\": null\r\n    },\r\n    {\r\n      \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-Storage-EastUS/providers/microsoft.insights/actionGroups/nj\",\r\n      \"type\": \"Microsoft.Insights/ActionGroups\",\r\n      \"name\": \"nj\",\r\n      \"location\": \"Global\",\r\n      \"kind\": null,\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"groupShortName\": \"nj\",\r\n        \"enabled\": true,\r\n        \"emailReceivers\": [],\r\n        \"smsReceivers\": [\r\n          {\r\n            \"name\": \"jaga-sms\",\r\n            \"countryCode\": \"1\",\r\n            \"phoneNumber\": \"4253011342\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"webhookReceivers\": []\r\n      },\r\n      \"identity\": null\r\n    }\r\n  ]\r\n}",
+      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/actionGroups/andygroup-donotuse\",\r\n      \"type\": \"Microsoft.Insights/ActionGroups\",\r\n      \"name\": \"andygroup-donotuse\",\r\n      \"location\": \"Global\",\r\n      \"kind\": null,\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"groupShortName\": \"andygroup\",\r\n        \"enabled\": false,\r\n        \"emailReceivers\": [\r\n          {\r\n            \"name\": \"emailreceiver\",\r\n            \"emailAddress\": \"[email protected]\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"smsReceivers\": [\r\n          {\r\n            \"name\": \"smsreceiver\",\r\n            \"countryCode\": \"1\",\r\n            \"phoneNumber\": \"4254251234\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"webhookReceivers\": []\r\n      },\r\n      \"identity\": null\r\n    },\r\n    {\r\n      \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-Storage-EastUS/providers/microsoft.insights/actionGroups/nj\",\r\n      \"type\": \"Microsoft.Insights/ActionGroups\",\r\n      \"name\": \"nj\",\r\n      \"location\": \"Global\",\r\n      \"kind\": null,\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"groupShortName\": \"nj\",\r\n        \"enabled\": true,\r\n        \"emailReceivers\": [],\r\n        \"smsReceivers\": [\r\n          {\r\n            \"name\": \"jaga-sms\",\r\n            \"countryCode\": \"1\",\r\n            \"phoneNumber\": \"4253011342\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"webhookReceivers\": []\r\n      },\r\n      \"identity\": null\r\n    }\r\n  ]\r\n}",
       "ResponseHeaders": {
         "Content-Length": [
           "1040"
@@ -259,7 +259,7 @@
           "Microsoft.Azure.Management.Monitor.Management.MonitorManagementClient/0.17.0.0"
         ]
       },
-      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/actionGroups/andygroup-donotuse\",\r\n      \"type\": \"Microsoft.Insights/ActionGroups\",\r\n      \"name\": \"andygroup-donotuse\",\r\n      \"location\": \"Global\",\r\n      \"kind\": null,\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"groupShortName\": \"andygroup\",\r\n        \"enabled\": false,\r\n        \"emailReceivers\": [\r\n          {\r\n            \"name\": \"emailreceiver\",\r\n            \"emailAddress\": \"[email protected]\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"smsReceivers\": [\r\n          {\r\n            \"name\": \"smsreceiver\",\r\n            \"countryCode\": \"1\",\r\n            \"phoneNumber\": \"7817386781\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"webhookReceivers\": []\r\n      },\r\n      \"identity\": null\r\n    }\r\n  ]\r\n}",
+      "ResponseBody": "{\r\n  \"value\": [\r\n    {\r\n      \"id\": \"/subscriptions/07c0b09d-9f69-4e6e-8d05-f59f67299cb2/resourceGroups/Default-ActivityLogAlerts/providers/microsoft.insights/actionGroups/andygroup-donotuse\",\r\n      \"type\": \"Microsoft.Insights/ActionGroups\",\r\n      \"name\": \"andygroup-donotuse\",\r\n      \"location\": \"Global\",\r\n      \"kind\": null,\r\n      \"tags\": {},\r\n      \"properties\": {\r\n        \"groupShortName\": \"andygroup\",\r\n        \"enabled\": false,\r\n        \"emailReceivers\": [\r\n          {\r\n            \"name\": \"emailreceiver\",\r\n            \"emailAddress\": \"[email protected]\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"smsReceivers\": [\r\n          {\r\n            \"name\": \"smsreceiver\",\r\n            \"countryCode\": \"1\",\r\n            \"phoneNumber\": \"4254251234\",\r\n            \"status\": \"Enabled\"\r\n          }\r\n        ],\r\n        \"webhookReceivers\": []\r\n      },\r\n      \"identity\": null\r\n    }\r\n  ]\r\n}",
       "ResponseHeaders": {
         "Content-Length": [
           "590"