fix(metrics): portable BigInteger PKs + split test asserts

This commit is contained in:
2026-06-21 20:53:21 +05:00
parent 572bb44ffa
commit 3b3841fc0e
2 changed files with 6 additions and 4 deletions

View File

@@ -5,7 +5,7 @@ from .base import Base, Column, Integer, BigInteger, String, DateTime, Index, fu
class InstanceMetric(Base): class InstanceMetric(Base):
__tablename__ = "instance_metric" __tablename__ = "instance_metric"
id = Column(Integer, primary_key=True, autoincrement=True) id = Column(BigInteger().with_variant(Integer, "sqlite"), primary_key=True, autoincrement=True)
server_id = Column(Integer, nullable=False) server_id = Column(Integer, nullable=False)
vmid = Column(Integer, nullable=False) vmid = Column(Integer, nullable=False)
vm_type = Column(String(10), nullable=True) vm_type = Column(String(10), nullable=True)
@@ -28,7 +28,7 @@ class InstanceMetric(Base):
class InstanceNicMetric(Base): class InstanceNicMetric(Base):
__tablename__ = "instance_nic_metric" __tablename__ = "instance_nic_metric"
id = Column(Integer, primary_key=True, autoincrement=True) id = Column(BigInteger().with_variant(Integer, "sqlite"), primary_key=True, autoincrement=True)
server_id = Column(Integer, nullable=False) server_id = Column(Integer, nullable=False)
vmid = Column(Integer, nullable=False) vmid = Column(Integer, nullable=False)
ts = Column(DateTime(timezone=True), nullable=False, server_default=func.now()) ts = Column(DateTime(timezone=True), nullable=False, server_default=func.now())

View File

@@ -13,6 +13,8 @@ def test_instance_metric_roundtrip(db_session):
server_id=1, vmid=114, ts=ts, dev="tap114i0", in_rate=5.0, out_rate=6.0)) server_id=1, vmid=114, ts=ts, dev="tap114i0", in_rate=5.0, out_rate=6.0))
db_session.commit() db_session.commit()
m = db_session.query(InstanceMetric).one() m = db_session.query(InstanceMetric).one()
assert m.vmid == 114 and m.iops_read == 12.0 assert m.vmid == 114
assert m.iops_read == 12.0
n = db_session.query(InstanceNicMetric).one() n = db_session.query(InstanceNicMetric).one()
assert n.dev == "tap114i0" and n.out_rate == 6.0 assert n.dev == "tap114i0"
assert n.out_rate == 6.0