← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/api/openstack/compute/contrib/consoles.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-08-16 14:04:11 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: package-import@ubuntu.com-20120816140411-0mr4n241wmk30t9l
Tags: upstream-2012.2~f3
Import upstream version 2012.2~f3

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/compute/contrib/consoles.py
48
48
                                                      console_type)
49
49
        except exception.InstanceNotFound as e:
50
50
            raise webob.exc.HTTPNotFound(explanation=unicode(e))
 
51
        except exception.InstanceNotReady as e:
 
52
            raise webob.exc.HTTPConflict(explanation=unicode(e))
51
53
 
52
54
        return {'console': {'type': console_type, 'url': output['url']}}
53
55