Commit 5a657846 authored by Gary Wong's avatar Gary Wong

Merge branch 'flack2' of git-public.flux.utah.edu:/flux/git/users/mstrum/emulab-devel

parents 8b60a24d 00c66f4a
......@@ -3,15 +3,18 @@ Unless otherwise stated, all files are GENIPUBLIC-COPYRIGHT
=====================
Third party binaries:
ESRI
ESRI (currently enabled)
* libs/agslib*
* See: http://resources.arcgis.com/en/communities/flex-api/
Google Maps
* Terms of use: http://www.esri.com/legal/licensing/software-license.html
Google Maps (disabled)
* libs/map_flex_*
* See: http://code.google.com/apis/maps/documentation/flash/
MapQuest
* Terms of service: https://developers.google.com/maps/terms
MapQuest (disabled)
* libs/MQFlashMapsAPI*
* See: http://developer.mapquest.com/web/products/featured/as3-flex-flash
* Terms of use: http://developer.mapquest.com/web/info/terms-of-use
===================
Third party images:
......@@ -26,18 +29,21 @@ FatCow free icons
Third-party source:
Apache License, Version 2.0
---------------------------
Google TooltipOverlay example
http://www.apache.org/licenses/LICENSE-2.0.html
-----------------------------------------------
Google TooltipOverlay example (not used anymore, but source included)
* src/com/flack/geni/display/mapping/mapproviders/googlemapsprovider/GoogleTooltipOverlay.as
* Obtained as part of the Google Maps API for Flash examples
Mozilla Public License, Version 1.1
http://www.mozilla.org/MPL/1.1/
-----------------------------------
Collapsible panel
Collapsible panel (not used in GENI version, and Emulab version not deployed yet)
* src/com/flack/shared/display/components/CollapsiblePanel.as
* See: http://www.iwobanas.com/2009/09/creating-collapsible-panel-in-flex-4/
GNU Library or Lesser General Public License (LGPL)
http://www.gnu.org/licenses/lgpl.html
---------------------------------------------------
* XML-RPC by Matt Shaw and Daniel Mclaren
- src/com/mattism/http/xmlrpc/*
......@@ -50,26 +56,26 @@ Attribution
- See: http://www.kelvinluck.com/2009/08/google-maps-for-flash-marker-clustering/
* Resizable window by Kevin Lin
- src/com/flack/shared/display/components/ResizableTitleWindow.as
- See: http://www.kelvinluck.com/2009/08/google-maps-for-flash-marker-clustering/
- See: http://flexponential.com/2010/01/10/resizable-titlewindow-in-flex-4/
* Spinner by Jeremy Mitchell
- src/com/flack/shared/display/components/Spinner.as
- See: Jeremy Mitchell
- See: http://blog.flexdevelopers.com/2011/03/using-flex-4-skins-states-to-disable.html
BSD License or the GNU General Public License (GPL) Version 2
-------------------------------------------------------------
New BSD License or the GNU General Public License (GPL) Version 2
-----------------------------------------------------------------
Forge TLS JavaScript library
- js/forge/*
- See: https://github.com/digitalbazaar/forge
- License available in LICENSE_FORGE in this same directory
BSD License
-----------
- src/com/hurlant/*
* See: http://code.google.com/p/as3crypto/
- License available in LICENSE_AS3CRYPTO in this same directory
Adobe Systems Incorporated
--------------------------
- src/com/flack/shared/utils/DateUtil.as
* See: http://code.google.com/p/as3corelib/source/browse/trunk/src/com/adobe/utils/DateUtil.as
- src/com/flack/shared/display/skins/*
Henri Torgemane
---------------
- src/com/hurlant/*
* See: http://code.google.com/p/as3crypto/
- License available in LICENSE_AS3CRYPTO in this same directory
\ No newline at end of file
- src/com/flack/shared/display/skins/*
\ No newline at end of file
......@@ -576,7 +576,6 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
getUrlWindow.title = "Please enter the full URL for the RSPEC";
getUrlWindow.Text = "http://";
getUrlWindow.showWindow(true);
getUrlWindow.onCancel = null;
getUrlWindow.onSuccess = tryImportFromWeb;
}
......@@ -996,6 +995,7 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
verticalAlign="middle"
fontSize="16"
fontWeight="bold"
maxDisplayedLines="1"
paddingLeft="4" paddingTop="4" />
<components:Spinner id="spinner"
width="21"
......@@ -1036,6 +1036,11 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
<s:HGroup width="100%"
verticalAlign="middle"
gap="2">
<s:Button id="gotoAddResourcesButton"
toolTip="Open the pane to add resources to the canvas."
label="Add Resources"
click="dashboardViewstack.selectedChild = resourcesView" />
<s:Spacer width="100%" />
<s:Button id="refreshStatusButton"
toolTip="Refresh the status on all slivers"
label="Get Status"
......
......@@ -29,6 +29,7 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
<fx:Declarations>
<s:RadioButtonGroup id="boundGroup"
valueCommit="boundGroup_valueCommitHandler(event)"/>
<s:RadioButtonGroup id="diskSourceGroup" change="okButton.enabled = true" />
</fx:Declarations>
<fx:Script>
<![CDATA[
......@@ -50,6 +51,7 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
import com.flack.geni.resources.sites.GeniManager;
import com.flack.geni.resources.sites.SupportedSliverType;
import com.flack.geni.resources.sites.SupportedSliverTypeCollection;
import com.flack.geni.resources.sites.managers.ProtogeniComponentManager;
import com.flack.geni.resources.virtual.ExecuteService;
import com.flack.geni.resources.virtual.InstallService;
import com.flack.geni.resources.virtual.VirtualComponent;
......@@ -59,11 +61,14 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
import com.flack.geni.resources.virtual.VirtualLinkCollection;
import com.flack.geni.resources.virtual.VirtualNode;
import com.flack.geni.resources.virtual.VirtualNodeCollection;
import com.flack.geni.tasks.xmlrpc.protogeni.cm.CreateImageCmTask;
import com.flack.shared.FlackEvent;
import com.flack.shared.SharedMain;
import com.flack.shared.display.areas.DocumentArea;
import com.flack.shared.display.components.DataButton;
import com.flack.shared.display.components.TextInputWindow;
import com.flack.shared.resources.sites.FlackManager;
import com.flack.shared.tasks.Tasker;
import com.flack.shared.utils.ColorUtil;
import com.flack.shared.utils.ImageUtil;
import com.flack.shared.utils.NetUtil;
......@@ -75,6 +80,7 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
import spark.collections.Sort;
import spark.collections.SortField;
import spark.components.Button;
import spark.events.TextOperationEvent;
import spark.primitives.Rect;
[Bindable]
......@@ -199,9 +205,25 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
exclusiveCheckbox.selected = node.exclusive;
if(node.sliverType.selectedImage != null)
diskImageText.text = node.sliverType.selectedImage.id.full;
{
if(node.sliverType.selectedImage.url.length > 0)
{
diskImageUrlCheckbox.selected = true;
diskImageText.text = node.sliverType.selectedImage.url;
}
else
{
diskImageNameCheckbox.selected = true;
diskImageText.text = node.sliverType.selectedImage.id.full;
}
}
else
{
diskImageText.text = "";
}
if(node.manager.type == FlackManager.TYPE_PROTOGENI && node.Created)
createImageButton.visible = true;
installVgroup.removeAllElements();
if(node.services.installServices != null && node.services.installServices.length > 0)
......@@ -638,7 +660,12 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
node.sliverType.name = SelectedSliverType.name;
if(diskImageText.visible && diskImageText.text.length > 0)
node.sliverType.selectedImage = new DiskImage(diskImageText.text);
{
if(diskImageUrlCheckbox.selected)
node.sliverType.selectedImage = new DiskImage("", "", "", "", false, diskImageText.text);
else
node.sliverType.selectedImage = new DiskImage(diskImageText.text);
}
var serviceIdx:int;
if(selectedType.supportsInstallService)
{
......@@ -714,6 +741,31 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
openNext(linkContent);
}
protected function createImageButton_clickHandler(event:MouseEvent):void
{
var promptForImageNameWindow:TextInputWindow = new TextInputWindow();
promptForImageNameWindow.onSuccess = userChoseImageName;
promptForImageNameWindow.title = "Please enter a name for the disk image.";
promptForImageNameWindow.showWindow();
promptForImageNameWindow.valueTextinput.restrict = "a-zA-Z0-9";
}
public function userChoseImageName(newName:String):void
{
var createImageTask:CreateImageCmTask = new CreateImageCmTask(node, newName);
createImageTask.forceRunNow = true;
SharedMain.tasker.add(createImageTask);
}
protected function diskImageText_changeHandler(event:Event):void
{
if(!okButton.enabled)
{
okButton.enabled = node.sliverType.selectedImage == null
|| diskImageText.text != node.sliverType.selectedImage.id.full;
}
}
]]>
</fx:Script>
......@@ -887,11 +939,31 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
prompt="Select image to override default"
dataProvider="{diskImages}"
labelField="description"
change="diskImageText.text = diskImageSelect.selectedItem.id.full" />
change="diskImageText.text = diskImageSelect.selectedItem.id.full; diskImageNameCheckbox.selected = true;" />
<s:Rect />
<s:Button id="createImageButton"
visible="false"
includeInLayout="{createImageButton.visible}"
label="Create image"
click="createImageButton_clickHandler(event)" />
</s:HGroup>
<s:HGroup width="100%"
gap="2">
<s:RadioButton id="diskImageNameCheckbox"
group="{diskSourceGroup}"
selected="true"
label="Name"
toolTip="Name for images available on this manager." />
<s:RadioButton id="diskImageUrlCheckbox"
group="{diskSourceGroup}"
label="URL"
toolTip="URL for images from a different manager." />
<s:TextInput id="diskImageText"
width="100%"
prompt="Select image above, paste URN, or manually type OSID"
change="diskImageText_changeHandler(event)"
valueCommit="diskImageText_changeHandler(event)" />
</s:HGroup>
<s:TextInput id="diskImageText" width="100%"
prompt="Select image above, paste URN, or manually type OSID"
valueCommit="if(!okButton.enabled) okButton.enabled = node.sliverType.selectedImage == null || diskImageText.text != node.sliverType.selectedImage.id.full" />
</s:VGroup>
<s:HGroup width="100%"
height="100%"
......
......@@ -185,7 +185,12 @@ FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
addExtraButton.setStyle("chromeColor", ColorUtil.colorsDark[manager.colorIdx]);
addExtraButton.setStyle("color", ColorUtil.colorsLight[manager.colorIdx]);
addExtraButton.alpha = 0.8;
addExtraButton.data = new VirtualNode(null, manager, supportedType.type.name, true, supportedType.type.name);
addExtraButton.data = new VirtualNode(
null,
manager,
supportedType.type.name,
supportedType.defaultExclusiveSetting,
supportedType.type.name);
addExtraButton.addEventListener(MouseEvent.CLICK, addVirtualNode);
extraGroup.addElement(addExtraButton);
}
......
......@@ -97,10 +97,15 @@ VirtualNode for use on the slice canvas
}
else
hostnameLabel.visible = hostnameLabel.includeInLayout = false;
if(node.sliverType.selectedImage != null && node.sliverType.selectedImage.id.full.length > 0)
if(node.sliverType.selectedImage != null)
{
osidLabel.text = node.sliverType.selectedImage.Osid;
osidLabel.visible = osidLabel.includeInLayout = true;
if(node.sliverType.selectedImage.id.full.length > 0)
osidLabel.text = node.sliverType.selectedImage.Osid;
else if(node.sliverType.selectedImage.url.length > 0)
osidLabel.text = StringUtil.shortenString(node.sliverType.selectedImage.url, 20);
else
osidLabel.text = "";
osidLabel.visible = osidLabel.includeInLayout = osidLabel.text.length > 0;
}
else
osidLabel.visible = osidLabel.includeInLayout = false;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools
{
import com.flack.geni.plugins.Plugin;
......
<?xml version="1.0" encoding="utf-8"?>
<!--
GENIPUBLIC-COPYRIGHT
Copyright (c) 2008-2012 University of Utah and the Flux Group,
University of Kentucky and the Laboratory for Advanced Networking.
All rights reserved.
Permission to use, copy, modify and distribute this software is hereby
granted provided that (1) source code retains these copyright, permission,
and disclaimer notices, and (2) redistributions including binaries
reproduce the notices in supporting documentation.
THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
-->
<plugins:PluginArea xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark"
xmlns:mx="library://ns.adobe.com/flex/mx"
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools
{
import com.adobe.crypto.SHA1;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.GeniMain;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.plugins.instools.Instools;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.GeniMain;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.plugins.instools.Instools;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.plugins.instools.Instools;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.plugins.instools.SliceInstoolsDetails;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.adobe.crypto.SHA1;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.plugins.instools.Instools;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.plugins.instools.SliceInstoolsDetails;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.plugins.instools.Instools;
......
/* GENIPUBLIC-COPYRIGHT
* Copyright (c) 2008-2012 University of Utah and the Flux Group,
* University of Kentucky and the Laboratory for Advanced Networking.
* All rights reserved.
*
* Permission to use, copy, modify and distribute this software is hereby
* granted provided that (1) source code retains these copyright, permission,
* and disclaimer notices, and (2) redistributions including binaries
* reproduce the notices in supporting documentation.
*
* THE UNIVERSITY OF UTAH ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. THE UNIVERSITY OF UTAH DISCLAIMS ANY LIABILITY OF ANY KIND
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
*/
package com.flack.geni.plugins.instools.instasks
{
import com.flack.geni.plugins.instools.SliceInstoolsDetails;
......
......@@ -16,7 +16,7 @@ package com.flack.geni.plugins.planetlab
{
public class M1TinySliverType extends OpenStackSliverType
{
static public const TYPE_M1TINY:String = "m1.tinly";
static public const TYPE_M1TINY:String = "m1.tiny";
public function M1TinySliverType()
{
......
......@@ -38,7 +38,8 @@ package com.flack.geni.resources
newOs:String = "",
newVersion:String = "",
newDescription:String = "",
newIsDefault:Boolean = false)
newIsDefault:Boolean = false,
newUrl:String = "")
{
super(newId);
if(id.full.length > 0 && IdnUrn.isIdnUrn(newId))
......@@ -47,11 +48,13 @@ package com.flack.geni.resources
version = newVersion;
description = newDescription;
isDefault = newIsDefault;
url = newUrl;
}
public var os:String;
public var version:String;
public var description:String;
public var url:String;
public var isDefault:Boolean;
public var extensions:Extensions = new Extensions();
......
......@@ -140,7 +140,7 @@ package com.flack.geni.resources.physical
var group:PhysicalNodeCollection = new PhysicalNodeCollection();
for each (var n:PhysicalNode in collection)
{
if((slicable && n.sliverTypes.length > 1) ||
if((slicable && n.sliverTypes.length > 0) ||
(!slicable && n.sliverTypes.length == 0))
{
group.add(n);
......
......@@ -21,13 +21,13 @@ package com.flack.geni.resources.sites
import com.flack.geni.plugins.emulab.FirewallSliverType;
import com.flack.geni.plugins.emulab.Netfpga2SliverType;
import com.flack.geni.plugins.emulab.RawPcSliverType;
import com.flack.geni.plugins.planetlab.PlanetlabSliverType;
import com.flack.geni.plugins.planetlab.M1TinySliverType;
import com.flack.geni.plugins.planetlab.M1SmallSliverType;
import com.flack.geni.plugins.planetlab.M1MediumSliverType;
import com.flack.geni.plugins.planetlab.M1LargeSliverType;
import com.flack.geni.plugins.planetlab.M1XLargeSliverType;
import com.flack.geni.plugins.planetlab.M1MediumSliverType;
import com.flack.geni.plugins.planetlab.M1SmallSliverType;
import com.flack.geni.plugins.planetlab.M1TinySliverType;
import com.flack.geni.plugins.planetlab.M1WorkerSliverType;
import com.flack.geni.plugins.planetlab.M1XLargeSliverType;
import com.flack.geni.plugins.planetlab.PlanetlabSliverType;
import com.flack.geni.plugins.shadownet.JuniperRouterSliverType;
import com.flack.geni.resources.SliverType;
import com.flack.geni.resources.SliverTypes;
......@@ -39,6 +39,7 @@ package com.flack.geni.resources.sites
public var type:SliverType;
public var supportsExclusive:Boolean = true;
public var supportsShared:Boolean = true;
public var defaultExclusiveSetting:Boolean = true;
public var supportsBound:Boolean = true;
public var supportsUnbound:Boolean = true;
public var supportsInterfaces:Boolean = true;
......@@ -62,6 +63,7 @@ package com.flack.geni.resources.sites
case M1XLargeSliverType.TYPE_M1XLARGE:
case M1WorkerSliverType.TYPE_M1WORKER:
supportsExclusive = false;
defaultExclusiveSetting = false;
interfacesUnadvertised = true;
supportsInstallService = false;
supportsExecuteService = false;
......@@ -70,6 +72,7 @@ package com.flack.geni.resources.sites
case PlanetlabSliverType.TYPE_PLANETLAB_V2:
case JuniperRouterSliverType.TYPE_JUNIPER_LROUTER:
supportsExclusive = false;
defaultExclusiveSetting = false;
supportsUnbound = false;
interfacesUnadvertised = true;
supportsDiskImage = false;
......@@ -117,10 +120,10 @@ package com.flack.geni.resources.sites
supportsInstallService = false;
supportsExecuteService = false;
break;
case EmulabOpenVzSliverType.TYPE_EMULABOPENVZ:
case SliverTypes.XEN_VM:
case SliverTypes.QEMUPC:
supportsDiskImage = false;
case EmulabOpenVzSliverType.TYPE_EMULABOPENVZ:
default:
}
}
......
......@@ -405,11 +405,15 @@ package com.flack.geni.tasks.process
if(version.version < 2)
{
if(node.sliverType.selectedImage != null && node.sliverType.selectedImage.id.full.length > 0
if(node.sliverType.selectedImage != null
&& (node.sliverType.selectedImage.id.full.length > 0 || node.sliverType.selectedImage.url.length > 0)
&& version.version > 0.1)
{
var diskImageXml:XML = node.sliverType.selectedImage.extensions.createAndApply("disk_image");
diskImageXml.@name = node.sliverType.selectedImage.id.full;
if(node.sliverType.selectedImage.id.full.length > 0)