Revision 0514bcc7

b/snf-astakos-app/astakos/im/api/backends/lib/django/__init__.py
48 48
    ItemNotExists, ItemExists, MissingIdentifier, MultipleItemsExist)
49 49

  
50 50
from astakos.im.util import reserved_email, model_to_dict
51
from astakos.im.endpoints.qh import get_quota
51
from astakos.im.functions import get_quota
52 52
try:
53 53
    from astakos.im.messages import astakos_messages
54 54
except:
b/snf-astakos-app/astakos/im/endpoints/qh.py
73 73
    logger.info('set_quota: %s rejected: %s' % (payload, result))
74 74
    return result
75 75

  
76
def get_quota(user):
76
def qh_get_quota(user, resources):
77 77
    c = get_client()
78 78
    if not c:
79 79
        return
80 80
    payload = []
81 81
    append = payload.append
82
    for r in user.quota.keys():
82
    for r in resources:
83 83
        append((user.uuid, r, ENTITY_KEY),)
84 84
    result = c.get_quota(context={}, clientkey=clientkey, get_quota=payload)
85 85
    logger.info('get_quota: %s rejected: %s' % (payload, result))
......
117 117
                                         'import_limit',
118 118
                                         'export_limit'))
119 119

  
120
QuotaValues = namedtuple('QuotaValues', ('quantity',
121
                                         'capacity',
122
                                         'import_limit',
123
                                         'export_limit'))
124

  
125
def add_quota_values(q1, q2):
126
    return QuotaValues(
127
        quantity = q1.quantity + q2.quantity,
128
        capacity = q1.capacity + q2.capacity,
129
        import_limit = q1.import_limit + q2.import_limit,
130
        export_limit = q1.export_limit + q2.export_limit)
131

  
120 132
def qh_register_user(user):
121 133
    return register_users([user])
122 134

  
123 135
def register_users(users):
136
    rejected = create_users(users)
137
    if not rejected:
138
        register_quotas(users)
139

  
140
def create_users(users):
124 141
    payload = list(CreateEntityPayload(
125 142
                    entity=u.uuid,
126 143
                    owner='system',
127 144
                    key=ENTITY_KEY,
128 145
                    ownerkey='') for u in users)
129
    rejected = create_entity(payload)
130
    if not rejected:
131
        payload = []
132
        append = payload.append
133
        for u in users:
134
            for resource, capacity in u.quota.iteritems():
135
                append( SetQuotaPayload(
136
                                holder=u.uuid,
137
                                resource=resource,
138
                                key=ENTITY_KEY,
139
                                quantity=0,
140
                                capacity=capacity if capacity != inf else None,
141
                                import_limit=QH_PRACTICALLY_INFINITE,
142
                                export_limit=QH_PRACTICALLY_INFINITE,
143
                                flags=0))
144
        return set_quota(payload)
146
    return create_entity(payload)
145 147

  
146

  
147
def register_resources(resources):
148
    rdata = ((r.service, r) for r in resources)
149
    services = set(r.service for r in resources)
148
def register_quotas(users):
149
    payload = []
150
    append = payload.append
151
    for u in users:
152
        for resource, q in u.all_quotas().iteritems():
153
            append( SetQuotaPayload(
154
                    holder=u.uuid,
155
                    resource=resource,
156
                    key=ENTITY_KEY,
157
                    quantity=q.quantity,
158
                    capacity=q.capacity,
159
                    import_limit=q.import_limit,
160
                    export_limit=q.export_limit,
161
                    flags=0))
162
    return set_quota(payload)
163

  
164
def register_services(services):
150 165
    payload = list(CreateEntityPayload(
151 166
                    entity=service,
152 167
                    owner='system',
153 168
                    key=ENTITY_KEY,
154 169
                    ownerkey='') for service in set(services))
155
    rejected = create_entity(payload)
156
    if not rejected:
