← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/db/sqlalchemy/migrate_repo/versions/115_make_user_quotas_key_and_value.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/migrate_repo/versions/115_make_user_quotas_key_and_value.py
1
 
# vim: tabstop=4 shiftwidth=4 softtabstop=4
2
 
 
3
 
# Copyright 2012 OpenStack LLC.
4
 
#
5
 
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
6
 
#    not use this file except in compliance with the License. You may obtain
7
 
#    a copy of the License at
8
 
#
9
 
#         http://www.apache.org/licenses/LICENSE-2.0
10
 
#
11
 
#    Unless required by applicable law or agreed to in writing, software
12
 
#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
13
 
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
14
 
#    License for the specific language governing permissions and limitations
15
 
#    under the License.
16
 
 
17
 
from nova.openstack.common import log as logging
18
 
from sqlalchemy import Boolean, Column, DateTime, Integer
19
 
from sqlalchemy import MetaData, String, Table
20
 
 
21
 
LOG = logging.getLogger(__name__)
22
 
 
23
 
 
24
 
def upgrade(migrate_engine):
25
 
    # Upgrade operations go here. Don't create your own engine;
26
 
    # bind migrate_engine to your metadata
27
 
    meta = MetaData()
28
 
    meta.bind = migrate_engine
29
 
 
30
 
    # Add 'user_id' column to quota_usages table.
31
 
    quota_usages = Table('quota_usages', meta, autoload=True)
32
 
    user_id = Column('user_id',
33
 
                     String(length=255, convert_unicode=False,
34
 
                            assert_unicode=None, unicode_error=None,
35
 
                            _warn_on_bytestring=False))
36
 
    quota_usages.create_column(user_id)
37
 
 
38
 
    # Add 'user_id' column to reservations table.
39
 
    reservations = Table('reservations', meta, autoload=True)
40
 
    user_id = Column('user_id',
41
 
                     String(length=255, convert_unicode=False,
42
 
                            assert_unicode=None, unicode_error=None,
43
 
                            _warn_on_bytestring=False))
44
 
    reservations.create_column(user_id)
45
 
 
46
 
    # New table.
47
 
    user_quotas = Table('user_quotas', meta,
48
 
                        Column('id', Integer(), primary_key=True),
49
 
                        Column('created_at', DateTime(timezone=False)),
50
 
                        Column('updated_at', DateTime(timezone=False)),
51
 
                        Column('deleted_at', DateTime(timezone=False)),
52
 
                        Column('deleted', Boolean(), default=False),
53
 
                        Column('user_id',
54
 
                               String(length=255, convert_unicode=False,
55
 
                                      assert_unicode=None, unicode_error=None,
56
 
                                      _warn_on_bytestring=False)),
57
 
                        Column('project_id',
58
 
                               String(length=255, convert_unicode=False,
59
 
                                      assert_unicode=None, unicode_error=None,
60
 
                                      _warn_on_bytestring=False)),
61
 
                        Column('resource',
62
 
                               String(length=255, convert_unicode=False,
63
 
                                      assert_unicode=None, unicode_error=None,
64
 
                                      _warn_on_bytestring=False),
65
 
                               nullable=False),
66
 
                        Column('hard_limit', Integer(), nullable=True),
67
 
                        mysql_engine='InnoDB',
68
 
                        mysql_charset='utf8',
69
 
                        )
70
 
 
71
 
    try:
72
 
        user_quotas.create()
73
 
    except Exception:
74
 
        LOG.error(_("Table |%s| not created!"), repr(user_quotas))
75
 
        raise
76
 
 
77
 
 
78
 
def downgrade(migrate_engine):
79
 
    # Operations to reverse the above upgrade go here.
80
 
    meta = MetaData()
81
 
    meta.bind = migrate_engine
82
 
 
83
 
    quota_usages = Table('quota_usages', meta, autoload=True)
84
 
    quota_usages.drop_column('user_id')
85
 
 
86
 
    reservations = Table('reservations', meta, autoload=True)
87
 
    reservations.drop_column('user_id')
88
 
 
89
 
    user_quotas = Table('user_quotas', meta, autoload=True)
90
 
    try:
91
 
        user_quotas.drop()
92
 
    except Exception:
93
 
        LOG.error(_("user_quotas table not dropped"))
94
 
        raise