X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_nbi%2Finstance_topics.py;h=4cb1e9c66c6df81dcb3ff4823f8f8aa230dfdb03;hb=refs%2Fchanges%2F99%2F7899%2F7;hp=d3a3b4162fc31d4e01e3ab26aad2459f1c8fcfa6;hpb=982da4e03c39e679919c1cb36fc00e9b8bd5d450;p=osm%2FNBI.git diff --git a/osm_nbi/instance_topics.py b/osm_nbi/instance_topics.py index d3a3b41..4cb1e9c 100644 --- a/osm_nbi/instance_topics.py +++ b/osm_nbi/instance_topics.py @@ -23,6 +23,8 @@ from osm_nbi.base_topic import BaseTopic, EngineException, get_iterable # from descriptor_topics import DescriptorTopic from yaml import safe_dump from osm_common.dbbase import DbException +from osm_common.msgbase import MsgException +from osm_common.fsbase import FsException from re import match # For checking that additional parameter names are valid Jinja2 identifiers __author__ = "Alfonso Tierno " @@ -33,8 +35,8 @@ class NsrTopic(BaseTopic): topic_msg = "ns" schema_new = ns_instantiate - def __init__(self, db, fs, msg): - BaseTopic.__init__(self, db, fs, msg) + def __init__(self, db, fs, msg, auth): + BaseTopic.__init__(self, db, fs, msg, auth) def _check_descriptor_dependencies(self, session, descriptor): """ @@ -178,10 +180,15 @@ class NsrTopic(BaseTopic): :param indata: params to be used for the nsr :param kwargs: used to override the indata descriptor :param headers: http request headers - :return: the _id of nsr descriptor created at database + :return: the _id of nsr descriptor created at database. Or an exception of type + EngineException, ValidationError, DbException, FsException, MsgException. + Note: Exceptions are not captured on purpose. They should be captured at called """ try: + step = "checking quotas" + self.check_quota(session) + step = "validating input parameters" ns_request = self._remove_envelop(indata) # Override descriptor with query string kwargs @@ -377,11 +384,8 @@ class NsrTopic(BaseTopic): self.fs.mkdir(nsr_id) return nsr_id, None - except ValidationError as e: # TODO remove try Except, it is captured at nbi.py - raise EngineException(e, HTTPStatus.UNPROCESSABLE_ENTITY) - except Exception as e: - self.logger.exception("Exception {} at NsrTopic.new()".format(e), exc_info=True) - raise EngineException("Error {}: {}".format(step, e)) + except (ValidationError, EngineException, DbException, MsgException, FsException) as e: + raise type(e)("{} while '{}".format(e, step), http_code=e.http_code) def edit(self, session, _id, indata=None, kwargs=None, content=None): raise EngineException("Method edit called directly", HTTPStatus.INTERNAL_SERVER_ERROR) @@ -391,8 +395,8 @@ class VnfrTopic(BaseTopic): topic = "vnfrs" topic_msg = None - def __init__(self, db, fs, msg): - BaseTopic.__init__(self, db, fs, msg) + def __init__(self, db, fs, msg, auth): + BaseTopic.__init__(self, db, fs, msg, auth) def delete(self, session, _id, dry_run=False): raise EngineException("Method delete called directly", HTTPStatus.INTERNAL_SERVER_ERROR) @@ -415,8 +419,8 @@ class NsLcmOpTopic(BaseTopic): "terminate": None, } - def __init__(self, db, fs, msg): - BaseTopic.__init__(self, db, fs, msg) + def __init__(self, db, fs, msg, auth): + BaseTopic.__init__(self, db, fs, msg, auth) def _check_ns_operation(self, session, nsr, operation, indata): """ @@ -486,7 +490,7 @@ class NsLcmOpTopic(BaseTopic): for in_ivld in get_iterable(in_vnfd.get("internal-vld")): for ivld in get_iterable(vnfd.get("internal-vld")): if in_ivld["name"] == ivld["name"] or in_ivld["name"] == ivld["id"]: - for in_icp in get_iterable(in_ivld["internal-connection-point"]): + for in_icp in get_iterable(in_ivld.get("internal-connection-point")): for icp in ivld["internal-connection-point"]: if in_icp["id-ref"] == icp["id-ref"]: break @@ -809,7 +813,7 @@ class NsLcmOpTopic(BaseTopic): if not nsr["_admin"].get("nsState") or nsr["_admin"]["nsState"] == "NOT_INSTANTIATED": if operation == "terminate" and indata.get("autoremove"): # NSR must be deleted - return None # a none in this case is used to indicate not instantiated. It can be removed + return None, None # a none in this case is used to indicate not instantiated. It can be removed if operation != "instantiate": raise EngineException("ns_instance '{}' cannot be '{}' because it is not instantiated".format( nsInstanceId, operation), HTTPStatus.CONFLICT) @@ -823,8 +827,9 @@ class NsLcmOpTopic(BaseTopic): self._update_vnfrs(session, rollback, nsr, indata) nslcmop_desc = self._create_nslcmop(nsInstanceId, operation, indata) + _id = nslcmop_desc["_id"] self.format_on_new(nslcmop_desc, session["project_id"], make_public=session["public"]) - _id = self.db.create("nslcmops", nslcmop_desc) + self.db.create("nslcmops", nslcmop_desc) rollback.append({"topic": "nslcmops", "_id": _id}) if not slice_object: self.msg.write("ns", operation, nslcmop_desc) @@ -845,9 +850,9 @@ class NsiTopic(BaseTopic): topic = "nsis" topic_msg = "nsi" - def __init__(self, db, fs, msg): - BaseTopic.__init__(self, db, fs, msg) - self.nsrTopic = NsrTopic(db, fs, msg) + def __init__(self, db, fs, msg, auth): + BaseTopic.__init__(self, db, fs, msg, auth) + self.nsrTopic = NsrTopic(db, fs, msg, auth) @staticmethod def _format_ns_request(ns_request): @@ -1006,6 +1011,9 @@ class NsiTopic(BaseTopic): """ try: + step = "checking quotas" + self.check_quota(session) + step = "" slice_request = self._remove_envelop(indata) # Override descriptor with query string kwargs @@ -1169,9 +1177,9 @@ class NsiLcmOpTopic(BaseTopic): "terminate": None } - def __init__(self, db, fs, msg): - BaseTopic.__init__(self, db, fs, msg) - self.nsi_NsLcmOpTopic = NsLcmOpTopic(self.db, self.fs, self.msg) + def __init__(self, db, fs, msg, auth): + BaseTopic.__init__(self, db, fs, msg, auth) + self.nsi_NsLcmOpTopic = NsLcmOpTopic(self.db, self.fs, self.msg, self.auth) def _check_nsi_operation(self, session, nsir, operation, indata): """ @@ -1264,7 +1272,7 @@ class NsiLcmOpTopic(BaseTopic): if not nsir["_admin"].get("nsiState") or nsir["_admin"]["nsiState"] == "NOT_INSTANTIATED": if operation == "terminate" and indata.get("autoremove"): # NSIR must be deleted - return None # a none in this case is used to indicate not instantiated. It can be removed + return None, None # a none in this case is used to indicate not instantiated. It can be removed if operation != "instantiate": raise EngineException("netslice_instance '{}' cannot be '{}' because it is not instantiated".format( netsliceInstanceId, operation), HTTPStatus.CONFLICT)