Took latest from Azure ignite and resolved merge conflict

Author: safeermohammed

src/ResourceManager.sln

@@ -188,7 +188,9 @@ Global
 		{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 EndGlobal

src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/RecordsTests.cs

@@ -27,13 +27,27 @@ public void TestRecordSetCrud()
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-RecordSetCrud");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestRecordSetCrudTrimsDotFromZoneName()
+        {
+            DnsTestsBase.NewInstance.RunPowerShellTest("Test-RecordSetCrudTrimsDotFromZoneName");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRecordSetCrudWithPiping()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-RecordSetCrudWithPiping");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestRecordSetCrudWithPipingTrimsDotFromZoneName()
+        {
+            DnsTestsBase.NewInstance.RunPowerShellTest("Test-RecordSetCrudWithPipingTrimsDotFromZoneName");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestRecordSetA()

src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/RecordsTests.ps1

@@ -80,6 +80,51 @@ function Test-RecordSetCrud
 	Assert-True { $removed }
 
 	Assert-Throws { Get-AzureDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType A } "ResourceNotFound: Resource not found."
+
+	Remove-AzureDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Force
+}
+
+<#
+.SYNOPSIS
+Full Record Set CRUD cycle trims terminating dot from zone name
+#>
+function Test-RecordSetCrudTrimsDotFromZoneName
+{
+	$zoneName = getAssetname
+	$zoneNameWithDot = $zoneName + "."
+
+	$recordName = getAssetname
+    $resourceGroup = TestSetup-CreateResourceGroup
+	$zone = New-AzureDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName
+
+	$createdRecord = New-AzureDnsRecordSet -Name $recordName -ZoneName $zoneNameWithDot -ResourceGroupName $resourceGroup.ResourceGroupName -Ttl 100 -RecordType A -Tags @{Name="tag1";Value="val1"}
+
+	Assert-NotNull $createdRecord
+	Assert-AreEqual $zoneName $createdRecord.ZoneName 
+	Assert-AreEqual $recordName $createdRecord.Name 
+	Assert-AreEqual $resourceGroup.ResourceGroupName $createdRecord.ResourceGroupName 
+
+	$retrievedRecord = Get-AzureDnsRecordSet -Name $recordName -ZoneName $zoneNameWithDot -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType A
+
+	Assert-NotNull $retrievedRecord
+	Assert-AreEqual $recordName $retrievedRecord.Name 
+	Assert-AreEqual $zoneName $retrievedRecord.ZoneName 
+	Assert-AreEqual $resourceGroup.ResourceGroupName $retrievedRecord.ResourceGroupName
+
+	$retrievedRecord = Get-AzureDnsRecordSet -Name $recordName -ZoneName $zoneNameWithDot -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType A
+
+	Assert-NotNull $retrievedRecord
+	Assert-AreEqual $recordName $retrievedRecord.Name 
+	Assert-AreEqual $zoneName $retrievedRecord.ZoneName 
+	Assert-AreEqual $resourceGroup.ResourceGroupName $retrievedRecord.ResourceGroupName
+
+	$removed = Remove-AzureDnsRecordSet -Name $recordName -ZoneName $zoneNameWithDot -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType A -PassThru -Force
+
+	Assert-True { $removed }
+
+	Assert-Throws { Get-AzureDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -RecordType A } "ResourceNotFound: Resource not found."
+
+	Remove-AzureDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName -Force
 }
 
 <#
@@ -110,6 +155,63 @@ function Test-RecordSetCrudWithPiping
 	Remove-AzureDnsZone -Name $zoneName -ResourceGroupName $updatedRecord.ResourceGroupName -Force
 }
 
+<#
+.SYNOPSIS
+Full Record Set CRUD cycle
+#>
+function Test-RecordSetCrudWithPipingTrimsDotFromZoneName
+{
+	$zoneName = getAssetname
+	$zoneNameWithDot = $zoneName + "."
+
+	$recordName = getAssetname
+    $zone = TestSetup-CreateResourceGroup | New-AzureDnsZone -Name $zoneName
+	
+	$zoneObjectWithDot = New-Object Microsoft.Azure.Commands.Dns.DnsZone
+	$zoneObjectWithDot.Name = $zoneNameWithDot
+	$zoneObjectWithDot.ResourceGroupName = $zone.ResourceGroupName
+	
+	$createdRecord = $zoneObjectWithDot | New-AzureDnsRecordSet -Name $recordName -Ttl 100 -RecordType A -Tags @{Name="tag1";Value="val1"}
+
+	Assert-NotNull $createdRecord
+	Assert-AreEqual $recordName $createdRecord.Name 
+	Assert-AreEqual $zoneName $createdRecord.ZoneName 
+	Assert-AreEqual $zone.ResourceGroupName $createdRecord.ResourceGroupName
+
+	$recordObjectWithDot = New-Object Microsoft.Azure.Commands.Dns.DnsRecordSet
+	$recordObjectWithDot.Name = $recordName
+	$recordObjectWithDot.ZoneName = $zoneNameWithDot
+	$recordObjectWithDot.ResourceGroupName = $zone.ResourceGroupName
+	$recordObjectWithDot.Ttl = 60
+
+	$recordAfterAdd = $recordObjectWithDot | Add-AzureDnsRecordConfig -Ipv4Address 13.13.0.13
+
+	# this is an offline operation, we don't check the dot and don't change the object in place
+	Assert-AreEqual $zoneNameWithDot $recordAfterAdd.ZoneName 
+
+	$updatedRecord = $recordAfterAdd | Set-AzureDnsRecordSet -Overwrite
+
+	Assert-NotNull $updatedRecord
+	Assert-AreEqual $recordName $updatedRecord.Name 
+	Assert-AreEqual $zoneName $updatedRecord.ZoneName 
+	Assert-AreEqual $zone.ResourceGroupName $updatedRecord.ResourceGroupName
+
+	$retrievedRecord = Get-AzureDnsRecordSet -Name $recordName -ZoneName $zoneNameWithDot -ResourceGroupName $zone.ResourceGroupName -RecordType A 
+	
+	Assert-NotNull $retrievedRecord
+	Assert-AreEqual $recordName $retrievedRecord.Name 
+	Assert-AreEqual $zoneName $retrievedRecord.ZoneName 
+	Assert-AreEqual $zone.ResourceGroupName $updatedRecord.ResourceGroupName
+	
+	$removed = $recordObjectWithDot | Remove-AzureDnsRecordSet -Overwrite -PassThru -Force
+
+	Assert-True { $removed }
+
+	Assert-Throws { Get-AzureDnsRecordSet -Name $recordName -ZoneName $zoneName -ResourceGroupName $updatedRecord.ResourceGroupName -RecordType A } "ResourceNotFound: Resource not found."
+
+	Remove-AzureDnsZone -Name $zoneName -ResourceGroupName $zone.ResourceGroupName -Force
+}
+
 <#
 .SYNOPSIS
 Full Record Set CRUD cycle

src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/ZoneTests.cs

@@ -27,12 +27,26 @@ public void TestZoneCrud()
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-ZoneCrud");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestZoneCrudTrimsDot()
+        {
+            DnsTestsBase.NewInstance.RunPowerShellTest("Test-ZoneCrudTrimsDot");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestZoneCrudWithPiping()
         {
             DnsTestsBase.NewInstance.RunPowerShellTest("Test-ZoneCrudWithPiping");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestZoneCrudWithPipingTrimsDot()
+        {
+            DnsTestsBase.NewInstance.RunPowerShellTest("Test-ZoneCrudWithPipingTrimsDot");
+        }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]

src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/ZoneTests.ps1

@@ -62,6 +62,37 @@ function Test-ZoneCrud
 	Assert-Throws { Get-AzureDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName } "ResourceNotFound: Resource not found."
 }
 
+<#
+.SYNOPSIS
+Tests that the zone cmdlets trim the terminating dot from the zone name
+#>
+function Test-ZoneCrudTrimsDot
+{
+	$zoneName = getAssetname
+	$zoneNameWithDot = $zoneName + "."
+    $resourceGroup = TestSetup-CreateResourceGroup
+	$createdZone = New-AzureDnsZone -Name $zoneNameWithDot -ResourceGroupName $resourceGroup.ResourceGroupName
+
+	Assert-NotNull $createdZone
+	Assert-AreEqual $zoneName $createdZone.Name 
+
+	$retrievedZone = Get-AzureDnsZone -Name $zoneNameWithDot -ResourceGroupName $resourceGroup.ResourceGroupName
+
+	Assert-NotNull $retrievedZone
+	Assert-AreEqual $zoneName $retrievedZone.Name 
+
+	$updatedZone = Set-AzureDnsZone -Name $zoneNameWithDot -ResourceGroupName $resourceGroup.ResourceGroupName -Tags @{Name="tag1";Value="value1"},@{Name="tag2";Value="value2"}
+
+	Assert-NotNull $updatedZone
+	Assert-AreEqual $zoneName $updatedZone.Name 
+
+	$removed = Remove-AzureDnsZone -Name $zoneNameWithDot -ResourceGroupName $resourceGroup.ResourceGroupName -PassThru -Force
+
+	Assert-True { $removed }
+
+	Assert-Throws { Get-AzureDnsZone -Name $zoneName -ResourceGroupName $resourceGroup.ResourceGroupName } "ResourceNotFound: Resource not found."
+}
+
 <#
 .SYNOPSIS
 Zone CRUD with piping
@@ -95,6 +126,34 @@ function Test-ZoneCrudWithPiping
 	Assert-Throws { Get-AzureDnsZone -Name $zoneName -ResourceGroupName $resourceGroupName } "ResourceNotFound: Resource not found."
 }
 
