Revision 5083fc47 snf-astakos-app/astakos/im/presentation.py

b/snf-astakos-app/astakos/im/presentation.py
84 84
            'verbose_name': 'System Disk',
85 85
            'group': 'compute'
86 86
        },
87
        'cyclades.ram': {
87
        'cyclades.total_ram': {
88 88
            'help_text': 'RAM used by VMs ',
89 89
            'help_text_input_each': ('This is the total amount of RAM that '
90 90
                                     'will be granted to each user of this '
91 91
                                     'Project (on all VMs)  '),
92 92
            'is_abbreviation': True,
93
            'report_desc': 'RAM',
93
            'report_desc': 'Total RAM',
94 94
            'placeholder': 'eg. 4GB',
95
            'verbose_name': 'ram',
95
            'verbose_name': 'Total ram',
96 96
            'group': 'compute'
97 97

  
98 98
        },
99
        'cyclades.active_ram': {
99
        'cyclades.ram': {
100 100
            'help_text': 'RAM used by active VMs ',
101 101
            'help_text_input_each': ('This is the total amount of RAM that '
102 102
                                     'will be granted to each user of this '
103 103
                                     'Project (on all active VMs)  '),
104 104
            'is_abbreviation': False,
105
            'report_desc': 'Active RAM',
105
            'report_desc': 'RAM',
106 106
            'placeholder': 'eg. 4GB',
107
            'verbose_name': 'Active RAM',
107
            'verbose_name': 'RAM',
108 108
            'group': 'compute'
109 109

  
110 110
        },
111
        'cyclades.cpu': {
111
        'cyclades.total_cpu': {
112 112
            'help_text': 'CPUs used by VMs ',
113 113
            'help_text_input_each': ('This is the total number of CPUs that '
114 114
                                     'will be granted to each user of this '
115 115
                                     'Project (on all VMs)  '),
116 116
            'is_abbreviation': True,
117
            'report_desc': 'CPUs',
117
            'report_desc': 'Total CPUs',
118 118
            'placeholder': 'eg. 1',
119
            'verbose_name': 'cpu',
119
            'verbose_name': 'Total cpu',
120 120
            'group': 'compute'
121 121

  
122 122
        },
123
        'cyclades.active_cpu': {
123
        'cyclades.cpu': {
124 124
            'help_text': 'CPUs used by active VMs ',
125 125
            'help_text_input_each': ('This is the total number of CPUs that '
126 126
                                     'will be granted to each user of this '
127 127
                                     'Project (on all active VMs)  '),
128 128
            'is_abbreviation': False,
129
            'report_desc': 'Active CPUs',
129
            'report_desc': 'CPUs',
130 130
            'placeholder': 'eg. 1',
131
            'verbose_name': 'Active CPU',
131
            'verbose_name': 'CPU',
132 132
            'group': 'compute'
133 133

  
134 134
        },
......
186 186
    'groups_order': ['storage', 'compute', 'network', 'accounts'],
187 187
    'resources_order': ['pithos.diskspace',
188 188
                        'cyclades.disk',
189
                        'cyclades.total_cpu',
189 190
                        'cyclades.cpu',
190
                        'cyclades.active_cpu',
191
                        'cyclades.total_ram',
191 192
                        'cyclades.ram',
192
                        'cyclades.active_ram',
193 193
                        'cyclades.vm',
194 194
                        'cyclades.network.private',
195 195
                        'cyclades.floating_ip',

Also available in: Unified diff