MAAS

Merge lp://staging/~julian-edwards/maas/savepoints-migration into lp://staging/~maas-committers/maas/trunk

savepoints-migration
Merge into trunk

Proposed by Julian Edwards on 2014-08-25

Status:

Merged

Approved by:

Julian Edwards on 2014-08-25

Approved revision:

no longer in the source branch.

Merged at revision:

2803

Proposed branch:

lp://staging/~julian-edwards/maas/savepoints-migration

Merge into:

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

Diff against target:

120 lines (+60/-6)

3 files modified

src/maasserver/api/tests/test_nodegroup.py (+12/-0)
src/maasserver/forms.py (+2/-1)
src/maasserver/migrations/0099_convert_cluster_interfaces_to_networks.py (+46/-5)

To merge this branch:

bzr merge lp://staging/~julian-edwards/maas/savepoints-migration

Related bugs:

Bug #1359551: create_Network_from_NodeGroupInterface is missing a catch for IntegrityError	Critical	Fix Released
Bug #1360008: Data migration fails with django.db.utils.InternalError: current transaction is aborted, commands ignored until end of transaction block	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)			Approve on 2014-08-25
Review via email: mp+232028@code.staging.launchpad.net

Commit message

Remove Django-models from the 0099_convert_cluster_interfaces_to_networks data migration and replace with the underlying code. Also, catch and deal with Integrity error.