config: topologies: slight code refactor
This commit is contained in:
parent
7572ab71b5
commit
6aafd5cb3f
1 changed files with 12 additions and 4 deletions
|
@ -86,10 +86,15 @@ class Cluster(BaseTopology):
|
||||||
node.makeTopology(options, network, IntLink, ExtLink, Router)
|
node.makeTopology(options, network, IntLink, ExtLink, Router)
|
||||||
|
|
||||||
# connect this cluster to the router
|
# connect this cluster to the router
|
||||||
link = IntLink(link_id=self.num_int_links(), node_a=self.router, node_b=node.router)
|
link = IntLink(link_id=self.num_int_links(), node_a=self.router,
|
||||||
|
node_b=node.router)
|
||||||
|
|
||||||
if node.extBW:
|
if node.extBW:
|
||||||
link.bandwidth_factor = node.extBW
|
link.bandwidth_factor = node.extBW
|
||||||
elif self.intBW: # if there is an interanl b/w for this node and no ext b/w to override
|
|
||||||
|
# if there is an interanl b/w for this node
|
||||||
|
# and no ext b/w to override
|
||||||
|
elif self.intBW:
|
||||||
link.bandwidth_factor = self.intBW
|
link.bandwidth_factor = self.intBW
|
||||||
|
|
||||||
if node.extLatency:
|
if node.extLatency:
|
||||||
|
@ -99,8 +104,11 @@ class Cluster(BaseTopology):
|
||||||
|
|
||||||
network.int_links.append(link)
|
network.int_links.append(link)
|
||||||
else:
|
else:
|
||||||
# node is just a controller connect it to the router via a ext_link
|
# node is just a controller,
|
||||||
link = ExtLink(link_id=self.num_ext_links(), ext_node=node, int_node=self.router)
|
# connect it to the router via a ext_link
|
||||||
|
link = ExtLink(link_id=self.num_ext_links(), ext_node=node,
|
||||||
|
int_node=self.router)
|
||||||
|
|
||||||
if self.intBW:
|
if self.intBW:
|
||||||
link.bandwidth_factor = self.intBW
|
link.bandwidth_factor = self.intBW
|
||||||
if self.intLatency:
|
if self.intLatency:
|
||||||
|
|
Loading…
Reference in a new issue