157
        payload = list(SetQuotaPayload(
158
                        holder=resource.service,
159
                        resource=resource,
160
                        key=ENTITY_KEY,
161
                        quantity=QH_PRACTICALLY_INFINITE,
162
                        capacity=0,
163
                        import_limit=QH_PRACTICALLY_INFINITE,
164
                        export_limit=QH_PRACTICALLY_INFINITE,
165
                        flags=0) for resource in resources)
166
        return set_quota(payload)
170
    return create_entity(payload)
171

  
172
def register_resources(resources):
173
    payload = list(SetQuotaPayload(
174
            holder=resource.service,
175
            resource=resource,
176
            key=ENTITY_KEY,
177
            quantity=QH_PRACTICALLY_INFINITE,
178
            capacity=0,
179
            import_limit=QH_PRACTICALLY_INFINITE,
180
            export_limit=QH_PRACTICALLY_INFINITE,
181
            flags=0) for resource in resources)
182
    return set_quota(payload)
167 183

  
168 184
def qh_add_quota(serial, sub_list, add_list):
169 185
    if not QUOTAHOLDER_URL:
b/snf-astakos-app/astakos/im/functions.py
66 66
from astakos.im.notifications import build_notification, NotificationError
67 67
from astakos.im.models import (
68 68
    AstakosUser, ProjectMembership, ProjectApplication, Project,
69
    trigger_sync, PendingMembershipError)
69
    trigger_sync, PendingMembershipError, get_resource_names)
70 70
from astakos.im.models import submit_application as models_submit_application
71 71
from astakos.im.project_notif import (
72 72
    membership_change_notify,
73 73
    application_submit_notify, application_approve_notify,
74 74
    application_deny_notify,
75 75
    project_termination_notify, project_suspension_notify)
76
from astakos.im.endpoints.qh import qh_register_user
76
from astakos.im.endpoints.qh import qh_register_user, qh_get_quota
77 77

  
78 78
import astakos.im.messages as astakos_messages
79 79

  
......
377 377
        super(SendNotificationError, self).__init__()
378 378

  
379 379

  
380
def get_quota(user):
381
    resources = get_resource_names()
382
    return qh_get_quota(user, resources)
383

  
384

  
380 385
### PROJECT VIEWS ###
381 386

  
382 387
AUTO_ACCEPT_POLICY = 1
b/snf-astakos-app/astakos/im/management/commands/astakos-load-service-resources.py
33 33
# interpreted as representing official policies, either expressed
34 34
# or implied, of GRNET S.A.
35 35

  
36
from astakos.im.models import Service, Resource
36
from astakos.im.models import load_service_resources
37 37
from django.core.management.base import BaseCommand, CommandError
38 38
import logging
39 39

  
40 40
logger = logging.getLogger(__name__)
41 41

  
42
def create_service_resources(service_name, service_dict):
43
    url = service_dict.get('url')
44
    resources = service_dict.get('resources') or ()
45
    service, created = Service.objects.get_or_create(
46
        name=service_name,
47
        defaults={'url': url}
48
    )
49

  
50
    for r in resources:
51
        try:
52
            resource_name = r.pop('name', '')
53
            uplimit = r.pop('uplimit', None)
54
            r, created = Resource.objects.get_or_create(
55
                service=service,
56
                name=resource_name,
57
                defaults=r)
58
        except Exception, e:
59
            print "Cannot create resource ", resource_name
60
            continue
61

  
62 42
class Command(BaseCommand):
63 43
    args = ""
64 44
    help = "Register service resources"
65 45

  
66 46
    def handle(self, *args, **options):
67
        from astakos.im.settings import SERVICES
68
        for k, v in SERVICES.iteritems():
69
            create_service_resources(k, v)
70

  
47
        load_service_resources()
