meteo (#120)

* issue 32 fixed

* removed swp

* fixed nconf issues

* issue 82, 84 fixes

* fixed #82

* isse #77

* fixed tests

* fixed files

* fixed tests master

* fixed comment

* moved validator

* removed duplicate file

* fixed tests, removed duplicate underscore, publish

* changes

* fixed methods.ts import

* fixed issues w methods

* fixes

* minor fixes

* A

Added Session Cache

Author: cemersoz

client/imports/lab/methods.ts

@@ -1,6 +1,9 @@
 Meteor.methods({
   'prepareLab': function(courseId : String ,labId : Number){
     return "here";
-  }
+  },
+  'startLab': function(callback : any){},
+  'nextTask': function(callback : any){},
+  'endLab': function(callback : any){}
 });
 

collections/labs.ts

@@ -3,6 +3,12 @@ import { Meteor } from 'meteor/meteor';
 
 import { Roles } from './users.ts';
 
+declare var validateLab : any;
+declare var _ : any;
+
+
+var _ = require('underscore');
+
 export const labs : any = new Mongo.Collection('labs');
 
 /**
@@ -95,7 +101,6 @@ labs.allow({
 /* LAB VALIDATOR */
   if(Meteor.isServer){
     var validateLab : any = require('../server/imports/lab/checkLab');
-
     Meteor.startup(function(){
       var LabValidator = function(userid, doc, fieldNames?, modifier?, options?){
         if (typeof fieldNames === "undefined"){
@@ -138,6 +143,13 @@ labs.allow({
           }
         });
       });
+      Meteor.publish('user-labs',function(){
+        this.autorun(function(computation){
+          let roles = (<any>(Meteor.users.findOne(this.userId))).roles;
+          let courses = roles.student.map((a) =>{return a[0]});
+          return (courses.map(function(courseId){return {course: courseId, labs: ((Collections.courses.findOne(courseId)).labs)}}));
+	});
+      });
     });
   }
 

private/settings.env.json

@@ -1,11 +1,14 @@
 {
   "swarm_node_ip": "10.100.1.10",
   "swarm_node_port": "4000",
+
+  "default_image": "alpine",
+
+  "mongo_log_collection": "logs",
+
   "etcd_node_ip": "192.168.56.102",
   "etcd_node_port": "2379",
   "etcd_user": "cem",
-  "etcd_pass": "ersoz",
-  "default_image": "alpine",
-  "mongo_log_url" : "ds025792.mlab.com:25792/tuxlab",
-  "mongo_log_collection" : "logs"
+  "etcd_pass": "ersoz"
+
 }

server/imports/api/lab.env.js

@@ -1,30 +1,21 @@
 // Import Dockerode
 var dockerode = require('dockerode');
-
 // Import other libraries
 var async = require('async');
 var underscore = require('underscore');
-var etcd = require('node-etcd');
 var nconf = require('nconf');
 
 /* constructor
  * intializes docker, etcd connection
  */
 var env = function(){
-  var etcd_address = nconf.get('etcd_node_ip')+':'+nconf.get('etcd_node_port');
-
-  var etcd_auth = {
-	  user: nconf.get('etcd_user'),
-	  password: nconf.get('etcd_pass')
-	}
 
   var docker_settings = {
 	  host: nconf.get('swarm_node_ip'),
 	  password: nconf.get('swarm_node_port')
   }
 
   this.docker = new dockerode(docker_settings);
-  this.etcd = new etcd(etcd_address,etcd_auth);
   this.root_dom = nconf.get("root_domain");
 
 }
