Revision e2497bc5
b/snf-astakos-app/astakos/im/settings.py | ||
---|---|---|
165 | 165 |
'cyclades': { |
166 | 166 |
'url': 'https://node1.example.com/ui/', |
167 | 167 |
'resources': [{ |
168 |
'name':'vm', |
|
169 |
'group':'compute', |
|
170 |
'uplimit':2, |
|
171 |
'desc': 'Number of virtual machines' |
|
172 |
},{ |
|
173 | 168 |
'name':'disk', |
174 | 169 |
'group':'compute', |
175 | 170 |
'uplimit':30*1024*1024*1024, |
... | ... | |
187 | 182 |
'unit':'bytes', |
188 | 183 |
'desc': 'Virtual machines' |
189 | 184 |
},{ |
185 |
'name':'vm', |
|
186 |
'group':'compute', |
|
187 |
'uplimit':2, |
|
188 |
'desc': 'Number of virtual machines' |
|
189 |
},{ |
|
190 | 190 |
'name':'network.private', |
191 | 191 |
'group':'network', |
192 | 192 |
'uplimit':1, |
... | ... | |
251 | 251 |
'placeholder':'eg. 10GB', |
252 | 252 |
'verbose_name':'Storage Space', |
253 | 253 |
}, |
254 |
'cyclades.vm': { |
|
255 |
'help_text':'These are the VMs one can create on the Cyclades UI ', |
|
256 |
'help_text_input_each':'This is the total number of VMs that will be granted to each user of this Project ', |
|
257 |
'is_abbreviation':True, |
|
258 |
'report_desc':'Virtual Machines', |
|
259 |
'placeholder':'eg. 2', |
|
260 |
'verbose_name':'vm', |
|
261 |
}, |
|
262 | 254 |
'cyclades.disk': { |
263 | 255 |
'help_text':'This is the System Disk that the VMs have that run the OS ', |
264 | 256 |
'help_text_input_each':"This is the total amount of System Disk that will be granted to each user of this Project (this refers to the total System Disk of all VMs, not each VM's System Disk) ", |
... | ... | |
283 | 275 |
'placeholder':'eg. 1', |
284 | 276 |
'verbose_name':'cpu' |
285 | 277 |
}, |
278 |
'cyclades.vm': { |
|
279 |
'help_text':'These are the VMs one can create on the Cyclades UI ', |
|
280 |
'help_text_input_each':'This is the total number of VMs that will be granted to each user of this Project ', |
|
281 |
'is_abbreviation':True, |
|
282 |
'report_desc':'Virtual Machines', |
|
283 |
'placeholder':'eg. 2', |
|
284 |
'verbose_name':'vm', |
|
285 |
}, |
|
286 | 286 |
'cyclades.network.private': { |
287 | 287 |
'help_text':'These are the Private Networks one can create on the Cyclades UI. ', |
288 | 288 |
'help_text_input_each':'This is the total number of Private Networks that will be granted to each user of this Project ', |
b/snf-astakos-app/astakos/im/views.py | ||
---|---|---|
834 | 834 |
if result.is_success: |
835 | 835 |
resource_usage = result.data |
836 | 836 |
backenddata = map(with_class, result.data) |
837 |
backenddata = map(with_class, backenddata) |
|
838 |
|
|
837 |
backenddata = map(pluralize , backenddata) |
|
839 | 838 |
else: |
840 | 839 |
messages.error(request, result.reason) |
841 | 840 |
return render_response('im/resource_usage.html', |
Also available in: Unified diff