b/snf-astakos-app/astakos/im/migrations/0017_auto__add_field_resource_uplimit__chg_field_astakosuserquota_capacity_.py
1
# encoding: utf-8
2
import datetime
3
from south.db import db
4
from south.v2 import SchemaMigration
5
from django.db import models
6

  
7
class Migration(SchemaMigration):
8

  
9
    def forwards(self, orm):
10
        
11
        # Adding field 'Resource.uplimit'
12
        db.add_column('im_resource', 'uplimit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(default=0, max_digits=38, decimal_places=0), keep_default=False)
13

  
14
        # Changing field 'AstakosUserQuota.capacity'
15
        db.alter_column('im_astakosuserquota', 'capacity', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(default=0, max_digits=38, decimal_places=0))
16

  
17
        # Changing field 'AstakosUserQuota.import_limit'
18
        db.alter_column('im_astakosuserquota', 'import_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(max_digits=38, decimal_places=0))
19

  
20
        # Changing field 'AstakosUserQuota.export_limit'
21
        db.alter_column('im_astakosuserquota', 'export_limit', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(max_digits=38, decimal_places=0))
22

  
23
        # Changing field 'AstakosUserQuota.quantity'
24
        db.alter_column('im_astakosuserquota', 'quantity', self.gf('synnefo.lib.db.intdecimalfield.IntDecimalField')(max_digits=38, decimal_places=0))
25

  
26

  
27
    def backwards(self, orm):
28
        
29
        # Deleting field 'Resource.uplimit'
30
        db.delete_column('im_resource', 'uplimit')
31

  
32
        # Changing field 'AstakosUserQuota.capacity'
33
        db.alter_column('im_astakosuserquota', 'capacity', self.gf('django.db.models.fields.BigIntegerField')(null=True))
34

  
35
        # Changing field 'AstakosUserQuota.import_limit'
36
        db.alter_column('im_astakosuserquota', 'import_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True))
37

  
38
        # Changing field 'AstakosUserQuota.export_limit'
39
        db.alter_column('im_astakosuserquota', 'export_limit', self.gf('django.db.models.fields.BigIntegerField')(null=True))
40

  
41
        # Changing field 'AstakosUserQuota.quantity'
42
        db.alter_column('im_astakosuserquota', 'quantity', self.gf('django.db.models.fields.BigIntegerField')(null=True))
43

  
44

  
45
    models = {
46
        'auth.group': {
47
            'Meta': {'object_name': 'Group'},
48
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
49
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
50
            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
51
        },
52
        'auth.permission': {
53
            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
54
            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
55
            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
56
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
57
            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
58
        },
59
        'auth.user': {
60
            'Meta': {'object_name': 'User'},
61
            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
62
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
63
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
64
            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
65
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
66
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
67
            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
68
            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
69
            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
70
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
71
            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
72
            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
73
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
74
        },
75
        'contenttypes.contenttype': {
76
            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
77
            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
78
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
79
            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
80
            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
81
        },
82
        'im.additionalmail': {
83
            'Meta': {'object_name': 'AdditionalMail'},
84
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
85
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
86
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
87
        },
88
        'im.approvalterms': {
89
            'Meta': {'object_name': 'ApprovalTerms'},
90
            'date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 14, 15, 20, 45, 481812)', 'db_index': 'True'}),
91
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
92
            'location': ('django.db.models.fields.CharField', [], {'max_length': '255'})
93
        },
94
        'im.astakosuser': {
95
            'Meta': {'object_name': 'AstakosUser', '_ormbases': ['auth.User']},
96
            'activation_sent': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
97
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
98
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
99
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
100
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
101
            'date_signed_terms': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
102
            'disturbed_quota': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
103
            'email_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
104
            'has_credits': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
105
            'has_signed_terms': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
106
            'invitations': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
107
            'is_verified': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
108
            'level': ('django.db.models.fields.IntegerField', [], {'default': '4'}),
109
            'policy': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.AstakosUserQuota']", 'symmetrical': 'False'}),
110
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
111
            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
112
            'updated': ('django.db.models.fields.DateTimeField', [], {}),
113
            'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}),
114
            'uuid': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True'})
115
        },
116
        'im.astakosuserauthprovider': {
117
            'Meta': {'ordering': "('module', 'created')", 'unique_together': "(('identifier', 'module', 'user'),)", 'object_name': 'AstakosUserAuthProvider'},
118
            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
119
            'affiliation': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
120
            'auth_backend': ('django.db.models.fields.CharField', [], {'default': "'astakos'", 'max_length': '255'}),
121
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
122
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
123
            'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
124
            'info_data': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
125
            'module': ('django.db.models.fields.CharField', [], {'default': "'local'", 'max_length': '255'}),
126
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auth_providers'", 'to': "orm['im.AstakosUser']"})
127
        },
128
        'im.astakosuserquota': {
129
            'Meta': {'unique_together': "(('resource', 'user'),)", 'object_name': 'AstakosUserQuota'},
130
            'capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'max_digits': '38', 'decimal_places': '0'}),
131
            'export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
132
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
133
            'import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
134
            'quantity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '0', 'max_digits': '38', 'decimal_places': '0'}),
135
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"}),
136
            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"})
137
        },
138
        'im.chain': {
139
            'Meta': {'object_name': 'Chain'},
140
            'chain': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
141
        },
142
        'im.emailchange': {
143
            'Meta': {'object_name': 'EmailChange'},
144
            'activation_key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '40', 'db_index': 'True'}),
145
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
146
            'new_email_address': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
147
            'requested_at': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime(2013, 1, 14, 15, 20, 45, 482512)'}),
148
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emailchanges'", 'unique': 'True', 'to': "orm['im.AstakosUser']"})
149
        },
150
        'im.invitation': {
151
            'Meta': {'object_name': 'Invitation'},
152
            'code': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True'}),
153
            'consumed': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
154
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
155
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
156
            'inviter': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'invitations_sent'", 'null': 'True', 'to': "orm['im.AstakosUser']"}),
157
            'is_consumed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
158
            'realname': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
159
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
160
        },
161
        'im.pendingthirdpartyuser': {
162
            'Meta': {'unique_together': "(('provider', 'third_party_identifier'),)", 'object_name': 'PendingThirdPartyUser'},
163
            'affiliation': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
164
            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
165
            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
166
            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
167
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
168
            'info': ('django.db.models.fields.TextField', [], {'default': "''", 'null': 'True', 'blank': 'True'}),
169
            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
170
            'provider': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
171
            'third_party_identifier': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
172
            'token': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
173
            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
174
        },
175
        'im.project': {
176
            'Meta': {'object_name': 'Project'},
177
            'application': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'project'", 'unique': 'True', 'to': "orm['im.ProjectApplication']"}),
178
            'creation_date': ('django.db.models.fields.DateTimeField', [], {}),
179
            'deactivation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
180
            'deactivation_reason': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
181
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
182
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
183
            'is_modified': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
184
            'last_approval_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
185
            'members': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.AstakosUser']", 'through': "orm['im.ProjectMembership']", 'symmetrical': 'False'}),
186
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80', 'db_index': 'True'}),
187
            'state': ('django.db.models.fields.IntegerField', [], {'default': '1', 'db_index': 'True'})
188
        },
189
        'im.projectapplication': {
190
            'Meta': {'unique_together': "(('chain', 'id'),)", 'object_name': 'ProjectApplication'},
191
            'applicant': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_applied'", 'to': "orm['im.AstakosUser']"}),
192
            'chain': ('django.db.models.fields.IntegerField', [], {}),
193
            'comments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
194
            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
195
            'end_date': ('django.db.models.fields.DateTimeField', [], {}),
196
            'homepage': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True'}),
197
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
198
            'issue_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
199
            'limit_on_members_number': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}),
200
            'member_join_policy': ('django.db.models.fields.IntegerField', [], {}),
201
            'member_leave_policy': ('django.db.models.fields.IntegerField', [], {}),
202
            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'}),
203
            'owner': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'projects_owned'", 'to': "orm['im.AstakosUser']"}),
204
            'precursor_application': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['im.ProjectApplication']", 'unique': 'True', 'null': 'True', 'blank': 'True'}),
205
            'resource_grants': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['im.Resource']", 'null': 'True', 'through': "orm['im.ProjectResourceGrant']", 'blank': 'True'}),
206
            'start_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
207
            'state': ('django.db.models.fields.IntegerField', [], {'default': '0'})
208
        },
209
        'im.projectmembership': {
210
            'Meta': {'unique_together': "(('person', 'project'),)", 'object_name': 'ProjectMembership'},
211
            'acceptance_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'db_index': 'True'}),
212
            'application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'memberships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
213
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
214
            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
215
            'is_pending': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
216
            'leave_request_date': ('django.db.models.fields.DateField', [], {'null': 'True'}),
217
            'pending_application': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pending_memebrships'", 'null': 'True', 'to': "orm['im.ProjectApplication']"}),
218
            'pending_serial': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'db_index': 'True'}),
219
            'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.AstakosUser']"}),
220
            'project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Project']"}),
221
            'request_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 14, 15, 20, 45, 486499)'}),
222
            'state': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
223
        },
224
        'im.projectmembershiphistory': {
225
            'Meta': {'object_name': 'ProjectMembershipHistory'},
226
            'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime.now'}),
227
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
228
            'person': ('django.db.models.fields.BigIntegerField', [], {}),
229
            'project': ('django.db.models.fields.BigIntegerField', [], {}),
230
            'reason': ('django.db.models.fields.IntegerField', [], {}),
231
            'serial': ('django.db.models.fields.BigIntegerField', [], {})
232
        },
233
        'im.projectresourcegrant': {
234
            'Meta': {'unique_together': "(('resource', 'project_application'),)", 'object_name': 'ProjectResourceGrant'},
235
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
236
            'member_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
237
            'member_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
238
            'member_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
239
            'project_application': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.ProjectApplication']", 'null': 'True'}),
240
            'project_capacity': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
241
            'project_export_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
242
            'project_import_limit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '100000000000000000000000000000000L', 'max_digits': '38', 'decimal_places': '0'}),
243
            'resource': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Resource']"})
244
        },
