← Back to branch summary

~ubuntu-branches/ubuntu/trusty/horizon/trusty-updates

« back to all changes in this revision

Viewing changes to openstack_dashboard/dashboards/project/instances/tabs.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-06 16:53:28 UTC
  • mfrom: (1.1.37)
  • Revision ID: package-import@ubuntu.com-20140306165328-w2vgmtfriqlhp27m
Tags: 1:2014.1~b3-0ubuntu1
* New upstream milestone release.
* d/static/*: Refreshed assets for new upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/dashboards/project/instances/tabs.py
79
79
                        getattr(instance, "name", ""),
80
80
                        instance.id)
81
81
                except Exception:
82
 
                    console_url = None
 
82
                    try:
 
83
                        console = api.nova.server_rdp_console(request,
 
84
                                                              instance.id)
 
85
                        console_url = "%s&title=%s(%s)" % (
 
86
                            console.url,
 
87
                            getattr(instance, "name", ""),
 
88
                            instance.id)
 
89
                    except Exception:
 
90
                        console_url = None
83
91
        elif console_type == 'VNC':
84
92
            try:
85
93
                console = api.nova.server_vnc_console(request, instance.id)
98
106
                    instance.id)
99
107
            except Exception:
100
108
                console_url = None
 
109
        elif console_type == 'RDP':
 
110
            try:
 
111
                console = api.nova.server_rdp_console(request, instance.id)
 
112
                console_url = "%s&title=%s(%s)" % (
 
113
                    console.url,
 
114
                    getattr(instance, "name", ""),
 
115
                    instance.id)
 
116
            except Exception:
 
117
                console_url = None
101
118
        else:
102
119
            console_url = None
103
120