Merge lp:~mpontillo/maas/networks-list-view into lp:~maas-committers/maas/trunk

[Mike Pontillo]

WIP

[MAAS Lander (maas-lander)]

Transitioned to Git.

lp:maas has now moved from Bzr to Git.
Please propose your branches with Launchpad using Git.

git clone https://git.launchpad.net/maas

Unmerged revisions

5659. By Mike Pontillo on 2017-01-26

Bring migrations up to date.

5658. By Mike Pontillo on 2017-01-26

Merge trunk.

5657. By Mike Pontillo on 2017-01-26

New approach: unmanaged multi-table inheritance.

5656. By Mike Pontillo on 2017-01-25

Investigate providing the networks listing based on a database view.

=== modified file 'src/maasserver/__init__.py'
--- src/maasserver/__init__.py	2016-12-07 12:46:14 +0000
+++ src/maasserver/__init__.py	2017-01-26 04:30:59 +0000
@@ -32,6 +32,8 @@
 
 class DefaultViewMeta(DefaultMeta):
     """Default `Meta` class for a view-backed model."""
+    # When managed is False, Django will not create a migration for this
+    # model class. This is required for model classes based on views.
     managed = False
 
 

=== modified file 'src/maasserver/dbviews.py'
--- src/maasserver/dbviews.py	2017-01-08 02:48:36 +0000
+++ src/maasserver/dbviews.py	2017-01-26 04:30:59 +0000
@@ -139,6 +139,63 @@
        AND family(sip_left.ip) = family(sip_right.ip)
     """)
 
+maasserver_network = dedent("""\
+    SELECT
+        -- subnet.*,
+        subnet.id AS "subnet_ptr_id",
+        fabric.id AS "fabric_id", fabric.name AS "fabric_name",
+        vlan.vid AS "vlan_vid", vlan.name AS "vlan_name",
+        space.id AS "space_id", space.name AS "space_name"
+    FROM maasserver_fabric fabric
+    LEFT OUTER JOIN maasserver_vlan vlan ON vlan.fabric_id = fabric.id
+    LEFT OUTER JOIN maasserver_subnet subnet ON subnet.vlan_id = vlan.id
+    LEFT OUTER JOIN maasserver_space space
+        ON space.id IS NOT DISTINCT FROM vlan.space_id
+    ORDER BY
+        fabric.name,
+        vlan.vid,
+        subnet.cidr
+""")
+
+maasserver_networks_by_fabric = dedent("""\
+    SELECT
+        subnet.*,
+        fabric.id AS "fabric_id", fabric.name AS "fabric_name",
+        vlan.vid AS "vlan_vid", vlan.name AS "vlan_name",
+        subnet.id AS "subnet_id", subnet.name AS "subnet_name",
+            subnet.cidr AS "subnet_cidr",
+        space.id AS "space_id", space.name AS "space_name"
+    FROM maasserver_fabric fabric
+    LEFT OUTER JOIN maasserver_vlan vlan ON vlan.fabric_id = fabric.id
+    LEFT OUTER JOIN maasserver_subnet subnet ON subnet.vlan_id = vlan.id
+    LEFT OUTER JOIN maasserver_space space
+        ON space.id IS NOT DISTINCT FROM vlan.space_id
+    ORDER BY
+        fabric.name,
+        vlan.vid,
+        subnet.cidr
+""")
+
+
+maasserver_networks_by_space = dedent("""\
+    SELECT
+        subnet.*,
+        space.id AS "space_id", space.name AS "space_name",
+        fabric.id AS "fabric_id", fabric.name AS "fabric_name",
+        vlan.vid AS "vlan_vid", vlan.name AS "vlan_name",
+        subnet.id AS "subnet_id", subnet.name AS "subnet_name",
+            subnet.cidr AS "subnet_cidr"
+    FROM maasserver_subnet subnet
+    LEFT OUTER JOIN maasserver_vlan vlan ON subnet.vlan_id = vlan.id
+    LEFT OUTER JOIN maasserver_space space ON space.id
+        IS NOT DISTINCT FROM vlan.space_id
+    LEFT OUTER JOIN maasserver_fabric fabric ON vlan.fabric_id = fabric.id
+    ORDER BY
+        space.name,
+        vlan.name,
+        subnet.cidr
+""")
+
 
 # Views that are helpful for supporting MAAS.
 # These can be batch-run using the maas-region-support-dump script.
@@ -274,6 +331,7 @@
 _ALL_VIEWS = {
     "maasserver_discovery": maasserver_discovery,
     "maasserver_routable_pairs": maasserver_routable_pairs,
+    "maasserver_network": maasserver_network,
     "maas_support__node_overview": maas_support__node_overview,
     "maas_support__device_overview": maas_support__device_overview,
     "maas_support__node_networking": maas_support__node_networking,

=== added file 'src/maasserver/migrations/builtin/maasserver/0108_network_view.py'
--- src/maasserver/migrations/builtin/maasserver/0108_network_view.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/maasserver/0108_network_view.py	2017-01-26 04:30:59 +0000
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0107_chassis_to_pods'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Network',
+            fields=[
+                ('subnet_ptr', models.OneToOneField(serialize=False, primary_key=True, to='maasserver.Subnet', auto_created=True, parent_link=True)),
+                ('space_name', models.CharField(blank=True, max_length=256, null=True, editable=False)),
+                ('fabric_name', models.CharField(blank=True, max_length=256, null=True, editable=False)),
+                ('vlan_name', models.CharField(blank=True, max_length=256, null=True, editable=False)),
+                ('vlan_vid', models.IntegerField(blank=True, null=True)),
+            ],
+            options={
+                'managed': False,
+                'verbose_name': 'Network',
+                'verbose_name_plural': 'Networks',
+                'db_table': 'maasserver_network',
+            },
+            bases=('maasserver.subnet', models.Model),
+        ),
+    ]

=== modified file 'src/maasserver/models/__init__.py'
--- src/maasserver/models/__init__.py	2017-01-23 19:56:16 +0000
+++ src/maasserver/models/__init__.py	2017-01-26 04:30:59 +0000
@@ -43,6 +43,7 @@
     'Machine',
     'MDNS',
     'Neighbour',
+    'Networks',
     'Node',
     'NodeGroupToRackController',
     'Notification',
@@ -142,6 +143,9 @@
 from maasserver.models.licensekey import LicenseKey
 from maasserver.models.mdns import MDNS
 from maasserver.models.neighbour import Neighbour
+from maasserver.models.network import (
+    Network,
+)
 from maasserver.models.node import (
     Controller,
     Device,

=== added file 'src/maasserver/models/network.py'
--- src/maasserver/models/network.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/models/network.py	2017-01-26 04:30:59 +0000
@@ -0,0 +1,61 @@
+# Copyright 2017 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Model definition for a `Discovery` (a discovered network device)."""
+
+__all__ = [
+    'Network',
+    'NetworksByFabric',
+    'NetworksBySpace',
+]
+
+from django.db.models import (
+    CharField,
+    DO_NOTHING,
+    ForeignKey,
+    IntegerField,
+)
+from maasserver import DefaultViewMeta
+from maasserver.models.subnet import Subnet
+from maasserver.models.viewmodel import ViewModel
+from provisioningserver.logger import get_maas_logger
+
+
+maaslog = get_maas_logger("discovery")
+
+
+class Network(Subnet, ViewModel):
+    """A `Network` object represents the combined data for a MAAS network."""
+
+    class Meta(DefaultViewMeta):
+        managed = False
+        db_table = "maasserver_network"
+        verbose_name = "Network"
+        verbose_name_plural = "Networks"
+
+    fabric = ForeignKey(
+        'Fabric', related_name='+', unique=False, blank=False, null=False,
+        editable=False, on_delete=DO_NOTHING)
+
+    space = ForeignKey(
+        'VLAN', related_name='+', unique=False, blank=False, null=True,
+        editable=False, on_delete=DO_NOTHING)
+
+    space_name = CharField(
+        max_length=256, editable=False, null=True, blank=True)
+
+    fabric_name = CharField(
+        max_length=256, editable=False, null=True, blank=True)
+
+    vlan_name = CharField(
+        max_length=256, editable=False, null=True, blank=True)
+
+    vlan_vid = IntegerField(null=True, blank=True)
+
+    def save(self, *args, **kwargs):
+        # Hack to allow saving this unmanaged model.
+        self.__class__ = Subnet
+        Subnet.save(self, *args, **kwargs)
+        self.__class__ = Network
+
+