@@ -114,7 +105,7 @@ env.prototype.init = function(opts){
   var crtOptsf = {Image: img,CMD: ['/bin/sh'], name: this.labVm}
 
   //change final options according to opts input, if there is any
-  underscore.extend(crtOptsf, crtOpts);
+  _.extend(crtOptsf, crtOpts);
 
   var slf = this;
   return new Promise(function(resolve,reject){
@@ -141,50 +132,51 @@ env.prototype.init = function(opts){
 	  else {
 	    var containerId = container.id.substring(0,7);
 	    container.start(strOpts,function(err,data){
-              if(err) {
+
+        if(err) {
 	        TuxLog.log('debug','container start err: '+err);
 	        reject("Internal error");
 	      }
 	      else {
-                var etcd_redrouter = {
-			docker: containerId,
-			port: 22,
-			username: "root",
-			allowed_auth: ["password"]
-			}
-
-		//etcd directory for helix record
-		var dir = slf.root_dom.split('.');
-		dir.reverse().push(this.usr,'A');
-		slf.helixKey = dir.join('/');
-
-		slf.redRouterKey = '/redrouter/ssh::'+slf.usr;
-
-	        //set etcd record for redrouter
-		etcd.set(slf.redRouterKey,etcd_redrouter,function(err,res){
-		  if(err){
-                    TuxLog.log('debug', 'error creating redrotuer etcd record: '+err);
-		    reject("Internal error");
-		  }
-
-		  //set etcd record for helixdns
-		  docker.getContainer(containerId).inspect(function(err,container){
-		    if(err){
-		      TuxLog.log('debug', 'docker cannot find the container it just created: '+err);
-		      reject("Internal error");
-		      //TODO: get the actual information that we actually want. Perhaps change this entirely
-		    }
-		    else{
-
-		      //set etcd record for helix
-		      etcd.set(slf.helixKey,container.NetworkSettings,function(err,res){
-		        if(err){
-			  TuxLog.log('debug','error creating helix etcd record: '+err);
-		          reject("Internal error");
-		        }
-			else{
-		          slf.vmList.labVm = slf.labVm;
-		          resolve();
+            var etcd_redrouter = {
+        			docker: containerId,
+        			port: 22,
+        			username: "root",
+        			allowed_auth: ["password"]
+			      }
+
+            		//etcd directory for helix record
+            		var dir = slf.root_dom.split('.');
+            		dir.reverse().push(this.usr,'A');
+            		slf.helixKey = dir.join('/');
+
+            		slf.redRouterKey = '/redrouter/ssh::'+slf.usr;
+
+            	        //set etcd record for redrouter
+            		etcd.set(slf.redRouterKey,etcd_redrouter,function(err,res){
+            		  if(err){
+                                TuxLog.log('debug', 'error creating redrotuer etcd record: '+err);
+            		    reject("Internal error");
+            		  }
+
+            		  //set etcd record for helixdns
+            		  docker.getContainer(containerId).inspect(function(err,container){
+            		    if(err){
+            		      TuxLog.log('debug', 'docker cannot find the container it just created: '+err);
+            		      reject("Internal error");
+            		      //TODO: get the actual information that we actually want. Perhaps change this entirely
+            		    }
+            		    else{
+
+            		      //set etcd record for helix
+            		      etcd.set(slf.helixKey,container.NetworkSettings,function(err,res){
+            		        if(err){
+            			  TuxLog.log('debug','error creating helix etcd record: '+err);
+            		          reject("Internal error");
+            		        }
+            			else{
+            		          slf.vmList.labVm = slf.labVm;
+            		          resolve();
                         }
                       });
                     }
@@ -199,7 +191,6 @@ env.prototype.init = function(opts){
   });
 }
 
-
 /* creates a new container with an image from the options provided,
  * downloads image if it does not yet exist.
  * @param {{},{}} : two options file, dockerodeCreateOptions,dockerodeStartOptions
@@ -228,7 +219,7 @@ env.prototype.createVm = function(opts) {
   var crtOptsf = {Image:img,CMD:['/bin/sh']}
 
   //extend the final options with the supplied options
-  underscore.extend(crtOptsf,crtOpt);
+  _.extend(crtOptsf,crtOpt);
   crtOptsf.name = cName;
   //this.vmList.push({name: crtOpt.name,id:cName});
   //clone this into slf to use in the promise
@@ -285,8 +276,8 @@ env.prototype.removeVm = function (vmName,opts) {
   return function(){
     return new Promise(function(resolve,reject){
 
-     //check if container initialized
-     if(!underscore.has(this.vmList,vmName)){
+     //check if container initialized 
+     if(!_.has(this.vmList,vmName)){
         TuxLog.log('labfile_error',"trying to delete non-existing vm");
         reject("Internal error");
       }
@@ -307,7 +298,7 @@ env.prototype.updateVm = function(vmName, opts) {
   var slf = this;
   return function(){
     return new Promise(function(resolve,reject){
-      if(!underscore.has(slf.vmList,vmName)){
+      if(!_.has(slf.vmList,vmName)){
         TuxLog.log('labfile_error','trying to update non-existing vm');
         reject("Internal error");
       }
@@ -330,7 +321,7 @@ env.prototype.shell = function(vmName,command,opts) {
   var slf = this;
   return function(){
     return new Promise(function(resolve,reject){
-      if(!underscore.has(slf.vmList,vmName)){
+      if(!_.has(slf.vmList,vmName)){
         TuxLog.log('labfile_error','trying to run shell on non-existing vm');
         reject("Internal error");
       }

server/imports/api/tuxlab.js renamed to server/imports/api/lab.js

@@ -1,7 +1,7 @@
 var fs = require('fs');
-var tuxlab = function(){}
+var lab = function(){}
 
-tuxlab.prototype.init = function(){
+lab.prototype.init = function(){
   var slf = this;
   var ts = {  prnt: slf,
               next: null,
@@ -15,11 +15,11 @@ tuxlab.prototype.init = function(){
   return ts;
 }
 
-tuxlab.prototype.currentTask = null;
-tuxlab.prototype.taskList = [];
-tuxlab.prototype.setup;
-tuxlab.prototype.tasks;
-tuxlab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
+lab.prototype.currentTask = null;
+lab.prototype.taskList = [];
+lab.prototype.setup;
+lab.prototype.tasks;
+lab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
   var slf = this;
   var ts = {  prnt: slf,
               setupFn: sFn,
@@ -38,4 +38,4 @@ tuxlab.prototype.newTask = function(ttl, mdown,sFn, vFn, opt){
 	    }
   return ts;
 }
-module.exports = new tuxlab();
+module.exports = new lab();

server/imports/api/lab.session.d.t.s

@@ -0,0 +1,13 @@
+namespace lab_exec {
+  interface labExec{
+    var env : any;
+    var tuxlab : any;
+    function init(user : string, labId : number, callback : any)
+    function parseTasks() : any
+    function start(callback : any) : any
+    function next(callback : any) : any
+    function end(callback : any) : any
+    
+  }
+  function labExec() : any
+}