245
        'im.resource': {
246
            'Meta': {'unique_together': "(('service', 'name'),)", 'object_name': 'Resource'},
247
            'desc': ('django.db.models.fields.TextField', [], {'null': 'True'}),
248
            'group': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
249
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
250
            'meta': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['im.ResourceMetadata']", 'symmetrical': 'False'}),
251
            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
252
            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['im.Service']"}),
253
            'unit': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
254
            'uplimit': ('synnefo.lib.db.intdecimalfield.IntDecimalField', [], {'default': '0', 'max_digits': '38', 'decimal_places': '0'})
255
        },
256
        'im.resourcemetadata': {
257
            'Meta': {'object_name': 'ResourceMetadata'},
258
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
259
            'key': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
260
            'value': ('django.db.models.fields.CharField', [], {'max_length': '255'})
261
        },
262
        'im.serial': {
263
            'Meta': {'object_name': 'Serial'},
264
            'serial': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
265
        },
266
        'im.service': {
267
            'Meta': {'ordering': "('order',)", 'object_name': 'Service'},
268
            'auth_token': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
269
            'auth_token_created': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
270
            'auth_token_expires': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
271
            'icon': ('django.db.models.fields.FilePathField', [], {'max_length': '100', 'blank': 'True'}),
272
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
273
            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255', 'db_index': 'True'}),
274
            'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
275
            'url': ('django.db.models.fields.FilePathField', [], {'max_length': '100'})
276
        },
