Commit 383092cc authored by Jonathon Duerig's avatar Jonathon Duerig

Various bugfixes. Integrate with Exo SM.

parent 3cbe9381
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -523,7 +523,7 @@ IN THE WORK.
public function regetSlice():void
{
Alert.show(
"Do you really want to clear and reload this slice?",
"Do you want to clear the canvas and refetch manifests for this slice?",
"Reload slice?",
Alert.YES|Alert.NO,
this,
......
......@@ -114,7 +114,7 @@ package com.flack.geni.resources.sites
* @return Manager matching the ID
*
*/
public function getById(id:String):GeniManager
public function getById(id:String, log: Object = null):GeniManager
{
var idnUrn:IdnUrn = new IdnUrn(id);
for each(var gm:GeniManager in collection)
......
......@@ -101,6 +101,11 @@ package com.flack.geni.resources.virt
sliverType.name = EmulabXenSliverType.TYPE_EMULABXEN;
sliverType.diskImages = newPhysicalNode.sliverTypes.getByName(EmulabXenSliverType.TYPE_EMULABXEN).diskImages;
}
else if(!newPhysicalNode.exclusive && newPhysicalNode.sliverTypes.getByName('XOSmall') != null)
{
sliverType.name = 'XOSmall';
sliverType.diskImages = newPhysicalNode.sliverTypes.getByName('XOSmall').diskImages;
}
else if(newPhysicalNode.sliverTypes.length > 0)
{
sliverType.name = newPhysicalNode.sliverTypes.collection[0].name;
......
......@@ -263,12 +263,17 @@ package com.flack.geni.tasks.process
);
return;
}
var virtualNodeManager:GeniManager = GeniMain.geniUniverse.managers.getById(managerIdString);
var managerLookupId : String = sliverIdString;
if (managerLookupId == null || managerLookupId == '')
{
managerLookupId = managerIdString;
}
var virtualNodeManager:GeniManager = GeniMain.geniUniverse.managers.getById(managerLookupId);
if(virtualNodeManager == null)
{
afterError(
new TaskError(
"Manager with ID '"+managerIdString+"' was not found for node named " + clientIdString +
"Manager with ID '"+managerLookupId+"' was not found for node named " + clientIdString +
". You may need to refresh the manager if there is a refresh button next to its name on the left.",
TaskError.CODE_PROBLEM
)
......
......@@ -119,7 +119,8 @@ package com.flack.geni.tasks.xmlrpc.am
);
if (manager.api.equals(supportedApi))
continue;
if(supportedApi.version <= 3 && supportedApi.version > highestSuppportedVersion.version)
if(supportedApi.version <= 2
&& supportedApi.version > highestSuppportedVersion.version)
highestSuppportedVersion = supportedApi;
manager.apis.add(supportedApi);
}
......
......@@ -207,7 +207,7 @@ package com.flack.geni.tasks.xmlrpc.am
LogMessage.LEVEL_INFO,
LogMessage.IMPORTANCE_HIGH
);
parent.add(new DescribeTask(aggregateSliver));
super.afterComplete(addCompletedMessage);
}
else
......
......@@ -96,6 +96,10 @@ package com.flack.geni.tasks.xmlrpc.protogeni.ch
try
{
var url:String = obj.url;
var foamPattern : RegExp = /\Wfoam\W/;
if (foamPattern.test(url)) {
continue;
}
var hostPattern:RegExp = /^(http(s?):\/\/([^\/]+))(\/.*)?$/;
var match : Object = hostPattern.exec(url);
if(match != null && match[4] == null) {
......
......@@ -51,7 +51,7 @@ package com.flack.shared
/**
* Flack version
*/
public static const version:String = "v17.8";
public static const version:String = "v17.11";
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