Revision efb70adf

b/snf-astakos-app/astakos/im/migrations/0030_populate_resource_data.py
38 38
                except Exception, e:
39 39
                    print "Cannot create resource ", rn
40 40
                    continue
41

  
42
                q, created = orm.AstakosGroupQuota.objects.get_or_create(
43
                    group=default,
44
                    resource=r,
45
                    defaults={
46
                        'uplimit':uplimit,
47
                    }
48
                )
41
                else:
42
                    q, created = orm.AstakosGroupQuota.objects.get_or_create(
43
                        group=default,
44
                        resource=r,
45
                        defaults={
46
                            'uplimit':uplimit,
47
                        }
48
                    )
49 49
        map(create_policies, SERVICES.iteritems())
50 50

  
51 51
    def backwards(self, orm):
b/snf-astakos-app/astakos/im/settings.py
143 143
            },{
144 144
            'name':'disksize',
145 145
            'group':'compute',
146
            'uplimit':5,
147
            'unit':'GB',
146
            'uplimit':5*1024*1024*1024,
147
            'unit':'bytes',
148 148
            'desc': 'Virtual machine disk size'
149 149
            },{
150 150
            'name':'cpu',
......
154 154
            },{
155 155
            'name':'ram',
156 156
            'group':'compute',
157
            'uplimit':1024,
158
            'unit':'MB',
157
            'uplimit':1024*1024*1024,
158
            'unit':'bytes',
159 159
            'desc': 'Virtual machines'
160 160
            }]
161 161
    },

Also available in: Unified diff