277
        'im.sessioncatalog': {
278
            'Meta': {'object_name': 'SessionCatalog'},
279
            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
280
            'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40'}),
281
            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'sessions'", 'null': 'True', 'to': "orm['im.AstakosUser']"})
282
        }
283
    }
284

  
285
    complete_apps = ['im']
b/snf-astakos-app/astakos/im/models.py
70 70
    SITENAME, SERVICES, MODERATION_ENABLED, RESOURCES_PRESENTATION_DATA)
71 71
from astakos.im import settings as astakos_settings
72 72
from astakos.im.endpoints.qh import (
73
    register_resources, qh_add_quota, QuotaLimits,
74
    qh_query_serials, qh_ack_serials)
73
    register_services, register_resources, qh_add_quota, QuotaLimits,
74
    qh_query_serials, qh_ack_serials,
75
    QuotaValues, add_quota_values)
75 76
from astakos.im import auth_providers
76 77

  
77 78
import astakos.im.messages as astakos_messages
......
162 163
    desc = models.TextField(_('Description'), null=True)
163 164
    unit = models.CharField(_('Name'), null=True, max_length=255)
164 165
    group = models.CharField(_('Group'), null=True, max_length=255)
166
    uplimit = intDecimalField(default=0)
165 167

  
166 168
    class Meta:
167
        unique_together = ("name", "service")
169
        unique_together = ("service", "name")
168 170

  
169 171
    def __str__(self):
170 172
        return '%s%s%s' % (self.service, RESOURCE_SEPARATOR, self.name)
171 173

  
174
    def full_name(self):
175
        return str(self)
176

  
172 177
    @property
173 178
    def help_text(self):
174 179
        return get_presentation(str(self)).get('help_text', '')
......
194 199
        return get_presentation(str(self)).get('verbose_name', '')
195 200

  
196 201

  
197
_default_quota = {}
198
def get_default_quota():
199
    global _default_quota
200
    if _default_quota:
201
        return _default_quota
202
    for s, data in SERVICES.iteritems():
