Commit 58546975 authored by Simon Redman's avatar Simon Redman

Ignore OVS nodes when configuring segment routing stuff

parent 71fde17d
......@@ -37,6 +37,8 @@ if __name__ == "__main__":
help="Username to use on all hosts. Defaults to current user's username")
parser.add_argument("--stop", action='store_true',
help="Stop all services (after writing config files)")
parser.add_argument("--ovs-prefix", action='store', type=str, default='ovs',
help="Prefix used in Emulab profile to distinguish OVS nodes (Default \"ovs\")")
args = parser.parse_args()
......@@ -55,9 +57,16 @@ if __name__ == "__main__":
add_routable_ipv6_addrs.add_ULAs_to_hosts(netgraph.graph, ULA_map)
add_routable_ipv6_addrs.add_interfaces_to_netgraph(netgraph.graph, ULA_map)
frr_configurator.configure_nodes(netgraph.graph)
frr_configurator.start_frr_on_network(netgraph.graph)
ovs_nodes = []
for node in netgraph.graph.nodes:
node_name = netgraph.graph._node[node]['label']
if str.startswith(node_name, args.ovs_prefix):
ovs_nodes.append(node)
sysctl_configurator.configure_nodes(netgraph.graph)
# TODO: Make frr_configurator ignore OVS nodes
frr_configurator.configure_nodes(netgraph.graph, ignore_nodes=ovs_nodes)
frr_configurator.start_frr_on_network(netgraph.graph, ignore_nodes=ovs_nodes)
sysctl_configurator.configure_nodes(netgraph.graph,ignore_nodes=ovs_nodes)
ssh_helper.network_graph_logout(netgraph.graph)
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