@@ -44,7 +44,7 @@ def update(cls, _id, **kwargs):
4444 CIManager ().update (_id , _sync = True , ** kwargs )
4545
4646 if RackBuiltinAttributes .U_COUNT in kwargs :
47- payload = {RackBuiltinAttributes .FREE_U_COUNT : cls ._calc_u_free_count (_id )}
47+ payload = {RackBuiltinAttributes .FREE_U_COUNT : cls .calc_u_free_count (_id )}
4848
4949 CIManager ().update (_id , _sync = True , ** payload )
5050
@@ -57,7 +57,7 @@ def delete(self, _id):
5757 CIManager ().update (ci ['_id' ], ** payload )
5858
5959 @staticmethod
60- def _calc_u_free_count (rack_id , device_id = None , u_start = None , u_count = None ):
60+ def calc_u_free_count (rack_id , device_id = None , u_start = None , u_count = None ):
6161 rack = CIManager .get_ci_by_id (rack_id , need_children = False )
6262 if not rack .get (RackBuiltinAttributes .U_COUNT ):
6363 return 0
@@ -123,7 +123,7 @@ def check_u_slot(self):
123123
124124 def add_device (self , rack_id , device_id , u_start , u_count = None ):
125125 with (redis_lock .Lock (rd .r , "DCIM_RACK_OPERATE_{}" .format (rack_id ))):
126- self ._calc_u_free_count (rack_id , device_id , u_start , u_count )
126+ self .calc_u_free_count (rack_id , device_id , u_start , u_count )
127127
128128 self .add_relation (rack_id , device_id )
129129
@@ -133,7 +133,7 @@ def add_device(self, rack_id, device_id, u_start, u_count=None):
133133 CIManager ().update (device_id , _sync = True , ** payload )
134134
135135 payload = {
136- RackBuiltinAttributes .FREE_U_COUNT : self ._calc_u_free_count (rack_id , device_id , u_start , u_count )}
136+ RackBuiltinAttributes .FREE_U_COUNT : self .calc_u_free_count (rack_id , device_id , u_start , u_count )}
137137 CIManager ().update (rack_id , _sync = True , ** payload )
138138
139139 OperateHistoryManager ().add (operate_type = OperateTypeEnum .ADD_DEVICE , rack_id = rack_id , ci_id = device_id )
@@ -142,7 +142,7 @@ def remove_device(self, rack_id, device_id):
142142 with (redis_lock .Lock (rd .r , "DCIM_RACK_OPERATE_{}" .format (rack_id ))):
143143 CIRelationManager .delete_3 (rack_id , device_id , apply_async = False , valid = False )
144144
145- payload = {RackBuiltinAttributes .FREE_U_COUNT : self ._calc_u_free_count (rack_id )}
145+ payload = {RackBuiltinAttributes .FREE_U_COUNT : self .calc_u_free_count (rack_id )}
146146 CIManager ().update (rack_id , _sync = True , ** payload )
147147
148148 payload = {RackBuiltinAttributes .U_START : None }
@@ -152,7 +152,7 @@ def remove_device(self, rack_id, device_id):
152152
153153 def move_device (self , rack_id , device_id , to_u_start ):
154154 with (redis_lock .Lock (rd .r , "DCIM_RACK_OPERATE_{}" .format (rack_id ))):
155- payload = {RackBuiltinAttributes .FREE_U_COUNT : self ._calc_u_free_count (rack_id , device_id , to_u_start )}
155+ payload = {RackBuiltinAttributes .FREE_U_COUNT : self .calc_u_free_count (rack_id , device_id , to_u_start )}
156156 CIManager ().update (rack_id , _sync = True , ** payload )
157157
158158 CIManager ().update (device_id , _sync = True , ** {RackBuiltinAttributes .U_START : to_u_start })
@@ -161,23 +161,22 @@ def move_device(self, rack_id, device_id, to_u_start):
161161
162162 def migrate_device (self , rack_id , device_id , to_rack_id , to_u_start ):
163163 with (redis_lock .Lock (rd .r , "DCIM_RACK_OPERATE_{}" .format (rack_id ))):
164- self ._calc_u_free_count (to_rack_id , device_id , to_u_start )
164+ self .calc_u_free_count (to_rack_id , device_id , to_u_start )
165165
166166 if rack_id != to_rack_id :
167167 CIRelationManager .delete_3 (rack_id , device_id , apply_async = False , valid = False )
168168
169169 self .add_relation (to_rack_id , device_id )
170170
171171 payload = {
172- RackBuiltinAttributes .FREE_U_COUNT : self ._calc_u_free_count (to_rack_id , device_id , to_u_start )}
172+ RackBuiltinAttributes .FREE_U_COUNT : self .calc_u_free_count (to_rack_id , device_id , to_u_start )}
173173 CIManager ().update (to_rack_id , _sync = True , ** payload )
174174
175175 CIManager ().update (device_id , _sync = True , ** {RackBuiltinAttributes .U_START : to_u_start })
176176
177177 if rack_id != to_rack_id :
178- payload = {RackBuiltinAttributes .FREE_U_COUNT : self ._calc_u_free_count (rack_id )}
178+ payload = {RackBuiltinAttributes .FREE_U_COUNT : self .calc_u_free_count (rack_id )}
179179 CIManager ().update (rack_id , _sync = True , ** payload )
180180
181181 OperateHistoryManager ().add (operate_type = OperateTypeEnum .REMOVE_DEVICE , rack_id = rack_id , ci_id = device_id )
182182 OperateHistoryManager ().add (operate_type = OperateTypeEnum .ADD_DEVICE , rack_id = to_rack_id , ci_id = device_id )
183-
0 commit comments