From de7ea5fb8a246301e23d63503c0fba63ad3ef0a1 Mon Sep 17 00:00:00 2001 From: Anubhav Aggarwal Date: Fri, 20 May 2016 20:06:12 +0530 Subject: [PATCH] Fixing Pester Tests By Using Right Key for map while mapping fqdn --- Tasks/AzureFileCopy/Utility.ps1 | 4 +- Tasks/AzureFileCopy/task.json | 2 +- Tasks/AzureFileCopy/task.loc.json | 2 +- Tasks/DeployAzureResourceGroup/Utility.ps1 | 4 +- Tasks/DeployAzureResourceGroup/task.json | 50 ++++++++++---------- Tasks/DeployAzureResourceGroup/task.loc.json | 2 +- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Tasks/AzureFileCopy/Utility.ps1 b/Tasks/AzureFileCopy/Utility.ps1 index f75cdc8aee41..49b83fbc4d17 100644 --- a/Tasks/AzureFileCopy/Utility.ps1 +++ b/Tasks/AzureFileCopy/Utility.ps1 @@ -564,11 +564,11 @@ function Get-MachinesFqdnsForLB { if(-not [string]::IsNullOrEmpty($publicIP.DnsSettings.Fqdn)) { - $fqdnMap[$publicIp.IpConfiguration.Id.ToLower()] = $publicIP.DnsSettings.Fqdn + $fqdnMap[$publicIp.Id.ToLower()] = $publicIP.DnsSettings.Fqdn } elseif(-not [string]::IsNullOrEmpty($publicIP.IpAddress)) { - $fqdnMap[$publicIp.IpConfiguration.Id.ToLower()] = $publicIP.IpAddress + $fqdnMap[$publicIp.Id.ToLower()] = $publicIP.IpAddress } } } diff --git a/Tasks/AzureFileCopy/task.json b/Tasks/AzureFileCopy/task.json index 937393e4f8fd..e5655d3346aa 100644 --- a/Tasks/AzureFileCopy/task.json +++ b/Tasks/AzureFileCopy/task.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 56 + "Patch": 57 }, "demands": [ "azureps" diff --git a/Tasks/AzureFileCopy/task.loc.json b/Tasks/AzureFileCopy/task.loc.json index 0109f360aca1..615283a56d14 100644 --- a/Tasks/AzureFileCopy/task.loc.json +++ b/Tasks/AzureFileCopy/task.loc.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 56 + "Patch": 57 }, "demands": [ "azureps" diff --git a/Tasks/DeployAzureResourceGroup/Utility.ps1 b/Tasks/DeployAzureResourceGroup/Utility.ps1 index 456c0a0fea49..06aeeecc798b 100644 --- a/Tasks/DeployAzureResourceGroup/Utility.ps1 +++ b/Tasks/DeployAzureResourceGroup/Utility.ps1 @@ -510,11 +510,11 @@ function Get-MachinesFqdnsForLB { if(-not [string]::IsNullOrEmpty($publicIP.DnsSettings.Fqdn)) { - $fqdnMap[$publicIp.IpConfiguration.Id.ToLower()] = $publicIP.DnsSettings.Fqdn + $fqdnMap[$publicIp.Id.ToLower()] = $publicIP.DnsSettings.Fqdn } elseif(-not [string]::IsNullOrEmpty($publicIP.IpAddress)) { - $fqdnMap[$publicIp.IpConfiguration.Id.ToLower()] = $publicIP.IpAddress + $fqdnMap[$publicIp.Id.ToLower()] = $publicIP.IpAddress } } } diff --git a/Tasks/DeployAzureResourceGroup/task.json b/Tasks/DeployAzureResourceGroup/task.json index 0d875236be39..de8ca5249bc7 100644 --- a/Tasks/DeployAzureResourceGroup/task.json +++ b/Tasks/DeployAzureResourceGroup/task.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 75 + "Patch": 76 }, "demands": [ "azureps" @@ -58,33 +58,33 @@ "visibleRule": "ConnectedServiceNameSelector = ConnectedServiceNameClassic" }, { - "name": "action", - "type": "pickList", + "name": "action", + "type": "pickList", "label": "Action", "defaultValue": "Create Or Update Resource Group", "required": true, - "helpMarkDown" : "Action to be performed on the Azure resources or resource group.", + "helpMarkDown": "Action to be performed on the Azure resources or resource group.", "options": { - "Create Or Update Resource Group": "Create Or Update Resource Group", - "Select Resource Group": "Select Resource Group", - "Start": "Start Virtual Machines", - "Stop": "Stop Virtual Machines", - "Restart": "Restart Virtual Machines", - "Delete": "Delete Virtual Machines", - "DeleteRG": "Delete Resource Group" - }, + "Create Or Update Resource Group": "Create Or Update Resource Group", + "Select Resource Group": "Select Resource Group", + "Start": "Start Virtual Machines", + "Stop": "Stop Virtual Machines", + "Restart": "Restart Virtual Machines", + "Delete": "Delete Virtual Machines", + "DeleteRG": "Delete Resource Group" + }, "visibleRule": "ConnectedServiceNameSelector = ConnectedServiceName" }, { - "name": "actionClassic", - "type": "pickList", + "name": "actionClassic", + "type": "pickList", "label": "Action", "defaultValue": "Select Resource Group", "required": true, - "helpMarkDown" : "Action to be performed on the Azure resources or cloud service.", + "helpMarkDown": "Action to be performed on the Azure resources or cloud service.", "options": { - "Select Resource Group": "Select Cloud Service" - }, + "Select Resource Group": "Select Cloud Service" + }, "visibleRule": "ConnectedServiceNameSelector = ConnectedServiceNameClassic" }, { @@ -97,7 +97,7 @@ "EditableOptions": "True" }, "visibleRule": "ConnectedServiceNameSelector = ConnectedServiceName" - }, + }, { "name": "cloudService", "type": "pickList", @@ -105,7 +105,7 @@ "required": true, "helpMarkDown": "Provide the name of the cloud service.", "properties": { - "EditableOptions": "True" + "EditableOptions": "True" }, "visibleRule": "ConnectedServiceNameSelector = ConnectedServiceNameClassic" }, @@ -134,15 +134,15 @@ "West US": "West US" }, "properties": { - "EditableOptions": "True" + "EditableOptions": "True" }, "visibleRule": "action = Create Or Update Resource Group" }, { - "name": "csmFile", - "type": "filePath", - "label": "Template", - "defaultValue":"", + "name": "csmFile", + "type": "filePath", + "label": "Template", + "defaultValue": "", "required": true, "helpMarkDown": "Specify the path to the Azure Resource Manager template. For more information about the templates see http://aka.ms/azuretemplates. To get started immediately use template http://aka.ms/sampletemplate.", "visibleRule": "action = Create Or Update Resource Group" @@ -213,4 +213,4 @@ "workingDirectory": "$(currentDirectory)" } } -} \ No newline at end of file +} diff --git a/Tasks/DeployAzureResourceGroup/task.loc.json b/Tasks/DeployAzureResourceGroup/task.loc.json index d86f186488e1..bc6a22b0be77 100644 --- a/Tasks/DeployAzureResourceGroup/task.loc.json +++ b/Tasks/DeployAzureResourceGroup/task.loc.json @@ -13,7 +13,7 @@ "version": { "Major": 1, "Minor": 0, - "Patch": 75 + "Patch": 76 }, "demands": [ "azureps"