From e94feb86f58c59d575f9ae75f5005a329ee52c73 Mon Sep 17 00:00:00 2001 From: tierno Date: Wed, 10 Jun 2020 14:57:11 +0000 Subject: [PATCH] Change requirements reference to osm-im. Minor flake8 Change-Id: Id0e6c41c302d50b9a9e430155f678e7f38699b2e Signed-off-by: tierno --- RO/osm_ro/wim/engine.py | 4 ++-- RO/osm_ro/wim/tests/fixtures.py | 14 +++++++------- RO/osm_ro/wim/tests/test_engine.py | 2 +- RO/requirements.txt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/RO/osm_ro/wim/engine.py b/RO/osm_ro/wim/engine.py index 6a232a45..ec01b23a 100644 --- a/RO/osm_ro/wim/engine.py +++ b/RO/osm_ro/wim/engine.py @@ -410,7 +410,7 @@ class WimEngine(object): def create_actions(self, wan_links): """For an array of wan_links, create all the corresponding actions""" - return [self.create_action(l) for l in wan_links] + return [self.create_action(li) for li in wan_links] def delete_action(self, wan_link): """For a single wan_link create the corresponding create action""" @@ -431,7 +431,7 @@ class WimEngine(object): if instance_scenario_id: wan_links = self.persist.get_wan_links( instance_scenario_id=instance_scenario_id, sdn='false') - return [self.delete_action(l) for l in wan_links] + return [self.delete_action(li) for li in wan_links] def incorporate_actions(self, wim_actions, instance_action): """Make the instance action consider new WIM actions and make the WIM diff --git a/RO/osm_ro/wim/tests/fixtures.py b/RO/osm_ro/wim/tests/fixtures.py index b37cc135..4280a460 100644 --- a/RO/osm_ro/wim/tests/fixtures.py +++ b/RO/osm_ro/wim/tests/fixtures.py @@ -221,18 +221,18 @@ def instance_nets(num_datacenters=2, num_links=2, status='BUILD'): them (e.g M = 2 -> back and forth) """ return [ - {'uuid': uuid('net%d%d' % (k, l)), + {'uuid': uuid('net%d%d' % (k, li)), 'datacenter_id': uuid('dc%d' % k), 'datacenter_tenant_id': uuid('dc-account0%d' % k), 'instance_scenario_id': uuid('nsr0'), # ^ instance_scenario_id == NS Record id - 'sce_net_id': uuid('vld%d' % l), + 'sce_net_id': uuid('vld%d' % li), # ^ scenario net id == VLD id 'status': status, 'vim_net_id': None, 'created': True} for k in range(num_datacenters) - for l in range(num_links) + for li in range(num_links) ] @@ -289,17 +289,17 @@ def instance_wim_nets(instance=0, wim=0, num_links=1, VIM nets """ return [ - {'uuid': uuid('wim-net%d%d%d' % (wim, instance, l)), + {'uuid': uuid('wim-net%d%d%d' % (wim, instance, li)), 'wim_id': uuid('wim%d' % wim), 'wim_account_id': uuid('wim-account%d' % wim), - 'wim_internal_id': uuid('-net%d%d' % (wim, l)), + 'wim_internal_id': uuid('-net%d%d' % (wim, li)), 'instance_scenario_id': uuid('nsr%d' % instance), # ^ instance_scenario_id == NS Record id - 'sce_net_id': uuid('vld%d' % l), + 'sce_net_id': uuid('vld%d' % li), # ^ scenario net id == VLD id 'status': status, 'created': False} - for l in range(num_links) + for li in range(num_links) ] diff --git a/RO/osm_ro/wim/tests/test_engine.py b/RO/osm_ro/wim/tests/test_engine.py index d518123a..7b3d9afe 100644 --- a/RO/osm_ro/wim/tests/test_engine.py +++ b/RO/osm_ro/wim/tests/test_engine.py @@ -169,7 +169,7 @@ class TestWimEngine(unittest.TestCase): for link in wan_links: self.assertEqual(link['instance_scenario_id'], uuid('nsr0')) # Each VLD needs a network to be created in each datacenter - self.assertItemsEqual([l['sce_net_id'] for l in wan_links], + self.assertItemsEqual([li['sce_net_id'] for li in wan_links], [uuid('vld0'), uuid('vld1')]) diff --git a/RO/requirements.txt b/RO/requirements.txt index 8d8ea73d..edb517d5 100644 --- a/RO/requirements.txt +++ b/RO/requirements.txt @@ -20,4 +20,4 @@ paramiko requests==2.18.* netaddr logutils -git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im +osm-im @ git+https://osm.etsi.org/gerrit/osm/IM.git#egg=osm-im -- 2.25.1