+<#
+.SYNOPSIS
+Tests that the zone CRUD cmdlets trim the terminating dot from the zone name when piping
+#>
+function Test-ZoneCrudWithPipingTrimsDot
+{
+	$zoneName = getAssetname
+	$zoneNameWithDot = $zoneName + "."
+    $createdZone = TestSetup-CreateResourceGroup | New-AzureDnsZone -Name $zoneName
+	
+	$resourceGroupName = $createdZone.ResourceGroupName
+
+	$zoneObjectWithDot = New-Object Microsoft.Azure.Commands.Dns.DnsZone
+	$zoneObjectWithDot.Name = $zoneNameWithDot
+	$zoneObjectWithDot.ResourceGroupName = $resourceGroupName
+
+	$updatedZone = $zoneObjectWithDot | Set-AzureDnsZone -Overwrite 
+
+	Assert-NotNull $updatedZone
+	Assert-AreEqual $zoneName $updatedZone.Name 
+
+	$removed = $zoneObjectWithDot | Remove-AzureDnsZone -Overwrite -PassThru -Force
+
+	Assert-True { $removed }
+
+	Assert-Throws { Get-AzureDnsZone -Name $zoneName -ResourceGroupName $resourceGroupName } "ResourceNotFound: Resource not found."
+}
+
 <#
 .SYNOPSIS
 Zone CRUD with piping