Commit e28ed510 authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Bugfixes: Print disk images in rspecv2, use 'emulab-openvz' sliver_type

parent ad21d552
...@@ -1792,7 +1792,7 @@ sub print_node ...@@ -1792,7 +1792,7 @@ sub print_node
if (defined($mainType) && $genimode eq $V_0_2) { if (defined($mainType) && $genimode eq $V_0_2) {
print_osids($mainType); print_osids($mainType);
} }
print_node_types(@$types); print_node_types($mainType, @$types);
my $avail = "false"; my $avail = "false";
if ($nodetoavailable{$name} if ($nodetoavailable{$name}
|| $name eq $fake_inet_switch || $name eq $fake_inet_switch
...@@ -1833,7 +1833,7 @@ sub print_node ...@@ -1833,7 +1833,7 @@ sub print_node
# ptop format # ptop format
print "<node name=\"$name\""; print "<node name=\"$name\"";
print ">\n"; print ">\n";
print_node_types(@$types); print_node_types($mainType, @$types);
print_node_flags(@$flags); print_node_flags(@$flags);
print_node_features(@$features); print_node_features(@$features);
print "</node>\n"; print "</node>\n";
...@@ -1892,6 +1892,7 @@ sub print_type_limits ...@@ -1892,6 +1892,7 @@ sub print_type_limits
# print_node_flags() must always be observed lest we break the schema. # print_node_flags() must always be observed lest we break the schema.
sub print_node_types sub print_node_types
{ {
my $mainType = shift(@_);
my $i = 0; my $i = 0;
for (; $i < scalar(@_); ++$i) { for (; $i < scalar(@_); ++$i) {
my ($name, $count) = split(/:/, $_[$i], 2); my ($name, $count) = split(/:/, $_[$i], 2);
...@@ -1914,10 +1915,14 @@ sub print_node_types ...@@ -1914,10 +1915,14 @@ sub print_node_types
print " />\n"; print " />\n";
} elsif ($genimode eq $V_2) { } elsif ($genimode eq $V_2) {
if ($name eq "pc") { if ($name eq "pc") {
print " <sliver_type name=\"raw-pc\" />\n"; print " <sliver_type name=\"raw-pc\">\n";
if (defined($mainType)) {
print_osids($mainType);
}
print " </sliver_type>\n";
} }
if ($name eq "pcvm") { if ($name eq "pcvm") {
print " <sliver_type name=\"openvz\" />\n"; print " <sliver_type name=\"emulab-openvz\" />\n";
} }
print " <hardware_type name=\"$name\">\n"; print " <hardware_type name=\"$name\">\n";
if ($count eq "*") { if ($count eq "*") {
......
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