Merge pull request #2 from wmantly/new

New
This commit is contained in:
wmantly committed 2016-01-29 17:43:01 -05:00
commit b67c251e89
2 files changed
+128 -167

No files matched your search

+79 -117
View File
@@ -1,129 +1,91 @@
module.exports = function(config){ module.exports = function(config){
var obj = {}; var obj = {};
var cmd = require('node-cmd'); var cmd = require('node-cmd');
var sysExec = function(command, callback){ var sysExec = function(command, callback){
// console.log('sysExec: ', command, '||| callback:', callback) // console.log('sysExec: ', command, '||| callback:', callback)
cmd.get('unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; '+command, callback) cmd.get('unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; '+command, callback)
} }
/* var obj = {};
var child = require('child'),
sshBind = config.sshBind || false;
//http://stackoverflow.com/questions/10530532/ obj.create = function(name, template, config, cbComplete){
function textToArgs(s){ sysExec('lxc-create -n '+name+' -t '+template, cbComplete);
var words = []; };
s.replace(/"([^"]*)"|'([^']*)'|(\S+)/g,function(g0,g1,g2,g3){ words.push(g1 || g2 || g3 || '')});
return words; obj.clone = function(name, base_name, cbComplete, cbData){
} sysExec('lxc-clone -o '+base_name+ ' -n '+name +' -B overlayfs -s', cbComplete, cbData);
};
var sysExec = function(command, onData, onClose){ obj.destroy = function(name, callback){
sysExec('lxc-destroy -n '+ name, function(data){
callback(!data.match(/Destroyed container/))
});
};
onData = onData || function(){}; obj.start = function(name, callback){
onClose = onClose || function(){}; var cmd = 'lxc-start --name '+name+' --daemon';
console.log('start cmd\n', cmd, '\n');
sysExec(cmd, callback);
};
obj.startEphemeral = function(name, base_name, callback){
var output = '';
sysExec('lxc-start-ephemeral -o '+base_name+ ' -n '+name +' --union-type overlayfs -d', function(data){
if(data.match("doesn't exist.")) return callback({status: 500, error: "doesn't exist."});
if(data.match("already exists.")) return callback({status: 500, error: "already exists"});
if(data.match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)) return callback({status: 200, state:'RUNNING', ip: data.match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)[0]});
callback({'?': '?', data: data, name: name, base_name: base_name});
});
};
if (sshBind != false) obj.stop = function(name, callback){
{ console.log('stop', name);
var runCommand = sshBind.slice(); sysExec('lxc-stop -n '+ name, callback);
runCommand.push(command); };
} else {
var runCommand = textToArgs('unset XDG_SESSION_ID XDG_RUNTIME_DIR; cgm movepid all virt $$; '+command);
}
var errors = ''; obj.freeze = function(name, callback){
sysExec('lxc-freeze -n '+name, callback);
};
obj.unfreeze = function(name, callback){
sysExec('lxc-unfreeze -n '+name, callback);
};
obj.info = function(name, callback){
var output = '';
sysExec('lxc-info -n '+name, function(data){
console.log('info', name, data)
if(data.match("doesn't exist")) return callback({state: 'NULL'});
var info = {};
data = data.replace(/\suse/ig, '').replace(/\sbytes/ig, '').split("\n").slice(0,-1);
for(var i in data){
var temp = data[i].split(/\:\s+/);
info[temp[0].toLowerCase().trim()] = temp[1].trim();
}
callback(info);
});
};
child({ obj.list = function(callback){
command: runCommand.slice(0,1)[0], sysExec('lxc-ls --fancy', function(data){
args: runCommand.slice(1), var output = data.split("\n");
cbStdout: function(data){ onData(''+data) }, var keys = output.splice(0,1)[0].split(/\s+/).slice(0,-1);
cbStderr: function(data){ errors+=data; onData(''+data) }, var info = [];
cbClose: function(exitCode){ onClose(exitCode == 0 ? null:exitCode, errors) }
}).start();
};
*/
obj.create = function(name, template, config, cbComplete){ keys = keys.map(function(v){return v.toLowerCase()});
sysExec('lxc-create -n '+name+' -t '+template, cbComplete); output = output.slice(0).splice(1).slice(0,-1);
};
obj.clone = function(name, base_name, cbComplete, cbData){
sysExec('lxc-clone -o '+base_name+ ' -n '+name +' -B overlayfs -s', cbComplete, cbData);
};
obj.destroy = function(name, callback){ for (var i in output)
sysExec('lxc-destroy -n '+ name, function(data){ {
callback(!data.match(/Destroyed container/))
});
};
obj.start = function(name, callback){ var aIn = output[i].split(/\s+/).slice(0,-1),
var cmd = 'lxc-start --name '+name+' --daemon'; mapOut = {};
console.log('start cmd\n', cmd, '\n'); aIn.map( function(v,i){ mapOut[keys[i]] = v; } );
sysExec(cmd, callback); info.push(mapOut);
};
}
obj.startEphemeral = function(name, base_name, callback){ callback(info);
});
};
var output = ''; return obj;
sysExec('lxc-start-ephemeral -o '+base_name+ ' -n '+name +' --union-type overlayfs -d', function(data){ };
if(data.match("doesn't exist.")) return callback({status: 500, error: "doesn't exist."});
if(data.match("already exists.")) return callback({status: 500, error: "already exists"});
if(data.match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)) return callback({status: 200, state:'RUNNING', ip: data.match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)[0]});
callback({'?': '?', data: data, name: name, base_name: base_name});
});
};
obj.stop = function(name, callback){
console.log('stop', name);
sysExec('lxc-stop -n '+ name, callback);
};
obj.freeze = function(name, cbComplete, cbData){
sysExec('lxc-freeze -n '+name, cbComplete, cbData);
};
obj.unfreeze = function(name, cbComplete, cbData){
sysExec('lxc-unfreeze -n '+name, cbComplete, cbData);
};
obj.info = function(name, callback){
var output = '';
sysExec('lxc-info -n '+name, function(data){
console.log('info', name, data)
if(data.match("doesn't exist")) return callback({state: 'NULL'});
var info = {};
data = data.replace(/\suse/ig, '').replace(/\sbytes/ig, '').split("\n").slice(0,-1);
for(var i in data){
var temp = data[i].split(/\:\s+/);
info[temp[0].toLowerCase().trim()] = temp[1].trim();
}
callback(info);
});
};
obj.list = function(callback){
sysExec('lxc-ls --fancy', function(data){
var output = data.split("\n");
var keys = output.splice(0,1)[0].split(/\s+/).slice(0,-1);
var info = [];
keys = keys.map(function(v){return v.toLowerCase()});
output = output.slice(0).splice(1).slice(0,-1);
for (var i in output)
{
var aIn = output[i].split(/\s+/).slice(0,-1),
mapOut = {};
aIn.map( function(v,i){ mapOut[keys[i]] = v; } );
info.push(mapOut);
}
callback(info);
});
};
return obj;
};
+49 -50
View File
@@ -7,75 +7,74 @@ var lxc = require('../lxc')({sshBind: false/*['/usr/bin/ssh', 'virt@127.0.0.1']*
//lxc.startEphemeral('ubuntu_template', 'ue0', function(){console.log('cb1', arguments)}, function(){console.log('cb2', arguments)}) //lxc.startEphemeral('ubuntu_template', 'ue0', function(){console.log('cb1', arguments)}, function(){console.log('cb2', arguments)})
router.get('/start/:name', function(req, res, next){ router.get('/start/:name', function(req, res, next){
lxc.start(req.params.name, function(status, message){ lxc.start(req.params.name, function(status, message){
if(status){ if(status){
res.json({status: 500, name: req.params.name, message: message}); res.json({status: 500, name: req.params.name, message: message});
}else{ }else{
setTimeout(function() { setTimeout(function() {
lxc.info(req.params.name, null, function(data){ lxc.info(req.params.name, null, function(data){
var domain = req.query.domain || 'vm42.us'; var domain = req.query.domain || 'vm42.us';
domain = req.params.name+'.'+domain; domain = req.params.name+'.'+domain;
client.SADD("hosts", domain, function(){}); client.SADD("hosts", domain, function(){});
var ip = data.ip + ':5000'; var ip = data.ip + ':5000';
client.HSET(domain, "ip", ip, redis.print); client.HSET(domain, "ip", ip, redis.print);
client.HSET(domain, "updated", (new Date).getTime(), redis.print); client.HSET(domain, "updated", (new Date).getTime(), redis.print);
client.hset(domain, "include", "proxy.include"); client.hset(domain, "include", "proxy.include");
res.json({status: 200, info: data}); res.json({status: 200, info: data});
}); });
}, 5000); }, 5000);
} }
}); });
}); });
router.get('/live/:template/:name', function(req, res, next){ router.get('/live/:template/:name', function(req, res, next){
lxc.startEphemeral(req.params.name, req.params.template, function (data) { lxc.startEphemeral(req.params.name, req.params.template, function (data) {
res.json(data); res.json(data);
}); });
}); });
router.get('/stop/:name', function(req, res, next){ router.get('/stop/:name', function(req, res, next){
lxc.stop(req.params.name, function(data, message){ lxc.stop(req.params.name, function(data, message){
if(data){ if(data){
res.json({status: 500, name: req.params.name, message: message}); res.json({status: 500, name: req.params.name, message: message});
}else{ }else{
res.json({status: 200}); res.json({status: 200});
} }
}); });
}); });
router.get('/clone/:template/:name', function(req, res, next){ router.get('/clone/:template/:name', function(req, res, next){
lxc.clone(req.params.name, req.params.template, function(message){ lxc.clone(req.params.name, req.params.template, function(message){
if( message.match(/Created container/) ){ if( message.match(/Created container/) ){
res.json({status: 200}); res.json({status: 200});
}else{ }else{
res.json({status: 500, message: message}); res.json({status: 500, message: message});
} }
}); });
}); });
router.get('/destroy/:name', function(req, res, next){ router.get('/destroy/:name', function(req, res, next){
lxc.destroy(req.params.name, function(data){ lxc.destroy(req.params.name, function(data){
if(data){ if(data){
res.json({status: 500, message: data}); res.json({status: 500, message: data});
}else{ }else{
res.json({status: 200}); res.json({status: 200});
} }
}); });
}); });
router.get('/info/:name', function(req, res, next){ router.get('/info/:name', function(req, res, next){
lxc.info(req.params.name, function(data){ lxc.info(req.params.name, function(data){
res.json(data); res.json(data);
}); });
}); });
router.get('/list', function(req, res, next) { router.get('/list', function(req, res, next) {
lxc.list(function(data){ lxc.list(function(data){
res.json(data); res.json(data);
}); });
}); });
module.exports = router; module.exports = router;
// {"changed":true,"filter":false,"title":"index.js","tooltip":"/routes/index.js","value":"var express = require('express');\nvar router = express.Router();\nvar extend = require('node.extend');\nvar redis = require(\"redis\");\nvar client = redis.createClient();\nvar lxc = require('../lxc')({sshBind: ['/usr/bin/ssh', 'virt@127.0.0.1']});\n//lxc.startEphemeral('ubuntu_template', 'ue0', function(){console.log('cb1', arguments)}, function(){console.log('cb2', arguments)})\n\nrouter.get('/start/:name', function(req, res, next){\n lxc.start(req.params.name, null, function(status, message){\n if(status){\n res.json({status: 500, name: req.params.name, message: message});\n }else{\n setTimeout(function() {\n lxc.info(req.params.name, null, function(data){\n var domain = req.query.domain || 'vm42.us';\n domain = req.params.name+'.'+domain;\n client.SADD(\"hosts\", domain, function(){});\n \n var ip = data.ip + ':5000';\n client.HSET(domain, \"ip\", ip, redis.print);\n client.HSET(domain, \"updated\", (new Date).getTime(), redis.print);\n client.hset(domain, \"include\", \"proxy.include\");\n res.json({status: 200, info: data});\n });\n }, 5000);\n\n }\n });\n});\n\nrouter.get('/live/:template/:name', function(req, res, next){\n lxc.startEphemeral(req.params.name, req.params.template, null, function (data) {\n res.json(data);\n });\n});\n\nrouter.get('/stop/:name', function(req, res, next){\n lxc.stop(req.params.name, null, function(data, message){\n if(data){\n res.json({status: 500, name: req.params.name, message: message});\n }else{\n res.json({status: 200});\n }\n });\n});\n\nrouter.get('/clone/:template/:name', function(req, res, next){\n lxc.clone(req.params.name, req.params.template, function(message){\n if( message.match(/Created container/) ){\n res.json({status: 200});\n }else{\n res.json({status: 500, message: message});\n }\n });\n});\n\nrouter.get('/destroy/:name', function(req, res, next){\n lxc.destroy(req.params.name, null, function(data, message){\n if(data){\n res.json({status: 500, message: message});\n }else{\n res.json({status: 200});\n }\n });\n});\n\nrouter.get('/info/:name', function(req, res, next){\n lxc.info(req.params.name, null, function(data){\n res.json(data);\n });\n});\n\nrouter.get('/list', function(req, res, next) {\n lxc.list(function(data){\n res.json(data); \n });\n});\n\nmodule.exports = router;","undoManager":{"mark":90,"position":100,"stack":[[{"start":{"row":32,"column":27},"end":{"row":32,"column":30},"action":"remove","lines":["par"],"id":37},{"start":{"row":32,"column":27},"end":{"row":32,"column":33},"action":"insert","lines":["params"]}],[{"start":{"row":32,"column":33},"end":{"row":32,"column":34},"action":"insert","lines":["."],"id":38}],[{"start":{"row":32,"column":34},"end":{"row":32,"column":35},"action":"insert","lines":["n"],"id":39}],[{"start":{"row":32,"column":35},"end":{"row":32,"column":36},"action":"insert","lines":["a"],"id":40}],[{"start":{"row":32,"column":36},"end":{"row":32,"column":37},"action":"insert","lines":["m"],"id":41}],[{"start":{"row":32,"column":37},"end":{"row":32,"column":38},"action":"insert","lines":["e"],"id":42}],[{"start":{"row":32,"column":38},"end":{"row":32,"column":39},"action":"insert","lines":[","],"id":43}],[{"start":{"row":32,"column":39},"end":{"row":32,"column":40},"action":"insert","lines":[" "],"id":44}],[{"start":{"row":32,"column":40},"end":{"row":32,"column":41},"action":"insert","lines":["p"],"id":45}],[{"start":{"row":32,"column":41},"end":{"row":32,"column":42},"action":"insert","lines":["a"],"id":46}],[{"start":{"row":32,"column":42},"end":{"row":32,"column":43},"action":"insert","lines":["q"],"id":47}],[{"start":{"row":32,"column":42},"end":{"row":32,"column":43},"action":"remove","lines":["q"],"id":48}],[{"start":{"row":32,"column":41},"end":{"row":32,"column":42},"action":"remove","lines":["a"],"id":49}],[{"start":{"row":32,"column":40},"end":{"row":32,"column":41},"action":"remove","lines":["p"],"id":50}],[{"start":{"row":32,"column":40},"end":{"row":32,"column":41},"action":"insert","lines":["r"],"id":51}],[{"start":{"row":32,"column":41},"end":{"row":32,"column":42},"action":"insert","lines":["e"],"id":52}],[{"start":{"row":32,"column":42},"end":{"row":32,"column":43},"action":"insert","lines":["q"],"id":53}],[{"start":{"row":32,"column":43},"end":{"row":32,"column":44},"action":"insert","lines":[","],"id":54}],[{"start":{"row":32,"column":43},"end":{"row":32,"column":44},"action":"remove","lines":[","],"id":55}],[{"start":{"row":32,"column":43},"end":{"row":32,"column":44},"actio Line truncated