MAAS

Merge lp://qastaging/~rvb/maas/add-network-node-rel into lp://qastaging/~maas-committers/maas/trunk

add-network-node-rel
Merge into trunk

Proposed by Raphaël Badin on 2014-02-03

Status:	Rejected
Rejected by:	Raphaël Badin on 2014-02-04
Proposed branch:	lp://qastaging/~rvb/maas/add-network-node-rel
Merge into:	lp://qastaging/~maas-committers/maas/trunk
Prerequisite:	lp://qastaging/~jtv/maas/vlan-to-network
Diff against target:	314 lines (+282/-0) (has conflicts) 3 files modified src/maasserver/migrations/0066_rename_vlan_add_link_node_network.py (+268/-0) src/maasserver/models/node.py (+3/-0) src/maasserver/models/tests/test_node.py (+11/-0) Contents conflict in src/maasserver/migrations/0066_replace_vlan_with_network.py
To merge this branch:	bzr merge lp://qastaging/~rvb/maas/add-network-node-rel
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)		2014-02-03	Approve on 2014-02-03
Review via email: mp+204506@code.qastaging.launchpad.net

Commit message

Add a relation between nodes and networks.

Description of the change

By using a ManyToManyField field, we let Django take care of the creation of the intermediate table.

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2014-02-03:

Ok but a small gripe: the number of migrations we have is ridiculous. Can you merge this with the previous one of jtv's please? It's not been released to Trusty yet so is safe to do so.

review: Approve

lp://qastaging/~rvb/maas/add-network-node-rel updated on 2014-02-04

1881. By Raphaël Badin on 2014-02-04: Fold two migrations into one.

Revision history for this message

Raphaël Badin (rvb) wrote on 2014-02-04:

> Ok but a small gripe: the number of migrations we have is ridiculous. Can you
> merge this with the previous one of jtv's please? It's not been released to
> Trusty yet so is safe to do so.

Well okay… although this is not buying us much: one migration out of more than 60.

Revision history for this message

Raphaël Badin (rvb) wrote on 2014-02-04:

Hum, the MP says it has a conflict and the diff doesn't show one. I'm guessing this is because the pre-req has been merged or something. I'm sick of fighting with bzr so I'll just abandon this MP and start afresh.

Revision history for this message

Raphaël Badin (rvb) wrote on 2014-02-04:

This is the new MP: https://code.launchpad.net/~rvb/maas/add-network-node-rel2/+merge/204617

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2014-02-04:

On Tuesday 04 Feb 2014 09:01:05 you wrote:
> > Ok but a small gripe: the number of migrations we have is ridiculous. Can
> > you merge this with the previous one of jtv's please? It's not been
> > released to Trusty yet so is safe to do so.
>
> Well okay… although this is not buying us much: one migration out of more
> than 60.

It's the principle as much as anything. Installing a package from new results
in a huge set of migrations. I'd really like some sort of normalisation for
this case as well.

Revision history for this message

Gavin Panella (allenap) wrote on 2014-02-04:

I feel we could buy ourselves a world of pain by trying to consolidate migrations. It's not really something that improves MAAS over the longer run. Let's live with it and wait to see if South or something else comes up with a decent "skip to the end" solution that we can use without having to maintain it too.

Revision history for this message

Julian Edwards (julian-edwards) wrote on 2014-02-04:

On Tuesday 04 Feb 2014 11:40:17 you wrote:
> I feel we could buy ourselves a world of pain by trying to consolidate
> migrations. It's not really something that improves MAAS over the longer
> run. Let's live with it and wait to see if South or something else comes up
> with a decent "skip to the end" solution that we can use without having to
> maintain it too.

This was more of a "let's be a bit more thoughtful about how we do this".
Landing two separate branches that incrementally change a new model isn't too
smart.

Otherwise I agree that messing around trying to force things could be painful.