← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ironic/migrate_nova/migrate_db.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/migrate_nova/migrate_db.py
15
15
import os
16
16
import sys
17
17
 
 
18
from oslo_utils import uuidutils
18
19
import sqlalchemy as sa
19
20
from sqlalchemy.orm import sessionmaker
20
21
 
21
22
from ironic.common import states as ironic_states
22
 
from ironic.common import utils
23
23
from ironic.db.sqlalchemy import models as ironic_models
24
24
from ironic.migrate_nova import nova_baremetal_states as nova_states
25
25
from ironic.migrate_nova import nova_models
186
186
        i_port = ironic_models.Port()
187
187
 
188
188
        i_port.id = n_port.id
189
 
        i_port.uuid = utils.generate_uuid()
 
189
        i_port.uuid = uuidutils.generate_uuid()
190
190
        i_port.address = n_port.address
191
191
        i_port.node_id = n_port.bm_node_id
192
192