fix: various minor fixes (ff20fd05) · Commits · TFS / controller

src/device/service/drivers/p4/p4_driver.py

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -81,7 +81,7 @@ class P4Driver(_Driver):
	self.__endpoint = None		self.__endpoint = None
	self.__settings = settings		self.__settings = settings
	self.__id = None		self.__id = None
	self.__name = None		self.__name = DRIVER_NAME
	self._name = self.__name		self._name = self.__name
	self.__vendor = P4_VAL_DEF_VENDOR		self.__vendor = P4_VAL_DEF_VENDOR
	self.__hw_version = P4_VAL_DEF_HW_VER		self.__hw_version = P4_VAL_DEF_HW_VER

src/monitoring/service/MetricsDBTools.py

+27 −30

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,7 @@
	# limitations under the License.		# limitations under the License.

	import time		import time
			import math
	from random import random		from random import random

	from questdb.ingress import Sender, IngressError		from questdb.ingress import Sender, IngressError
	@@ -264,69 +265,65 @@ class MetricsDB():
	for kpi in kpi_list:		for kpi in kpi_list:
	alarm = False		alarm = False
	kpi_value = kpi[2]		kpi_value = kpi[2]
			kpiMinIsNone = ((kpiMinValue is None) or math.isnan(kpiMinValue))
			kpiMaxIsNone = ((kpiMaxValue is None) or math.isnan(kpiMaxValue))
	if (kpiMinValue == kpi_value and kpiMaxValue == kpi_value and inRange):		if (kpiMinValue == kpi_value and kpiMaxValue == kpi_value and inRange):
	alarm = True		alarm = True
	elif (		elif (inRange and not kpiMinIsNone and not kpiMaxIsNone and includeMinValue and includeMaxValue):
	inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue):
	if (kpi_value >= kpiMinValue and kpi_value <= kpiMaxValue):		if (kpi_value >= kpiMinValue and kpi_value <= kpiMaxValue):
	alarm = True		alarm = True
	elif (		elif (inRange and not kpiMinIsNone and not kpiMaxIsNone and includeMinValue and not includeMaxValue):
	inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue):
	if (kpi_value >= kpiMinValue and kpi_value < kpiMaxValue):		if (kpi_value >= kpiMinValue and kpi_value < kpiMaxValue):
	alarm = True		alarm = True
	elif (		elif (inRange and not kpiMinIsNone and not kpiMaxIsNone and not includeMinValue and includeMaxValue):
	inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue):
	if (kpi_value > kpiMinValue and kpi_value <= kpiMaxValue):		if (kpi_value > kpiMinValue and kpi_value <= kpiMaxValue):
	alarm = True		alarm = True
	elif (		elif (inRange and not kpiMinIsNone and not kpiMaxIsNone and not includeMinValue and not includeMaxValue):
	inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue):
	if (kpi_value > kpiMinValue and kpi_value < kpiMaxValue):		if (kpi_value > kpiMinValue and kpi_value < kpiMaxValue):
	alarm = True		alarm = True
	elif (		elif (not inRange and not kpiMinIsNone and not kpiMaxIsNone and includeMinValue and includeMaxValue):
	not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and includeMaxValue):
	if (kpi_value <= kpiMinValue or kpi_value >= kpiMaxValue):		if (kpi_value <= kpiMinValue or kpi_value >= kpiMaxValue):
	alarm = True		alarm = True
	elif (		elif (not inRange and not kpiMinIsNone and not kpiMaxIsNone and includeMinValue and not includeMaxValue):
	not inRange and kpiMinValue is not None and kpiMaxValue is not None and includeMinValue and not includeMaxValue):
	if (kpi_value <= kpiMinValue or kpi_value > kpiMaxValue):		if (kpi_value <= kpiMinValue or kpi_value > kpiMaxValue):
	alarm = True		alarm = True
	elif (		elif (not inRange and not kpiMinIsNone and not kpiMaxIsNone and not includeMinValue and includeMaxValue):
	not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and includeMaxValue):
	if (kpi_value < kpiMinValue or kpi_value >= kpiMaxValue):		if (kpi_value < kpiMinValue or kpi_value >= kpiMaxValue):
	alarm = True		alarm = True
	elif (		elif (not inRange and not kpiMinIsNone and not kpiMaxIsNone and not includeMinValue and not includeMaxValue):
	not inRange and kpiMinValue is not None and kpiMaxValue is not None and not includeMinValue and not includeMaxValue):
	if (kpi_value < kpiMinValue or kpi_value > kpiMaxValue):		if (kpi_value < kpiMinValue or kpi_value > kpiMaxValue):
	alarm = True		alarm = True
	elif (inRange and kpiMinValue is not None and kpiMaxValue is None and includeMinValue):		elif (inRange and not kpiMinIsNone and kpiMaxIsNone and includeMinValue):
	if (kpi_value >= kpiMinValue):		if (kpi_value >= kpiMinValue):
	alarm = True		alarm = True
	elif (inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue):		elif (inRange and not kpiMinIsNone and kpiMaxIsNone and not includeMinValue):
	if (kpi_value > kpiMinValue):		if (kpi_value > kpiMinValue):
	alarm = True		alarm = True
	elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue):		elif (not inRange and not kpiMinIsNone and kpiMaxIsNone and includeMinValue):
	if (kpi_value <= kpiMinValue):		if (kpi_value <= kpiMinValue):
	alarm = True		alarm = True
	elif (not inRange and kpiMinValue is not None and kpiMaxValue is None and not includeMinValue):		elif (not inRange and not kpiMinIsNone and kpiMaxIsNone and not includeMinValue):
	if (kpi_value <= kpiMinValue):		if (kpi_value < kpiMinValue):
	alarm = True		alarm = True
	elif (inRange and kpiMinValue is None and kpiMaxValue is not None and includeMaxValue):		elif (inRange and kpiMinIsNone and not kpiMaxIsNone and includeMaxValue):
	if (kpi_value <= kpiMaxValue):		if (kpi_value <= kpiMaxValue):
	alarm = True		alarm = True
	elif (inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue):		elif (inRange and kpiMinIsNone and not kpiMaxIsNone and not includeMaxValue):
	if (kpi_value < kpiMaxValue):		if (kpi_value < kpiMaxValue):
	alarm = True		alarm = True
	elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue):		elif (not inRange and kpiMinIsNone and not kpiMaxIsNone and includeMaxValue):
	if (kpi_value >= kpiMaxValue):		if (kpi_value >= kpiMaxValue):
	alarm = True		alarm = True
	elif (not inRange and kpiMinValue is None and kpiMaxValue is not None and not includeMaxValue):		elif (not inRange and kpiMinIsNone and not kpiMaxIsNone and not includeMaxValue):
	if (kpi_value >= kpiMaxValue):		if (kpi_value > kpiMaxValue):
	alarm = True		alarm = True

	if alarm:		if alarm:
	valid_kpi_list.append(kpi)		valid_kpi_list.append(kpi)
			if valid_kpi_list:
	alarm_queue.put_nowait(valid_kpi_list)		alarm_queue.put_nowait(valid_kpi_list)
	LOGGER.debug(f"Alarm of KPI {kpi_id} triggered -> kpi_value:{kpi[2]}, timestamp:{kpi[1]}")		LOGGER.debug(f"Alarm of KPI {kpi_id} triggered -> kpi_value:{kpi[2]}, timestamp:{kpi[1]}")
			else:
			LOGGER.debug(f"No new alarms triggered for the alarm of KPI {kpi_id}")
	else:		else:
	LOGGER.debug(f"No new data for the alarm of KPI {kpi_id}")		LOGGER.debug(f"No new data for the alarm of KPI {kpi_id}")
	except (Exception) as e:		except (Exception) as e:

src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -203,6 +203,7 @@ public class PolicyServiceImpl implements PolicyService {
	policyRuleBasic.getPolicyRuleId()));		policyRuleBasic.getPolicyRuleId()));
	return policyRuleState;		return policyRuleState;
	}		}
			contextService.setPolicyRule(policyRule);

	LOGGER.infof("Passed 6th");		LOGGER.infof("Passed 6th");

	@@ -508,7 +509,6 @@ public class PolicyServiceImpl implements PolicyService {
	// LOGGER.infof("b");		// LOGGER.infof("b");
	// }		// }
	// );		// );
	// }
	//		//
	// return Multi.createBy().merging().streams(alarmResponseStreamList);		// return Multi.createBy().merging().streams(alarmResponseStreamList);
	// }		// }