From e9be5a3a2630996178ea76fc878e927c42ea6677 Mon Sep 17 00:00:00 2001
From: Leigh B Stoller <stoller@flux.utah.edu>
Date: Mon, 17 Sep 2018 07:06:28 -0600
Subject: [PATCH] The set of node type pruned from the list is now specific to
 the Portal and MAINSITE and if its the local cluster. Basically, try not to
 skip node types for some cases that they are wanted.

---
 www/aptui/instance_defs.php | 20 ++++++++++++++++----
 www/aptui/instantiate.php   |  4 ----
 www/aptui/js/reserve.js     |  4 +---
 www/aptui/js/resinfo.js     |  3 +--
 www/aptui/reserve.ajax      |  4 ++++
 www/aptui/reserve.php       |  4 ----
 www/aptui/resinfo.php       |  6 +-----
 7 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/www/aptui/instance_defs.php b/www/aptui/instance_defs.php
index 5a146d37a..30c502118 100644
--- a/www/aptui/instance_defs.php
+++ b/www/aptui/instance_defs.php
@@ -808,9 +808,14 @@ class Instance
     #
     # Return a list of types not to show user.
     #
-    function NodeTypePruneList() {
+    function NodeTypePruneList($aggregate = null) {
         global $ISEMULAB, $ISCLOUD, $ISAPT, $ISPNET, $ISPOWDER, $TBMAINSITE;
-        
+        global $DEFAULT_AGGREGATE_URN;
+        $aggregate_urn = ($aggregate ? $aggregate->urn() : "");
+
+        #
+        # We never want to show these.
+        #
         $skiptypes = array("dboxvm"    => true,
                            "d430k"     => true,
                            "d530"      => true,
@@ -819,8 +824,15 @@ class Instance
                            "pc2400hp"  => true,
                            "d2100"     => true,
                            "pc2400w"   => true);
-                   
-        if (($ISEMULAB || $ISCLOUD || $ISAPT) && $TBMAINSITE) {
+
+        #
+        # If showing nodes from another cluster, then we show them
+        # all (not sure how long this rule will last). Otherwise,
+        # only the Powder/Phantom portals get to see all these types.
+        #
+        if ($TBMAINSITE && 
+            !($ISPOWDER || $ISPNET) &&
+            $aggregate_urn == $DEFAULT_AGGREGATE_URN) {
             $skiptypes["sdr"]      = true;
             $skiptypes["nuc5300"]  = true;
             $skiptypes["enodeb"]   = true;
diff --git a/www/aptui/instantiate.php b/www/aptui/instantiate.php
index 6d5df9cb6..c44869448 100644
--- a/www/aptui/instantiate.php
+++ b/www/aptui/instantiate.php
@@ -378,10 +378,6 @@ function SPITFORM($formfields, $newuser, $errors)
     }
     SpitAggregateStatus(true);
 
-    echo "<script type='text/plain' id='skiptypes-json'>\n";
-    echo htmlentities(json_encode(Instance::NodeTypePruneList()));
-    echo "</script>\n";
-    
     SpitOopsModal("oops");
     echo "<script type='text/javascript'>\n";
     echo "    window.PROFILE    = '" . $formfields["profile"] . "';\n";
diff --git a/www/aptui/js/reserve.js b/www/aptui/js/reserve.js
index 54b73ba84..bf28013ec 100644
--- a/www/aptui/js/reserve.js
+++ b/www/aptui/js/reserve.js
@@ -14,7 +14,6 @@ $(function ()
     var fields       = null;
     var projlist     = null;
     var amlist       = null;
-    var skiptypes    = null;
     var isadmin      = false;
     var editing      = false;
     var buttonstate  = "check";
@@ -30,7 +29,6 @@ $(function ()
 	fields   = JSON.parse(_.unescape($('#form-json')[0].textContent));
 	projlist = JSON.parse(_.unescape($('#projects-json')[0].textContent));
 	amlist   = JSON.parse(_.unescape($('#amlist-json')[0].textContent));
-	skiptypes= JSON.parse(_.unescape($('#skiptypes-json')[0].textContent));
 
 	GeneratePageBody(fields);
 
@@ -392,7 +390,7 @@ $(function ()
 
 		ShowResGraph({"forecast"  : json.value.forecast,
 			      "selector"  : id,
-			      "skiptypes"      : skiptypes,
+			      "skiptypes"      : json.value.prunelist,
 			      "click_callback" : function(when, type) {
 				  if (!editing) {
 				      SetCluster(details.nickname, urn);
diff --git a/www/aptui/js/resinfo.js b/www/aptui/js/resinfo.js
index e3224c077..813e4ed82 100644
--- a/www/aptui/js/resinfo.js
+++ b/www/aptui/js/resinfo.js
@@ -12,7 +12,6 @@ $(function ()
     var totalsTemplate  = _.template(templates["resinfo-totals"]);
     var amlist          = null;
     var isadmin         = false;
-    var skiptypes       = null;
 
     function initialize()
     {
@@ -20,7 +19,6 @@ $(function ()
 
 	isadmin  = window.ISADMIN;
 	amlist   = JSON.parse(_.unescape($('#amlist-json')[0].textContent));
-	skiptypes= JSON.parse(_.unescape($('#skiptypes-json')[0].textContent));
 
 	GeneratePageBody();
 
@@ -114,6 +112,7 @@ $(function ()
 			.removeClass("hidden");
 		    return;
 		}
+		var skiptypes  = json.value.prunelist;
 		// Just POWDER
 		var radiotypes = {"nuc5300"   : true,
 				  "nuc6260"   : true,
diff --git a/www/aptui/reserve.ajax b/www/aptui/reserve.ajax
index 1ecb8dd20..644b6e9f2 100644
--- a/www/aptui/reserve.ajax
+++ b/www/aptui/reserve.ajax
@@ -803,6 +803,10 @@ function Do_ReservationInfo()
     # If requesting for a single cluster, return just that.
     if (isset($aggregate)) {
         $blob = $blob[$aggregate->urn()];
+        $blob["prunelist"] = Instance::NodeTypePruneList($aggregate);
+    }
+    else {
+        $blob["prunelist"] = Instance::NodeTypePruneList();
     }
     $webtask->Delete();
     SPITAJAX_RESPONSE($blob);
diff --git a/www/aptui/reserve.php b/www/aptui/reserve.php
index 69b6d00a4..6820ca880 100644
--- a/www/aptui/reserve.php
+++ b/www/aptui/reserve.php
@@ -127,10 +127,6 @@ echo "<script type='text/plain' id='amlist-json'>\n";
 echo htmlentities(json_encode($amlist));
 echo "</script>\n";
 
-echo "<script type='text/plain' id='skiptypes-json'>\n";
-echo htmlentities(json_encode(Instance::NodeTypePruneList()));
-echo "</script>\n";
-
 $defaults = array();
 $defaults["pid"]   = '';
 # Default project.
diff --git a/www/aptui/resinfo.php b/www/aptui/resinfo.php
index ae1d70ef8..2c57e8d13 100644
--- a/www/aptui/resinfo.php
+++ b/www/aptui/resinfo.php
@@ -1,6 +1,6 @@
 <?php
 #
-# Copyright (c) 2000-2017 University of Utah and the Flux Group.
+# Copyright (c) 2000-2018 University of Utah and the Flux Group.
 #
 # {{{EMULAB-LICENSE
 #
@@ -94,10 +94,6 @@ echo "<script type='text/javascript'>\n";
 echo "   window.ISADMIN  = $isadmin;\n";
 echo "</script>\n";
 
-echo "<script type='text/plain' id='skiptypes-json'>\n";
-echo htmlentities(json_encode(Instance::NodeTypePruneList()));
-echo "</script>\n";
-
 REQUIRE_UNDERSCORE();
 REQUIRE_SUP();
 REQUIRE_MOMENT();
-- 
GitLab