From 335eeccee95b625988bebaead42e325acbe1ee08 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 12 Feb 2016 16:10:06 +0530 Subject: [PATCH] networks: Use new setup mechanism --- plinth/modules/networks/__init__.py | 28 ++++++++++++++++++++++------ plinth/modules/networks/networks.py | 10 ---------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/plinth/modules/networks/__init__.py b/plinth/modules/networks/__init__.py index c3c93a17b..d72425a19 100644 --- a/plinth/modules/networks/__init__.py +++ b/plinth/modules/networks/__init__.py @@ -19,23 +19,37 @@ Plinth module to interface with network-manager """ -from django.utils.translation import ugettext as _ +from django.utils.translation import ugettext_lazy as _ from logging import Logger import subprocess -from . import networks -from .networks import init from plinth import action_utils +from plinth import cfg from plinth import network -__all__ = ['networks', 'init'] +version = 1 + +is_essential = True depends = ['system'] +title = _('Networks') + logger = Logger(__name__) +def init(): + """Initialize the Networks module.""" + menu = cfg.main_menu.get('system:index') + menu.add_urlname(title, 'glyphicon-signal', 'networks:index', 18) + + +def setup(helper, old_version=None): + """Install and configure the module.""" + helper.install(['network-manager']) + + def diagnose(): """Run diagnostics and return the results.""" results = [] @@ -44,8 +58,10 @@ def diagnose(): addresses = _get_interface_addresses(interfaces) for address in addresses: - results.append(action_utils.diagnose_port_listening(53, 'tcp', address)) - results.append(action_utils.diagnose_port_listening(53, 'udp', address)) + results.append( + action_utils.diagnose_port_listening(53, 'tcp', address)) + results.append( + action_utils.diagnose_port_listening(53, 'udp', address)) results.append(_diagnose_dnssec('4')) results.append(_diagnose_dnssec('6')) diff --git a/plinth/modules/networks/networks.py b/plinth/modules/networks/networks.py index 88034ee9f..522b08aa1 100644 --- a/plinth/modules/networks/networks.py +++ b/plinth/modules/networks/networks.py @@ -25,9 +25,7 @@ from logging import Logger from .forms import (ConnectionTypeSelectForm, EthernetForm, PPPoEForm, WifiForm) -from plinth import cfg from plinth import network -from plinth import package logger = Logger(__name__) @@ -40,14 +38,6 @@ subsubmenu = [{'url': reverse_lazy('networks:index'), 'text': ugettext_lazy('Add Connection')}] -def init(): - """Initialize the Networks module.""" - menu = cfg.main_menu.get('system:index') - menu.add_urlname(ugettext_lazy('Networks'), 'glyphicon-signal', - 'networks:index', 18) - - -@package.required(['network-manager']) def index(request): """Show connection list.""" connections = network.get_connection_list()