← 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, Soren Hansen
  • Date: 2012-09-07 17:49:53 UTC
  • mfrom: (1.1.61)
  • Revision ID: package-import@ubuntu.com-20120907174953-oapuvix1jxm830he
Tags: 2012.2~rc1~20120907.15996-0ubuntu1
https://launchpad.net/bugs/995285
[ Chuck Short ]
* New upstream release.
* debian/nova-common.postinst: Drop nova_sudoers permission changing
  since we do it in the debian/rules. (LP: #995285)

[ Soren Hansen ]
* Update debian/watch to account for symbolically named tarballs and
  use newer URL.
* Fix Launchpad URLs in debian/watch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/compute/servers.py
446
446
            else:
447
447
                search_opts['user_id'] = context.user_id
448
448
 
 
449
        limit, marker = common.get_limit_and_marker(req)
449
450
        instance_list = self.compute_api.get_all(context,
450
 
                                                 search_opts=search_opts)
 
451
                                                 search_opts=search_opts,
 
452
                                                 limit=limit, marker=marker)
451
453
 
452
 
        limited_list = self._limit_items(instance_list, req)
453
454
        if is_detail:
454
 
            self._add_instance_faults(context, limited_list)
455
 
            response = self._view_builder.detail(req, limited_list)
 
455
            self._add_instance_faults(context, instance_list)
 
456
            response = self._view_builder.detail(req, instance_list)
456
457
        else:
457
 
            response = self._view_builder.index(req, limited_list)
458
 
        req.cache_db_instances(limited_list)
 
458
            response = self._view_builder.index(req, instance_list)
 
459
        req.cache_db_instances(instance_list)
459
460
        return response
460
461
 
461
462
    def _get_server(self, context, req, instance_uuid):
1021
1022
        self.compute_api.set_admin_password(context, server, password)
1022
1023
        return webob.Response(status_int=202)
1023
1024
 
1024
 
    def _limit_items(self, items, req):
1025
 
        return common.limited_by_marker(items, req)
1026
 
 
1027
1025
    def _validate_metadata(self, metadata):
1028
1026
        """Ensure that we can work with the metadata given."""
1029
1027
        try: