Reset branch to master (c528d882) · Commits · osm / NBI

osm_nbi/admin_topics.py

+54 −61

Original line number	Diff line number	Diff line
		@@ -37,8 +37,6 @@ from osm_nbi.validation import (
		k8srepo_edit_schema,
		vca_new_schema,
		vca_edit_schema,
		paas_new_schema,
		paas_edit_schema,
		osmrepo_new_schema,
		osmrepo_edit_schema,
		validate_input,
		@@ -372,21 +370,14 @@ class CommonVimWimSdn(BaseTopic):
		"""
		super().format_on_new(content, project_id=project_id, make_public=make_public)
		content["schema_version"] = schema_version = "1.11"
		self._encrypt_password(content, schema_version)
		self._encrypt_config_fields(content, schema_version)
		content["_admin"]["operationalState"] = "PROCESSING"
		self._insert_create_operation(content)
		return "{}:0".format(content["_id"])

		def _encrypt_password(self, content, schema_version):
		# encrypt passwords
		if content.get(self.password_to_encrypt):
		content[self.password_to_encrypt] = self.db.encrypt(
		content[self.password_to_encrypt],
		schema_version=schema_version,
		salt=content["_id"],
		)

		def _encrypt_config_fields(self, content, schema_version):
		config_to_encrypt_keys = self.config_to_encrypt.get(
		schema_version
		) or self.config_to_encrypt.get("default")
		@@ -399,7 +390,8 @@ class CommonVimWimSdn(BaseTopic):
		salt=content["_id"],
		)

		def _insert_create_operation(self, content):
		content["_admin"]["operationalState"] = "PROCESSING"

		# create operation
		content["_admin"]["operations"] = [self._create_operation("create")]
		content["_admin"]["current_operation"] = None
		@@ -407,25 +399,50 @@ class CommonVimWimSdn(BaseTopic):
		if content.get("vim_type"):
		if content["vim_type"] == "openstack":
		compute = {
		"ram": {"total": None, "used": None},
		"vcpus": {"total": None, "used": None},
		"instances": {"total": None, "used": None},
		"ram": {
		"total": None,
		"used": None
		},
		"vcpus": {
		"total": None,
		"used": None
		},
		"instances": {
		"total": None,
		"used": None
		}
		}
		storage = {
		"volumes": {"total": None, "used": None},
		"snapshots": {"total": None, "used": None},
		"storage": {"total": None, "used": None},
		"volumes": {
		"total": None,
		"used": None
		},
		"snapshots": {
		"total": None,
		"used": None
		},
		"storage": {
		"total": None,
		"used": None
		}
		}
		network = {
		"networks": {"total": None, "used": None},
		"subnets": {"total": None, "used": None},
		"floating_ips": {"total": None, "used": None},
		"networks": {
		"total": None,
		"used": None
		},
		"subnets": {
		"total": None,
		"used": None
		},
		"floating_ips": {
		"total": None,
		"used": None
		}
		content["resources"] = {
		"compute": compute,
		"storage": storage,
		"network": network,
		}
		content["resources"] = {"compute": compute, "storage": storage, "network": network}

		return "{}:0".format(content["_id"])

		def delete(self, session, _id, dry_run=False, not_send_msg=None):
		"""
		@@ -729,39 +746,6 @@ class VcaTopic(CommonVimWimSdn):
		super().check_conflict_on_del(session, _id, db_content)


		class PaasTopic(CommonVimWimSdn):
		topic = "paas"
		topic_msg = "paas"
		schema_new = paas_new_schema
		schema_edit = paas_edit_schema
		multiproject = True
		password_to_encrypt = "secret"
		config_to_encrypt = {}

		def format_on_edit(self, final_content, edit_content):
		oid = super().format_on_edit(final_content, edit_content)
		final_content["_admin"]["operationalState"] = "PROCESSING"
		final_content["_admin"]["detailed-status"] = "Editing"
		return oid

		def _check_if_used_by_ns(self):
		pass

		def check_conflict_on_del(self, session, _id, db_content):
		"""
		Check if deletion can be done because of dependencies if it is not force.
		:param session: contains "username", "admin", "force", "public", "project_id", "set_project"
		:param _id: internal _id
		:param db_content: The database content of this item _id
		:return: None if ok or raises EngineException with the conflict
		"""
		if session["force"]:
		return
		self._check_if_used_by_ns()

		super().check_conflict_on_del(session, _id, db_content)


		class K8sRepoTopic(CommonVimWimSdn):
		topic = "k8srepos"
		topic_msg = "k8srepo"
		@@ -1109,7 +1093,10 @@ class UserTopicAuth(UserTopic):
		if to_add["project"] in (
		mapping["project"],
		mapping["project_name"],
		) and to_add["role"] in (mapping["role"], mapping["role_name"]):
		) and to_add["role"] in (
		mapping["role"],
		mapping["role_name"],
		):

		if mapping in mappings_to_remove: # do not remove
		mappings_to_remove.remove(mapping)
		@@ -1126,7 +1113,10 @@ class UserTopicAuth(UserTopic):
		if to_set["project"] in (
		mapping["project"],
		mapping["project_name"],
		) and to_set["role"] in (mapping["role"], mapping["role_name"]):
		) and to_set["role"] in (
		mapping["role"],
		mapping["role_name"],
		):
		if mapping in mappings_to_remove: # do not remove
		mappings_to_remove.remove(mapping)
		break # do not add, it is already at user
		@@ -1139,7 +1129,10 @@ class UserTopicAuth(UserTopic):
		if to_set["project"] in (
		mapping["project"],
		mapping["project_name"],
		) and to_set["role"] in (mapping["role"], mapping["role_name"]):
		) and to_set["role"] in (
		mapping["role"],
		mapping["role_name"],
		):
		break
		else:
		# delete

