API changes for new infra, other changes

client/imports/ui/pages/lab/labview.ts

@@ -79,8 +79,8 @@ export default class LabView extends MeteorComponent {
       slf.labProgress = "0 / "+slf.tasks.length;
       slf.auth = {
         username: Meteor.user().profile.nickname,
-        password: res.sshInfo.pass,
-        domain: "10.100.1.11"
+        password: res.system.password,
+        domain: res.system.node_ip
       };
       slf.taskUpdates = res.taskUpdates;
 

collections/course_records.ts

@@ -55,6 +55,9 @@ if(Meteor.isServer) {
       data: {
         type: Object,
         optional: true
+      },
+      attempted: {
+        type: Number
       }
     });
     var labSchema = new SimpleSchema({
@@ -71,6 +74,9 @@ if(Meteor.isServer) {
         type: Object,
         optional: true
       },
+      attempted: {
+        type: Number
+      },
       tasks: {
         type: [taskSchema]
       }

collections/users.ts

@@ -75,6 +75,18 @@ if (Meteor.isServer){
         optional: true
       }
     })
+
+    var sessionSchema = new SimpleSchema({
+      labId:{
+        type: String
+      },
+      started:{
+        type: Number,
+	autoValue: function(){
+	  return Date.now();
+	}
+      }
+    });
 
     // Overall User Schema
     var userSchema = new SimpleSchema({
@@ -92,6 +104,9 @@ if (Meteor.isServer){
       announcements:{
         type: [announcementSchema],
         defaultValue: []
+      },
+      sessions:{
+        type: sessionSchema
       }
     });
     (<any> Meteor.users).attachSchema(userSchema);
@@ -182,4 +197,4 @@ if(Meteor.isServer) {
 }
 if(Meteor.isClient) {
     Meteor.subscribe('userRoles');
-}
+}

private/settings.env.json

@@ -6,8 +6,8 @@
   "swarm_node_port" : "4000",
   "etcd_node_ip" : "10.100.1.10",
   "etcd_node_port" : "2379",
-    "etcd_user" : "meteor",
-  "etcd_pass" : "fff86d549374f03f4ba82bfe170b5018",
+    "etcd_user" : "root",
+  "etcd_pass" : "d8a1975ae8a6c0377d95d84736e419bb",
     "default_image" : "alpine",
   "mongo_log_url" : "ds025792.mlab.com:25792/tuxlab",
   "mongo_log_collection" : "logs"

server/imports/api/env.os_families.js

@@ -0,0 +1,52 @@
+//secure keys are not defined, but may be implemented
+
+/** supported linux families for lab virtual machines
+ * although instructors can pass system objects like the ones below,
+ * no other os has been tested and may not function as expected
+ * if the os_family field is not provided, all systems default to alpine
+ */
+var os_families = {
+  //alpine defaults to the tuxlab_labvm image
+  alpine: {
+    username: "root",
+    password: "",
+    key: "",
+    os_family: "alpine",
+    image: "tuxlab_labvm",
+    ssh_port: 22
+  },
+
+  redhat: {
+    username: "",
+    password: "",
+    key: "",
+    os_family: "redhat",
+    image: ""
+  },
+
+  ubuntu: {
+    username: "",
+    password: "",
+    key: "",
+    os_family: "ubuntu",
+    image: "ubuntu"
+  },
+
+  debian: {
+    username: "",
+    password: "",
+    key: "",
+    os_family: "debian",
+    image: ""
+  },
+
+  arch: {
+    username: "",
+    password: "",
+    key: "",
+    os_family: "arch",
+    image: ""
+  }
+}
+
+module.exports = os_families;