Commit a35a38a7 authored by Jonathon Duerig's avatar Jonathon Duerig

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.
parent 35822ff7
......@@ -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);
......
......@@ -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
}
......@@ -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);
......
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment