Tweak logic for determining effective importers, in datasync consumer

Defer pruning of "local" models until after the mapping has already happened.
This commit is contained in:
Lance Edgar 2016-08-13 16:48:26 -05:00
parent 6a76e4f9b1
commit 365cd91d6f

View file

@ -220,13 +220,13 @@ class NewDataSyncImportConsumer(DataSyncConsumer):
""" """
handler = load_object(self.handler_spec) handler = load_object(self.handler_spec)
importers = self.get_importers_from_handler(handler, default_only=True) importers = self.get_importers_from_handler(handler, default_only=True)
for host_name, local_name in self.model_map.iteritems():
if local_name in importers:
importers[host_name] = importers[local_name]
if self.skip_local_models: if self.skip_local_models:
for name in list(importers): for name in list(importers):
if name in self.skip_local_models: if name in self.skip_local_models:
del importers[name] del importers[name]
for host_name, local_name in self.model_map.iteritems():
if local_name in importers:
importers[host_name] = importers[local_name]
return importers return importers
def get_importers_from_handler(self, handler, default_only=True): def get_importers_from_handler(self, handler, default_only=True):