Commit 6109280f authored by Matt Strum's avatar Matt Strum

Merge branch 'flack3'

parents ab399ca7 e7082812
......@@ -33,7 +33,7 @@ package com.flack.geni.tasks.process
import com.flack.geni.RspecUtil;
import com.flack.geni.plugins.emulab.EmulabBbgSliverType;
import com.flack.geni.plugins.emulab.EmulabOpenVzSliverType;
import com.flack.geni.plugins.emulab.EmulabXenSliverType;
import com.flack.geni.plugins.emulab.EmulabXenSliverType;
import com.flack.geni.plugins.emulab.RawPcSliverType;
import com.flack.geni.plugins.shadownet.JuniperRouterSliverType;
import com.flack.geni.resources.DiskImage;
......@@ -70,6 +70,7 @@ package com.flack.geni.tasks.process
import com.flack.geni.resources.virt.extensions.stitching.SwitchingCapabilityDescriptor;
import com.flack.geni.resources.virt.extensions.stitching.SwitchingCapabilitySpecificInfoL2sc;
import com.flack.geni.resources.virt.extensions.stitching.SwitchingCapabilitySpecificInfoLsc;
import com.flack.geni.resources.virt.VirtualInterface;
import com.flack.shared.FlackEvent;
import com.flack.shared.SharedMain;
import com.flack.shared.logging.LogMessage;
......@@ -476,6 +477,7 @@ package com.flack.geni.tasks.process
var virtualInterface:VirtualInterface = virtualNode.interfaces.getByClientId(virtualInterfaceClientId);
/*
if(rspec.type == Rspec.TYPE_MANIFEST
&& virtualNode.manager == aggregateSliver.manager
&& virtualInterfaceSliverId.length == 0)
......@@ -490,6 +492,7 @@ package com.flack.geni.tasks.process
);
continue;
}
*/
if(virtualInterface == null)
{
......@@ -557,11 +560,22 @@ package com.flack.geni.tasks.process
}
// Bind interfaces that need it.
for each(var interfaceToTest:VirtualInterface in virtualNode.interfaces.collection)
{
if(interfaceToTest.physicalId.full.length == 0 && virtualNode.Bound)
if(rspec.type != Rspec.TYPE_MANIFEST) {
for each(var interfaceToTest:VirtualInterface in virtualNode.interfaces.collection)
{
interfaceToTest.physicalId.full = virtualNode.allocateExperimentalInterface().physicalId.full;
if(interfaceToTest.physicalId.full.length == 0 && virtualNode.Bound)
{
var interfaceToAdd:VirtualInterface = virtualNode.allocateExperimentalInterface();
if (interfaceToAdd != null) {
interfaceToTest.physicalId.full = interfaceToAdd.physicalId.full;
} else {
addMessage(
"Experimental interface not available.",
"Experimental interface not available for " + interfaceToTest.clientId + ".",
LogMessage.LEVEL_WARNING
);
}
}
}
}
......
File mode changed from 100755 to 100644
......@@ -93,7 +93,9 @@ package com.flack.geni.tasks.xmlrpc.am
try
{
manager.id.full = data.urn;
if (data.urn != null) {
manager.id.full = data.urn;
}
var apiDetail:ApiDetails = new ApiDetails(manager.api.type, Number(data.geni_api), manager.api.url, manager.api.level);
manager.api = apiDetail;
......
......@@ -108,7 +108,11 @@ package com.flack.geni.tasks.xmlrpc.protogeni.ch
if(newId.name.toLowerCase() == "cm")
{
newManager.type = GeniManager.TYPE_PROTOGENI;
newManager.api.type = ApiDetails.API_PROTOGENI;
if(url.indexOf("/am") != -1) {
newManager.api.type = ApiDetails.API_GENIAM;
} else {
newManager.api.type = ApiDetails.API_PROTOGENI;
}
newManager.url = url.substr(0, url.length-3);
newManager.supportedLinkTypes.getOrCreateByName(LinkType.GRETUNNEL_V2);
......@@ -159,7 +163,7 @@ package com.flack.geni.tasks.xmlrpc.protogeni.ch
newManager.supportedSliverTypes.getOrCreateByName(EmulabBbgSliverType.TYPE_EMULAB_BBG);
}
}
else if(newId.name == ProtogeniXmlrpcTask.MODULE_SA)
else if(newId.name.toLowerCase() == ProtogeniXmlrpcTask.MODULE_SA)
{
newManager.type = GeniManager.TYPE_SFA;
newManager.api.type = ApiDetails.API_GENIAM;
......
......@@ -51,7 +51,7 @@ package com.flack.shared
/**
* Flack version
*/
public static const version:String = "v17.3";
public static const version:String = "v17.8";
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