← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ironic/objects/chassis.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/objects/chassis.py
13
13
#    License for the specific language governing permissions and limitations
14
14
#    under the License.
15
15
 
 
16
from oslo_utils import strutils
 
17
from oslo_utils import uuidutils
 
18
 
16
19
from ironic.common import exception
17
 
from ironic.common import utils
18
20
from ironic.db import api as dbapi
19
21
from ironic.objects import base
20
22
from ironic.objects import utils as obj_utils
58
60
        :param chassis_id: the id *or* uuid of a chassis.
59
61
        :returns: a :class:`Chassis` object.
60
62
        """
61
 
        if utils.is_int_like(chassis_id):
 
63
        if strutils.is_int_like(chassis_id):
62
64
            return cls.get_by_id(context, chassis_id)
63
 
        elif utils.is_uuid_like(chassis_id):
 
65
        elif uuidutils.is_uuid_like(chassis_id):
64
66
            return cls.get_by_uuid(context, chassis_id)
65
67
        else:
66
68
            raise exception.InvalidIdentity(identity=chassis_id)