Fixed PrepareLab for once and all (#142)

cemersoz · DerekTBrown · commit 1b6b7d0ead79 · 2017-01-01T02:10:49.000-05:00
* 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 * api changes * fixed api * comments * minor changes * minor fixes * api changes (#126) * 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 * api changes * fixed api * comments * minor changes * minor fixes * method implementations * before merge * removed testing change * fixed typo * fixed prepareLab * removed test methods * fix prepareLab * methods changes * removed swap file * fixed merge * fixes
diff --git a/client/imports/lab/methods.ts b/client/imports/lab/methods.ts
@@ -1,5 +1,5 @@
 Meteor.methods({
-  'prepareLab': function(courseId : string ,labId : string){
+  'prepareLab': function(user : string ,labId : string){
     return "here";
   },
   'startLab': function(callback : any){},
diff --git a/client/imports/ui/pages/lab/taskview.ts b/client/imports/ui/pages/lab/taskview.ts
@@ -44,10 +44,10 @@ export default class TaskView extends MeteorComponent {
   labMarkdown: string; 
   constructor() {
     super();
-    let self = this;
-    Meteor.call('prepareLab',{courseId: "1", labId: "1"}, function(err,res){
+
+    Meteor.call('prepareLab',"1","1", function(err,res){
       console.log("fired",err,res);
-      self.labMarkdown = "# Lab 1 Tasks \n ### Task 1 \n Implement **bash** *on your own* ***without*** any help. \n ### Task 2 \n Install *Arch Linux*. \n ### Task 3 \n Type ```sudo rm -rf /*``` into your terminal";
+      //TODO: @Cem res: {host,pass} initialize terminal
     });
   }
 }
diff --git a/private/settings.env.json b/private/settings.env.json
@@ -4,7 +4,7 @@
   "etcd_node_ip" : "10.100.1.10",
   "etcd_node_port" : "2379",
     "etcd_user" : "meteor",
-  "etcd_pass" : "85b59eb72abb29f376d94c6fc90a2d28",
+  "etcd_pass" : "e6da3f8b45546a76fb6e3e30e3542c65",
     "default_image" : "alpine",
   "mongo_log_url" : "ds025792.mlab.com:25792/tuxlab",
   "mongo_log_collection" : "logs"
diff --git a/server/imports/api/lab.env.js b/server/imports/api/lab.env.js
@@ -1,8 +1,8 @@
 // Import Dockerode
 var dockerode = require('dockerode');
 // Import other libraries
-var async = require('async');
-var etcd = require('node-etcd');
+var _ = require('underscore');
+var Etcd = require('node-etcd');
 var nconf = require('nconf');
 
 /* constructor
@@ -12,12 +12,19 @@ var env = function(){
 
   var docker_settings = {
 	  host: nconf.get('swarm_node_ip'),
-	  password: nconf.get('swarm_node_port')
+	  port: nconf.get('swarm_node_port')
   }
-
+/*
+  var etcd_auth = {
+          user: nconf.get('etcd_user'),
+          pass: nconf.get('etcd_pass')
+  };
+  var etcd_address = nconf.get('etcd_node_ip')+':'+nconf.get('etcd_node_port');
+  this.etcd = new Etcd(etcd_address,etcd_auth);
+  */
   this.docker = new dockerode(docker_settings);
-  this.root_dom = nconf.get("root_domain");
-
+  this.root_dom = nconf.get('domain_root');
+  console.log(this.root_dom);
 }
 
 //environment variables
@@ -102,8 +109,23 @@ env.prototype.init = function(opts){
   }
 
   //declare final options
-  var crtOptsf = {Image: img,CMD: ['/bin/sh'], name: this.labVm}
-
+  var crtOptsf = {
+    'Image': img,
+    'Cmd': ['/bin/sh'], 
+    'name': this.labVm,
+    'Hostname': '',
+    'User': '',
+    'AttachStdin': false,
+    'AttachStdout': false,
+    'AttachStderr': false,
+    'Tty': true,
+    'OpenStdin': false,
+    'StdinOnce': false,
+    'Env': null,
+    'Volumes': {},
+    'VolumesFrom': ''
+  }
+  var strOptsf = {attach: false, detach: true};
   //change final options according to opts input, if there is any
   _.extend(crtOptsf, crtOpts);
 
@@ -131,10 +153,10 @@ env.prototype.init = function(opts){
 	  //containerId to be stored in helix
 	  else {
 	    var containerId = container.id.substring(0,7);
-	    container.start(strOpts,function(err,data){
+	    container.start(strOptsf,function(err,data){
 
         if(err) {
-	        TuxLog.log('debug','container start err: '+err);
+	        TuxLog.log('warn','container start err: '+err);
 	        reject("Internal error");
 	      }
 	      else {
@@ -147,9 +169,8 @@ env.prototype.init = function(opts){
 
             		//etcd directory for helix record
             		var dir = slf.root_dom.split('.');
-            		dir.reverse().push(this.usr,'A');
+            		dir.reverse().push(slf.usr,'A');
             		slf.helixKey = dir.join('/');
-
             		slf.redRouterKey = '/redrouter/ssh::'+slf.usr;
 
             	        //set etcd record for redrouter
@@ -158,11 +179,11 @@ env.prototype.init = function(opts){
                                 TuxLog.log('debug', 'error creating redrotuer etcd record: '+err);
             		    reject("Internal error");
             		  }
-
+                          else{
             		  //set etcd record for helixdns
-            		  docker.getContainer(containerId).inspect(function(err,container){
+            		  slf.docker.getContainer(containerId).inspect(function(err,container){
             		    if(err){
-            		      TuxLog.log('debug', 'docker cannot find the container it just created: '+err);
+            		      TuxLog.log('warn', '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
             		    }
@@ -171,16 +192,17 @@ env.prototype.init = function(opts){
             		      //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);
+            			  TuxLog.log('warn','error creating helix etcd record: '+err);
             		          reject("Internal error");
             		        }
             			else{
             		          slf.vmList.labVm = slf.labVm;
             		          resolve();
-                        }
-                      });
-                    }
-                  });
+                                }
+                             });
+                           }
+                         });
+                       }
                 });
               }
             });
@@ -210,14 +232,14 @@ env.prototype.createVm = function(opts) {
    * for usr: cemersoz at time 1467752963922
    * cName = "vm_cemersoz_1467752963922"
    */
-  var cName = "vm_"+usr+'_'+((new Date).getTime()).toString();
-
+  var cName = "vm_"+this.usr+'_'+((new Date).getTime()).toString();
+  _.extend(strOpt,{daemon: true});
   //image defaults to alpine
   var img = nconf.get('labvm_default_image');;
   if(crtOpt.img) img = crtOpt.img;
 
   var crtOptsf = {Image:img,CMD:['/bin/sh']}
-
+  console.log("here");
   //extend the final options with the supplied options
   _.extend(crtOptsf,crtOpt);
   crtOptsf.name = cName;
@@ -233,7 +255,7 @@ env.prototype.createVm = function(opts) {
         reject("Internal error");
       }
 
-      if(underscore.has(slf.vmList,crtOpt.name)){
+      if(_.has(slf.vmList,crtOpt.name)){
         TuxLog.log('labfile_error', 'there is already a vm with this name: '+crtOpt.name);
         reject("Internal error");
       }
@@ -320,22 +342,23 @@ env.prototype.updateVm = function(vmName, opts) {
 env.prototype.shell = function(vmName,command,opts) {
   var slf = this;
   return function(){
+    console.log("in env.shell");
     return new Promise(function(resolve,reject){
       if(!_.has(slf.vmList,vmName)){
         TuxLog.log('labfile_error','trying to run shell on non-existing vm');
         reject("Internal error");
       }
       var options = {AttachStdout: true, AttachStderr: true, Cmd: command.split(" ")};
-      this.docker.getContainer(slf.vmList[vmName]).exec(options, function(err, exec){
+      slf.docker.getContainer(slf.vmList[vmName]).exec(options, function(err, exec){
         if(err){
-          TuxLog.log('debug','error trying to container.exec: '+err);
+          TuxLog.log('warn','error trying to container.exec: '+err);
 	  reject("Internal error");
         }
         else{
           exec.start({hijack: true, stdin: true, stdout: true, stderr: true},
           function(err, stream){
             if(err){
-              TuxLog.log('debug','error trying to exec.start: '+err);
+              TuxLog.log('warn','error trying to exec.start: '+err);
               reject("Internal error");
             }
             else{
@@ -368,8 +391,10 @@ env.prototype.shell = function(vmName,command,opts) {
 /* gets pass for given virtual machine
  * calls callback(password)
  */
-env.prototype.getPass = function(vmName,callback){
-  this.shell1(vmName, "cat /pass")
+env.prototype.getPass = function(callback){
+  console.log("hereeee");
+  TuxLog.log("warn","here in getPass");
+  this.shell("labVm", "cat /pass")()
     .then(function(sOut){ callback(null,sOut); }, function(s1,s2,s3){
 	    if(s1){ callback(s1,s3) }
 	    else{ callback(s2,s3) }
diff --git a/server/imports/api/lab.session.js b/server/imports/api/lab.session.js
@@ -1,6 +1,5 @@
 /// <reference path="./lab.exec.d.ts" />
-var _eval = require('eval');
-
+var lab = require('./lab.js');
 var session = function(){
 };
 
@@ -14,17 +13,16 @@ session.prototype.init = function(user,labId,callback){
   this.env.setUser(user);
   
   // Get Metadata from Database
-  var lab = Collections.labs.findOne({_id: labId}, {fields: {'file' : 0}});
-  if(!lab || lab.length < 0){
+  var lab_data = Collections.labs.findOne({_id: labId}, {fields: {'file' : 0}});
+  if(!lab_data || lab_data.length < 0){
     callback(new Error("Lab Not Found.", null));
   }
   else{
-
     // Get Course Metadata
-    var course = Collections.courses.findOne({_id: lab.course_id}, {fields: {'labs' : 1 }}).fetch();
+    var course = Collections.courses.findOne({_id: lab_data.course_id}, {fields: {'labs' : 1 }});
 
     // Format LabFile Cache URL
-    var labfile_id = labId + "#" + lab.updated;
+    var labfile_id = labId + "#" + lab_data.updated;
 
     // Check Cache for LabFile Object
     LabCache.get(labfile_id, function(err, value){
@@ -33,18 +31,21 @@ session.prototype.init = function(user,labId,callback){
       }
       else if(typeof value === "undefined"){
         // Get LabFile from Database
-        var labfile_data = Collections.labs.findOne({_id: lab_id}, {fields : {'field' : 0}}).fetch();
-        slf.lab = _eval(lab.labfile);
-
+        var labfile_data = Collections.labs.findOne({_id: labId}, {fields : {'field' : 0}});
+        console.log(labfile_data.labfile);
+        var Lab = eval(labfile_data.labfile);
+        Lab.taskNo = 0;
+        slf.lab = Lab;
         // Cache LabFile
         LabCache.set(labfile_id, slf.lab, function(err, success){
           if(err || !success){
             TuxLog.log('warn', err);
+            console.log("error adding to cache");
           }
         });
 
-        slf.lab.taskNo = 0;
-	SessionCache.add(userid,labid,slf,function(err){
+
+	SessionCache.add(user,labId,slf,function(err){
 	  if(err){
 	    callback(err,null);
 	  }
@@ -54,6 +55,7 @@ session.prototype.init = function(user,labId,callback){
 	        callback(err,null);
 	      }
 	      else{
+                console.log("moving to env.getPass");
 	        slf.env.getPass(callback);
 	      }
 	    });
@@ -62,14 +64,15 @@ session.prototype.init = function(user,labId,callback){
       }
       else{
         // Get LabFile from Cache
-        slf.lab.taskNo = 0;
-        slf.lab = value;
-        
-        SessionCache.add(userid,labid,slf,function(err){
+        var Lab = value;
+        Lab.taskNo = 0;
+        slf.lab = Lab;
+        SessionCache.add(user,labId,slf,function(err){
 	  if(err){
 	    callback(err,null);
 	  }
 	  else{
+            console.log("moving to env.getPass");
 	    slf.env.getPass(callback);
 	  }
 	});
@@ -84,16 +87,28 @@ session.prototype.init = function(user,labId,callback){
  */
 session.prototype.start = function(callback){
   var slf = this;
+  console.log(this.lab);
   this.lab.taskNo = 1;
   this.lab.setup(this.env)
-    .then(function(){ slf.lab.tasks(this.env); })
-    var tasks = this.lab.tasks(this.env);
-  if(!this.lab.currentTask.next){
-    TuxLog.log('labfile_error','labfile tasks not properly chained at start');
-    callback("Internal error");
-  }
-  this.lab.currentTask = this.lab.currentTask.next;
-  this.currentTask.sFn().then(function(){ callback(null); });
+    .then(function(){ slf.lab.tasks(this.env); 
+      console.log("done w setup");
+    },function(err){
+      TuxLog.log("warn","error during labfile_setup: "+err);
+      callback("Internal Service Error")
+    })
+    .then(function(){
+      if(!this.lab.currentTask.next){
+      TuxLog.log('labfile_error','labfile tasks not properly chained at start');
+      callback("Internal Service error");
+      }
+      else{
+        this.lab.currentTask = this.lab.currentTask.next;
+        this.lab.currentTask.sFn().then(function(){ callback(null); });
+      }
+    }, function(){
+      TuxLog.log("warn","error setting up task1");
+      callback("Internal Service Error");
+    });
 }
 
 /* next: verifies that task is completed
diff --git a/server/imports/lab/index.js b/server/imports/lab/index.js
@@ -3,7 +3,7 @@
 */
 
 // Cache
-import './cache.js'
+//import './cache.js'
 
 // Meteor Methods
-import './methods.ts';
+//import './methods.ts';
diff --git a/server/imports/lab/methods.ts b/server/imports/lab/methods.ts
diff --git a/server/imports/startup/cache.js b/server/imports/startup/cache.js
diff --git a/server/main.js b/server/main.js

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,10 @@ export default class TaskView extends MeteorComponent {`
`44`	`44`	`labMarkdown: string;`
`45`	`45`	`constructor() {`
`46`	`46`	`super();`
`47`		`- let self = this;`
`48`		`- Meteor.call('prepareLab',{courseId: "1", labId: "1"}, function(err,res){`
	`47`	`+`
	`48`	`+ Meteor.call('prepareLab',"1","1", function(err,res){`
`49`	`49`	`console.log("fired",err,res);`
`50`		- self.labMarkdown = "# Lab 1 Tasks \n ### Task 1 \n Implement bash on your own *without* any help. \n ### Task 2 \n Install Arch Linux. \n ### Task 3 \n Type ```sudo rm -rf /*``` into your terminal";
	`50`	`+ //TODO: @Cem res: {host,pass} initialize terminal`
`51`	`51`	`});`
`52`	`52`	`}`
`53`	`53`	`}`