X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2app%2Fadapter%2Funit_of_work.py;h=57d1c00343f70c7369b2800e894885288b323ea9;hb=b024d12884afe2ac7405fe7767f51e050a095151;hp=f046db5d3774b53c7aef6f8e7f60b43612366fcf;hpb=d2f6cc674bf3623caf114a8d7709e70d55ec9340;p=pti%2Fo2.git diff --git a/o2app/adapter/unit_of_work.py b/o2app/adapter/unit_of_work.py index f046db5..57d1c00 100644 --- a/o2app/adapter/unit_of_work.py +++ b/o2app/adapter/unit_of_work.py @@ -21,7 +21,7 @@ from sqlalchemy.orm.session import Session from o2common.config import config from o2common.service.unit_of_work import AbstractUnitOfWork -from o2ims.adapter import ocloud_repository, alarm_repository, alarm_loader +from o2ims.adapter import ocloud_repository, alarm_repository from o2dms.adapter import dms_repository from o2common.helper import o2logging @@ -57,8 +57,6 @@ class SqlAlchemyUnitOfWork(AbstractUnitOfWork): .ResourceSqlAlchemyRepository(self.session) self.subscriptions = ocloud_repository\ .SubscriptionSqlAlchemyRepository(self.session) - self.configurations = ocloud_repository\ - .ConfigurationSqlAlchemyRepository(self.session) self.deployment_managers = ocloud_repository\ .DeploymentManagerSqlAlchemyRepository(self.session) self.nfdeployment_descs = dms_repository\ @@ -71,14 +69,13 @@ class SqlAlchemyUnitOfWork(AbstractUnitOfWork): .AlarmEventRecordSqlAlchemyRepository(self.session) self.alarm_definitions = alarm_repository\ .AlarmDefinitionSqlAlchemyRepository(self.session) + self.alarm_dictionaries = alarm_repository\ + .AlarmDictionarySqlAlchemyRepository(self.session) self.alarm_subscriptions = alarm_repository\ .AlarmSubscriptionSqlAlchemyRepository(self.session) self.alarm_probable_causes = alarm_repository\ .AlarmProbableCauseSqlAlchemyRepository(self.session) - # config file - self.alarm_dictionaries = alarm_loader\ - .AlarmDictionaryConfigFileRepository() return super().__enter__() def __exit__(self, *args): @@ -111,9 +108,6 @@ class SqlAlchemyUnitOfWork(AbstractUnitOfWork): for entry in self.subscriptions.seen: while hasattr(entry, 'events') and len(entry.events) > 0: yield entry.events.pop(0) - for entry in self.configurations.seen: - while hasattr(entry, 'events') and len(entry.events) > 0: - yield entry.events.pop(0) for entry in self.nfdeployment_descs.seen: while hasattr(entry, 'events') and len(entry.events) > 0: yield entry.events.pop(0)