osm_nbi/engine.py

+3 −8

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ from osm_nbi.authconn_tacacs import AuthconnTacacs
		from osm_nbi.base_topic import EngineException, versiontuple
		from osm_nbi.admin_topics import VimAccountTopic, WimAccountTopic, SdnTopic
		from osm_nbi.admin_topics import K8sClusterTopic, K8sRepoTopic, OsmRepoTopic
		from osm_nbi.admin_topics import VcaTopic, PaasTopic
		from osm_nbi.admin_topics import VcaTopic
		from osm_nbi.admin_topics import UserTopicAuth, ProjectTopicAuth, RoleTopicAuth
		from osm_nbi.descriptor_topics import (
		VnfdTopic,
		@@ -78,7 +78,6 @@ class Engine(object):
		"sdns": SdnTopic,
		"k8sclusters": K8sClusterTopic,
		"vca": VcaTopic,
		"paas": PaasTopic,
		"k8srepos": K8sRepoTopic,
		"osmrepos": OsmRepoTopic,
		"users": UserTopicAuth, # Valid for both internal and keystone authentication backends
		@@ -294,9 +293,7 @@ class Engine(object):
		:return: The list, it can be empty if no one match the filter_q.
		"""
		if topic not in self.map_topic:
		raise EngineException(
		"Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR
		)
		raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR)
		return self.map_topic[topic].list(session, filter_q, api_req)

		def get_item(self, session, topic, _id, filter_q=None, api_req=False):
		@@ -310,9 +307,7 @@ class Engine(object):
		:return: dictionary, raise exception if not found.
		"""
		if topic not in self.map_topic:
		raise EngineException(
		"Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR
		)
		raise EngineException("Unknown topic {}!!!".format(topic), HTTPStatus.INTERNAL_SERVER_ERROR)
		return self.map_topic[topic].show(session, _id, filter_q, api_req)

		def get_file(self, session, topic, _id, path=None, accept_header=None):

osm_nbi/instance_topics.py

+258 −502

File changed.

Preview size limit exceeded, changes collapsed.

osm_nbi/nbi.py

+69 −149

Original line number	Diff line number	Diff line
		@@ -115,8 +115,6 @@ URL: /osm GET POST
		/<id> O O O
		/k8sclusters O O
		/<id> O O O
		/paas O5 O5
		/<id> O5 O5 O5
		/k8srepos O O
		/<id> O O
		/osmrepos O O
		@@ -290,14 +288,6 @@ valid_url_methods = {
		"ROLE_PERMISSION": "vca:id:",
		},
		},
		"paas": {
		"METHODS": ("GET", "POST"),
		"ROLE_PERMISSION": "paas:",
		"<ID>": {
		"METHODS": ("GET", "DELETE", "PATCH"),
		"ROLE_PERMISSION": "paas:id:",
		},
		},
		"k8srepos": {
		"METHODS": ("GET", "POST"),
		"ROLE_PERMISSION": "k8srepos:",
		@@ -473,7 +463,7 @@ valid_url_methods = {
		},
		"verticalscale": {
		"METHODS": ("POST",),
		"ROLE_PERMISSION": "ns_instances:id:verticalscale:",
		"ROLE_PERMISSION": "ns_instances:id:verticalscale:"
		},
		},
		},
		@@ -507,41 +497,32 @@ valid_url_methods = {
		},
		"vnflcm": {
		"v1": {
		"vnf_instances": {
		"METHODS": ("GET", "POST"),
		"vnf_instances": {"METHODS": ("GET", "POST"),
		"ROLE_PERMISSION": "vnflcm_instances:",
		"<ID>": {
		"METHODS": ("GET", "DELETE"),
		"<ID>": {"METHODS": ("GET", "DELETE"),
		"ROLE_PERMISSION": "vnflcm_instances:id:",
		"scale": {
		"METHODS": ("POST",),
		"ROLE_PERMISSION": "vnflcm_instances:id:scale:",
		"scale": {"METHODS": ("POST",),
		"ROLE_PERMISSION": "vnflcm_instances:id:scale:"
		},
		"terminate": {
		"METHODS": ("POST",),
		"ROLE_PERMISSION": "vnflcm_instances:id:terminate:",
		},
		"instantiate": {
		"METHODS": ("POST",),
		"ROLE_PERMISSION": "vnflcm_instances:id:instantiate:",
		"terminate": {"METHODS": ("POST",),
		"ROLE_PERMISSION": "vnflcm_instances:id:terminate:"
		},
		"instantiate": {"METHODS": ("POST",),
		"ROLE_PERMISSION": "vnflcm_instances:id:instantiate:"
		},
		}
		},
		"vnf_lcm_op_occs": {
		"METHODS": ("GET",),
		"vnf_lcm_op_occs": {"METHODS": ("GET",),
		"ROLE_PERMISSION": "vnf_instances:opps:",
		"<ID>": {
		"METHODS": ("GET",),
		"ROLE_PERMISSION": "vnf_instances:opps:id:",
		"<ID>": {"METHODS": ("GET",),
		"ROLE_PERMISSION": "vnf_instances:opps:id:"
		},
		},
		"subscriptions": {
		"METHODS": ("GET", "POST"),
		"subscriptions": {"METHODS": ("GET", "POST"),
		"ROLE_PERMISSION": "vnflcm_subscriptions:",
		"<ID>": {
		"METHODS": ("GET", "DELETE"),
		"ROLE_PERMISSION": "vnflcm_subscriptions:id:",
		},
		"<ID>": {"METHODS": ("GET", "DELETE"),
		"ROLE_PERMISSION": "vnflcm_subscriptions:id:"
		}
		},
		}
		},
		@@ -639,11 +620,9 @@ valid_url_methods = {
		},
		"nsfm": {
		"v1": {
		"alarms": {
		"METHODS": ("GET", "PATCH"),
		"alarms": {"METHODS": ("GET", "PATCH"),
		"ROLE_PERMISSION": "alarms:",
		"<ID>": {
		"METHODS": ("GET", "PATCH"),
		"<ID>": {"METHODS": ("GET", "PATCH"),
		"ROLE_PERMISSION": "alarms:id:",
		},
		}
		@@ -905,87 +884,54 @@ class Server(object):

		# NS Fault Management
		@cherrypy.expose
		def nsfm(
		self,
		version=None,
		topic=None,
		uuid=None,
		project_name=None,
		ns_id=None,
		*args,
		**kwargs
		):
		if topic == "alarms":
		def nsfm(self, version=None, topic=None, uuid=None, project_name=None, ns_id=None, args, *kwargs):
		if topic == 'alarms':
		try:
		method = cherrypy.request.method
		role_permission = self._check_valid_url_method(
		method, "nsfm", version, topic, None, None, *args
		)
		query_string_operations = self._extract_query_string_operations(
		kwargs, method
		)
		role_permission = self._check_valid_url_method(method, "nsfm", version, topic, None, None, *args)
		query_string_operations = self._extract_query_string_operations(kwargs, method)

		self.authenticator.authorize(
		role_permission, query_string_operations, None
		)
		self.authenticator.authorize(role_permission, query_string_operations, None)

		# to handle get request
		if cherrypy.request.method == "GET":
		if cherrypy.request.method == 'GET':
		# if request is on basis of uuid
		if uuid and uuid != "None":
		if uuid and uuid != 'None':
		try:
		alarm = self.engine.db.get_one("alarms", {"uuid": uuid})
		alarm_action = self.engine.db.get_one(
		"alarms_action", {"uuid": uuid}
		)
		alarm_action = self.engine.db.get_one("alarms_action", {"uuid": uuid})
		alarm.update(alarm_action)
		vnf = self.engine.db.get_one(
		"vnfrs", {"nsr-id-ref": alarm["tags"]["ns_id"]}
		)
		vnf = self.engine.db.get_one("vnfrs", {"nsr-id-ref": alarm["tags"]["ns_id"]})
		alarm["vnf-id"] = vnf["_id"]
		return self._format_out(str(alarm))
		except Exception:
		return self._format_out("Please provide valid alarm uuid")
		elif ns_id and ns_id != "None":
		elif ns_id and ns_id != 'None':
		# if request is on basis of ns_id
		try:
		alarms = self.engine.db.get_list(
		"alarms", {"tags.ns_id": ns_id}
		)
		alarms = self.engine.db.get_list("alarms", {"tags.ns_id": ns_id})
		for alarm in alarms:
		alarm_action = self.engine.db.get_one(
		"alarms_action", {"uuid": alarm["uuid"]}
		)
		alarm_action = self.engine.db.get_one("alarms_action", {"uuid": alarm['uuid']})
		alarm.update(alarm_action)
		return self._format_out(str(alarms))
		except Exception:
		return self._format_out("Please provide valid ns id")
		else:
		# to return only alarm which are related to given project
		project = self.engine.db.get_one(
		"projects", {"name": project_name}
		)
		project_id = project.get("_id")
		ns_list = self.engine.db.get_list(
		"nsrs", {"_admin.projects_read": project_id}
		)
		project = self.engine.db.get_one("projects", {"name": project_name})
		project_id = project.get('_id')
		ns_list = self.engine.db.get_list("nsrs", {"_admin.projects_read": project_id})
		ns_ids = []
		for ns in ns_list:
		ns_ids.append(ns.get("_id"))
		alarms = self.engine.db.get_list("alarms")
		alarm_list = [
		alarm
		for alarm in alarms
		if alarm["tags"]["ns_id"] in ns_ids
		]
		alarm_list = [alarm for alarm in alarms if alarm["tags"]["ns_id"] in ns_ids]
		for alrm in alarm_list:
		action = self.engine.db.get_one(
		"alarms_action", {"uuid": alrm.get("uuid")}
		)
		action = self.engine.db.get_one("alarms_action", {"uuid": alrm.get("uuid")})
		alrm.update(action)
		return self._format_out(str(alarm_list))
		# to handle patch request for alarm update
		elif cherrypy.request.method == "PATCH":
		elif cherrypy.request.method == 'PATCH':
		data = yaml.load(cherrypy.request.body, Loader=yaml.SafeLoader)
		try:
		# check if uuid is valid
		@@ -994,43 +940,24 @@ class Server(object):
		return self._format_out("Please provide valid alarm uuid.")
		if data.get("is_enable") is not None:
		if data.get("is_enable"):
		alarm_status = "ok"
		alarm_status = 'ok'
		else:
		alarm_status = "disabled"
		self.engine.db.set_one(
		"alarms",
		{"uuid": data.get("uuid")},
		{"alarm_status": alarm_status},
		)
		alarm_status = 'disabled'
		self.engine.db.set_one("alarms", {"uuid": data.get("uuid")},
		{"alarm_status": alarm_status})
		else:
		self.engine.db.set_one(
		"alarms",
		{"uuid": data.get("uuid")},
		{"threshold": data.get("threshold")},
		)
		self.engine.db.set_one("alarms", {"uuid": data.get("uuid")},
		{"threshold": data.get("threshold")})
		return self._format_out("Alarm updated")
		except Exception as e:
		cherrypy.response.status = e.http_code.value
		if isinstance(
		e,
		(
		NbiException,
		EngineException,
		DbException,
		FsException,
		MsgException,
		AuthException,
		ValidationError,
		AuthconnException,
		),
		):
		if isinstance(e, (NbiException, EngineException, DbException, FsException, MsgException, AuthException,
		ValidationError, AuthconnException)):
		http_code_value = cherrypy.response.status = e.http_code.value
		http_code_name = e.http_code.name
		cherrypy.log("Exception {}".format(e))
		else:
		http_code_value = (
		cherrypy.response.status
		) = HTTPStatus.BAD_REQUEST.value # INTERNAL_SERVER_ERROR
		http_code_value = cherrypy.response.status = HTTPStatus.BAD_REQUEST.value # INTERNAL_SERVER_ERROR
		cherrypy.log("CRITICAL: Exception {}".format(e), traceback=True)
		http_code_name = HTTPStatus.BAD_REQUEST.name
		problem_details = {
		@@ -1077,10 +1004,9 @@ class Server(object):
		self._format_login(token_info)
		# password expiry check
		if self.authenticator.check_password_expiry(outdata):
		outdata = {
		"id": outdata["id"],
		outdata = {"id": outdata["id"],
		"message": "change_password",
		"user_id": outdata["user_id"],
		"user_id": outdata["user_id"]
		}
		# cherrypy.response.cookie["Authorization"] = outdata["id"]
		# cherrypy.response.cookie["Authorization"]['expires'] = 3600
		@@ -1527,9 +1453,7 @@ class Server(object):
		filter_q = None
		if "vcaStatusRefresh" in kwargs:
		filter_q = {"vcaStatusRefresh": kwargs["vcaStatusRefresh"]}
		outdata = self.engine.get_item(
		engine_session, engine_topic, _id, filter_q, True
		)
		outdata = self.engine.get_item(engine_session, engine_topic, _id, filter_q, True)

		elif method == "POST":
		cherrypy.response.status = HTTPStatus.CREATED.value
		@@ -1636,12 +1560,8 @@ class Server(object):
		elif topic == "vnf_instances" and item:
		indata["lcmOperationType"] = item
		indata["vnfInstanceId"] = _id
		_id, _ = self.engine.new_item(
		rollback, engine_session, "vnflcmops", indata, kwargs
		)
		self._set_location_header(
		main_topic, version, "vnf_lcm_op_occs", _id
		)
		_id, _ = self.engine.new_item(rollback, engine_session, "vnflcmops", indata, kwargs)
		self._set_location_header(main_topic, version, "vnf_lcm_op_occs", _id)
		outdata = {"id": _id}
		cherrypy.response.status = HTTPStatus.ACCEPTED.value
		else:

osm_nbi/osm_vnfm/vnf_instance_actions.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -100,8 +100,7 @@ class NewVnfLcmOp(BaseMethod):
		"nsName": indata["vnfName"],
		"nsDescription": indata["vnfDescription"],
		"nsdId": self.__get_nsdid(session, indata["vnfInstanceId"]),
		"vimAccountId": indata.get("vimAccountId"),
		"paasAccountId": indata.get("paasAccountId"),
		"vimAccountId": indata["vimAccountId"],
		"nsr_id": indata["vnfInstanceId"],
		"lcmOperationType": indata["lcmOperationType"],
		"nsInstanceId": indata["vnfInstanceId"]