Update elabinelab defaults to more current values.

We were still trying to allocate boss/ops nodes with FBSD83 and
inner nodes of type pc600 or pc850.

tbsetup/ns2ir/elabinelab-opsvm.ns

 #
-# Copyright (c) 2004-2013 University of Utah and the Flux Group.
+# Copyright (c) 2004-2017 University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -36,7 +36,7 @@ if {[info exists ::TBCOMPAT::elabinelab_hardware("boss")]} {
         tb-set-hardware $myboss $elabinelab_hardware("boss")
     }
 } else {
-    tb-set-hardware $myboss pc850
+    tb-set-hardware $myboss d710
 }
 
 if {[info exists ::TBCOMPAT::elabinelab_fixnodes("boss")]} {
@@ -64,7 +64,7 @@ if {$myboss_tarfiles != ""} {
     tb-set-node-tarfiles $myboss $myboss_tarfiles
 }
 
-tb-make-soft-vtype pcslow {pc600 pc850}
+tb-make-soft-vtype pcslow {pc3000}
 
 #
 # This is passed in by the parser, when wrapping an existing experiment.

tbsetup/ns2ir/elabinelab-withfsnode.ns

 #
-# Copyright (c) 2004-2013 University of Utah and the Flux Group.
+# Copyright (c) 2004-2017 University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -38,21 +38,21 @@ if {[info exists ::TBCOMPAT::elabinelab_hardware("boss")]} {
         tb-set-hardware $myboss $elabinelab_hardware("boss")
     }
 } else {
-    tb-set-hardware $myboss pc850
+    tb-set-hardware $myboss d710
 }
 if {[info exists ::TBCOMPAT::elabinelab_hardware("ops")]} {
     namespace eval TBCOMPAT {
         tb-set-hardware $myops $elabinelab_hardware("ops")
     }
 } else {
-    tb-set-hardware $myops pc850
+    tb-set-hardware $myops d710
 }
 if {[info exists ::TBCOMPAT::elabinelab_hardware("fs")]} {
     namespace eval TBCOMPAT {
         tb-set-hardware $myfs $elabinelab_hardware("fs")
     }
 } else {
-    tb-set-hardware $myfs pc850
+    tb-set-hardware $myfs d710
 }
 
 if {[info exists ::TBCOMPAT::elabinelab_fixnodes("boss")]} {
@@ -116,7 +116,7 @@ if {$myfs_tarfiles != ""} {
     tb-set-node-tarfiles $myfs $myfs_tarfiles
 }
 
-tb-make-soft-vtype pcslow {pc600 pc850}
+tb-make-soft-vtype pcslow {pc3000}
 
 #
 # This is passed in by the parser, when wrapping an existing experiment.
@@ -177,7 +177,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("boss")]} {
 	tb-set-node-os $myboss $sitevariables(elabinelab/boss_osid)
     }
 } else {
-    tb-set-node-os $myboss FBSD83-STD
+    tb-set-node-os $myboss FBSD102-64-STD
 }
 
 if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
@@ -189,7 +189,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
 	tb-set-node-os $myops $sitevariables(elabinelab/ops_osid)
     }
 } else {
-    tb-set-node-os $myops FBSD83-STD
+    tb-set-node-os $myops FBSD102-64-STD
 }
 
 if {[info exists ::TBCOMPAT::elabinelab_nodeos("fs")]} {
@@ -201,5 +201,5 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("fs")]} {
 	tb-set-node-os $myfs $sitevariables(elabinelab/fs_osid)
     }
 } else {
-    tb-set-node-os $myfs FBSD83-STD
+    tb-set-node-os $myfs FBSD102-64-STD
 }

tbsetup/ns2ir/elabinelab-xen.ns

 #
-# Copyright (c) 2004-2014, 2016 University of Utah and the Flux Group.
+# Copyright (c) 2004-2017 University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -40,14 +40,14 @@ if {[info exists ::TBCOMPAT::elabinelab_hardware("boss")]} {
         tb-set-hardware $myboss $elabinelab_hardware("boss")
     }
 } else {
-    tb-set-hardware $myboss pcvm3000
+    tb-set-hardware $myboss d710-vm
 }
 if {[info exists ::TBCOMPAT::elabinelab_hardware("ops")]} {
     namespace eval TBCOMPAT {
         tb-set-hardware $myops $elabinelab_hardware("ops")
     }
 } else {
-    tb-set-hardware $myops pcvm3000
+    tb-set-hardware $myops d710-vm
 }
 
 if {[info exists ::TBCOMPAT::elabinelab_fixnodes("boss")]} {
@@ -93,7 +93,7 @@ if {$myops_tarfiles != ""} {
     tb-set-node-tarfiles $myops $myops_tarfiles
 }
 
-#tb-make-soft-vtype pcslow {pc600 pc850}
+#tb-make-soft-vtype pcslow {pc3000}
 
 #
 # This is passed in by the parser, when wrapping an existing experiment.
@@ -158,7 +158,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("boss")]} {
         tb-set-node-os $myboss $elabinelab_nodeos("boss") $xenos
     }
 } else {
-    tb-set-node-os $myboss XEN-GUEST-FBSD90-STD $xenos
+    tb-set-node-os $myboss FBSD102-64-STD $xenos
 }
 
 if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
@@ -166,7 +166,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
         tb-set-node-os $myops $elabinelab_nodeos("ops") $xenos
     }
 } else {
-    tb-set-node-os $myops XEN-GUEST-FBSD90-STD $xenos
+    tb-set-node-os $myops FBSD102-64-STD $xenos
 }
 
 #

tbsetup/ns2ir/elabinelab.ns

 #
-# Copyright (c) 2004-2016 University of Utah and the Flux Group.
+# Copyright (c) 2004-2016 , 2017University of Utah and the Flux Group.
 # 
 # {{{EMULAB-LICENSE
 # 
@@ -36,14 +36,14 @@ if {[info exists ::TBCOMPAT::elabinelab_hardware("boss")]} {
         tb-set-hardware $myboss $elabinelab_hardware("boss")
     }
 } else {
-    tb-set-hardware $myboss pc850
+    tb-set-hardware $myboss d710
 }
 if {[info exists ::TBCOMPAT::elabinelab_hardware("ops")]} {
     namespace eval TBCOMPAT {
         tb-set-hardware $myops $elabinelab_hardware("ops")
     }
 } else {
-    tb-set-hardware $myops pc850
+    tb-set-hardware $myops d710
 }
 
 if {[info exists ::TBCOMPAT::elabinelab_fixnodes("boss")]} {
@@ -89,7 +89,7 @@ if {$myops_tarfiles != ""} {
     tb-set-node-tarfiles $myops $myops_tarfiles
 }
 
-tb-make-soft-vtype pcslow {pc600 pc850}
+tb-make-soft-vtype pcslow {pc3000}
 
 #
 # This is passed in by the parser, when wrapping an existing experiment.
@@ -153,7 +153,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("boss")]} {
 	tb-set-node-os $myboss $sitevariables(elabinelab/boss_osid)
     }
 } else {
-    tb-set-node-os $myboss FBSD83-STD
+    tb-set-node-os $myboss FBSD102-64-STD
 }
 
 if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
@@ -165,7 +165,7 @@ if {[info exists ::TBCOMPAT::elabinelab_nodeos("ops")]} {
 	tb-set-node-os $myops $sitevariables(elabinelab/ops_osid)
     }
 } else {
-    tb-set-node-os $myops FBSD83-STD
+    tb-set-node-os $myops FBSD102-64-STD
 }
 
 #