From 8d4c9dbd584bb5e11ca6bc35e34143a6b1314842 Mon Sep 17 00:00:00 2001 From: Oyvind Bakksjo Date: Fri, 24 Jun 2016 13:46:52 +0200 Subject: Reorder functions more logically (no forward references). --- node-admin/scripts/configure-container-networking.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'node-admin/scripts') diff --git a/node-admin/scripts/configure-container-networking.py b/node-admin/scripts/configure-container-networking.py index 2568a241e73..9eee2b5c375 100755 --- a/node-admin/scripts/configure-container-networking.py +++ b/node-admin/scripts/configure-container-networking.py @@ -162,6 +162,13 @@ def create_interface_in_namespace(network_namespace, ip_address_textual, interfa index_of_created_interface = network_namespace.link_lookup(ifname=interface_name)[0] return index_of_created_interface +def index_of_interface_in_namespace(interface_name, namespace): + interface_index_list = namespace.link_lookup(ifname=interface_name) + if not interface_index_list: + return None + assert len(interface_index_list) == 1 + return interface_index_list[0] + def move_interface(src_interface_index, dest_namespace, dest_namespace_pid, dest_interface_name): ipr.link('set', index=src_interface_index, @@ -175,14 +182,6 @@ def move_interface(src_interface_index, dest_namespace, dest_namespace_pid, dest return new_interface_index -def index_of_interface_in_namespace(interface_name, namespace): - interface_index_list = namespace.link_lookup(ifname=interface_name) - if not interface_index_list: - return None - assert len(interface_index_list) == 1 - return interface_index_list[0] - - flag_local_mode = "--local" local_mode = flag_local_mode in sys.argv if local_mode: -- cgit v1.2.3