7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-09-28 00:39:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): ipam assign address

Browse Source
This commit is contained in:
pycook
2024-11-11 18:56:09 +08:00
parent 1bf8588984
commit f7e748701d
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmdb-api/api/lib/cmdb/ipam/address.py
View File

@@ -106,8 +106,8 @@ class IpAddressManager(object):
ci_id = ip2ci[ip]['_id']
CIManager().update(ci_id, _sync=True, **kwargs)
if IPAddressBuiltinAttributes.ASSIGN_STATUS in kwargs and (
kwargs[IPAddressBuiltinAttributes.ASSIGN_STATUS] !=
ip2ci[ip].get(IPAddressBuiltinAttributes.ASSIGN_STATUS)):
(kwargs[IPAddressBuiltinAttributes.ASSIGN_STATUS] or 2) !=
(ip2ci[ip].get(IPAddressBuiltinAttributes.ASSIGN_STATUS) or 2)):
status_change_num += 1
ci_ids.append(ci_id)

6
cmdb-api/api/lib/cmdb/ipam/subnet.py
View File

@@ -265,9 +265,9 @@ class SubnetManager(object):
return _id
def delete(self, _id):
if CIRelation.get_by(only_query=True).join(CI, CI.id == CIRelation.second_ci_id).filter(
CIRelation.first_ci_id == _id).filter(CI.type_id == self.type_id).first():
@classmethod
def delete(cls, _id):
if CIRelation.get_by(only_query=True).filter(CIRelation.first_ci_id == _id).first():
return abort(400, ErrFormat.ipam_subnet_cannot_delete)
existed = IPAMSubnetScan.get_by(ci_id=_id, first=True, to_dict=False)