X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Fengine.py;h=38cc08e0b327600f062a06e7f180a4de404a2d57;hp=1eff5e18b5b2b8fabd995e317a10a32f1220fcae;hb=e86317875d395c37b3ded147b554ced8a8115358;hpb=d125caf630021538f19aadab045b5d17def67cdd;ds=sidebyside diff --git a/osm_nbi/engine.py b/osm_nbi/engine.py index 1eff5e1..38cc08e 100644 --- a/osm_nbi/engine.py +++ b/osm_nbi/engine.py @@ -20,7 +20,7 @@ from osm_common.fsbase import FsException from osm_common.msgbase import MsgException from http import HTTPStatus from base_topic import EngineException, versiontuple -from admin_topics import UserTopic, ProjectTopic, VimAccountTopic, SdnTopic +from admin_topics import UserTopic, ProjectTopic, VimAccountTopic, WimAccountTopic, SdnTopic from descriptor_topics import VnfdTopic, NsdTopic, PduTopic, NstTopic from instance_topics import NsrTopic, VnfrTopic, NsLcmOpTopic, NsiTopic, NsiLcmOpTopic from base64 import b64encode @@ -40,6 +40,7 @@ class Engine(object): "vnfrs": VnfrTopic, "nslcmops": NsLcmOpTopic, "vim_accounts": VimAccountTopic, + "wim_accounts": WimAccountTopic, "sdns": SdnTopic, "users": UserTopic, "projects": ProjectTopic, @@ -225,13 +226,6 @@ class Engine(object): raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR) return self.map_topic[topic].edit(session, _id, indata, kwargs, force) - def prune(self): - """ - Prune database not needed content - :return: None - """ - return self.db.del_list("nsrs", {"_admin.to_delete": True}) - def create_admin(self): """ Creates a new user admin/admin into database if database is empty. Useful for initialization