← Back to branch summary

~ntt-pf-lab/nova/monkey_patch_notification

« back to all changes in this revision

Viewing changes to nova/compute/api.py

  • Committer: Lvov Maxim
  • Date: 2011-07-26 05:50:05 UTC
  • mfrom: (1320 nova)
  • mto: This revision was merged to the branch mainline in revision 1322.
  • Revision ID: usrleon@gmail.com-20110726055005-7olsp0giqup3pao7
merge with trunk, resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/compute/api.py
127
127
        quota_metadata = quota.allowed_metadata_items(context, num_metadata)
128
128
        if quota_metadata < num_metadata:
129
129
            pid = context.project_id
130
 
            msg = _("Quota exceeeded for %(pid)s, tried to set "
 
130
            msg = _("Quota exceeded for %(pid)s, tried to set "
131
131
                    "%(num_metadata)s metadata properties") % locals()
132
132
            LOG.warn(msg)
133
133
            raise quota.QuotaError(msg, "MetadataLimitExceeded")
138
138
        for k, v in metadata.iteritems():
139
139
            if len(k) > 255 or len(v) > 255:
140
140
                pid = context.project_id
141
 
                msg = _("Quota exceeeded for %(pid)s, metadata property "
 
141
                msg = _("Quota exceeded for %(pid)s, metadata property "
142
142
                        "key or value too long") % locals()
143
143
                LOG.warn(msg)
144
144
                raise quota.QuotaError(msg, "MetadataLimitExceeded")
165
165
                                                instance_type)
166
166
        if num_instances < min_count:
167
167
            pid = context.project_id
168
 
            LOG.warn(_("Quota exceeeded for %(pid)s,"
 
168
            LOG.warn(_("Quota exceeded for %(pid)s,"
169
169
                    " tried to run %(min_count)s instances") % locals())
170
170
            if num_instances <= 0:
171
171
                message = _("Instance quota exceeded. You cannot run any "