Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add ManyToManyFields on concrete models #53

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add ManyToManyFields on concrete models #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
735b90c
Remove the "fac_set" property from InternetExchange
paravoid Sep 14, 2020
740bb99
Add ManyToManyFields on concrete models
paravoid Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions django_peeringdb/migrations/0012_manytomany.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by Django 2.2.12 on 2020-09-13 13:27

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
("django_peeringdb", "0011_ixlan_ixf_fields"),
]

operations = [
migrations.AddField(
model_name="network",
name="fac_set",
field=models.ManyToManyField(
related_name="net_set",
through="django_peeringdb.NetworkFacility",
to="django_peeringdb.Facility",
verbose_name="Facility",
),
),
migrations.AddField(
model_name="network",
name="ixlan_set",
field=models.ManyToManyField(
related_name="net_set",
through="django_peeringdb.NetworkIXLan",
to="django_peeringdb.IXLan",
verbose_name="Internet Exchange LAN",
),
),
]
42 changes: 28 additions & 14 deletions django_peeringdb/models/concrete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@ class Facility(FacilityBase):
)


@expose_model
class Network(NetworkBase):
org = models.ForeignKey(
Organization,
related_name="net_set",
verbose_name=_("Organization"),
on_delete=models.CASCADE,
)


@expose_model
class InternetExchange(InternetExchangeBase):
org = models.ForeignKey(
Expand All @@ -68,10 +58,12 @@ class InternetExchange(InternetExchangeBase):
verbose_name=_("Organization"),
on_delete=models.CASCADE,
)

@property
def fac_set(self):
return [ixfac.fac for ixfac in self.ixfac_set]
fac_set = models.ManyToManyField(
Facility,
related_name="ix_set",
verbose_name=_("Facility"),
through="InternetExchangeFacility",
)


@expose_model
Expand Down Expand Up @@ -117,6 +109,28 @@ class IXLanPrefix(IXLanPrefixBase):
)


@expose_model
class Network(NetworkBase):
org = models.ForeignKey(
Organization,
related_name="net_set",
verbose_name=_("Organization"),
on_delete=models.CASCADE,
)
fac_set = models.ManyToManyField(
Facility,
related_name="net_set",
verbose_name=_("Facility"),
through="NetworkFacility",
)
ixlan_set = models.ManyToManyField(
IXLan,
related_name="net_set",
verbose_name=_("Internet Exchange LAN"),
through="NetworkIXLan",
)


@expose_model
class NetworkContact(ContactBase):
net = models.ForeignKey(
Expand Down