Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing Pester Tests By Using Right Key for map while mapping fqdn #1769

Merged
merged 1 commit into from
May 20, 2016
Merged

Fixing Pester Tests By Using Right Key for map while mapping fqdn #1769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Tasks/AzureFileCopy/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopy/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 56
"Patch": 57
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopy/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 56
"Patch": 57
},
"demands": [
"azureps"
Expand Down
4 changes: 2 additions & 2 deletions Tasks/DeployAzureResourceGroup/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down
50 changes: 25 additions & 25 deletions Tasks/DeployAzureResourceGroup/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 75
"Patch": 76
},
"demands": [
"azureps"
Expand Down Expand Up @@ -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"
},
{
Expand All @@ -97,15 +97,15 @@
"EditableOptions": "True"
},
"visibleRule": "ConnectedServiceNameSelector = ConnectedServiceName"
},
},
{
"name": "cloudService",
"type": "pickList",
"label": "Cloud Service",
"required": true,
"helpMarkDown": "Provide the name of the cloud service.",
"properties": {
"EditableOptions": "True"
"EditableOptions": "True"
},
"visibleRule": "ConnectedServiceNameSelector = ConnectedServiceNameClassic"
},
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -213,4 +213,4 @@
"workingDirectory": "$(currentDirectory)"
}
}
}
}
2 changes: 1 addition & 1 deletion Tasks/DeployAzureResourceGroup/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 1,
"Minor": 0,
"Patch": 75
"Patch": 76
},
"demands": [
"azureps"
Expand Down