Revision 0e08e08e

b/docs/quota-api-guide.rst
33 33
      "cyclades.vm": {
34 34
          "unit": null,
35 35
          "description": "Number of virtual machines",
36
          "service": "cyclades",
36
          "service": "cyclades_compute",
37 37
          "allow_in_projects": true
38 38
          },
39 39
      "cyclades.ram": {
40 40
          "unit": "bytes",
41 41
          "description": "Virtual machine memory",
42
          "service": "cyclades",
42
          "service": "cyclades_compute",
43 43
          "allow_in_projects": true
44 44
          }
45 45
  }
b/snf-astakos-app/astakos/im/management/commands/resource-list.py
51 51
    FIELDS = {
52 52
        "id": ("id", "ID"),
53 53
        "name": ("name", "Resource Name"),
54
        "service type": ("service_type", "Service"),
54
        "service type": ("service_type", "Service type"),
55
        "service origin": ("service_origin", "Service"),
55 56
        "limit": ("limit_with_unit", "Base Quota"),
56 57
        "description": ("desc", "Description"),
57 58
        "allow_in_projects": ("allow_in_projects",
58 59
                              "Make resource available in projects"),
59 60
    }
60 61

  
61
    fields = ["id", "name", "service type", "limit", "allow_in_projects",
62
    fields = ["id", "name", "service origin", "limit",
62 63
              "description"]
63 64

  
64 65
    def show_limit(self, resource):
b/snf-astakos-app/astakos/im/migrations/0041_auto__add_field_resource_service_origin.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.service_origin'
12
        db.add_column('im_resource', 'service_origin', self.gf('django.db.models.fields.CharField')(default='', max_length=255, db_index=True), keep_default=False)
13

  
14

  
15
    def backwards(self, orm):
16
        
17
        # Deleting field 'Resource.service_origin'
18
        db.delete_column('im_resource', 'service_origin')
19

  
20

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

  
295
    complete_apps = ['im']
b/snf-astakos-app/astakos/im/migrations/0042_service_origin.py
1
# encoding: utf-8
2
import datetime
3
from south.db import db
4
from south.v2 import DataMigration
5
from django.db import models
6

  
7
class Migration(DataMigration):
8

  
9
    def forwards(self, orm):
10
        services = {
11
            'account':      'astakos_account',
12
            'compute':      'cyclades_compute',
13
            'object-store': 'pithos_objest-store',
14
            }
15
        resources = orm.Resource.objects.all()
16
        for resource in resources:
17
            service_origin = services.get(resource.service_type, "")
18
            resource.service_origin = service_origin
19
            resource.save()
20

  
21

  
22
    def backwards(self, orm):
23
        "Write your backwards methods here."
24

  
25

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

  
300
    complete_apps = ['im']
b/snf-astakos-app/astakos/im/models.py
211 211
    name = models.CharField(_('Name'), max_length=255, unique=True)
212 212
    desc = models.TextField(_('Description'), null=True)
213 213
    service_type = models.CharField(_('Type'), max_length=255)
214
    service_origin = models.CharField(max_length=255, db_index=True)
214 215
    unit = models.CharField(_('Unit'), null=True, max_length=255)
215 216
    uplimit = intDecimalField(default=0)
216 217
    allow_in_projects = models.BooleanField(default=True)
......
224 225
        return str(self)
225 226

  
226 227
    def get_info(self):
227
        return {'service_type': self.service_type,
228
        return {'service': self.service_origin,
228 229
                'description': self.desc,
229 230
                'unit': self.unit,
230 231
                'allow_in_projects': self.allow_in_projects,
b/snf-astakos-app/astakos/im/quotas.py
96 96

  
97 97

  
98 98
def service_get_quotas(component, users=None):
99
    type_values = Service.objects.filter(
100
        component=component).values_list('type')
101
    service_types = [t for (t,) in type_values]
102
    resources = Resource.objects.filter(service_type__in=service_types)
99
    name_values = Service.objects.filter(
100
        component=component).values_list('name')
101
    service_names = [t for (t,) in name_values]
102
    resources = Resource.objects.filter(service_origin__in=service_names)
103 103
    resource_names = [r.name for r in resources]
104 104
    counters = qh.get_quota(holders=users, resources=resource_names)
105 105
    return transform_data(counters)
b/snf-astakos-app/astakos/im/register.py
48 48
def add_resource(resource_dict):
49 49
    name = resource_dict.get('name')
50 50
    service_type = resource_dict.get('service_type')
51
    if not name or not service_type:
51
    service_origin = resource_dict.get('service_origin')
52
    if not name or not service_type or not service_origin:
52 53
        raise ResourceException("Malformed resource dict.")
53 54

  
54 55
    try:
56
        service = Service.objects.get(name=service_origin)
57
    except Service.DoesNotExist:
58
        m = "There is no service %s." % service_origin
59
        raise ResourceException(m)
60

  
61
    try:
55 62
        r = Resource.objects.get_for_update(name=name)
56 63
        exists = True
57 64
        if r.service_type != service_type:
58 65
            m = ("There already exists a resource named %s with service "
59 66
                 "type %s." % (name, r.service_type))
60 67
            raise ResourceException(m)
68
        if r.service_origin != service_origin:
69
            m = ("There already exists a resource named %s registered for "
70
                 "service %s." % (name, r.service_origin))
71
            raise ResourceException(m)
72

  
61 73
    except Resource.DoesNotExist:
62 74
        r = Resource(name=name,
63 75
                     uplimit=0,
64
                     service_type=service_type)
76
                     service_type=service_type,
77
                     service_origin=service_origin)
65 78
        exists = False
66 79

  
67 80
    for field in resource_fields:

Also available in: Unified diff