move BaseIdentityController to become subiquity's IdentityController

subiquity/controllers/identity.py

@@ -14,10 +14,53 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from subiquitycore.controllers.identity import BaseIdentityController
+import logging
 
+from subiquitycore.controller import BaseController
+from subiquitycore.models import IdentityModel
 from subiquity.ui.views import IdentityView
+from subiquitycore import utils
+
+log = logging.getLogger('subiquity.controllers.identity')
 
 
-class IdentityController(BaseIdentityController):
-    identity_view = IdentityView
+class IdentityController(BaseController):
+
+    identity_view = None
+
+    def __init__(self, common):
+        super().__init__(common)
+        self.model = IdentityModel(self.opts)
+
+    def default(self):
+        title = "Profile setup"
+        excerpt = ("Input your username and password to log in to the system.")
+        footer = ""
+        self.ui.set_header(title, excerpt)
+        self.ui.set_footer(footer, 40)
+        self.ui.set_body(IdentityView(self.model, self, self.opts))
+
+    def cancel(self):
+        self.signal.emit_signal('prev-screen')
+
+    def identity_done(self):
+        self.login()
+
+    def login(self):
+        log.debug("Identity login view")
+        title = ("Configuration Complete")
+        footer = ("View configured user and device access methods")
+        self.ui.set_header(title)
+        self.ui.set_footer(footer)
+
+        net_model = self.controllers['Network'].model
+        configured_ifaces = net_model.get_configured_interfaces()
+        login_view = LoginView(self.model, self, configured_ifaces)
+
+        self.ui.set_body(login_view)
+
+    def login_done(self):
+        # mark ourselves complete
+        utils.disable_subiquity()
+
+        self.signal.emit_signal('next-screen')

subiquitycore/controllers/identity.py

@@ -1,64 +0,0 @@
-# Copyright 2015 Canonical, Ltd.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import logging
-from subiquitycore.controller import BaseController
-from subiquitycore.models import IdentityModel
-from subiquitycore.ui.views import LoginView
-from subiquitycore import utils
-
-log = logging.getLogger('subiquitycore.controllers.identity')
-
-
-class BaseIdentityController(BaseController):
-
-    identity_view = None
-
-    def __init__(self, common):
-        super().__init__(common)
-        self.model = IdentityModel(self.opts)
-
-    def default(self):
-        title = "Profile setup"
-        excerpt = ("Input your username and password to log in to the system.")
-        footer = ""
-        self.ui.set_header(title, excerpt)
-        self.ui.set_footer(footer, 40)
-        self.ui.set_body(self.identity_view(self.model, self, self.opts))
-
-    def cancel(self):
-        self.signal.emit_signal('prev-screen')
-
-    def identity_done(self):
-        self.login()
-
-    def login(self):
-        log.debug("Identity login view")
-        title = ("Configuration Complete")
-        footer = ("View configured user and device access methods")
-        self.ui.set_header(title)
-        self.ui.set_footer(footer)
-
-        net_model = self.controllers['Network'].model
-        configured_ifaces = net_model.get_configured_interfaces()
-        login_view = LoginView(self.model, self, configured_ifaces)
-
-        self.ui.set_body(login_view)
-
-    def login_done(self):
-        # mark ourselves complete
-        utils.disable_subiquity()
-
-        self.signal.emit_signal('next-screen')