7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(api): check rack u slot

This commit is contained in:
pycook 2024-11-27 15:39:53 +08:00
parent 464b9d5394
commit 5aff5d728d
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmdb-api/api/lib/cmdb/dcim/rack.py
View File

@ -112,11 +112,14 @@ class RackManager(DCIMBase):
u_slot_sets.append(set(range(u_start, u_start + u_count))) u_slot_sets.append(set(range(u_start, u_start + u_count)))
if len(u_slot_sets) > 1: if len(u_slot_sets) > 1:
u_slot_abnormal = False
for a, b in itertools.combinations(u_slot_sets, 2): for a, b in itertools.combinations(u_slot_sets, 2):
u_slot_abnormal = bool(a.intersection(b)) if a.intersection(b):
if u_slot_abnormal != rack.get(RackBuiltinAttributes.U_SLOT_ABNORMAL): u_slot_abnormal = True
payload = {RackBuiltinAttributes.U_SLOT_ABNORMAL: u_slot_abnormal} break
CIManager().update(rack['_id'], **payload) if u_slot_abnormal != rack.get(RackBuiltinAttributes.U_SLOT_ABNORMAL):
payload = {RackBuiltinAttributes.U_SLOT_ABNORMAL: u_slot_abnormal}
CIManager().update(rack['_id'], **payload)
def add_device(self, rack_id, device_id, u_start, u_count=None): def add_device(self, rack_id, device_id, u_start, u_count=None):
with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id))): with (redis_lock.Lock(rd.r, "DCIM_RACK_OPERATE_{}".format(rack_id))):
@ -177,3 +180,4 @@ class RackManager(DCIMBase):
OperateHistoryManager().add(operate_type=OperateTypeEnum.REMOVE_DEVICE, rack_id=rack_id, ci_id=device_id) OperateHistoryManager().add(operate_type=OperateTypeEnum.REMOVE_DEVICE, rack_id=rack_id, ci_id=device_id)
OperateHistoryManager().add(operate_type=OperateTypeEnum.ADD_DEVICE, rack_id=to_rack_id, ci_id=device_id) OperateHistoryManager().add(operate_type=OperateTypeEnum.ADD_DEVICE, rack_id=to_rack_id, ci_id=device_id)