From a62dc15fee2e6ad109778cdedc2ccd9d51967262 Mon Sep 17 00:00:00 2001 From: Dan Voiculeasa Date: Tue, 29 Jun 2021 11:59:42 +0300 Subject: [PATCH] py3: nfv update range compatibility Range returns a list on python2 and a range object on python3. Convert to list where range is not iterated over. This commit is split from Charles Short's work Iecfe9b83245847b07aaaa0ec1aadad4734a9d118 and drops the usage of the six library for six.moves.range as it is not needed. Story: 2008454 Task: 42727 Co-authored-by: Charles Short Signed-off-by: Dan Voiculeasa Change-Id: I97ca43b258e89ccd5f94ef17c768e5080fc946af (cherry picked from commit 129036ccc4f8f9923f8888f1f8f0444e8dc2557c) --- nfv/nfv-client/nfv_client/shell.py | 2 +- nfv/nfv-vim/nfv_vim/network_rebalance/_dhcp_rebalance.py | 2 +- nfv/nfv-vim/nfv_vim/network_rebalance/_network_rebalance.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nfv/nfv-client/nfv_client/shell.py b/nfv/nfv-client/nfv_client/shell.py index 67323e9b..5c2c5f1d 100755 --- a/nfv/nfv-client/nfv_client/shell.py +++ b/nfv/nfv-client/nfv_client/shell.py @@ -147,7 +147,7 @@ def setup_create_cmd(parser, add_list_arg(create_cmd, '--alarm-restrictions', alarm_restrictions) create_cmd.add_argument('--max-parallel-worker-hosts', type=int, - choices=range(min_parallel, max_parallel + 1), + choices=list(range(min_parallel, max_parallel + 1)), help='maximum worker hosts to update in parallel') return create_cmd diff --git a/nfv/nfv-vim/nfv_vim/network_rebalance/_dhcp_rebalance.py b/nfv/nfv-vim/nfv_vim/network_rebalance/_dhcp_rebalance.py index 046e969e..62f04c2d 100644 --- a/nfv/nfv-vim/nfv_vim/network_rebalance/_dhcp_rebalance.py +++ b/nfv/nfv-vim/nfv_vim/network_rebalance/_dhcp_rebalance.py @@ -267,7 +267,7 @@ class DHCPAgentRebalance(object): def networks_are_balanced(self): - possible_agent_targets = range(0, len(self.num_networks_on_agents)) + possible_agent_targets = list(range(0, len(self.num_networks_on_agents))) # find the agent with the least amount of networks. agent_with_least_networks = \ diff --git a/nfv/nfv-vim/nfv_vim/network_rebalance/_network_rebalance.py b/nfv/nfv-vim/nfv_vim/network_rebalance/_network_rebalance.py index 13506db8..0adef7e0 100644 --- a/nfv/nfv-vim/nfv_vim/network_rebalance/_network_rebalance.py +++ b/nfv/nfv-vim/nfv_vim/network_rebalance/_network_rebalance.py @@ -359,7 +359,7 @@ class L3AgentRebalance(object): def routers_are_balanced(self): - possible_agent_targets = range(0, len(self.num_routers_on_agents)) + possible_agent_targets = list(range(0, len(self.num_routers_on_agents))) # find the agent with the least amount of routers. agent_with_least_routers = \