Commit 59269e46 authored by Leigh B Stoller's avatar Leigh B Stoller

A card/port fix wrt card/port no longer in the interfaces table.

parent fce94bee
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2003-2017 University of Utah and the Flux Group. # Copyright (c) 2003-2018 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -207,15 +207,11 @@ if (defined($wire)) { ...@@ -207,15 +207,11 @@ if (defined($wire)) {
fatal("Wire using interface two already exists: $wire\n"); fatal("Wire using interface two already exists: $wire\n");
} }
# Another check using card/port info, just to be sure. # Another check using card/port info, just to be sure.
$wire = Interface::Wire->LookupAny($node_id1, $wire = Interface::Wire->LookupAny($node_id1, $card1, $port1);
$interface1->card(),
$interface1->port());
if (defined($wire)) { if (defined($wire)) {
fatal("Wire using interface two already exists: $wire\n"); fatal("Wire using interface two already exists: $wire\n");
} }
$wire = Interface::Wire->LookupAny($node_id1, $wire = Interface::Wire->LookupAny($node_id1, $card2, $port2);
$interface2->card(),
$interface2->port());
if (defined($wire)) { if (defined($wire)) {
fatal("Wire using interface two already exists: $wire\n"); fatal("Wire using interface two already exists: $wire\n");
} }
......
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