diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/resource_availability_checker.py b/SAS/ResourceAssignment/ResourceAssigner/lib/resource_availability_checker.py index 08bddad5f0a01a38b65e92e10c52d17ad0ad3e55..412982ac92019c1c7967641aedd6216d311c8ce3 100644 --- a/SAS/ResourceAssignment/ResourceAssigner/lib/resource_availability_checker.py +++ b/SAS/ResourceAssignment/ResourceAssigner/lib/resource_availability_checker.py @@ -33,8 +33,8 @@ class CouldNotFindClaimException(Exception): class ResourceAvailabilityChecker(object): - def __init__(self, radbrpc): - self.radbrpc = radbrpc + def __init__(self, radb): + self.radb = radb @property @cache @@ -47,7 +47,7 @@ class ResourceAvailabilityChecker(object): "parent_ids": list of parent resource groups "resource_ids": list of resources in this group. } """ - memberships = self.radbrpc.getResourceGroupMemberships() + memberships = self.radb.getResourceGroupMemberships() return memberships['groups'] # resource-group-to-resource-group relations @property @@ -55,14 +55,14 @@ class ResourceAvailabilityChecker(object): def resource_types(self): """ Returns a dict of all the resource types, to convert name->id. """ - return {rt['name']: rt['id'] for rt in self.radbrpc.getResourceTypes()} + return {rt['name']: rt['id'] for rt in self.radb.getResourceTypes()} @property @cache def resource_claim_property_types(self): """ Returns a dict of all the resource claim property types, to convert name->id. """ - return {rcpt['name']: rcpt['id'] for rcpt in self.radbrpc.getResourceClaimPropertyTypes()} + return {rcpt['name']: rcpt['id'] for rcpt in self.radb.getResourceClaimPropertyTypes()} @cache def _summable_property_type_ids(self): @@ -145,8 +145,8 @@ class ResourceAvailabilityChecker(object): return claims def _get_current_resource_usage(self): - db_resource_list = self.radbrpc.getResources(include_availability=True) - db_resource_max_fill_ratios = self.radbrpc.getResourceAllocationConfig(sql_like_name_pattern='max_fill_ratio_%') + db_resource_list = self.radb.getResources(include_availability=True) + db_resource_max_fill_ratios = self.radb.getResourceAllocationConfig(sql_like_name_pattern='max_fill_ratio_%') self._apply_maximum_fill_ratios(db_resource_list, db_resource_max_fill_ratios)