Commit 0a6eb593 authored by Sofia Papagiannaki's avatar Sofia Papagiannaki

Change cyclades resource order

parent 28bdf6fe
......@@ -165,11 +165,6 @@ SERVICES = getattr(settings, 'ASTAKOS_SERVICES', {
'cyclades': {
'url': 'https://node1.example.com/ui/',
'resources': [{
'name':'vm',
'group':'compute',
'uplimit':2,
'desc': 'Number of virtual machines'
},{
'name':'disk',
'group':'compute',
'uplimit':30*1024*1024*1024,
......@@ -187,6 +182,11 @@ SERVICES = getattr(settings, 'ASTAKOS_SERVICES', {
'unit':'bytes',
'desc': 'Virtual machines'
},{
'name':'vm',
'group':'compute',
'uplimit':2,
'desc': 'Number of virtual machines'
},{
'name':'network.private',
'group':'network',
'uplimit':1,
......@@ -251,14 +251,6 @@ RESOURCES_PRESENTATION_DATA = getattr(
'placeholder':'eg. 10GB',
'verbose_name':'Storage Space',
},
'cyclades.vm': {
'help_text':'These are the VMs one can create on the Cyclades UI ',
'help_text_input_each':'This is the total number of VMs that will be granted to each user of this Project ',
'is_abbreviation':True,
'report_desc':'Virtual Machines',
'placeholder':'eg. 2',
'verbose_name':'vm',
},
'cyclades.disk': {
'help_text':'This is the System Disk that the VMs have that run the OS ',
'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,6 +275,14 @@ RESOURCES_PRESENTATION_DATA = getattr(
'placeholder':'eg. 1',
'verbose_name':'cpu'
},
'cyclades.vm': {
'help_text':'These are the VMs one can create on the Cyclades UI ',
'help_text_input_each':'This is the total number of VMs that will be granted to each user of this Project ',
'is_abbreviation':True,
'report_desc':'Virtual Machines',
'placeholder':'eg. 2',
'verbose_name':'vm',
},
'cyclades.network.private': {
'help_text':'These are the Private Networks one can create on the Cyclades UI. ',
'help_text_input_each':'This is the total number of Private Networks that will be granted to each user of this Project ',
......
......@@ -834,8 +834,7 @@ def resource_usage(request):
if result.is_success:
resource_usage = result.data
backenddata = map(with_class, result.data)
backenddata = map(with_class, backenddata)
backenddata = map(pluralize , backenddata)
else:
messages.error(request, result.reason)
return render_response('im/resource_usage.html',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment