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 #1015539 #4628

Merged
merged 14 commits into from
Jul 3, 2017
Merged

Fixing #1015539 #4628

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
84138d4
Fixing #1015539
aydey Jun 23, 2017
00420ce
Merge branch 'master' of http://github.com/microsoft/vsts-tasks into …
aydey Jun 27, 2017
fd65b2b
Resolving PR comments and adding changes for setting the execution po…
aydey Jun 27, 2017
6f865ba
Updating the task version and fixing some error messages
aydey Jun 27, 2017
0c5f2ed
Merge branch 'master' of http://github.com/microsoft/vsts-tasks into …
aydey Jun 28, 2017
477780c
Fixing error message
aydey Jun 27, 2017
15a214c
Fixing L0 tests
aydey Jun 27, 2017
afa1143
Resolving PR comments
aydey Jun 28, 2017
256f689
Updating the task patch number
aydey Jun 28, 2017
6ba75e8
Merge branch 'master' of http://github.com/microsoft/vsts-tasks into …
aydey Jun 29, 2017
5c4fa97
Fixing the error message to be displayed when the addition of WinRMCu…
aydey Jun 30, 2017
826001e
Checking for other Custom script extension present and resolving PR c…
aydey Jul 3, 2017
be0f991
Adding new L0 and fixing old L0 tests
aydey Jul 3, 2017
560e619
Resolving PR comments
aydey Jul 3, 2017
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
5 changes: 3 additions & 2 deletions Tasks/AzureResourceGroupDeployment/Strings/resources.resjson/en-US/resources.resjson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"loc.messages.SecurityRuleNameCannotBeNull": "securityRuleName cannot be null or undefined and it must be of type string.",
"loc.messages.SecurityRuleParametersCannotBeNull": "securityRuleParameters cannot be null or undefined.",
"loc.messages.OutputVariableShouldNotBeEmpty": "Output variable should not be empty.",
"loc.messages.ARG_SetExtensionFailedForVm": "Failed to set extension on Virtual Machine %s of Resource Group %s with result: %s",
"loc.messages.ARG_SetExtensionFailedForVm": "StdErr Message: Failed to set extension on Virtual Machine %s of Resource Group %s with error: %s",
"loc.messages.InvalidResponseLongRunningOperation": "Invalid response received for fetching status of a long running operation.",
"loc.messages.AddingInboundNatRule": "Adding Inbound Nat Rule for the Virtual Machine %s to the Load Balancer %s",
"loc.messages.InboundNatRuleAdditionFailed": "Addition of Inbound Nat Rule to the Load Balancer %s failed. Error: %s ",
Expand Down Expand Up @@ -150,5 +150,6 @@
"loc.messages.DeploymentGroupEndpointUrlCannotBeEmpty": "Deployment group endpoint url cannot be empty",
"loc.messages.DeploymentGroupEndpointPatTokenCannotBeEmpty": "Deployment group endpoint personal access token cannot be empty",
"loc.messages.ErrorWhileParsingParameter": "There was an error while overriding '%s' parameter because of '%s'.",
"loc.messages.ResourceNameCannotBeNull": "Resource name cannot be null."
"loc.messages.ResourceNameCannotBeNull": "Resource name cannot be null.",
"loc.messages.ProvisioningStatusOfExtensionIsNotSucceeded": "Provisioning State of CustomScriptExtension is not succeeded on vm: '%s'."
}
52 changes: 35 additions & 17 deletions Tasks/AzureResourceGroupDeployment/Tests/L0.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ describe('Azure Resource Group Deployment', function () {
assert(tr.succeeded, "Task should have succeeded");
assert(tr.stdout.indexOf("Updating the load balancers with the appropriate Inbound Nat rules") <= 0, "Shouldn't add Inbound Nat Rule for the LB");
assert(tr.stdout.indexOf("Enabling winrm for virtual machine") > 0, "Should add Custom Script Extension to the virual machine");
assert(tr.stdout.indexOf("virtualMachineExtensions.get is called on vm customVM") > 0, "Should try getting the extension on the virtual machine");
assert(tr.stdout.indexOf("virtualMachineExtensions.list is called") > 0, "Should try getting the extension on the virtual machine");
assert(tr.stdout.indexOf("virtualMachineExtensions.createOrUpdate is called") > 0, "Should call createOrUpdate of virtual Machine extensions");
assert(tr.stdout.indexOf("Addition of extension completed for vm: customVM") > 0, "Should be able to add the extension");
assert(tr.stdout.indexOf("Provisioning of CustomScriptExtension on vm customVM is in Succeeded State") > 0, "Provisioning of the Custom Script Extension should be in succeeded state");
Expand Down Expand Up @@ -833,7 +833,7 @@ describe('Azure Resource Group Deployment', function () {
assert(tr.stdout.indexOf("loadBalancers.list is called") > 0, "loadBalancers.list should have been called");
assert(tr.stdout.indexOf("loadBalancers.createOrUpdate is called") <= 0, "LoadBalancers.createOrUpdate should not have been called");
assert(tr.stdout.indexOf("networkInterfaces.createOrUpdate is called") <= 0, "The NIC of the VMs should not be updated");
assert(tr.stdout.indexOf("virtualMachineExtensions.get is called") > 0, "Should get the status for Custom Script Extension");
assert(tr.stdout.indexOf("virtualMachineExtensions.list is called") > 0, "Should get the status for Custom Script Extension");
assert(tr.stdout.indexOf("virtualMachineExtensions.createOrUpdate is called") > 0, "Should enable winrm Https Listener");
assert(tr.stdout.indexOf("securityRules.createOrUpdate is called: Added rule Name VSO-Custom-WinRM-Https-Port to the security Group") <= 0, "Shouldn't try adding NSG rule");
done();
Expand All @@ -844,7 +844,7 @@ describe('Azure Resource Group Deployment', function () {
done(error);
}
});
it('Custom Script Extension is present on the VM, status is succeeded, substatus is succeeded', (done) => {
it('WinRM Custom Script Extension is present on the VM, status is succeeded, substatus is succeeded', (done) => {
//No LB
//1 VM
//No NSG
Expand All @@ -861,7 +861,7 @@ describe('Azure Resource Group Deployment', function () {
assert(tr.stdout.indexOf("Updating the load balancers with the appropriate Inbound Nat rules") <= 0, "Shouldn't add Inbound Nat Rules to the LB");
assert(tr.stdout.indexOf("loadBalancers.createOrUpdate is called") <= 0, "LoadBalancers.createOrUpdate should not have been called");
assert(tr.stdout.indexOf("Updating the NIC of the concerned vms") <= 0, "The NIC of the VMs should not be updated");
assert(tr.stdout.indexOf("virtualMachineExtensions.get is called") > 0, "Should get the status for Custom Script Extension");
assert(tr.stdout.indexOf("virtualMachineExtensions.list is called") > 0, "Should get the list of all the Custom Script Extensions");
assert(tr.stdout.indexOf("Custom Script extension is for enabling Https Listener on VM") > 0, "The present custom script extension should enable winrm Https Listener");
assert(tr.stdout.indexOf("Validating the winrm configuration custom script extension status") > 0, "Should validate the substatus of the extension");
assert(tr.stdout.indexOf("virtualMachines.get is called with options: { expand: 'instanceView' }") > 0, "Should try to get the substatus of the extension");
Expand All @@ -875,7 +875,7 @@ describe('Azure Resource Group Deployment', function () {
done(error);
}
});
it('Custom Script Extension is present on the VM , status is succeeded, substatus is failed', (done) => {
it('WinRM Custom Script Extension is present on the VM , status is succeeded, substatus is failed', (done) => {
//No LB
//1 VM
//No NSG
Expand All @@ -887,7 +887,6 @@ describe('Azure Resource Group Deployment', function () {
tr.run();

try {
assert(tr.succeeded, "Task should have succeeded");
assert(tr.stdout.indexOf("loadBalancers.list is called") > 0, "loadBalancers.list should have been called");
assert(tr.stdout.indexOf("Updating the load balancers with the appropriate Inbound Nat rules") <= 0, "Shouldn't add Inbound Nat Rules to the LB");
assert(tr.stdout.indexOf("loadBalancers.createOrUpdate is called") <= 0, "LoadBalancers.createOrUpdate should not have been called");
Expand All @@ -905,7 +904,7 @@ describe('Azure Resource Group Deployment', function () {
done(error);
}
});
it('Custom Script Extension is present on the VM, status is failed', (done) => {
it('WinRM Custom Script Extension is present on the VM, status is failed', (done) => {
//No LB
//1 VM
//No NSG
Expand All @@ -917,15 +916,14 @@ describe('Azure Resource Group Deployment', function () {
tr.run();

try {
assert(tr.succeeded, "Task should have succeeded");
assert(tr.stdout.indexOf("loadBalancers.list is called") > 0, "loadBalancers.list should have been called");
assert(tr.stdout.indexOf("Updating the load balancers with the appropriate Inbound Nat rules") <= 0, "Shouldn't add Inbound Nat Rules to the LB");
assert(tr.stdout.indexOf("loadBalancers.createOrUpdate is called") <= 0, "LoadBalancers.createOrUpdate should not have been called");
assert(tr.stdout.indexOf("Updating the NIC of the concerned vms") <= 0, "The NIC of the VMs should not be updated");
assert(tr.stdout.indexOf("virtualMachineExtensions.list is called") > 0, "The extensions on the vm should be listed to get the extension of concern");
assert(tr.stdout.indexOf("Custom Script extension is for enabling Https Listener on VM") > 0, "The present custom script extension should enable winrm Https Listener");
assert(tr.stdout.indexOf("virtualMachineExtensions.deleteMethod is called") > 0, "Should remove the extension");
assert(tr.stdout.indexOf("virtualMachineExtensions.createOrUpdate is called") > 0, "Should add the extension");
assert(tr.stdout.indexOf("virtualMachines.get is called with options: { expand: 'instanceView' }") <= 0, "Should not try to get the substatus of the extension");
assert(tr.stdout.indexOf("securityRules.createOrUpdate is called: Added rule Name VSO-Custom-WinRM-Https-Port to the security Group") <= 0, "Shouldn't try adding NSG rule");
done();
}
Expand Down Expand Up @@ -955,7 +953,6 @@ describe('Azure Resource Group Deployment', function () {
assert(tr.stdout.indexOf("Custom Script extension is for enabling Https Listener on VM") > 0, "The present custom script extension should enable winrm Https Listener");
assert(tr.stdout.indexOf("virtualMachineExtensions.createOrUpdate is called") <= 0, "Should add the extension");
assert(tr.stdout.indexOf("Validating the winrm configuration custom script extension status") > 0, "Should Validate the Custom Script Extension");
assert(tr.stdout.indexOf("virtualMachines.get is called with options: { expand: 'instanceView' }") > 0, "Should try to get the substatus of the extension");
assert(tr.stdout.indexOf("networkSecurityGroups.list is called") > 0, "Should list the Network Security Groups");
assert(tr.stdout.indexOf("securityRules.createOrUpdate is called: Added rule Name VSO-Custom-WinRM-Https-Port to the security Group") > 0, "Shouldn't try to add NSG rule");
assert(tr.stdout.indexOf("securityRules.get is called") > 0, "Should try to get the security rule");
Expand All @@ -967,7 +964,7 @@ describe('Azure Resource Group Deployment', function () {
done(error);
}
});
it('Custom Script Extension present is not for enabling WinRMHttpsListener', (done) => {
it('WinRM Custom Script Extension present is not for enabling WinRMHttpsListener', (done) => {
// No LB
// 1 VM, No Nsg
let tp = path.join(__dirname, 'EnablePrereq.js');
Expand All @@ -983,7 +980,7 @@ describe('Azure Resource Group Deployment', function () {
assert(tr.stdout.indexOf("Updating the load balancers with the appropriate Inbound Nat rules") <= 0, "Shouldn't add Inbound Nat Rules to the LB");
assert(tr.stdout.indexOf("loadBalancers.createOrUpdate is called") <= 0, "LoadBalancers.createOrUpdate should not have been called");
assert(tr.stdout.indexOf("Updating the NIC of the concerned vms") <= 0, "The NIC of the VMs should not be updated");
assert(tr.stdout.indexOf("virtualMachines.get is called") <= 0, "Trying to get the extension on the Virtual machines");
assert(tr.stdout.indexOf("virtualMachineExtensions.list is called") > 0, "The extensions on the vm should be listed to get the extension of concern");
assert(tr.stdout.indexOf("virtualMachineExtensions.createOrUpdate is called") > 0, "Should update the extension to enable WinrmHttps Listener");
assert(tr.stdout.indexOf("networkSecurityGroups.list is called") > 0, "Should list the Network Security Groups");
assert(tr.stdout.indexOf("securityRules.createOrUpdate is called: Added rule Name VSO-Custom-WinRM-Https-Port to the security Group") <= 0, "Shouldn't try to add NSG rule");
Expand All @@ -995,7 +992,7 @@ describe('Azure Resource Group Deployment', function () {
done(error);
}
});
it('Custom Script is not present, VM has NSG associated', (done) => {
it('WinRM Custom Script is not present, VM has NSG associated', (done) => {
let tp = path.join(__dirname, 'EnablePrereq.js');
process.env["resourceGroupName"] = "ExtensionNotPresentNSGPresent";
process.env["csmFile"] = "CSM.json";
Expand All @@ -1021,7 +1018,7 @@ describe('Azure Resource Group Deployment', function () {
done(error);
}
});
it('1 LB 1 VM, Custom Script extension is not present, VM has NSG associated', (done) => {
it('1 LB 1 VM, WinRM Custom Script extension is not present, VM has NSG associated', (done) => {
let tp = path.join(__dirname, 'EnablePrereq.js');
process.env["resourceGroupName"] = "OneLBOneVMExtensionNotPresentNSGPresent";
process.env["csmFile"] = "CSM.json";
Expand All @@ -1035,7 +1032,7 @@ describe('Azure Resource Group Deployment', function () {
assert(tr.stdout.indexOf("loadBalancers.createOrUpdate is called") > 0, "LoadBalancers.createOrUpdate should have been called");
assert(tr.stdout.indexOf("networkInterfaces.list is called") > 0, "The network Interfaces of the vms should be listed");
assert(tr.stdout.indexOf("networkInterfaces.createOrUpdate is called") > 0, "The network Interfaces of the vms should be updated with appropriate Inbound Nat Rules of LB");
assert(tr.stdout.indexOf("virtualMachineExtensions.get is called") > 0, "Should try to get the Custom Script Extension");
assert(tr.stdout.indexOf("virtualMachineExtensions.list is called") > 0, "Should try to list all the Custom Script Extensions");
assert(tr.stdout.indexOf("virtualMachineExtensions.createOrUpdate is called") > 0, "Should enable winrm Https Listener");
assert(tr.stdout.indexOf("networkSecurityGroups.list is called") > 0, "Should list the Network Security Groups");
assert(tr.stdout.indexOf("securityRules.get is called") > 0, "Should try to get the security rule");
Expand All @@ -1048,7 +1045,7 @@ describe('Azure Resource Group Deployment', function () {
done(error);
}
});
it('1 LB 2 Vms, Custom Script Extension is not present, VMs have NSG associated', (done) => {
it('1 LB 2 Vms, WinRM Custom Script Extension is not present, VMs have NSG associated', (done) => {
let tp = path.join(__dirname, 'EnablePrereq.js');
process.env["resourceGroupName"] = "OneLBTwoVMsExtensionNotPresentNSGPresent";
process.env["csmFile"] = "CSM.json";
Expand All @@ -1062,7 +1059,7 @@ describe('Azure Resource Group Deployment', function () {
assert(tr.stdout.indexOf("loadBalancers.createOrUpdate is called") > 0, "LoadBalancers.createOrUpdate should have been called");
assert(tr.stdout.indexOf("networkInterfaces.list is called") > 0, "The network Interfaces of the vms should be listed");
assert(tr.stdout.indexOf("networkInterfaces.createOrUpdate is called") > 0, "The network Interfaces of the vms should be updated with appropriate Inbound Nat Rules of LB");
assert(tr.stdout.indexOf("virtualMachineExtensions.get is called") > 0, "Should try to get the Custom Script Extension");
assert(tr.stdout.indexOf("virtualMachineExtensions.list is called") > 0, "Should try to get the Custom Script Extension");
assert(tr.stdout.indexOf("virtualMachineExtensions.createOrUpdate is called") > 0, "Should enable winrm Https Listener");
assert(tr.stdout.indexOf("networkSecurityGroups.list is called") > 0, "Should list the Network Security Groups");
assert(tr.stdout.indexOf("securityRules.get is called") > 0, "Should try to get the security rule");
Expand All @@ -1075,4 +1072,25 @@ describe('Azure Resource Group Deployment', function () {
done(error);
}
});
it('WinRM Custom Script Extension is not present, but some other CustomScriptExtension is present', (done) => {
let tp = path.join(__dirname, 'EnablePrereq.js');
process.env["resourceGroupName"] = "SomeOtherCustomScriptExtensionPresent";
process.env["csmFile"] = "CSM.json";
process.env["csmParametersFile"] = "CSM.json";
let tr = new ttm.MockTestRunner(tp);
tr.run();

try {
assert(tr.succeeded, "Task should have succeeded");
assert(tr.stdout.indexOf("virtualMachineExtensions.list is called") > 0, "Should try to get the Custom Script Extension");
assert(tr.stdout.indexOf("virtualMachineExtensions.deleteMethod is called") > 0, "Should try to delete the already existing Custom Script extension");
assert(tr.stdout.indexOf("virtualMachineExtensions.createOrUpdate is called") > 0, "Should enable winrm Https Listener");
done();
}
catch (error) {
console.log("STDERR", tr.stderr);
console.log("STDOUT", tr.stdout);
done(error);
}
});
});
48 changes: 48 additions & 0 deletions ...ment/Tests/mock_node_modules/azure-arm-compute/lib/operations/virtualMachineExtensions.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading