From a35a38a71e33e7019aafa9ededba5ae7e5cf0f3f Mon Sep 17 00:00:00 2001
From: Jonathon Duerig <duerig@flux.utah.edu>
Date: Wed, 22 Jan 2014 16:57:09 -0700
Subject: [PATCH] Flack 17.20 -- Shorten default client_ids. Fix
 green-before-ready in Flack.

Shorter default client_ids will reduce the odds of us running into hostname limitations. Green should now not show until things are actually done according to sliver status.
---
 .../geni/display/slicer/ManagerVirtualArea.mxml | 17 +++++++++++++++--
 .../src/com/flack/geni/plugins/gemini/Gemini.as |  4 ++--
 .../flack/geni/tasks/xmlrpc/am/StatusTask.as    |  2 +-
 .../flack/src/com/flack/shared/SharedMain.as    |  2 +-
 4 files changed, 19 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 protogeni/flack/src/com/flack/geni/plugins/gemini/Gemini.as

diff --git a/protogeni/flack/src/com/flack/geni/display/slicer/ManagerVirtualArea.mxml b/protogeni/flack/src/com/flack/geni/display/slicer/ManagerVirtualArea.mxml
index 5e9e3d725..220b6643c 100755
--- a/protogeni/flack/src/com/flack/geni/display/slicer/ManagerVirtualArea.mxml
+++ b/protogeni/flack/src/com/flack/geni/display/slicer/ManagerVirtualArea.mxml
@@ -182,7 +182,14 @@ IN THE WORK.
 						sliverTypeButton.setStyle("chromeColor", ColorUtil.colorsDark[manager.colorIdx]);
 						sliverTypeButton.setStyle("color", ColorUtil.colorsLight[manager.colorIdx]);
 						sliverTypeButton.alpha = 0.8;
-						sliverTypeButton.data = new VirtualNode(null, manager, sliverTypeName, true, sliverTypeName);
+						var name:String = sliverTypeName;
+						if (name == "emulab-xen") {
+						  name = "xen";
+						} else if (name == "emulab-openvz") {
+						  name = "ovz";
+						}
+						name = "node"
+						sliverTypeButton.data = new VirtualNode(null, manager, name, true, sliverTypeName);
 						sliverTypeButton.addEventListener(MouseEvent.CLICK, addVirtualNode);
 						basicGroup.addElementAt(sliverTypeButton, 1);
 					}
@@ -218,10 +225,16 @@ IN THE WORK.
 						addExtraButton.setStyle("chromeColor", ColorUtil.colorsDark[manager.colorIdx]);
 						addExtraButton.setStyle("color", ColorUtil.colorsLight[manager.colorIdx]);
 						addExtraButton.alpha = 0.8;
+						var name:String = supportedType.type.name;
+						if (name == "emulab-xen") {
+						  name = "xen";
+						} else if (name == "emulab-openvz") {
+						  name = "ovz";
+						}
 						addExtraButton.data = new VirtualNode(
 							null,
 							manager,
-							supportedType.type.name,
+							name,
 							supportedType.defaultExclusiveSetting,
 							supportedType.type.name);
 						addExtraButton.addEventListener(MouseEvent.CLICK, addVirtualNode);
diff --git a/protogeni/flack/src/com/flack/geni/plugins/gemini/Gemini.as b/protogeni/flack/src/com/flack/geni/plugins/gemini/Gemini.as
old mode 100644
new mode 100755
index b024aa637..bc3a15c6a
--- a/protogeni/flack/src/com/flack/geni/plugins/gemini/Gemini.as
+++ b/protogeni/flack/src/com/flack/geni/plugins/gemini/Gemini.as
@@ -124,7 +124,7 @@ package com.flack.geni.plugins.gemini
 			var globalNode:VirtualNode = new VirtualNode(
 				slice,
 				manager,
-				manager.makeValidClientIdFor(slice.getUniqueId(null, ("GN" + manager.hrn).replace(/\./g, "").substr(0, 16))),
+				manager.makeValidClientIdFor(slice.getUniqueId(null, "GN")),
 				false,
 				"emulab-openvz");
 			globalNode.emulabRoutableControlIp = true;
@@ -251,4 +251,4 @@ package com.flack.geni.plugins.gemini
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/StatusTask.as b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/StatusTask.as
index 4641acb9f..c648c6533 100755
--- a/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/StatusTask.as
+++ b/protogeni/flack/src/com/flack/geni/tasks/xmlrpc/am/StatusTask.as
@@ -107,7 +107,7 @@ package com.flack.geni.tasks.xmlrpc.am
 	    aggregateSliver.AllocationState = Sliver.ALLOCATION_PROVISIONED;
 	    var globalStatus:String = data.geni_status;
 					
-	    if (data.pg_status && data.geni_status == 'unknown' && data.pg_status == 'changing') {
+	    if (data.pg_status && data.geni_status == 'unknown' && (data.pg_status == 'changing' || data.pg_status == 'mixed')) {
 	      globalStatus = 'configuring';
 	    }
 	    aggregateSliver.OperationalState = Sliver.GeniStatusToOperationalState(globalStatus);
diff --git a/protogeni/flack/src/com/flack/shared/SharedMain.as b/protogeni/flack/src/com/flack/shared/SharedMain.as
index 6126719a3..112831b0c 100755
--- a/protogeni/flack/src/com/flack/shared/SharedMain.as
+++ b/protogeni/flack/src/com/flack/shared/SharedMain.as
@@ -52,7 +52,7 @@ package com.flack.shared
 		/**
 		 * Flack version
 		 */
-		public static const version:String = "v17.19";
+		public static const version:String = "v17.20";
 		
 		public static const MODE_GENI:int = 0;
 		public static const MODE_EMULAB:int = 1;
-- 
GitLab