s/vms/instances/

This commit is contained in:
Trent Mick 2015-08-25 15:15:02 -07:00
parent 4d21d9d889
commit 8ff2fcb53c
4 changed files with 24 additions and 23 deletions

View File

@ -58,10 +58,10 @@ function CLI() {
},
helpSubcmds: [
'help',
{ group: 'VMs/Machines/Containers' },
{ group: 'Instances (aka VMs/Machines/Containers)' },
'create',
'vms',
'vm-audit',
'instances',
'instance-audit',
{ group: 'Images' },
'images',
{ group: 'Other', unmatched: true }
@ -102,10 +102,10 @@ CLI.prototype.init = function (opts, args, callback) {
// Images
CLI.prototype.do_images = require('./do_images');
// VMs/Containers/Machines
// Instances (aka VMs/containers/machines)
CLI.prototype.do_create = require('./do_create');
CLI.prototype.do_vms = require('./do_vms');
CLI.prototype.do_vm_audit = require('./do_vm_audit');
CLI.prototype.do_instances = require('./do_instances');
CLI.prototype.do_instance_audit = require('./do_instance_audit');

View File

@ -94,13 +94,13 @@ do_create.options = [
},
];
do_create.help = (
'Create a new VM/container/machine.\n'
'Create a new instance.\n'
+ '\n'
+ 'Usage:\n'
+ ' {{name}} provision <options>\n'
+ ' {{name}} create <options>\n'
+ '\n'
+ '{{options}}'
);
do_create.aliases = ['create-vm'];
do_create.aliases = ['create-inst'];
module.exports = do_create;

View File

@ -1,7 +1,7 @@
/*
* Copyright (c) 2015 Joyent Inc. All rights reserved.
*
* `triton vms ...`
* `triton instance-audit ...`
*/
var format = require('util').format;
@ -10,7 +10,7 @@ var tabula = require('tabula');
var errors = require('./errors');
do_vm_audit = function do_vm_audit(subcmd, opts, args, callback) {
function do_instance_audit(subcmd, opts, args, callback) {
var self = this;
if (opts.help) {
this.do_help('help', {}, [subcmd], callback);
@ -42,7 +42,7 @@ do_vm_audit = function do_vm_audit(subcmd, opts, args, callback) {
callback();
});
};
do_vm_audit.options = [
do_instance_audit.options = [
{
names: ['help', 'h'],
type: 'bool',
@ -54,15 +54,15 @@ do_vm_audit.options = [
help: 'JSON output.'
}
];
do_vm_audit.help = (
do_instance_audit.help = (
'List instance actions.\n'
+ '\n'
+ 'Usage:\n'
+ ' {{name}} vm-audit <machine>\n'
+ ' {{name}} instance-audit <machine>\n'
+ '\n'
+ '{{options}}'
);
module.exports = do_vm_audit;
module.exports = do_instance_audit;

View File

@ -1,7 +1,7 @@
/*
* Copyright (c) 2015 Joyent Inc. All rights reserved.
*
* `triton vms ...`
* `triton instances ...`
*/
var format = require('util').format;
@ -10,7 +10,7 @@ var tabula = require('tabula');
var errors = require('./errors');
do_vms = function do_vms(subcmd, opts, args, callback) {
function do_instances(subcmd, opts, args, callback) {
var self = this;
if (opts.help) {
this.do_help('help', {}, [subcmd], callback);
@ -57,7 +57,7 @@ do_vms = function do_vms(subcmd, opts, args, callback) {
callback(err);
});
};
do_vms.options = [
do_instances.options = [
{
names: ['help', 'h'],
type: 'bool',
@ -69,14 +69,15 @@ do_vms.options = [
help: 'JSON output.'
}
];
do_vms.help = (
'List VMs/machines/containers.\n'
do_instances.help = (
'List instances.\n'
+ '\n'
+ 'Usage:\n'
+ ' {{name}} vms [<filters>...]\n'
+ ' {{name}} instances [<filters>...]\n'
+ '\n'
+ '{{options}}'
);
do_instances.aliases = ['insts'];
module.exports = do_vms;
module.exports = do_instances;