← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ironic/vivid-updates

« back to all changes in this revision

Viewing changes to ironic/tests/db/sqlalchemy/test_migrations.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-03-30 11:14:57 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20150330111457-kr4ju3guf22m4vbz
Tags: 2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1358820
https://launchpad.net/bugs/1429962
* New upstream release.
  + d/control: 
    - Align with upstream dependencies.
    - Add dh-python to build-dependencies.
    - Add psmisc as a dependency. (LP: #1358820)
  + d/p/fix-requirements.patch: Rediffed.
  + d/ironic-conductor.init.in: Fixed typos in LSB headers,
    thanks to JJ Asghar. (LP: #1429962)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ironic/tests/db/sqlalchemy/test_migrations.py
48
48
from oslo_db.sqlalchemy import test_base
49
49
from oslo_db.sqlalchemy import test_migrations
50
50
from oslo_db.sqlalchemy import utils as db_utils
 
51
from oslo_utils import uuidutils
51
52
import sqlalchemy
52
53
import sqlalchemy.exc
53
54
 
54
55
from ironic.common.i18n import _LE
55
 
from ironic.common import utils
56
56
from ironic.db.sqlalchemy import migration
57
57
from ironic.db.sqlalchemy import models
58
58
from ironic.openstack.common import log as logging
310
310
        nodes = db_utils.get_table(engine, 'nodes')
311
311
        instance_uuid = 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee'
312
312
        data = {'driver': 'fake',
313
 
                'uuid': utils.generate_uuid(),
 
313
                'uuid': uuidutils.generate_uuid(),
314
314
                'instance_uuid': instance_uuid}
315
315
        nodes.insert().values(data).execute()
316
 
        data['uuid'] = utils.generate_uuid()
 
316
        data['uuid'] = uuidutils.generate_uuid()
317
317
        # TODO(viktors): Remove check on sqlalchemy.exc.IntegrityError, when
318
318
        #                Ironic will use oslo_db 0.4.0 or higher.
319
319
        #                See bug #1214341 for details.
332
332
        # add some nodes in various states so we can assert that "None"
333
333
        # was replaced by "available", and nothing else changed.
334
334
        nodes = db_utils.get_table(engine, 'nodes')
335
 
        data = [{'uuid': utils.generate_uuid(),
 
335
        data = [{'uuid': uuidutils.generate_uuid(),
336
336
                 'provision_state': 'fake state'},
337
 
                {'uuid': utils.generate_uuid(),
 
337
                {'uuid': uuidutils.generate_uuid(),
338
338
                 'provision_state': 'active'},
339
 
                {'uuid': utils.generate_uuid(),
 
339
                {'uuid': uuidutils.generate_uuid(),
340
340
                 'provision_state': 'deleting'},
341
 
                {'uuid': utils.generate_uuid(),
 
341
                {'uuid': uuidutils.generate_uuid(),
342
342
                 'provision_state': None}]
343
343
        nodes.insert().values(data).execute()
344
344
        return data
367
367
        self.assertIsInstance(nodes.c.driver_internal_info.type,
368
368
                              sqlalchemy.types.TEXT)
369
369
 
 
370
    def _check_4f399b21ae71(self, engine, data):
 
371
        nodes = db_utils.get_table(engine, 'nodes')
 
372
        col_names = [column.name for column in nodes.c]
 
373
        self.assertIn('clean_step', col_names)
 
374
        self.assertIsInstance(nodes.c.clean_step.type,
 
375
                              sqlalchemy.types.String)
 
376
 
370
377
    def test_upgrade_and_version(self):
371
378
        with patch_with_engine(self.engine):
372
379
            self.migration_api.upgrade('head')