Merge pull request Azure#2136 from gandhiniraj/dev

Add default parameter for Remove-AzureRmResourceLock and Get-AzureRmProviderOperation

Author: Hovsep

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Lock/RemoveAzureResourceLockCmdlet.cs

@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.ResourceManager.Cmdlets.Implementation
     /// <summary>
     /// The remove azure resource lock cmdlet.
     /// </summary>
-    [Cmdlet(VerbsCommon.Remove, "AzureRmResourceLock", SupportsShouldProcess = true), OutputType(typeof(PSObject))]
+    [Cmdlet(VerbsCommon.Remove, "AzureRmResourceLock", SupportsShouldProcess = true, DefaultParameterSetName = ResourceLockManagementCmdletBase.LockIdParameterSet), OutputType(typeof(PSObject))]
     public class RemoveAzureResourceLockCmdlet : ResourceLockManagementCmdletBase 
     {
         /// <summary>

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll-Help.xml

@@ -4861,17 +4861,26 @@
     </maml:alertSet>
     <command:examples>
       <command:example>
-        <maml:title>--------------------------  RemoveLock1  --------------------------</maml:title>
+        <maml:title>-------------------------- Example 1: RemoveLock using ResourceId  --------------------------</maml:title>
         <maml:introduction>
-          <maml:paragraph>PS C:\&gt;</maml:paragraph>
         </maml:introduction>
         <dev:code>Remove-AzureRmResourceLock -ResourceId /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Storage-SouthCentralUS/providers/Microsoft.ClassicStorage/storageAccounts/mystorageaccount/providers/Microsoft.Authorization/locks/test</dev:code>
         <dev:remarks>
-          <maml:para />
-          <maml:para />
-          <maml:para />
-          <maml:para>
-          </maml:para>
+        </dev:remarks>
+        <command:commandLines>
+          <command:commandLine>
+            <command:commandText>
+              <maml:para />
+            </command:commandText>
+          </command:commandLine>
+        </command:commandLines>
+      </command:example>
+          <command:example>
+        <maml:title>-------------------------- Example 2: RemoveLock using LockId  --------------------------</maml:title>
+        <maml:introduction>
+        </maml:introduction>
+        <dev:code>Remove-AzureRmResourceLock -LockId /subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/Default-Storage-SouthCentralUS/providers/Microsoft.ClassicStorage/storageAccounts/mystorageaccount/providers/Microsoft.Authorization/locks/test</dev:code>
+        <dev:remarks>
         </dev:remarks>
         <command:commandLines>
           <command:commandLine>

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceLockTests.ps1

@@ -41,4 +41,8 @@ function Test-ResourceLockCRUD
 	$removed = Remove-AzureRMResourceLock -LockId $expectedSet.LockId -Force
 	Assert-AreEqual True $removed
 
+	$actual = New-AzureRMResourceLock -LockName $rname -LockLevel CanNotDelete -Force -Scope $rg.ResourceId
+	$removed = Remove-AzureRMResourceLock -ResourceId $actual.ResourceId -Force
+	Assert-AreEqual True $removed
+
 }