Revision 1f5565c3
b/docs/upgrade/upgrade-0.14.rst | ||
---|---|---|
49 | 49 |
3 Quota-related steps |
50 | 50 |
===================== |
51 | 51 |
|
52 |
3.1 Set services and resources |
|
53 |
------------------------------ |
|
54 |
|
|
55 | 52 |
Astakos and its resources should also get registered, so that they can |
56 | 53 |
be known to the quota system. |
57 | 54 |
|
... | ... | |
60 | 57 |
astakos-host$ snf-manage service-add astakos service_url api_url |
61 | 58 |
astakos-host$ snf-manage resource-export-astakos > astakos.json |
62 | 59 |
astakos-host$ snf-manage resource-import --json astakos.json |
63 |
astakos-host$ snf-manage resource-modify astakos.pending_app --limit <num> |
|
64 |
|
|
65 |
The last command will set the limit of max pending project applications |
|
66 |
per user. This replaces setting ASTAKOS_PENDING_APPLICATION_LIMIT. |
|
67 | 60 |
|
68 |
In order to migrate the user-specific limits, run |
|
69 |
(script: ``migrate_pending_app.py``):: |
|
61 |
The limit on pending project applications is since 0.14 handled as an |
|
62 |
Astakos resource, rather than a custom setting. In order to set this |
|
63 |
limit (replacing setting ASTAKOS_PENDING_APPLICATION_LIMIT) run:: |
|
70 | 64 |
|
71 |
import os |
|
72 |
os.environ['DJANGO_SETTINGS_MODULE'] = 'synnefo.settings' |
|
73 |
from astakos.im.models import UserSetting, AstakosUserQuota, Resource |
|
74 |
|
|
75 |
SETTING = 'PENDING_APPLICATION_LIMIT' |
|
76 |
RESOURCE = 'astakos.pending_app' |
|
77 |
|
|
78 |
try: |
|
79 |
resource = Resource.objects.get(name=RESOURCE) |
|
80 |
except Resource.DoesNotExist: |
|
81 |
print "Resource 'astakos.pending_app' not found." |
|
82 |
exit() |
|
83 |
|
|
84 |
settings = UserSetting.objects.filter(setting=SETTING) |
|
85 |
for setting in settings: |
|
86 |
user = setting.user |
|
87 |
value = setting.value |
|
88 |
q, created = AstakosUserQuota.objects.get_or_create( |
|
89 |
user=user, resource=resource, capacity=value) |
|
90 |
if not created: |
|
91 |
print "Base quota already exists: %s %s" % (user.uuid, RESOURCE) |
|
92 |
continue |
|
93 |
print "Migrated base quota: %s %s %s" % (user.uuid, RESOURCE, value) |
|
65 |
astakos-host$ snf-manage resource-modify astakos.pending_app --limit <num> |
|
94 | 66 |
|
95 |
with:: |
|
67 |
To take into account the user-specific limits we need a data migration. The |
|
68 |
following command populates the user-specific base quota for resource |
|
69 |
``astakos.pending_app`` using the deprecated user setting:: |
|
96 | 70 |
|
97 |
astakos-host$ python ./migrate_pending_app.py
|
|
71 |
astakos-host$ astakos-migrate-0.14
|
|
98 | 72 |
|
99 |
followed by:: |
|
73 |
Finally, Astakos needs to inform the quota system for the current number |
|
74 |
of pending applications per user:: |
|
100 | 75 |
|
101 |
astakos-host$ snf-manage reconcile-resources-astakos |
|
76 |
astakos-host$ snf-manage reconcile-resources-astakos --fix |
b/snf-astakos-app/astakos/scripts/upgrade/migrate_014.py | ||
---|---|---|
1 |
# Copyright 2013 GRNET S.A. All rights reserved. |
|
2 |
# |
|
3 |
# Redistribution and use in source and binary forms, with or |
|
4 |
# without modification, are permitted provided that the following |
|
5 |
# conditions are met: |
|
6 |
# |
|
7 |
# 1. Redistributions of source code must retain the above |
|
8 |
# copyright notice, this list of conditions and the following |
|
9 |
# disclaimer. |
|
10 |
# |
|
11 |
# 2. Redistributions in binary form must reproduce the above |
|
12 |
# copyright notice, this list of conditions and the following |
|
13 |
# disclaimer in the documentation and/or other materials |
|
14 |
# provided with the distribution. |
|
15 |
# |
|
16 |
# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS |
|
17 |
# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
|
18 |
# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
|
19 |
# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR |
|
20 |
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
|
21 |
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
|
22 |
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF |
|
23 |
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED |
|
24 |
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT |
|
25 |
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN |
|
26 |
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
|
27 |
# POSSIBILITY OF SUCH DAMAGE. |
|
28 |
# |
|
29 |
# The views and conclusions contained in the software and |
|
30 |
# documentation are those of the authors and should not be |
|
31 |
# interpreted as representing official policies, either expressed |
|
32 |
# or implied, of GRNET S.A. |
|
33 |
|
|
34 |
import os |
|
35 |
os.environ['DJANGO_SETTINGS_MODULE'] = 'synnefo.settings' |
|
36 |
from astakos.im.models import UserSetting, AstakosUserQuota, Resource |
|
37 |
from astakos.im.quotas import qh_sync_users |
|
38 |
|
|
39 |
SETTING = 'PENDING_APPLICATION_LIMIT' |
|
40 |
RESOURCE = 'astakos.pending_app' |
|
41 |
|
|
42 |
|
|
43 |
def main(): |
|
44 |
try: |
|
45 |
resource = Resource.objects.get(name=RESOURCE) |
|
46 |
except Resource.DoesNotExist: |
|
47 |
print "Resource 'astakos.pending_app' not found." |
|
48 |
return |
|
49 |
|
|
50 |
userids = set() |
|
51 |
settings = UserSetting.objects.filter(setting=SETTING) |
|
52 |
for setting in settings: |
|
53 |
user = setting.user |
|
54 |
value = setting.value |
|
55 |
q, created = AstakosUserQuota.objects.get_or_create( |
|
56 |
user=user, resource=resource, |
|
57 |
defaults={'capacity': value}) |
|
58 |
if not created: |
|
59 |
print "Base quota already exists: %s %s" % (user.uuid, RESOURCE) |
|
60 |
continue |
|
61 |
print "Migrated base quota: %s %s %s" % (user.uuid, RESOURCE, value) |
|
62 |
userids.add(user.id) |
|
63 |
|
|
64 |
qh_sync_users(userids) |
|
65 |
|
|
66 |
|
|
67 |
if __name__ == '__main__': |
|
68 |
main() |
b/snf-astakos-app/setup.py | ||
---|---|---|
208 | 208 |
'web_context_processors = astakos.synnefo_settings:context_processors', |
209 | 209 |
'urls = astakos.urls:urlpatterns', |
210 | 210 |
'web_static = astakos.synnefo_settings:static_files' |
211 |
] |
|
211 |
], |
|
212 |
'console_scripts': [ |
|
213 |
'astakos-migrate-0.14 = astakos.scripts.upgrade.migrate_014:main' |
|
214 |
], |
|
212 | 215 |
} |
213 | 216 |
) |
Also available in: Unified diff