203
        map(
204
            lambda d:_default_quota.update(
205
                {'%s%s%s' % (s, RESOURCE_SEPARATOR, d.get('name')):d.get('uplimit', 0)}
206
            ),
207
            data.get('resources', {})
202
def load_service_resources():
203
    ss = []
204
    rs = []
205
    for service_name, data in SERVICES.iteritems():
206
        url = data.get('url')
207
        resources = data.get('resources') or ()
208
        service, created = Service.objects.get_or_create(
209
            name=service_name,
210
            defaults={'url': url}
208 211
        )
209
    return _default_quota
212
        ss.append(service)
213

  
214
        for resource in resources:
215
            try:
216
                resource_name = resource.pop('name', '')
217
                r, created = Resource.objects.get_or_create(
218
                    service=service,
219
                    name=resource_name,
220
                    defaults=resource)
221
                rs.append(r)
222

  
223
            except Exception, e:
224
                print "Cannot create resource ", resource_name
225
                continue
226
    register_services(ss)
227
    register_resources(rs)
228

  
229
def _quota_values(capacity):
230
    return QuotaValues(
231
        quantity = 0,
232
        capacity = capacity,
233
        import_limit = QH_PRACTICALLY_INFINITE,
234
        export_limit = QH_PRACTICALLY_INFINITE)
235

  
236
def get_default_quota():
237
    _DEFAULT_QUOTA = {}
238
    resources = Resource.objects.all()
239
    for resource in resources:
240
        capacity = resource.uplimit
241
        limits = _quota_values(capacity)
242
        _DEFAULT_QUOTA[resource.full_name()] = limits
243

  
244
    return _DEFAULT_QUOTA
245

  
246
def get_resource_names():
247
    _RESOURCE_NAMES = []
248
    resources = Resource.objects.all()
249
    _RESOURCE_NAMES = [resource.full_name() for resource in resources]
250
    return _RESOURCE_NAMES
210 251

  
211 252

  
212 253
class AstakosUserManager(UserManager):
......
341 382
        except Invitation.DoesNotExist:
342 383
            return None
343 384

  
344
    @property
345
    def quota(self):
346
        """Returns a dict with the sum of quota limits per resource"""
347
        d = defaultdict(int)
348
        default_quota = get_default_quota()
349
        d.update(default_quota)
350
        for q in self.policies:
351
            d[q.resource] = q.capacity or inf
352
        for m in self.projectmembership_set.select_related().all():
353
            if not m.acceptance_date:
354
                continue
355
            p = m.project
356
            if not p.is_active_strict():
357
                continue
358
            grants = p.application.projectresourcegrant_set.all()
359
            for g in grants:
360
                d[str(g.resource)] += g.member_capacity or inf
361
        return d
385
    def initial_quotas(self):
386
        quotas = dict(get_default_quota())
387
        for user_quota in self.policies:
388
            resource = user_quota.resource.full_name()
389
            quotas[resource] = user_quota.quota_values()
390
        return quotas
391

  
392
    def all_quotas(self):
393
        quotas = self.initial_quotas()
394

  
395
        objects = self.projectmembership_set.select_related()
396
        memberships = objects.filter(is_active=True)
397
        for membership in memberships:
398
            application = membership.application
399

  
400
            grants = application.projectresourcegrant_set.all()
401
            for grant in grants:
402
                resource = grant.resource.full_name()
403
                prev = quotas.get(resource, 0)
404
                new = add_quota_values(prev, grant.member_quota_values())
405
                quotas[resource] = new
406
        return quotas
362 407

  
363 408
    @property
364 409
    def policies(self):
......
816 861

  
817 862
class AstakosUserQuota(models.Model):
818 863
    objects = ExtendedManager()
819
    capacity = models.BigIntegerField(_('Capacity'), null=True)
820
    quantity = models.BigIntegerField(_('Quantity'), null=True)
821
    export_limit = models.BigIntegerField(_('Export limit'), null=True)
822
    import_limit = models.BigIntegerField(_('Import limit'), null=True)
864
    capacity = intDecimalField(_('Capacity'))
865
    quantity = intDecimalField(_('Quantity'), default=0)
866
    export_limit = intDecimalField(_('Export limit'), default=QH_PRACTICALLY_INFINITE)
867
    import_limit = intDecimalField(_('Import limit'), default=QH_PRACTICALLY_INFINITE)
823 868
    resource = models.ForeignKey(Resource)
824 869
    user = models.ForeignKey(AstakosUser)
825 870

  
826 871
    class Meta:
827 872
        unique_together = ("resource", "user")
828 873

  
874
    def quota_values():
875
        return QuotaValues(
876
            quantity = self.quantity,
877
            capacity = self.capacity,
878
            import_limit = self.import_limit,
879
            export_limit = self.export_limit)
880

  
829 881

  
830 882
class ApprovalTerms(models.Model):
831 883
    """
......
1437 1489
    class Meta:
1438 1490
        unique_together = ("resource", "project_application")
1439 1491

  
1492
    def member_quota_values(self):
1493
        return QuotaValues(
1494
            quantity = 0,
1495
            capacity = self.member_capacity,
1496
            import_limit = self.member_import_limit,
1497
            export_limit = self.member_export_limit)
1498

  
1440 1499

  
1441 1500
class ProjectManager(ForUpdateManager):
1442 1501

  
......
2022 2081
post_save.connect(astakosuser_post_save, sender=AstakosUser)
2023 2082

  
2024 2083
def resource_post_save(sender, instance, created, **kwargs):
2025
    if not created:
2026
        return
2027
    register_resources((instance,))
2084
    pass
2085

  
2028 2086
post_save.connect(resource_post_save, sender=Resource)
2029 2087

  
2030 2088
def renew_token(sender, instance, **kwargs):

Also available in: Unified diff