Skip to content

compute: fix autoscaler tests #1660

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

Merged
callmehiphop merged 1 commit into from
Oct 3, 2016
Merged

compute: fix autoscaler tests #1660

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
2 changes: 1 addition & 1 deletion packages/compute/src/autoscaler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function Autoscaler(zone, name) {
* loadBalance: 40,
* maxReplicas: 5,
* minReplicas: 0,
* target: 'instance-group-1'
* target: 'instance-group-manager-1'
* }, function(err, autoscaler, operation, apiResponse) {
* // `autoscaler` is an Autoscaler object.
*
Expand Down
2 changes: 1 addition & 1 deletion packages/compute/src/zone.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Zone.prototype.autoscaler = function(name) {
* loadBalance: 40,
* maxReplicas: 5,
* minReplicas: 0,
* target: 'instance-group-1'
* target: 'instance-group-manager-1'
* };
*
* function callback(err, autoscaler, operation, apiResponse) {
Expand Down
202 changes: 198 additions & 4 deletions packages/compute/system-test/compute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,19 +96,46 @@ describe('Compute', function() {
var AUTOSCALER_NAME = generateName('autoscaler');
var autoscaler = zone.autoscaler(AUTOSCALER_NAME);

var INSTANCE_GROUP_NAME = generateName('instance-group');
var instanceGroup = zone.instanceGroup(INSTANCE_GROUP_NAME);
var NETWORK_NAME = generateName('network');
var network = compute.network(NETWORK_NAME);

var INSTANCE_TEMPLATE_NAME = generateName('instance-template');
var INSTANCE_GROUP_MANAGER_NAME = generateName('instance-group-manager');

before(function(done) {
async.series([
create(instanceGroup),
create(network, {
range: '10.240.0.0/16'
}),

function(callback) {
createInstanceTemplate(
INSTANCE_TEMPLATE_NAME,
network.formattedName,
callback
);
},

function(callback) {
createInstanceGroupManager(
INSTANCE_GROUP_MANAGER_NAME,
[
'https://www.googleapis.com/compute/v1/projects',
compute.projectId,
'global/instanceTemplates',
INSTANCE_TEMPLATE_NAME
].join('/'),
callback
);
},

create(autoscaler, {
coolDown: 30,
cpu: 80,
loadBalance: 40,
maxReplicas: 5,
minReplicas: 1,
target: INSTANCE_GROUP_NAME
target: INSTANCE_GROUP_MANAGER_NAME
})
], done);
});
Expand Down Expand Up @@ -1318,6 +1345,8 @@ describe('Compute', function() {
deleteUrlMaps,
deleteServices,
deleteHttpsHealthChecks,
deleteInstanceGroupManagers,
deleteInstanceTemplates,
deleteTargetInstances,
deleteAllGcloudTestObjects
], callback);
Expand Down Expand Up @@ -1666,4 +1695,169 @@ describe('Compute', function() {
});
});
}

function getInstanceTemplates(callback) {
compute.request({
uri: '/global/instanceTemplates',
qs: {
filter: 'name eq ' + TESTS_PREFIX + '.*'
}
}, callback);
}

function deleteInstanceTemplates(callback) {
getInstanceTemplates(function(err, resp) {
if (err) {
callback(err);
return;
}

if (!resp.items) {
callback();
return;
}

var names = resp.items.map(prop('name'));
async.each(names, deleteInstanceTemplate, callback);
});
}

function createInstanceTemplate(name, networkName, callback) {
compute.request({
method: 'POST',
uri: '/global/instanceTemplates',
json: {
name: name,
properties: {
disks: [
{
boot: true,
mode: 'READ_ONLY',
initializeParams: {
diskName: generateName('disk'),
diskSizeGb: 2,
diskType: 'pd-standard',
sourceImage: [
'projects/centos-cloud/global/images/centos-6-v20150710'
].join('')
}
}
],
machineType: 'n1-standard-1',
networkInterfaces: [
{
network: networkName,
accessConfigs: [
{
name: generateName('access_config'),
type: 'ONE_TO_ONE_NAT'
}
]
}
]
}
}
}, function(err, resp) {
if (err) {
callback(err);
return;
}

var operation = compute.operation(resp.name);
operation
.on('error', callback)
.on('complete', function() {
callback();
});
});
}

function deleteInstanceTemplate(name, callback) {
compute.request({
method: 'DELETE',
uri: '/global/instanceTemplates/' + name
}, function(err, resp) {
if (err) {
callback(err);
return;
}

var operation = compute.operation(resp.name);
operation
.on('error', callback)
.on('complete', function() {
callback();
});
});
}

function getInstanceGroupManagers(callback) {
zone.request({
uri: '/instanceGroupManagers',
qs: {
filter: 'name eq ' + TESTS_PREFIX + '.*'
}
}, callback);
}

function deleteInstanceGroupManagers(callback) {
getInstanceGroupManagers(function(err, resp) {
if (err) {
callback(err);
return;
}

if (!resp.items) {
callback();
return;
}

var names = resp.items.map(prop('name'));
async.each(names, deleteInstanceGroupManager, callback);
});
}

function createInstanceGroupManager(name, instanceTemplateName, callback) {
zone.request({
method: 'POST',
uri: '/instanceGroupManagers',
json: {
baseInstanceName: name.replace(/\W/g, ''),
name: name,
targetSize: 1,
instanceTemplate: instanceTemplateName
}
}, function(err, resp) {
if (err) {
callback(err);
return;
}

var operation = zone.operation(resp.name);
operation
.on('error', callback)
.on('complete', function() {
callback();
});
});
}

function deleteInstanceGroupManager(name, callback) {
zone.request({
method: 'DELETE',
uri: '/instanceGroupManagers/' + name
}, function(err, resp) {
if (err) {
callback(err);
return;
}

var operation = zone.operation(resp.name);
operation
.on('error', callback)
.on('complete', function() {
callback();
});
});
}
});