Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert to root user
[pti/o2.git]
/
o2app
/
adapter
/
unit_of_work.py
diff --git
a/o2app/adapter/unit_of_work.py
b/o2app/adapter/unit_of_work.py
index
f046db5
..
93893e2
100644
(file)
--- 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 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
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)
.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\
self.deployment_managers = ocloud_repository\
.DeploymentManagerSqlAlchemyRepository(self.session)
self.nfdeployment_descs = dms_repository\
@@
-76,9
+74,6
@@
class SqlAlchemyUnitOfWork(AbstractUnitOfWork):
self.alarm_probable_causes = alarm_repository\
.AlarmProbableCauseSqlAlchemyRepository(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):
return super().__enter__()
def __exit__(self, *args):
@@
-111,9
+106,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.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)
for entry in self.nfdeployment_descs.seen:
while hasattr(entry, 'events') and len(entry.events) > 0:
yield entry.events.pop(0)