All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 47f21843 authored by Leigh B Stoller's avatar Leigh B Stoller

Minor additions.

parent b9aec4fd
......@@ -60,6 +60,7 @@ use Scalar::Util qw(looks_like_number);
use vars qw($RSPEC_0_1 $RSPEC_0_2 $RSPEC_2 $RSPEC_3
$RSPEC_0_1_NS $RSPEC_0_2_NS $RSPEC_2_NS
$EMULAB_NS $JACKS_NS $XSI_NS $STITCH_NS $SHAREDVLAN_NS $SITEINFO_NS
$RSPEC_TOUR
$REQUEST_2_URL $MANIFEST_2_URL
$REQUEST_3_URL $MANIFEST_3_URL
$PROFILE_PARAMETERS_NS);
......@@ -80,6 +81,7 @@ our $STITCH_NS = "http://hpn.east.isi.edu/rspec/ext/stitch/0.1/";
our $SHAREDVLAN_NS = "http://www.geni.net/resources/rspec/ext/shared-vlan/1";
our $SHAREDVLAN_PG_NS = "http://www.protogeni.net/resources/rspec/ext/shared-vlan/1";
our $PROFILE_PARAMETERS_NS = "http://www.protogeni.net/resources/rspec/ext/profile-parameters/1";
our $RSPEC_TOUR = "http://www.protogeni.net/resources/rspec/ext/apt-tour/1";
$REQUEST_2_URL = "http://www.protogeni.net/resources/rspec/2/request.xsd";
$MANIFEST_2_URL = "http://www.protogeni.net/resources/rspec/2/manifest.xsd";
......@@ -358,6 +360,11 @@ sub TunnelType($)
return $result;
}
sub LinkType($)
{
return TunnelType($_[0]);
}
sub GetExpires($)
{
my ($node) = @_;
......@@ -1113,6 +1120,16 @@ sub TrivialOkay($)
return $result;
}
sub RoutableControlIP($)
{
my ($node) = @_;
my @routable_control_ip =
GeniXML::FindNodesNS("n:routable_control_ip", $node,
$GeniXML::EMULAB_NS)->get_nodelist();
return scalar(@routable_control_ip);
}
sub GetAddressPools($)
{
my ($rspec) = @_;
......
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