Revision 140d08d0

b/ui/views.py
57 57
UPDATE_INTERVAL = getattr(settings, "UI_UPDATE_INTERVAL", 5000)
58 58
UPDATE_INTERVAL_INCREASE = getattr(settings, "UI_UPDATE_INTERVAL_INCREASE", 500)
59 59
UPDATE_INTERVAL_INCREASE_AFTER_CALLS_COUNT = getattr(settings,
60
                                "UI_UPDATE_INTERVAL_INCREASE_AFTER_CALLS_COUNT", 3)
60
                                "UI_UPDATE_INTERVAL_INCREASE_AFTER_CALLS_COUNT",
61
                                3)
61 62
UPDATE_INTERVAL_FAST = getattr(settings, "UI_UPDATE_INTERVAL_FAST", 2500)
62 63
UPDATE_INTERVAL_MAX = getattr(settings, "UI_UPDATE_INTERVAL_MAX", 10000)
63 64

  
64 65
# predefined values settings
65 66
VM_IMAGE_COMMON_METADATA = getattr(settings, "VM_IMAGE_COMMON_METADATA", ["OS"])
66 67
SUGGESTED_FLAVORS_DEFAULT = {}
67
SUGGESTED_FLAVORS = getattr(settings, "VM_CREATE_SUGGESTED_FLAVORS", SUGGESTED_FLAVORS_DEFAULT)
68
SUGGESTED_ROLES_DEFAULT = ["Database server", "File server", "Mail server", "Web server", "Proxy"]
69
SUGGESTED_ROLES = getattr(settings, "VM_CREATE_SUGGESTED_ROLES", SUGGESTED_ROLES_DEFAULT)
68
SUGGESTED_FLAVORS = getattr(settings, "VM_CREATE_SUGGESTED_FLAVORS",
69
                            SUGGESTED_FLAVORS_DEFAULT)
70
SUGGESTED_ROLES_DEFAULT = ["Database server", "File server", "Mail server",
71
                           "Web server", "Proxy"]
72
SUGGESTED_ROLES = getattr(settings, "VM_CREATE_SUGGESTED_ROLES",
73
                          SUGGESTED_ROLES_DEFAULT)
70 74

  
71 75
SUPPORT_SSH_OS_LIST = getattr(settings, "UI_SUPPORT_SSH_OS_LIST",)
72 76

  
......
98 102
# ssh keys
99 103
MAX_SSH_KEYS_PER_USER = getattr(settings, "USERDATA_MAX_SSH_KEYS_PER_USER")
100 104

  
101
FLAVORS_DISK_TEMPLATES_INFO = getattr(settings, "UI_FLAVORS_DISK_TEMPLATES_INFO", {})
102 105

  
103 106
def template(name, context):
104 107
    template_path = os.path.join(os.path.dirname(__file__), "templates/")
......
156 159
    machine = request.GET.get('machine','')
157 160
    host_ip = request.GET.get('host_ip','')
158 161
    host_ip_v6 = request.GET.get('host_ip_v6','')
159
    context = {'host': host, 'port': port, 'password': password, 'machine': machine, 'host_ip': host_ip, 'host_ip_v6': host_ip_v6}
162
    context = {'host': host, 'port': port, 'password': password,
163
               'machine': machine, 'host_ip': host_ip, 'host_ip_v6': host_ip_v6}
160 164
    return template('machines_console', context)
161 165

  
162 166
def js_tests(request):
......
188 192
CONNECT_PROMPT_MESSAGES = {
189 193
    'linux': {
190 194
            'linux': [CONNECT_LINUX_LINUX_MESSAGE, ""],
191
            'windows': [CONNECT_LINUX_WINDOWS_MESSAGE, CONNECT_LINUX_WINDOWS_SUBMESSAGE]
195
            'windows': [CONNECT_LINUX_WINDOWS_MESSAGE,
196
                        CONNECT_LINUX_WINDOWS_SUBMESSAGE]
192 197
        },
193 198
    'windows': {
194
            'linux': [CONNECT_WINDOWS_LINUX_MESSAGE, CONNECT_WINDOWS_LINUX_SUBMESSAGE],
195
            'windows': [CONNECT_WINDOWS_WINDOWS_MESSAGE, CONNECT_WINDOWS_WINDOWS_SUBMESSAGE]
199
            'linux': [CONNECT_WINDOWS_LINUX_MESSAGE,
200
                      CONNECT_WINDOWS_LINUX_SUBMESSAGE],
201
            'windows': [CONNECT_WINDOWS_WINDOWS_MESSAGE,
202
                        CONNECT_WINDOWS_WINDOWS_SUBMESSAGE]
196 203
        }
197 204
    }
198 205

  
199 206
# retrieve domain prefix from settings
200
DOMAIN_PREFIX = getattr(settings, 'MACHINE_DOMAIN_PREFIX', getattr(settings, 'BACKEND_PREFIX_ID', ""))
207
DOMAIN_PREFIX = getattr(settings, 'MACHINE_DOMAIN_PREFIX', getattr(settings,
208
                        'BACKEND_PREFIX_ID', ""))
201 209

  
202 210
# domain template string
203 211
DOMAIN_TPL = "%s%%s" % DOMAIN_PREFIX
......
265 273
            connect_message = CONNECT_PROMPT_MESSAGES[host_os][operating_system][0]
266 274
            subinfo = CONNECT_PROMPT_MESSAGES[host_os][operating_system][1]
267 275
        except KeyError:
268
            connect_message = _("You are trying to connect from a %s machine to a %s machine") % (host_os, operating_system)
276
            connect_message = _("You are trying to connect from a %s "
277
                                "machine to a %s machine") % (host_os, operating_system)
269 278
            subinfo = ""
270 279

  
271 280
        response_object = {
......
276 285
                'subinfo': unicode(subinfo),
277 286
                'link': {'title': unicode(link_title), 'url': link_url}
278 287
            }
279
        response = HttpResponse(json.dumps(response_object), mimetype='application/json')  #no windows, no rdp
288
        response = HttpResponse(json.dumps(response_object),
289
                                mimetype='application/json')  #no windows, no rdp
280 290

  
281 291
    return response
282 292

  
......
295 305

  
296 306
    mail_subject = unicode(_("Feedback from synnefo application"))
297 307

  
298
    mail_context = {'message': message, 'data': data, 'allow_data_send': allow_data_send, 'request': request}
308
    mail_context = {'message': message, 'data': data,
309
                    'allow_data_send': allow_data_send, 'request': request}
299 310
    mail_content = render_to_string("feedback_mail.txt", mail_context)
300 311

  
301 312
    send_mail(mail_subject, mail_content, FEEDBACK_EMAIL_FROM,

Also available in: Unified diff