← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/api/openstack/compute/servers.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/compute/servers.py
32
32
from nova import exception
33
33
from nova import flags
34
34
from nova import log as logging
35
 
from nova.rpc import common as rpc_common
 
35
from nova.openstack.common.rpc import common as rpc_common
 
36
from nova.openstack.common import timeutils
36
37
from nova import utils
37
38
 
38
39
 
426
427
 
427
428
        if 'changes-since' in search_opts:
428
429
            try:
429
 
                parsed = utils.parse_isotime(search_opts['changes-since'])
 
430
                parsed = timeutils.parse_isotime(search_opts['changes-since'])
430
431
            except ValueError:
431
432
                msg = _('Invalid changes-since value')
432
433
                raise exc.HTTPBadRequest(explanation=msg)
676
677
 
677
678
        try:
678
679
            _get_inst_type = instance_types.get_instance_type_by_flavor_id
679
 
            inst_type = _get_inst_type(flavor_id)
 
680
            inst_type = _get_inst_type(flavor_id, read_deleted="no")
680
681
 
681
682
            (instances, resv_id) = self.compute_api.create(context,
682
683
                            inst_type,
704
705
                                                headers={'Retry-After': 0})
705
706
        except exception.InstanceTypeMemoryTooSmall as error:
706
707
            raise exc.HTTPBadRequest(explanation=unicode(error))
 
708
        except exception.InstanceTypeNotFound as error:
 
709
            raise exc.HTTPBadRequest(explanation=unicode(error))
707
710
        except exception.InstanceTypeDiskTooSmall as error:
708
711
            raise exc.HTTPBadRequest(explanation=unicode(error))
709
712
        except exception.InvalidMetadata as error: