MAAS

Merge lp://qastaging/~julian-edwards/maas/mac-address-get-raw-bug-1285233 into lp://qastaging/~maas-committers/maas/trunk

mac-address-get-raw-bug-1285233
Merge into trunk

Proposed by Julian Edwards on 2014-02-27

Status:

Merged

Approved by:

Julian Edwards on 2014-02-27

Approved revision:

no longer in the source branch.

Merged at revision:

2038

Proposed branch:

lp://qastaging/~julian-edwards/maas/mac-address-get-raw-bug-1285233

Merge into:

lp://qastaging/~maas-committers/maas/trunk

Diff against target:

59 lines (+28/-6)

2 files modified

src/maasserver/models/macaddress.py (+10/-6)
src/maasserver/models/tests/test_macaddress.py (+18/-0)

To merge this branch:

bzr merge lp://qastaging/~julian-edwards/maas/mac-address-get-raw-bug-1285233

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Jeroen T. Vermeulen (community)		2014-02-27	Approve on 2014-02-27
Review via email: mp+208537@code.qastaging.launchpad.net

Commit message

Make sure MACAddress.__unicode__ handles uncleaned mac_address fields

Revision history for this message

Jeroen T. Vermeulen (jtv) wrote on 2014-02-27:

Thanks for the fix. Are you quite sure that the MACAddress constructor won't attempt any cleaning? Might be worth an assertion to confirm. I've seen this go wrong once or twice, where the test didn't actually tickle the problem case and gave us a false sense of security.

review: Approve

Revision history for this message

Jeroen T. Vermeulen (jtv) wrote on 2014-02-27:

By the way, the code does seem a little bit over-complicated, when you look at how the MAC class fits in. Why not simply:

    def __unicode__(self):
        address = self.mac_address
        if isinstance(address, MAC):
            address = address.get_raw()
        if isinstance(address, bytes):
            address = address.decode('utf-8')
       return address