Revision 75380308 snf-astakos-app/astakos/im/presentation.py

b/snf-astakos-app/astakos/im/presentation.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
RESOURCES_PRESENTATION_DATA = {
34
from astakos.im import settings
35

  
36
RESOURCES = {
35 37
    'groups': {
36 38
        'compute': {
37 39
            'help_text': ('Compute resources '
......
55 57
        },
56 58
    },
57 59
    'resources': {
58
        'pithos+.diskspace': {
60
        'pithos.diskspace': {
59 61
            'help_text': ('This is the space on Pithos for storing files '
60 62
                          'and VM Images. '),
61 63
            'help_text_input_each': ('This is the total amount of space on '
......
65 67
            'report_desc': 'Storage Space',
66 68
            'placeholder': 'eg. 10GB',
67 69
            'verbose_name': 'Storage Space',
70
            'group': 'storage'
68 71
        },
69 72
        'cyclades.disk': {
70 73
            'help_text': ('This is the System Disk that the VMs have that '
......
77 80
            'is_abbreviation': False,
78 81
            'report_desc': 'System Disk',
79 82
            'placeholder': 'eg. 5GB, 2GB etc',
80
            'verbose_name': 'System Disk'
83
            'verbose_name': 'System Disk',
84
            'group': 'compute'
81 85
        },
82 86
        'cyclades.ram': {
83 87
            'help_text': 'RAM used by VMs ',
......
87 91
            'is_abbreviation': True,
88 92
            'report_desc': 'RAM',
89 93
            'placeholder': 'eg. 4GB',
90
            'verbose_name': 'ram'
94
            'verbose_name': 'ram',
95
            'group': 'compute'
96

  
91 97
        },
92 98
        'cyclades.cpu': {
93 99
            'help_text': 'CPUs used by VMs ',
......
97 103
            'is_abbreviation': True,
98 104
            'report_desc': 'CPUs',
99 105
            'placeholder': 'eg. 1',
100
            'verbose_name': 'cpu'
106
            'verbose_name': 'cpu',
107
            'group': 'compute'
108

  
101 109
        },
102 110
        'cyclades.vm': {
103 111
            'help_text': ('These are the VMs one can create on the '
......
109 117
            'report_desc': 'Virtual Machines',
110 118
            'placeholder': 'eg. 2',
111 119
            'verbose_name': 'vm',
120
            'group': 'compute'
121

  
112 122
        },
113 123
        'cyclades.network.private': {
114 124
            'help_text': ('These are the Private Networks one can create on '
......
119 129
            'is_abbreviation': False,
120 130
            'report_desc': 'Private Networks',
121 131
            'placeholder': 'eg. 1',
122
            'verbose_name': 'Private Network'
132
            'verbose_name': 'Private Network',
133
            'group': 'network'
134

  
123 135
        }
124 136
    },
125 137
    'groups_order': ['storage', 'compute', 'network'],
126
    'resources_order': ['pithos+.diskspace',
138
    'resources_order': ['pithos.diskspace',
127 139
                        'cyclades.disk',
128 140
                        'cyclades.cpu',
129 141
                        'cyclades.ram',

Also available in: Unified diff