Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 lib/jobs/create-ipmi-obm-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function createIpmiObmSettingsJobFactory(

/**
* @memberOf ObmSettingsJob
* @returns {Q.Promise}
* @returns {Promise.Promise}
*/
ObmSettingsJob.prototype._run = function run() {
var self = this;
Expand Down
2 changes: 1 addition & 1 deletion lib/jobs/create-obm-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function createObmSettingsJobFactory(

/**
* @memberOf ObmSettingsJob
* @returns {Q.Promise}
* @returns {Promise.Promise}
*/
ObmSettingsJob.prototype._run = function run() {
var self = this;
Expand Down
4 changes: 2 additions & 2 deletions lib/jobs/ipmi-job.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ di.annotate(ipmiJobFactory, new di.Inject(
'Logger',
'Util',
'Assert',
'Q',
'Promise',
'_',
'Services.Waterline'
));
Expand All @@ -26,7 +26,7 @@ function ipmiJobFactory(
Logger,
util,
assert,
Q,
Promise,
_,
waterline
) {
Expand Down
6 changes: 3 additions & 3 deletions lib/jobs/noop-job.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ var di = require('di');

module.exports = noOpJobFactory;
di.annotate(noOpJobFactory, new di.Provide('Job.noop'));
di.annotate(noOpJobFactory, new di.Inject('Job.Base', 'Logger', 'Util', 'uuid', 'Q'));
function noOpJobFactory(BaseJob, Logger, util, uuid, Q) {
di.annotate(noOpJobFactory, new di.Inject('Job.Base', 'Logger', 'Util', 'uuid', 'Promise'));
function noOpJobFactory(BaseJob, Logger, util, uuid, Promise) {
var logger = Logger.initialize(noOpJobFactory);

/**
Expand All @@ -33,7 +33,7 @@ function noOpJobFactory(BaseJob, Logger, util, uuid, Q) {
NoOpJob.prototype._run = function run() {
var self = this;
logger.info("RUNNING NOOP JOB");
Q.delay().then(function() {
Promise.delay().then(function() {
self._done();
});
};
Expand Down
2 changes: 1 addition & 1 deletion lib/jobs/run-graph.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ di.annotate(runGraphJobFactory, new di.Provide('Job.Graph.Run'));
'Assert',
'uuid',
'Util',
'Q',
'Promise',
'_'
)
);
Expand Down
2 changes: 1 addition & 1 deletion lib/jobs/run-sku-graph.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ di.annotate(runSkuGraphJobFactory, new di.Provide('Job.Graph.RunSku'));
'Assert',
'uuid',
'Util',
'Q',
'Promise',
'_'
)
);
Expand Down
2 changes: 1 addition & 1 deletion lib/jobs/shell-reboot.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ di.annotate(shellRebootJobFactory, new di.Provide('Job.Linux.ShellReboot'));
'Logger',
'Assert',
'Util',
'Q',
'Promise',
'_'
)
);
Expand Down
6 changes: 3 additions & 3 deletions lib/jobs/snmp-poller-alert-job.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ di.annotate(snmpPollerAlertJobFactory, new di.Inject(
'Logger',
'Util',
'Assert',
'Q'
'Promise'
));
function snmpPollerAlertJobFactory(PollerAlertJob, Logger, util, assert, Q) {
function snmpPollerAlertJobFactory(PollerAlertJob, Logger, util, assert, Promise) {
var logger = Logger.initialize(snmpPollerAlertJobFactory);

/**
Expand All @@ -37,7 +37,7 @@ function snmpPollerAlertJobFactory(PollerAlertJob, Logger, util, assert, Q) {

SnmpPollerAlertJob.prototype._determineAlert = function _determineAlert(data) {
data;
return Q.resolve();
return Promise.resolve();
};

return SnmpPollerAlertJob;
Expand Down
6 changes: 3 additions & 3 deletions lib/services/amt-obm-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ module.exports = amtObmServiceFactory;

di.annotate(amtObmServiceFactory, new di.Provide('amt-obm-service'));
di.annotate(amtObmServiceFactory,
new di.Inject('Q', 'OBM.base', '_')
new di.Inject('Promise', 'OBM.base', '_')
);

function amtObmServiceFactory(Q, BaseObmService, _) {
function amtObmServiceFactory(Promise, BaseObmService, _) {
function AmtObmService(options) {
BaseObmService.call(this, options);
this.requiredKeys = ['host', 'password'];
Expand Down Expand Up @@ -48,7 +48,7 @@ function amtObmServiceFactory(Q, BaseObmService, _) {
return false;
}

return Q.reject(
return Promise.reject(
new Error('Unable to determine power state (' + result.stdout + ').')
);
});
Expand Down
10 changes: 5 additions & 5 deletions lib/services/apc-obm-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ module.exports = apcObmServiceFactory;

di.annotate(apcObmServiceFactory, new di.Provide('apc-obm-service'));
di.annotate(apcObmServiceFactory,
new di.Inject('Q', 'OBM.base', '_')
new di.Inject('Promise', 'OBM.base', '_')
);

function apcObmServiceFactory(Q, BaseObmService, _) {
function apcObmServiceFactory(Promise, BaseObmService, _) {
function ApcObmService(options) {
BaseObmService.call(this, options);
this.requiredKeys = ['community', 'host', 'port'];
Expand All @@ -37,14 +37,14 @@ function apcObmServiceFactory(Q, BaseObmService, _) {
return this._runInternal([this.mibCommand + '.' + this.options.config.port], 'snmpwalk')
.then(function (result) {
if (_.contains(result.stdout, 'outletOn')) {
return Q.resolve(true);
return Promise.resolve(true);
}

if (_.contains(result.stdout, 'outletOff')) {
return Q.resolve(false);
return Promise.resolve(false);
}

return Q.reject(
return Promise.reject(
new Error('Unable to determine power state (' + result.stdout + ').')
);
});
Expand Down
20 changes: 10 additions & 10 deletions lib/services/base-obm-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ module.exports = BaseObmServiceFactory;
di.annotate(BaseObmServiceFactory, new di.Provide('OBM.base'));
di.annotate(BaseObmServiceFactory,
new di.Inject(
'Assert', 'Q', '_', 'Logger', 'ChildProcess'
'Assert', 'Promise', '_', 'Logger', 'ChildProcess'
)
);

function BaseObmServiceFactory (assert, Q, _, Logger, ChildProcess) {
function BaseObmServiceFactory (assert, Promise, _, Logger, ChildProcess) {
var logger = Logger.initialize(BaseObmServiceFactory);

/**
Expand All @@ -33,43 +33,43 @@ function BaseObmServiceFactory (assert, Q, _, Logger, ChildProcess) {
BaseObmService.prototype.identifyOn = function() {
var error = new Error('identify not implemented');
error.name = 'ObmCommandNotImplementedError';
return Q.reject(error);
return Promise.reject(error);
};

BaseObmService.prototype.identifyOff = function() {
var error = new Error('identify not implemented');
error.name = 'ObmCommandNotImplementedError';
return Q.reject(error);
return Promise.reject(error);
};

BaseObmService.prototype.reboot = function() {
var error = new Error('reboot not implemented');
error.name = 'ObmCommandNotImplementedError';
return Q.reject(error);
return Promise.reject(error);
};

BaseObmService.prototype.powerOn = function() {
var error = new Error('powerOn not implemented');
error.name = 'ObmCommandNotImplementedError';
return Q.reject(error);
return Promise.reject(error);
};

BaseObmService.prototype.powerOff = function() {
var error = new Error('powerOff not implemented');
error.name = 'ObmCommandNotImplementedError';
return Q.reject(error);
return Promise.reject(error);
};

BaseObmService.prototype.powerStatus = function() {
var error = new Error('powerStatus not implemented');
error.name = 'ObmCommandNotImplementedError';
return Q.reject(error);
return Promise.reject(error);
};

BaseObmService.prototype.setBootPxe = function() {
var error = new Error('setBootPxe not implemented');
error.name = 'ObmCommandNotImplementedError';
return Q.reject(error);
return Promise.reject(error);
};

// NOTE: makes updates to the config object via reference, because we all
Expand Down Expand Up @@ -103,7 +103,7 @@ function BaseObmServiceFactory (assert, Q, _, Logger, ChildProcess) {
var self = this;
assert.object(options);
assert.string(options.command);
return Q.resolve()
return Promise.resolve()
.then(function() {
self.childProcess = new ChildProcess(
options.command, options.args, options.env, options.code);
Expand Down
8 changes: 4 additions & 4 deletions lib/services/ipmi-obm-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ var di = require('di'),
module.exports = ipmiObmServiceFactory;

di.annotate(ipmiObmServiceFactory, new di.Provide('ipmi-obm-service'));
di.annotate(ipmiObmServiceFactory, new di.Inject('OBM.base', 'Q'));
di.annotate(ipmiObmServiceFactory, new di.Inject('OBM.base', 'Promise'));

function ipmiObmServiceFactory(BaseObmService, Q) {
function ipmiObmServiceFactory(BaseObmService, Promise) {
function IpmiObmService(options) {
BaseObmService.call(this, options);
this.requiredKeys = ['password', 'host', 'user'];
Expand Down Expand Up @@ -49,9 +49,9 @@ function ipmiObmServiceFactory(BaseObmService, Q) {
IpmiObmService.prototype.powerStatus = function() {
return this._runInternal(['chassis', 'power', 'status']).then(function (result) {
if (result && result.stdout) {
return Q.resolve(result.stdout.indexOf('Chassis Power is on') >= 0);
return Promise.resolve(result.stdout.indexOf('Chassis Power is on') >= 0);
} else {
return Q.reject(
return Promise.reject(
new Error('Unable to determine power state (' + result.stdout + ').')
);
}
Expand Down
14 changes: 7 additions & 7 deletions lib/services/noop-obm-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ var di = require('di'),
module.exports = noopObmServiceFactory;

di.annotate(noopObmServiceFactory, new di.Provide('noop-obm-service'));
di.annotate(noopObmServiceFactory, new di.Inject('Q', 'lru-cache', 'OBM.base'));
di.annotate(noopObmServiceFactory, new di.Inject('Promise', 'lru-cache', 'OBM.base'));

function noopObmServiceFactory(Q, lruCache, BaseObmService) {
function noopObmServiceFactory(Promise, lruCache, BaseObmService) {
function NoopObmService() {
BaseObmService.call(this, {});
this.requiredKeys = [];
Expand All @@ -22,21 +22,21 @@ function noopObmServiceFactory(Q, lruCache, BaseObmService) {
NoopObmService.nodePowerStates = lruCache({ max: 100 });

NoopObmService.prototype.reboot = function() {
return Q.resolve(true);
return Promise.resolve(true);
};

NoopObmService.prototype.powerOn = function(nodeId) {
if (nodeId && nodeId.toString) {
this.nodePowerStates.set(nodeId.toString(), true);
}
return Q.resolve(true);
return Promise.resolve(true);
};

NoopObmService.prototype.powerOff = function(nodeId) {
if (nodeId && nodeId.toString) {
this.nodePowerStates.set(nodeId.toString(), false);
}
return Q.resolve(true);
return Promise.resolve(true);
};

NoopObmService.prototype.powerStatus = function(nodeId) {
Expand All @@ -46,13 +46,13 @@ function noopObmServiceFactory(Q, lruCache, BaseObmService) {
// Default noop node states to OFF if we haven't seen this nodeId before.
result = result !== undefined ? result : true;
}
return Q.resolve(result);
return Promise.resolve(result);
};

NoopObmService.prototype._runInternal = function() {};

NoopObmService.prototype.setBootPxe = function() {
return Q.resolve(true);
return Promise.resolve(true);
};

NoopObmService.create = function(options) {
Expand Down
8 changes: 4 additions & 4 deletions lib/services/raritan-obm-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ var di = require('di'),
module.exports = raritanObmServiceFactory;

di.annotate(raritanObmServiceFactory, new di.Provide('raritan-obm-service'));
di.annotate(raritanObmServiceFactory, new di.Inject('Q', 'OBM.base'));
di.annotate(raritanObmServiceFactory, new di.Inject('Promise', 'OBM.base'));

function raritanObmServiceFactory(Q, BaseObmService) {
function raritanObmServiceFactory(Promise, BaseObmService) {
function RaritanObmService(options) {
BaseObmService.call(this, options);
this.requiredKeys = ['port'];
Expand Down Expand Up @@ -43,9 +43,9 @@ function raritanObmServiceFactory(Q, BaseObmService) {
if (match && match[1]) {
var code = parseInt(match[1], 10);

return Q.resolve(code & 0x01 ? true : false);
return Promise.resolve(code & 0x01 ? true : false);
} else {
return Q.reject(
return Promise.reject(
new Error('Unable to determine power state (' + result.stdout + ').')
);
}
Expand Down
10 changes: 5 additions & 5 deletions lib/services/servertech-obm-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ module.exports = serverTechObmServiceFactory;

di.annotate(serverTechObmServiceFactory, new di.Provide('servertech-obm-service'));
di.annotate(serverTechObmServiceFactory,
new di.Inject('Q', 'OBM.base', '_')
new di.Inject('Promise', 'OBM.base', '_')
);

function serverTechObmServiceFactory(Q, BaseObmService, _) {
function serverTechObmServiceFactory(Promise, BaseObmService, _) {
function ServerTechObmService(config) {
BaseObmService.call(this, config);
this.requiredKeys = ['community', 'host', 'port'];
Expand All @@ -40,15 +40,15 @@ function serverTechObmServiceFactory(Q, BaseObmService, _) {
.then(function (result) {
if (_.contains(result.stdout.contains, 'INTEGER: on') ||
_.contains(result.stdout.contains, 'INTEGER: idleOn')) {
return Q.resolve(true);
return Promise.resolve(true);
}

if (_.contains(result.stdout.contains, 'INTEGER: off') ||
_.contains(result.stdout.contains, 'INTEGER: idleOff')) {
return Q.resolve(false);
return Promise.resolve(false);
}

return Q.reject(
return Promise.reject(
new Error('Unable to determine power state (' + result.stdout + ').')
);
});
Expand Down
4 changes: 2 additions & 2 deletions lib/services/vbox-obm-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ var di = require('di'),
module.exports = vBoxObmServiceFactory;

di.annotate(vBoxObmServiceFactory, new di.Provide('vbox-obm-service'));
di.annotate(vBoxObmServiceFactory, new di.Inject('Q', 'OBM.base', '_'));
di.annotate(vBoxObmServiceFactory, new di.Inject('Promise', 'OBM.base', '_'));

function vBoxObmServiceFactory(Q, BaseObmService, _) {
function vBoxObmServiceFactory(Promise, BaseObmService, _) {
function VBoxObmService(options) {
BaseObmService.call(this, options);
this.requiredKeys = ['user', 'alias'];
Expand Down
Loading