Revision 447475de snf-astakos-app/astakos/im/presentation.py

b/snf-astakos-app/astakos/im/presentation.py
96 96
            'group': 'compute'
97 97

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

  
110
        },
99 111
        'cyclades.cpu': {
100 112
            'help_text': 'CPUs used by VMs ',
101 113
            'help_text_input_each': ('This is the total number of CPUs that '
......
108 120
            'group': 'compute'
109 121

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

  
134
        },
111 135
        'cyclades.vm': {
112 136
            'help_text': ('These are the VMs one can create on the '
113 137
                          'Cyclades UI '),
......
134 158
            'group': 'network'
135 159

  
136 160
        },
161
        'cyclades.floating_ip': {
162
            'help_text': ('These are the Public (Floating) IPs one can '
163
                          'reserve on the Cyclades UI. '),
164
            'help_text_input_each': ('This is the total number of Public '
165
                                     '(Floating) IPs that will be granted to '
166
                                     'each user of this Project '),
167
            'is_abbreviation': False,
168
            'report_desc': 'Public (Floating) IPs',
169
            'placeholder': 'eg. 1',
170
            'verbose_name': 'Public (Floating) IP',
171
            'group': 'network'
172

  
173
        },
137 174
        'astakos.pending_app': {
138 175
            'help_text': ('Pending project applications limit'),
139 176
            'help_text_input_each': ('Total pending project applications user '
......
150 187
    'resources_order': ['pithos.diskspace',
151 188
                        'cyclades.disk',
152 189
                        'cyclades.cpu',
190
                        'cyclades.active_cpu',
153 191
                        'cyclades.ram',
192
                        'cyclades.active_ram',
154 193
                        'cyclades.vm',
155 194
                        'cyclades.network.private',
195
                        'cyclades.floating_ip',
156 196
                        'astakos.pending_app'
157 197
                        ],
158 198
    'exclude_from_usage': ['astakos.pending_app']

Also available in: Unified diff