Commit 3a6b9a66 authored by Simon Redman's avatar Simon Redman

Rename nodes for right-hand topology

parent 19e12abd
......@@ -48,46 +48,46 @@ def connectNodes(request, node1, node2):
# Build Domain A
CO = node_constructor("CO")
CO.disk_image = router_disk_image
CB = node_constructor("CB")
CB.disk_image = router_disk_image
N11 = node_constructor("N11")
N11.disk_image = router_disk_image
N08 = node_constructor("N08")
N08.disk_image = router_disk_image
N09 = node_constructor("N09")
N09.disk_image = router_disk_image
N02 = node_constructor("N02")
N02.disk_image = router_disk_image
N12 = node_constructor("N12")
N12.disk_image = router_disk_image
N07 = node_constructor("N07")
N07.disk_image = router_disk_image
N05 = node_constructor("N05")
N05.disk_image = router_disk_image
N10 = node_constructor("N10")
N10.disk_image = router_disk_image
# Interconnect Domain A
# N11 and N12 are handled implicitly by the other connections
# Connect CO
for node in (N11, N09, N12):
connectNodes(request, CO, node)
# N08 and N07 are handled implicitly by the other connections
# Connect CB
for node in (N08, N02, N07):
connectNodes(request, CB, node)
# Connect N9
for node in (N11, N12, N05):
connectNodes(request, N09, node)
for node in (N08, N07, N10):
connectNodes(request, N02, node)
# Connect N5
for node in (N11, N12):
connectNodes(request, N05, node)
for node in (N08, N07):
connectNodes(request, N10, node)
# Add the extra nodes to Domain A
# There should be a "services" node, but I have run out of physical interfaces for the CO router...
CO_ovs = node_constructor("{prefix}_CO".format(prefix=params.ovs_name))
CO_ovs.disk_image = ovs_disk_image
# There should be a "services" node, but I have run out of physical interfaces for the CB router...
CB_ovs = node_constructor("{prefix}_CB".format(prefix=params.ovs_name))
CB_ovs.disk_image = ovs_disk_image
connectNodes(request, CO, CO_ovs)
connectNodes(request, CB, CB_ovs)
CO_host = node_constructor("{prefix}_CO".format(prefix=params.host_name))
CO_host.disk_image = router_disk_image
CB_host = node_constructor("{prefix}_CB".format(prefix=params.host_name))
CB_host.disk_image = router_disk_image
connectNodes(request, CO_host, CO_ovs)
connectNodes(request, CB_host, CB_ovs)
pc.printRequestRSpec(request)
\ No newline at end of file
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