Refine log levels in ACL service (55d6cb83) · Commits · OCF / capif

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/accesscontrolpolicyapi.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -27,11 +27,11 @@ class accessControlPolicyApi(Resource):
		if supported_features is not None:
		current_app.logger.debug(f"SupportedFeatures present on query with value {supported_features}, but currently not used")

		current_app.logger.info(f"Looking for ACLs of service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
		current_app.logger.debug(f"Looking for ACLs of service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
		policies_cursor = mycol.find(query,projection)
		policies = list(policies_cursor)
		if not policies:
		current_app.logger.info(f"No ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
		current_app.logger.warning(f"No ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
		#Not found error
		return not_found_error(f"No ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}", "Wrong id")

		@@ -42,7 +42,7 @@ class accessControlPolicyApi(Resource):
		api_invoker_policies = policies[0]['api_invoker_policies']
		current_app.logger.debug(f"api_invoker_policies: {api_invoker_policies}")
		if not api_invoker_policies:
		current_app.logger.info(f"ACLs list is present but empty, then no ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
		current_app.logger.warning(f"ACLs list is present but empty, then no ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}")
		#Not found error
		return not_found_error(f"No ACLs found for the requested service: {service_api_id}, aef_id: {aef_id}, invoker: {api_invoker_id} and supportedFeatures: {supported_features}", "Wrong id")
		acl = AccessControlPolicyList(api_invoker_policies)

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/consumer_messager.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@ class Subscriber():
		def listen(self):
		for raw_message in self.p.listen():
		if raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "acls-messages":
		current_app.logger.info("acls-messages recived")
		current_app.logger.debug("acls-messages recived")
		message, *ids = raw_message["data"].decode('utf-8').split(":")
		if message == "create-acl" and len(ids) == 3:
		self.acls_ops.create_acl(ids[0], ids[1], ids[2])
		@@ -32,7 +32,7 @@ class Subscriber():
		self.acls_ops.remove_invoker_acl(ids[0])

		if raw_message["type"] == "message" and raw_message["channel"].decode('utf-8') == "internal-messages":
		current_app.logger.info("New internal event received")
		current_app.logger.debug("New internal event received")
		internal_redis_event = json.loads(
		raw_message["data"].decode('utf-8'))
		if internal_redis_event.get('event') == "INVOKER-REMOVED":

services/TS29222_CAPIF_Access_Control_Policy_API/capif_acl/core/internal_service_ops.py

+11 −11

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ class InternalServiceOps(Resource):

		def create_acl(self, invoker_id, service_id, aef_id):

		current_app.logger.info(f"Creating ACL for invoker: {invoker_id}")
		current_app.logger.debug(f"Creating ACL for invoker: {invoker_id}")

		if "acls" not in self.db.db.list_collection_names():
		self.db.db.create_collection("acls")
		@@ -39,7 +39,7 @@ class InternalServiceOps(Resource):
		{"service_id": service_id, "aef_id": aef_id}, {"_id": 0})

		if res:
		current_app.logger.info(
		current_app.logger.debug(
		f"Adding invoker ACL for invoker {invoker_id}")
		range_list = [TimeRangeList(
		datetime.utcnow(), datetime.utcnow()+timedelta(days=time_range_days))]
		@@ -53,9 +53,9 @@ class InternalServiceOps(Resource):

		inserted_invoker_acl = mycol.find_one({"service_id": service_id, "aef_id": aef_id,
		"api_invoker_policies.api_invoker_id": invoker_id}, {"_id": 0})
		current_app.logger.info(inserted_invoker_acl)
		current_app.logger.debug(inserted_invoker_acl)
		inserted_invoker_acl_camel = dict_to_camel_case(inserted_invoker_acl)
		current_app.logger.info(inserted_invoker_acl_camel)
		current_app.logger.debug(inserted_invoker_acl_camel)

		created_invoker_policy = next((policy for policy in inserted_invoker_acl_camel['apiInvokerPolicies'] if policy['apiInvokerId'] == invoker_id), None)

		@@ -67,7 +67,7 @@ class InternalServiceOps(Resource):
		acc_ctrl_pol_list=accCtrlPolListExt).send_event()

		else:
		current_app.logger.info(
		current_app.logger.debug(
		f"Creating service ACLs for service: {service_id}")
		range_list = [TimeRangeList(
		datetime.utcnow(), datetime.utcnow()+timedelta(days=time_range_days))]
		@@ -82,9 +82,9 @@ class InternalServiceOps(Resource):
		result = mycol.insert_one(service_acls)

		inserted_service_acls = mycol.find_one({"_id": result.inserted_id}, {"_id": 0})
		current_app.logger.info(inserted_service_acls)
		current_app.logger.debug(inserted_service_acls)
		inserted_service_acls_camel = dict_to_camel_case(inserted_service_acls)
		current_app.logger.info(inserted_service_acls_camel)
		current_app.logger.debug(inserted_service_acls_camel)

		created_invoker_policy = next((policy for policy in inserted_service_acls_camel['apiInvokerPolicies'] if policy['apiInvokerId'] == invoker_id), None)

		@@ -100,7 +100,7 @@ class InternalServiceOps(Resource):

		def remove_acl(self, invoker_id, service_id, aef_id):

		current_app.logger.info(f"Removing ACL for invoker: {invoker_id}")
		current_app.logger.debug(f"Removing ACL for invoker: {invoker_id}")

		mycol = self.db.get_col_by_name(self.db.acls)

		@@ -113,7 +113,7 @@ class InternalServiceOps(Resource):
		"api_invoker_id": invoker_id}}}
		)
		else:
		current_app.logger.info(
		current_app.logger.warning(
		f"Not found: {service_id} for api : {service_id}")

		RedisEvent("ACCESS_CONTROL_POLICY_UNAVAILABLE").send_event()
		@@ -123,7 +123,7 @@ class InternalServiceOps(Resource):

		def remove_invoker_acl(self, invoker_id):

		current_app.logger.info(f"Removing ACLs for invoker: {invoker_id}")
		current_app.logger.debug(f"Removing ACLs for invoker: {invoker_id}")
		mycol = self.db.get_col_by_name(self.db.acls)

		mycol.update_many({"api_invoker_policies.api_invoker_id": invoker_id},
		@@ -135,7 +135,7 @@ class InternalServiceOps(Resource):

		def remove_provider_acls(self, id):

		current_app.logger.info(f"Removing ACLs for provider/service: {id}")
		current_app.logger.debug(f"Removing ACLs for provider/service: {id}")
		mycol = self.db.get_col_by_name(self.db.acls)

		mycol.delete_many({"$or": [{"service_id": id}, {"aef_id": id}]})