sts-sponsors team mailing list archive

[Alberto Donato <mp+438282@xxxxxxxxxxxxxxxxxx>]

Alberto Donato has proposed merging ~ack/maas:drop-viewmodel into maas:master.

Commit message:
drop ViewModel base class, since it's not really useful



Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~ack/maas/+git/maas/+merge/438282
-- 
Your team MAAS Maintainers is requested to review the proposed merge of ~ack/maas:drop-viewmodel into maas:master.

diff --git a/src/maasserver/models/discovery.py b/src/maasserver/models/discovery.py
index 60061f7..e3a96e6 100644
--- a/src/maasserver/models/discovery.py
+++ b/src/maasserver/models/discovery.py
@@ -13,13 +13,12 @@ from django.db.models import (
     GenericIPAddressField,
     IntegerField,
     Manager,
+    Model,
     TextField,
 )
 from django.db.models.query import QuerySet
 
 from maasserver.fields import CIDRField, DomainNameField, MAC_VALIDATOR
-from maasserver.models.cleansave import CleanSave
-from maasserver.models.viewmodel import ViewModel
 from maasserver.utils.orm import MAASQueriesMixin
 from provisioningserver.logger import get_maas_logger
 from provisioningserver.utils.network import get_mac_organization
@@ -164,7 +163,7 @@ class DiscoveryManager(Manager, DiscoveryQueriesMixin):
         return delete_result
 
 
-class Discovery(CleanSave, ViewModel):
+class Discovery(Model):
     """A `Discovery` object represents the combined data for a network entity
     that MAAS believes has been discovered.
 
diff --git a/src/maasserver/models/viewmodel.py b/src/maasserver/models/viewmodel.py
deleted file mode 100644
index 79e6ad9..0000000
--- a/src/maasserver/models/viewmodel.py
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2016 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Model base class for view-backed models."""
-
-
-from django.db.models import Model
-
-
-class ViewModel(Model):
-    """Base class for a view-backed Django `Model`."""
-
-    class Meta:
-        abstract = True
-
-    def save(self):
-        raise NotImplementedError("Cannot save a view-backed model.")