Revision 140da2d1 snf-astakos-app/astakos/im/models.py

b/snf-astakos-app/astakos/im/models.py
2121 2121

  
2122 2122
    transaction.commit()
2123 2123

  
2124
def _sync_projects(execute):
2124
def _sync_projects(sync):
2125 2125
    sync_finish_serials()
2126
    if not execute:
2126
    if not sync:
2127 2127
        # Do some reporting and
2128 2128
        return
2129 2129

  
......
2132 2132
    sync_finish_serials([serial])
2133 2133
    post_sync_projects()
2134 2134

  
2135
def sync_projects(execute=True, retries=3, retry_wait=1.0):
2135
def sync_projects(sync=True, retries=3, retry_wait=1.0):
2136 2136
    return lock_sync(_sync_projects,
2137
                     args=[execute],
2137
                     args=[sync],
2138 2138
                     retries=retries,
2139 2139
                     retry_wait=retry_wait)
2140 2140

  
2141
def _sync_users(users, execute):
2141
def _sync_users(users, sync):
2142 2142
    sync_finish_serials()
2143 2143

  
2144 2144
    existing, nonexisting = qh_check_users(users)
2145 2145
    resources = get_resource_names()
2146 2146
    quotas = qh_get_quota_limits(existing, resources)
2147 2147

  
2148
    if execute:
2148
    if sync:
2149 2149
        r = register_users(nonexisting)
2150 2150
        r = register_quotas(users)
2151 2151

  
2152 2152
    # TODO: some proper reporting
2153 2153
    return (existing, nonexisting, quotas)
2154 2154

  
2155
def sync_users(users, execute=True, retries=3, retry_wait=1.0):
2155
def sync_users(users, sync=True, retries=3, retry_wait=1.0):
2156 2156
    return lock_sync(_sync_users,
2157
                     args=[users, execute],
2157
                     args=[users, sync],
2158 2158
                     retries=retries,
2159 2159
                     retry_wait=retry_wait)
2160 2160

  
2161
def sync_all_users(execute=True, retries=3, retry_wait=1.0):
2161
def sync_all_users(sync=True, retries=3, retry_wait=1.0):
2162 2162
    users = AstakosUser.objects.all()
2163
    return sync_users(users, execute, retries=retries, retry_wait=retry_wait)
2163
    return sync_users(users, sync, retries=retries, retry_wait=retry_wait)
2164 2164

  
2165 2165
def lock_sync(func, args=[], kwargs={}, retries=3, retry_wait=1.0):
2166 2166
    transaction.commit()

Also available in: Unified diff