Get rid of SWITCH_PORT_BASE since it's 1 for OF >= 1.0.
This commit is contained in:
+2
-4
@@ -16,8 +16,6 @@ setup for testing, and can even be emulated with the Mininet package.
|
|||||||
# from networkx.classes.graph import Graph
|
# from networkx.classes.graph import Graph
|
||||||
|
|
||||||
from networkx import Graph
|
from networkx import Graph
|
||||||
from mininet.node import SWITCH_PORT_BASE
|
|
||||||
|
|
||||||
|
|
||||||
class NodeID(object):
|
class NodeID(object):
|
||||||
'''Topo node identifier.'''
|
'''Topo node identifier.'''
|
||||||
@@ -156,8 +154,8 @@ class Topo(object):
|
|||||||
@param src source switch DPID
|
@param src source switch DPID
|
||||||
@param dst destination switch DPID
|
@param dst destination switch DPID
|
||||||
'''
|
'''
|
||||||
src_base = SWITCH_PORT_BASE if self.is_switch(src) else 0
|
src_base = 1 if self.is_switch(src) else 0
|
||||||
dst_base = SWITCH_PORT_BASE if self.is_switch(dst) else 0
|
dst_base = 1 if self.is_switch(dst) else 0
|
||||||
if src not in self.ports:
|
if src not in self.ports:
|
||||||
self.ports[src] = {}
|
self.ports[src] = {}
|
||||||
if dst not in self.ports[src]:
|
if dst not in self.ports[src]:
|
||||||
|
|||||||
Reference in New Issue
Block a user