← Back to branch summary

~ubuntu-branches/ubuntu/precise/horizon/precise-updates

« back to all changes in this revision

Viewing changes to horizon/dashboards/nova/instances_and_volumes/instances/tabs.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman, Adrien Cunin
  • Date: 2012-04-04 07:21:15 UTC
  • mfrom: (1.1.12)
  • Revision ID: package-import@ubuntu.com-20120404072115-lb9v3gq3yv93ern2
Tags: 2012.1~rc2-0ubuntu1
https://launchpad.net/bugs/966069
https://launchpad.net/bugs/965410
[ Chuck Short ]
* New usptream release.
* debian/control: Use python-cherrypy3
* debian/rules: Update pythonpath in order to run tests.
* debian/patches/fix-coverage-binary-name.patch: Make the testsuite
  run.
* debian/rules: Fail build if tests fail.

[ Adam Gandelman ]
* debian/control: Add python-memcache 
* debain/dashboard.conf: Update to match current upstream documentation
  (LP: #966069)

[ Adrien Cunin ]
* Renamed Apache config file from dashboard.conf to openstack-dashboard.conf
  (LP: #965410)
  - Updated post{inst,rm} and added preinst to handle correctly the rename

Show diffs side-by-side

added added

removed removed

Lines of Context:
horizon/dashboards/nova/instances_and_volumes/instances/tabs.py
14
14
#    License for the specific language governing permissions and limitations
15
15
#    under the License.
16
16
 
17
 
from django.utils.translation import ugettext as _
 
17
from django.utils.translation import ugettext_lazy as _
18
18
 
19
19
from horizon import api
20
20
from horizon import exceptions
40
40
    def get_context_data(self, request):
41
41
        instance = self.tab_group.kwargs['instance']
42
42
        try:
43
 
            data = api.server_console_output(request, instance.id)
 
43
            data = api.server_console_output(request,
 
44
                                            instance.id,
 
45
                                            tail_length=35)
44
46
        except:
45
47
            data = _('Unable to get log for instance "%s".') % instance.id
46
48
            exceptions.handle(request, ignore=True)
66
68
            exceptions.handle(request,
67
69
                              _('Unable to get VNC console for '
68
70
                                'instance "%s".') % instance.id)
69
 
        return {'vnc_url': vnc_url}
 
71
        return {'vnc_url': vnc_url, 'instance_id': instance.id}
70
72
 
71
73
 
72
74
class InstanceDetailTabs(tabs.TabGroup):