Commit 42d37422 authored by Jonathon Duerig's avatar Jonathon Duerig
Browse files

Added a bogus "(null)" interface to all switches to mollify assign. Still need...

Added a bogus "(null)" interface to all switches to mollify assign. Still need to really solve this problem in a backwards compatible way.
parent b076eb32
...@@ -30,7 +30,7 @@ sub usage() ...@@ -30,7 +30,7 @@ sub usage()
" in the ptopfile (as if they were free)\n" . " in the ptopfile (as if they were free)\n" .
" -v Include stuff for topologies with virtual nodes\n". " -v Include stuff for topologies with virtual nodes\n".
" -r Include stuff for topologies with widearea nodes\n". " -r Include stuff for topologies with widearea nodes\n".
" -s Include stuff for topologies with simulated nodes\n". # " -s Include stuff for topologies with simulated nodes\n".
" -h Include stuff for topologies with shared nodes\n". " -h Include stuff for topologies with shared nodes\n".
" -a Include even reserved nodes\n". " -a Include even reserved nodes\n".
" -m Override multiplex_factor\n". " -m Override multiplex_factor\n".
...@@ -1348,7 +1348,12 @@ sub print_switch ...@@ -1348,7 +1348,12 @@ sub print_switch
{ {
my $name = shift(@_); my $name = shift(@_);
my $uuid = shift(@_); my $uuid = shift(@_);
print_node($name, ["switch:1", "*lan:*"], [], [], $uuid, []); my $interfaces = [];
if ($do_xml && $genimode)
{
push @$interfaces, "(null)";
}
print_node($name, ["switch:1", "*lan:*"], [], [], $uuid, $interfaces);
} }
sub print_node sub print_node
......
Supports Markdown
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