From 6b5b5b8ad7935a158a83b7a90902a04ef6fa8f93 Mon Sep 17 00:00:00 2001 From: Alexander Kislitsky Date: Tue, 22 Mar 2016 09:31:58 +0300 Subject: [PATCH] Performance of network manager operation improve We have extra SQLs generated in the NetworkManager when passing node_id instead already loaded SQLAlchemy node object. Additional changes: - Bulk insert used in IPs assiging process. - zip changed on six.moves.zip in the NetworkManager. - Removed unused function get_admin_ips_for_interfaces from NetworkManager. Co-Authored-By: Dmitry Guryanov Partial-Bug: #1498365 Change-Id: I0518a5879c775d568de5652dbdd856a0cede80ce --- cluster_upgrade/objects/adapters.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cluster_upgrade/objects/adapters.py b/cluster_upgrade/objects/adapters.py index a4495a9..7a2854e 100644 --- a/cluster_upgrade/objects/adapters.py +++ b/cluster_upgrade/objects/adapters.py @@ -131,10 +131,6 @@ class NailgunNetworkManager(object): def assign_given_vips_for_net_groups(self, vips): self.net_manager.assign_given_vips_for_net_groups(self.cluster, vips) - def get_admin_network_group(self, node_id=None): - ng = objects.NetworkGroup.get_admin_network_group(node_id) - return NailgunNetworkGroupAdapter(ng) - def set_node_netgroups_ids(self, node, mapping): return objects.Node.set_netgroups_ids(node.node, mapping)