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

Remove rspecv2 processing from the solution entirely.

Since the interface names in the solution do not match the interface names on the request, we can't correlate them anyhow. Reverting to just v1 processing until we move libvtop to outputting rspecv2
parent 6a6cc4fc
...@@ -1820,9 +1820,11 @@ sub GetTicketAuxAux($$$$$$$$$) ...@@ -1820,9 +1820,11 @@ sub GetTicketAuxAux($$$$$$$$$)
my $virtual_port_id = GeniXML::GetInterfaceId($iface_ref); my $virtual_port_id = GeniXML::GetInterfaceId($iface_ref);
my $virtual_node_id = GeniXML::GetInterfaceNodeId($iface_ref); my $virtual_node_id = GeniXML::GetInterfaceNodeId($iface_ref);
if (! GeniXML::IsVersion0($rspec) if (!defined($virtual_node_id) || !defined($virtual_port_id)) {
&& defined($virtual_port_id)) { $response = GeniResponse->Create(GENIRESPONSE_ERROR, undef,
$virtual_node_id = $iface2node{$virtual_port_id}; "Virtual node ID or virtual interface ".
"ID missing on interface");
goto bad;
} }
# #
# If this was an external node we placed into the topo, skip # If this was an external node we placed into the topo, skip
...@@ -1834,12 +1836,6 @@ sub GetTicketAuxAux($$$$$$$$$) ...@@ -1834,12 +1836,6 @@ sub GetTicketAuxAux($$$$$$$$$)
next; next;
} }
my $component_id = GeniXML::GetText("component_id", $iface_ref); my $component_id = GeniXML::GetText("component_id", $iface_ref);
if (!defined($virtual_node_id) || !defined($virtual_port_id)) {
$response = GeniResponse->Create(GENIRESPONSE_ERROR, undef,
"Virtual node ID or virtual interface ".
"ID missing on interface");
goto bad;
}
my $vportp = $vportmap{"$virtual_node_id:$virtual_port_id"}; my $vportp = $vportmap{"$virtual_node_id:$virtual_port_id"};
my $linkref = $vportp->{'rspec'}; my $linkref = $vportp->{'rspec'};
my $virtlan = $vportp->{'virtlan'}; my $virtlan = $vportp->{'virtlan'};
......
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