← 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/aggregates.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/aggregates.py
54
54
        return {'aggregates': aggregates}
55
55
 
56
56
    def create(self, req, body):
57
 
        """Creates an aggregate, given its name and availablity_zone."""
 
57
        """Creates an aggregate, given its name and availability_zone."""
58
58
        context = _get_context(req)
59
59
        authorize(context)
60
60
 
90
90
        return self._marshall_aggregate(aggregate)
91
91
 
92
92
    def update(self, req, id, body):
93
 
        """Updates the name and/or availbility_zone of given aggregate."""
 
93
        """Updates the name and/or availability_zone of given aggregate."""
94
94
        context = _get_context(req)
95
95
        authorize(context)
96
96
 
152
152
            LOG.exception(_("Cannot add host %(host)s in aggregate "
153
153
                            "%(id)s") % locals())
154
154
            raise exc.HTTPNotFound
155
 
        except (exception.AggregateHostConflict,
156
 
                exception.AggregateHostExists,
 
155
        except (exception.AggregateHostExists,
157
156
                exception.InvalidAggregateAction):
158
157
            LOG.exception(_("Cannot add host %(host)s in aggregate "
159
158
                            "%(id)s") % locals())