From 7b4235dced0c66096638bebd5cc98a631538b0e1 Mon Sep 17 00:00:00 2001 From: Ilia Abashin Date: Fri, 1 Sep 2017 15:51:52 +0300 Subject: Refactored link finders Mappings are now defined in a configuration file and fetched dynamically. Change-Id: I250c22967fc66fc0aca173d4c9d65581d879b5d2 Signed-off-by: Ilia Abashin --- app/discover/events/event_interface_add.py | 4 ++-- app/discover/events/event_port_add.py | 8 +++++--- app/discover/events/event_router_add.py | 4 ++-- app/discover/events/event_router_update.py | 2 +- app/discover/events/event_subnet_add.py | 5 +++-- app/discover/events/event_subnet_update.py | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) (limited to 'app/discover/events') diff --git a/app/discover/events/event_interface_add.py b/app/discover/events/event_interface_add.py index 2c7af13..698559c 100644 --- a/app/discover/events/event_interface_add.py +++ b/app/discover/events/event_interface_add.py @@ -8,7 +8,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### import time - from functools import partial from discover.events.event_base import EventBase, EventResult @@ -17,7 +16,8 @@ from discover.events.event_subnet_add import EventSubnetAdd from discover.fetchers.api.api_access import ApiAccess from discover.fetchers.api.api_fetch_regions import ApiFetchRegions from discover.fetchers.cli.cli_fetch_host_vservice import CliFetchHostVservice -from discover.find_links_for_vservice_vnics import FindLinksForVserviceVnics +from discover.link_finders.find_links_for_vservice_vnics import \ + FindLinksForVserviceVnics from discover.scanner import Scanner from utils.util import decode_router_id, encode_router_id diff --git a/app/discover/events/event_port_add.py b/app/discover/events/event_port_add.py index 63a5e80..9220015 100644 --- a/app/discover/events/event_port_add.py +++ b/app/discover/events/event_port_add.py @@ -12,10 +12,12 @@ import datetime from discover.events.event_base import EventBase, EventResult from discover.fetchers.api.api_fetch_host_instances import ApiFetchHostInstances from discover.fetchers.cli.cli_fetch_instance_vnics import CliFetchInstanceVnics -from discover.fetchers.cli.cli_fetch_instance_vnics_vpp import CliFetchInstanceVnicsVpp +from discover.fetchers.cli.cli_fetch_instance_vnics_vpp import \ + CliFetchInstanceVnicsVpp from discover.fetchers.cli.cli_fetch_vservice_vnics import CliFetchVserviceVnics -from discover.find_links_for_instance_vnics import FindLinksForInstanceVnics -from discover.find_links_for_vedges import FindLinksForVedges +from discover.link_finders.find_links_for_instance_vnics import \ + FindLinksForInstanceVnics +from discover.link_finders.find_links_for_vedges import FindLinksForVedges from discover.scanner import Scanner diff --git a/app/discover/events/event_router_add.py b/app/discover/events/event_router_add.py index 20e07e5..3c1c9e2 100644 --- a/app/discover/events/event_router_add.py +++ b/app/discover/events/event_router_add.py @@ -8,14 +8,14 @@ # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### import datetime - from functools import partial from discover.events.event_base import EventBase, EventResult from discover.events.event_port_add import EventPortAdd from discover.events.event_subnet_add import EventSubnetAdd from discover.fetchers.cli.cli_fetch_host_vservice import CliFetchHostVservice -from discover.find_links_for_vservice_vnics import FindLinksForVserviceVnics +from discover.link_finders.find_links_for_vservice_vnics import \ + FindLinksForVserviceVnics from discover.scanner import Scanner from utils.util import decode_router_id, encode_router_id diff --git a/app/discover/events/event_router_update.py b/app/discover/events/event_router_update.py index 8dd53f0..cfbbf58 100644 --- a/app/discover/events/event_router_update.py +++ b/app/discover/events/event_router_update.py @@ -11,7 +11,7 @@ from discover.events.event_base import EventBase, EventResult from discover.events.event_port_delete import EventPortDelete from discover.events.event_router_add import EventRouterAdd from discover.fetchers.cli.cli_fetch_host_vservice import CliFetchHostVservice -from discover.find_links_for_vservice_vnics import FindLinksForVserviceVnics +from discover.link_finders.find_links_for_vservice_vnics import FindLinksForVserviceVnics from discover.scanner import Scanner from utils.util import encode_router_id diff --git a/app/discover/events/event_subnet_add.py b/app/discover/events/event_subnet_add.py index a33f7cf..fcae5fd 100644 --- a/app/discover/events/event_subnet_add.py +++ b/app/discover/events/event_subnet_add.py @@ -15,8 +15,9 @@ from discover.fetchers.api.api_access import ApiAccess from discover.fetchers.api.api_fetch_port import ApiFetchPort from discover.fetchers.api.api_fetch_regions import ApiFetchRegions from discover.fetchers.db.db_fetch_port import DbFetchPort -from discover.find_links_for_pnics import FindLinksForPnics -from discover.find_links_for_vservice_vnics import FindLinksForVserviceVnics +from discover.link_finders.find_links_for_pnics import FindLinksForPnics +from discover.link_finders.find_links_for_vservice_vnics import \ + FindLinksForVserviceVnics from discover.scanner import Scanner diff --git a/app/discover/events/event_subnet_update.py b/app/discover/events/event_subnet_update.py index 26d1984..3529f0d 100644 --- a/app/discover/events/event_subnet_update.py +++ b/app/discover/events/event_subnet_update.py @@ -14,7 +14,7 @@ from discover.events.event_subnet_add import EventSubnetAdd from discover.fetchers.api.api_access import ApiAccess from discover.fetchers.api.api_fetch_regions import ApiFetchRegions from discover.fetchers.db.db_fetch_port import DbFetchPort -from discover.find_links_for_vservice_vnics import FindLinksForVserviceVnics +from discover.link_finders.find_links_for_vservice_vnics import FindLinksForVserviceVnics from discover.scanner import Scanner -- cgit 1.2.3-korg