Merge pull request #431 from mwhudson/better-offline-behaviour-2
rework network ui, allow offline progress
This commit is contained in:
commit
7f1cf504bb
|
@ -96,5 +96,5 @@ parts:
|
||||||
stage-packages: [libc6, libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]
|
stage-packages: [libc6, libnl-3-dev, libnl-genl-3-dev, libnl-route-3-dev]
|
||||||
source: https://github.com/CanonicalLtd/probert.git
|
source: https://github.com/CanonicalLtd/probert.git
|
||||||
source-type: git
|
source-type: git
|
||||||
source-commit: 8b56d73068ec1f293d3db3b0b44966ede9ed1c94
|
source-commit: d4276ab044f4cc8311fb66a9050f6674726cbbf2
|
||||||
requirements: requirements.txt
|
requirements: requirements.txt
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
from functools import partial
|
from functools import partial
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import select
|
|
||||||
import subprocess
|
import subprocess
|
||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
|
@ -27,13 +26,11 @@ from subiquitycore.models.network import BondParameters, sanitize_config
|
||||||
from subiquitycore.tasksequence import (
|
from subiquitycore.tasksequence import (
|
||||||
BackgroundTask,
|
BackgroundTask,
|
||||||
BackgroundProcess,
|
BackgroundProcess,
|
||||||
CancelableTask,
|
|
||||||
PythonSleep,
|
PythonSleep,
|
||||||
TaskSequence,
|
TaskSequence,
|
||||||
TaskWatcher,
|
TaskWatcher,
|
||||||
)
|
)
|
||||||
from subiquitycore.ui.views.network import (
|
from subiquitycore.ui.views.network import (
|
||||||
ApplyingConfigWidget,
|
|
||||||
NetworkView,
|
NetworkView,
|
||||||
)
|
)
|
||||||
from subiquitycore.controller import BaseController
|
from subiquitycore.controller import BaseController
|
||||||
|
@ -52,10 +49,15 @@ class DownNetworkDevices(BackgroundTask):
|
||||||
self.devs_to_delete = devs_to_delete
|
self.devs_to_delete = devs_to_delete
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return 'DownNetworkDevices(%s)' % ([dev.name for dev in
|
return 'DownNetworkDevices({}, {})'.format(
|
||||||
self.devs_to_down],)
|
[dev.name for dev in self.devs_to_down],
|
||||||
|
[dev.name for dev in self.devs_to_delete],
|
||||||
|
)
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def _bg_run(self):
|
||||||
for dev in self.devs_to_down:
|
for dev in self.devs_to_down:
|
||||||
try:
|
try:
|
||||||
log.debug('downing %s', dev.name)
|
log.debug('downing %s', dev.name)
|
||||||
|
@ -72,60 +74,29 @@ class DownNetworkDevices(BackgroundTask):
|
||||||
except subprocess.CalledProcessError as cp:
|
except subprocess.CalledProcessError as cp:
|
||||||
log.info("deleting %s failed with %r", dev.name, cp.stderr)
|
log.info("deleting %s failed with %r", dev.name, cp.stderr)
|
||||||
|
|
||||||
def _bg_run(self):
|
|
||||||
return True
|
|
||||||
|
|
||||||
def end(self, observer, fut):
|
def end(self, observer, fut):
|
||||||
if fut.result():
|
observer.task_succeeded()
|
||||||
observer.task_succeeded()
|
|
||||||
else:
|
|
||||||
observer.task_failed()
|
|
||||||
|
|
||||||
|
|
||||||
class WaitForDefaultRouteTask(CancelableTask):
|
class ApplyWatcher(TaskWatcher):
|
||||||
|
def __init__(self, view):
|
||||||
|
self.view = view
|
||||||
|
|
||||||
def __init__(self, timeout, event_receiver):
|
def task_complete(self, stage):
|
||||||
self.timeout = timeout
|
pass
|
||||||
self.event_receiver = event_receiver
|
|
||||||
|
|
||||||
def __repr__(self):
|
def tasks_finished(self):
|
||||||
return 'WaitForDefaultRouteTask(%r)' % (self.timeout,)
|
self.view.hide_apply_spinner()
|
||||||
|
|
||||||
def got_route(self):
|
def task_error(self, stage, info):
|
||||||
self.event_receiver.remove_default_route_waiter(self.got_route)
|
self.view.show_network_error(stage, info)
|
||||||
os.write(self.success_w, b'x')
|
|
||||||
|
|
||||||
def start(self):
|
|
||||||
self.fail_r, self.fail_w = os.pipe()
|
|
||||||
self.success_r, self.success_w = os.pipe()
|
|
||||||
self.event_receiver.add_default_route_waiter(self.got_route)
|
|
||||||
|
|
||||||
def _bg_run(self):
|
|
||||||
try:
|
|
||||||
r, _, _ = select.select([self.fail_r, self.success_r], [], [],
|
|
||||||
self.timeout)
|
|
||||||
return self.success_r in r
|
|
||||||
finally:
|
|
||||||
os.close(self.fail_r)
|
|
||||||
os.close(self.fail_w)
|
|
||||||
os.close(self.success_r)
|
|
||||||
os.close(self.success_w)
|
|
||||||
|
|
||||||
def end(self, observer, fut):
|
|
||||||
if fut.result():
|
|
||||||
observer.task_succeeded()
|
|
||||||
else:
|
|
||||||
observer.task_failed('timeout')
|
|
||||||
|
|
||||||
def cancel(self):
|
|
||||||
os.write(self.fail_w, b'x')
|
|
||||||
|
|
||||||
|
|
||||||
class SubiquityNetworkEventReceiver(NetworkEventReceiver):
|
class SubiquityNetworkEventReceiver(NetworkEventReceiver):
|
||||||
def __init__(self, model):
|
def __init__(self, model):
|
||||||
self.model = model
|
self.model = model
|
||||||
self.view = None
|
self.view = None
|
||||||
self.default_route_waiters = []
|
self.default_route_watchers = []
|
||||||
self.default_routes = set()
|
self.default_routes = set()
|
||||||
|
|
||||||
def new_link(self, ifindex, link):
|
def new_link(self, ifindex, link):
|
||||||
|
@ -154,20 +125,19 @@ class SubiquityNetworkEventReceiver(NetworkEventReceiver):
|
||||||
ifindex = data['ifindex']
|
ifindex = data['ifindex']
|
||||||
if action == "NEW" or action == "CHANGE":
|
if action == "NEW" or action == "CHANGE":
|
||||||
self.default_routes.add(ifindex)
|
self.default_routes.add(ifindex)
|
||||||
for waiter in self.default_route_waiters:
|
|
||||||
waiter()
|
|
||||||
elif action == "DEL" and ifindex in self.default_routes:
|
elif action == "DEL" and ifindex in self.default_routes:
|
||||||
self.default_routes.remove(ifindex)
|
self.default_routes.remove(ifindex)
|
||||||
|
for watcher in self.default_route_watchers:
|
||||||
|
watcher(self.default_routes)
|
||||||
log.debug('default routes %s', self.default_routes)
|
log.debug('default routes %s', self.default_routes)
|
||||||
|
|
||||||
def add_default_route_waiter(self, waiter):
|
def add_default_route_watcher(self, watcher):
|
||||||
self.default_route_waiters.append(waiter)
|
self.default_route_watchers.append(watcher)
|
||||||
if self.default_routes:
|
watcher(self.default_routes)
|
||||||
waiter()
|
|
||||||
|
|
||||||
def remove_default_route_waiter(self, waiter):
|
def remove_default_route_watcher(self, watcher):
|
||||||
if waiter in self.default_route_waiters:
|
if watcher in self.default_route_watchers:
|
||||||
self.default_route_waiters.remove(waiter)
|
self.default_route_watchers.remove(watcher)
|
||||||
|
|
||||||
|
|
||||||
default_netplan = '''
|
default_netplan = '''
|
||||||
|
@ -196,7 +166,7 @@ network:
|
||||||
'''
|
'''
|
||||||
|
|
||||||
|
|
||||||
class NetworkController(BaseController, TaskWatcher):
|
class NetworkController(BaseController):
|
||||||
|
|
||||||
root = "/"
|
root = "/"
|
||||||
|
|
||||||
|
@ -204,9 +174,11 @@ class NetworkController(BaseController, TaskWatcher):
|
||||||
super().__init__(common)
|
super().__init__(common)
|
||||||
self.model = self.base_model.network
|
self.model = self.base_model.network
|
||||||
self.answers = self.all_answers.get("Network", {})
|
self.answers = self.all_answers.get("Network", {})
|
||||||
|
self.view = None
|
||||||
|
self.view_shown = False
|
||||||
|
self.dhcp_check_handle = None
|
||||||
if self.opts.dry_run:
|
if self.opts.dry_run:
|
||||||
self.root = os.path.abspath(".subiquity")
|
self.root = os.path.abspath(".subiquity")
|
||||||
self.tried_once = False
|
|
||||||
netplan_path = self.netplan_path
|
netplan_path = self.netplan_path
|
||||||
netplan_dir = os.path.dirname(netplan_path)
|
netplan_dir = os.path.dirname(netplan_path)
|
||||||
if os.path.exists(netplan_dir):
|
if os.path.exists(netplan_dir):
|
||||||
|
@ -218,11 +190,13 @@ class NetworkController(BaseController, TaskWatcher):
|
||||||
self.model.parse_netplan_configs(self.root)
|
self.model.parse_netplan_configs(self.root)
|
||||||
|
|
||||||
self.network_event_receiver = SubiquityNetworkEventReceiver(self.model)
|
self.network_event_receiver = SubiquityNetworkEventReceiver(self.model)
|
||||||
self.network_event_receiver.add_default_route_waiter(self.got_route)
|
self.network_event_receiver.add_default_route_watcher(
|
||||||
|
self.route_watcher)
|
||||||
self._done_by_action = False
|
self._done_by_action = False
|
||||||
|
|
||||||
def got_route(self):
|
def route_watcher(self, routes):
|
||||||
self.signal.emit_signal('network-change')
|
if routes:
|
||||||
|
self.signal.emit_signal('network-change')
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
self._observer_handles = []
|
self._observer_handles = []
|
||||||
|
@ -257,7 +231,14 @@ class NetworkController(BaseController, TaskWatcher):
|
||||||
def start_scan(self, dev):
|
def start_scan(self, dev):
|
||||||
self.observer.trigger_scan(dev.ifindex)
|
self.observer.trigger_scan(dev.ifindex)
|
||||||
|
|
||||||
|
def done(self):
|
||||||
|
self.view = None
|
||||||
|
self.model.has_network = bool(
|
||||||
|
self.network_event_receiver.default_routes)
|
||||||
|
self.signal.emit_signal('next-screen')
|
||||||
|
|
||||||
def cancel(self):
|
def cancel(self):
|
||||||
|
self.view = None
|
||||||
self.signal.emit_signal('prev-screen')
|
self.signal.emit_signal('prev-screen')
|
||||||
|
|
||||||
def _action_get(self, id):
|
def _action_get(self, id):
|
||||||
|
@ -321,12 +302,42 @@ class NetworkController(BaseController, TaskWatcher):
|
||||||
else:
|
else:
|
||||||
raise Exception("could not process action {}".format(action))
|
raise Exception("could not process action {}".format(action))
|
||||||
|
|
||||||
|
def update_initial_configs(self):
|
||||||
|
# Any device that does not have a (global) address by the time
|
||||||
|
# we get to the network screen is marked as disabled, with an
|
||||||
|
# explanation.
|
||||||
|
for dev in self.model.get_all_netdevs():
|
||||||
|
has_global_address = False
|
||||||
|
if dev.info is None or not dev.config:
|
||||||
|
continue
|
||||||
|
for a in dev.info.addresses.values():
|
||||||
|
if a.scope == "global":
|
||||||
|
has_global_address = True
|
||||||
|
break
|
||||||
|
if not has_global_address:
|
||||||
|
dev.remove_ip_networks_for_version(4)
|
||||||
|
dev.remove_ip_networks_for_version(6)
|
||||||
|
log.debug("disabling %s", dev.name)
|
||||||
|
dev.disabled_reason = _("autoconfiguration failed")
|
||||||
|
|
||||||
|
def check_dchp_results(self, device_versions):
|
||||||
|
log.debug('check_dchp_results for %s', device_versions)
|
||||||
|
for dev, v in device_versions:
|
||||||
|
if not dev.dhcp_addresses()[v]:
|
||||||
|
dev.set_dhcp_state(v, "TIMEDOUT")
|
||||||
|
self.network_event_receiver.update_link(dev.ifindex)
|
||||||
|
|
||||||
def default(self):
|
def default(self):
|
||||||
view = NetworkView(self.model, self)
|
if not self.view_shown:
|
||||||
self.network_event_receiver.view = view
|
self.update_initial_configs()
|
||||||
self.ui.set_body(view)
|
self.view = NetworkView(self.model, self)
|
||||||
|
if not self.view_shown:
|
||||||
|
self.apply_config(silent=True)
|
||||||
|
self.view_shown = True
|
||||||
|
self.network_event_receiver.view = self.view
|
||||||
|
self.ui.set_body(self.view)
|
||||||
if self.answers.get('accept-default', False):
|
if self.answers.get('accept-default', False):
|
||||||
self.network_finish(self.model.render())
|
self.done()
|
||||||
elif self.answers.get('actions', False):
|
elif self.answers.get('actions', False):
|
||||||
self._run_iterator(self._run_actions(self.answers['actions']))
|
self._run_iterator(self._run_actions(self.answers['actions']))
|
||||||
|
|
||||||
|
@ -338,6 +349,86 @@ class NetworkController(BaseController, TaskWatcher):
|
||||||
netplan_config_file_name = '00-snapd-config.yaml'
|
netplan_config_file_name = '00-snapd-config.yaml'
|
||||||
return os.path.join(self.root, 'etc/netplan', netplan_config_file_name)
|
return os.path.join(self.root, 'etc/netplan', netplan_config_file_name)
|
||||||
|
|
||||||
|
def apply_config(self, silent=False):
|
||||||
|
if self.dhcp_check_handle is not None:
|
||||||
|
self.loop.remove_alarm(self.dhcp_check_handle)
|
||||||
|
self.dhcp_check_handle = None
|
||||||
|
|
||||||
|
config = self.model.render()
|
||||||
|
|
||||||
|
devs_to_delete = []
|
||||||
|
devs_to_down = []
|
||||||
|
dhcp_device_versions = []
|
||||||
|
for dev in self.model.get_all_netdevs(include_deleted=True):
|
||||||
|
for v in 4, 6:
|
||||||
|
if dev.dhcp_enabled(v):
|
||||||
|
if not silent:
|
||||||
|
dev.set_dhcp_state(v, "PENDING")
|
||||||
|
self.network_event_receiver.update_link(dev.ifindex)
|
||||||
|
else:
|
||||||
|
dev.set_dhcp_state(v, "RECONFIGURE")
|
||||||
|
dhcp_device_versions.append((dev, v))
|
||||||
|
if dev.info is None:
|
||||||
|
continue
|
||||||
|
if dev.is_virtual:
|
||||||
|
devs_to_delete.append(dev)
|
||||||
|
continue
|
||||||
|
if dev.config != self.model.config.config_for_device(dev.info):
|
||||||
|
devs_to_down.append(dev)
|
||||||
|
|
||||||
|
log.debug("network config: \n%s",
|
||||||
|
yaml.dump(sanitize_config(config), default_flow_style=False))
|
||||||
|
|
||||||
|
for p in netplan.configs_in_root(self.root, masked=True):
|
||||||
|
if p == self.netplan_path:
|
||||||
|
continue
|
||||||
|
os.rename(p, p + ".dist-" + self.opts.project)
|
||||||
|
|
||||||
|
write_file(self.netplan_path, '\n'.join((
|
||||||
|
("# This is the network config written by '%s'" %
|
||||||
|
self.opts.project),
|
||||||
|
yaml.dump(config, default_flow_style=False))), omode="w")
|
||||||
|
|
||||||
|
self.model.parse_netplan_configs(self.root)
|
||||||
|
|
||||||
|
if self.opts.dry_run:
|
||||||
|
delay = 0.1/self.scale_factor
|
||||||
|
tasks = [
|
||||||
|
('one', BackgroundProcess(['sleep', str(delay)])),
|
||||||
|
('two', PythonSleep(delay)),
|
||||||
|
('three', BackgroundProcess(['sleep', str(delay)])),
|
||||||
|
]
|
||||||
|
if os.path.exists('/lib/netplan/generate'):
|
||||||
|
# If netplan appears to be installed, run generate to at
|
||||||
|
# least test that what we wrote is acceptable to netplan.
|
||||||
|
tasks.append(('generate',
|
||||||
|
BackgroundProcess(['netplan', 'generate',
|
||||||
|
'--root', self.root])))
|
||||||
|
else:
|
||||||
|
tasks = []
|
||||||
|
if devs_to_down or devs_to_delete:
|
||||||
|
tasks.extend([
|
||||||
|
('stop-networkd',
|
||||||
|
BackgroundProcess(['systemctl',
|
||||||
|
'stop', 'systemd-networkd.service'])),
|
||||||
|
('down',
|
||||||
|
DownNetworkDevices(self.observer.rtlistener,
|
||||||
|
devs_to_down, devs_to_delete)),
|
||||||
|
])
|
||||||
|
tasks.extend([
|
||||||
|
('apply', BackgroundProcess(['netplan', 'apply'])),
|
||||||
|
])
|
||||||
|
|
||||||
|
if not silent:
|
||||||
|
self.view.show_apply_spinner()
|
||||||
|
ts = TaskSequence(self.run_in_bg, tasks, ApplyWatcher(self.view))
|
||||||
|
ts.run()
|
||||||
|
if dhcp_device_versions:
|
||||||
|
self.dhcp_check_handle = self.loop.set_alarm_in(
|
||||||
|
10,
|
||||||
|
lambda loop, ud: self.check_dchp_results(ud),
|
||||||
|
dhcp_device_versions)
|
||||||
|
|
||||||
def add_vlan(self, device, vlan):
|
def add_vlan(self, device, vlan):
|
||||||
return self.model.new_vlan(device, vlan)
|
return self.model.new_vlan(device, vlan)
|
||||||
|
|
||||||
|
@ -360,87 +451,3 @@ class NetworkController(BaseController, TaskWatcher):
|
||||||
existing.config['parameters'] = params
|
existing.config['parameters'] = params
|
||||||
existing.name = result['name']
|
existing.name = result['name']
|
||||||
return existing
|
return existing
|
||||||
|
|
||||||
def network_finish(self, config):
|
|
||||||
log.debug("network config: \n%s",
|
|
||||||
yaml.dump(sanitize_config(config), default_flow_style=False))
|
|
||||||
|
|
||||||
for p in netplan.configs_in_root(self.root, masked=True):
|
|
||||||
if p == self.netplan_path:
|
|
||||||
continue
|
|
||||||
os.rename(p, p + ".dist-" + self.opts.project)
|
|
||||||
|
|
||||||
write_file(self.netplan_path, '\n'.join((
|
|
||||||
("# This is the network config written by '%s'" %
|
|
||||||
self.opts.project),
|
|
||||||
yaml.dump(config, default_flow_style=False))), omode="w")
|
|
||||||
|
|
||||||
self.model.parse_netplan_configs(self.root)
|
|
||||||
if self.opts.dry_run:
|
|
||||||
delay = 0.1/self.scale_factor
|
|
||||||
tasks = [
|
|
||||||
('one', BackgroundProcess(['sleep', str(delay)])),
|
|
||||||
('two', PythonSleep(delay)),
|
|
||||||
('three', BackgroundProcess(['sleep', str(delay)])),
|
|
||||||
]
|
|
||||||
if os.path.exists('/lib/netplan/generate'):
|
|
||||||
# If netplan appears to be installed, run generate to at
|
|
||||||
# least test that what we wrote is acceptable to netplan.
|
|
||||||
tasks.append(('generate',
|
|
||||||
BackgroundProcess(['netplan', 'generate',
|
|
||||||
'--root', self.root])))
|
|
||||||
if not self.tried_once:
|
|
||||||
tasks.append(
|
|
||||||
('timeout',
|
|
||||||
WaitForDefaultRouteTask(3, self.network_event_receiver))
|
|
||||||
)
|
|
||||||
tasks.append(('fail', BackgroundProcess(['false'])))
|
|
||||||
self.tried_once = True
|
|
||||||
else:
|
|
||||||
devs_to_delete = []
|
|
||||||
devs_to_down = []
|
|
||||||
for dev in self.model.get_all_netdevs(include_deleted=True):
|
|
||||||
if dev.info is None:
|
|
||||||
continue
|
|
||||||
devcfg = self.model.config.config_for_device(dev.info)
|
|
||||||
if dev.is_virtual:
|
|
||||||
devs_to_delete.append(dev)
|
|
||||||
elif dev.config != devcfg:
|
|
||||||
devs_to_down.append(dev)
|
|
||||||
tasks = []
|
|
||||||
if devs_to_down or devs_to_delete:
|
|
||||||
tasks.extend([
|
|
||||||
('stop-networkd',
|
|
||||||
BackgroundProcess(['systemctl',
|
|
||||||
'stop', 'systemd-networkd.service'])),
|
|
||||||
('down',
|
|
||||||
DownNetworkDevices(self.observer.rtlistener,
|
|
||||||
devs_to_down, devs_to_delete)),
|
|
||||||
])
|
|
||||||
tasks.extend([
|
|
||||||
('apply', BackgroundProcess(['netplan', 'apply'])),
|
|
||||||
('timeout',
|
|
||||||
WaitForDefaultRouteTask(30, self.network_event_receiver)),
|
|
||||||
])
|
|
||||||
|
|
||||||
def cancel():
|
|
||||||
self.cs.cancel()
|
|
||||||
self.task_error('canceled')
|
|
||||||
self.acw = ApplyingConfigWidget(len(tasks), cancel)
|
|
||||||
self.ui.frame.body.show_overlay(self.acw, min_width=60)
|
|
||||||
|
|
||||||
self.cs = TaskSequence(self.run_in_bg, tasks, self)
|
|
||||||
self.cs.run()
|
|
||||||
|
|
||||||
def task_complete(self, stage):
|
|
||||||
self.acw.advance()
|
|
||||||
|
|
||||||
def task_error(self, stage, info=None):
|
|
||||||
self.ui.frame.body.remove_overlay()
|
|
||||||
self.ui.frame.body.show_network_error(stage, info)
|
|
||||||
if self.answers.get('accept-default', False) or self._done_by_action:
|
|
||||||
self.network_finish(self.model.render())
|
|
||||||
|
|
||||||
def tasks_finished(self):
|
|
||||||
self.loop.set_alarm_in(
|
|
||||||
0.0, lambda loop, ud: self.signal.emit_signal('next-screen'))
|
|
||||||
|
|
|
@ -110,6 +110,11 @@ class NetworkDev(object):
|
||||||
self.type = typ
|
self.type = typ
|
||||||
self.config = {}
|
self.config = {}
|
||||||
self.info = None
|
self.info = None
|
||||||
|
self.disabled_reason = None
|
||||||
|
self._dhcp_state = {
|
||||||
|
4: None,
|
||||||
|
6: None,
|
||||||
|
}
|
||||||
|
|
||||||
def dhcp_addresses(self):
|
def dhcp_addresses(self):
|
||||||
r = {4: [], 6: []}
|
r = {4: [], 6: []}
|
||||||
|
@ -126,7 +131,18 @@ class NetworkDev(object):
|
||||||
return r
|
return r
|
||||||
|
|
||||||
def dhcp_enabled(self, version):
|
def dhcp_enabled(self, version):
|
||||||
return self.config.get('dhcp{v}'.format(v=version), False)
|
if self.config is None:
|
||||||
|
return False
|
||||||
|
else:
|
||||||
|
return self.config.get('dhcp{v}'.format(v=version), False)
|
||||||
|
|
||||||
|
def dhcp_state(self, version):
|
||||||
|
if not self.config.get('dhcp{v}'.format(v=version), False):
|
||||||
|
return None
|
||||||
|
return self._dhcp_state[version]
|
||||||
|
|
||||||
|
def set_dhcp_state(self, version, state):
|
||||||
|
self._dhcp_state[version] = state
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def name(self):
|
def name(self):
|
||||||
|
@ -234,6 +250,7 @@ class NetworkModel(object):
|
||||||
def __init__(self, support_wlan=True):
|
def __init__(self, support_wlan=True):
|
||||||
self.support_wlan = support_wlan
|
self.support_wlan = support_wlan
|
||||||
self.devices_by_name = {} # Maps interface names to NetworkDev
|
self.devices_by_name = {} # Maps interface names to NetworkDev
|
||||||
|
self.has_network = False
|
||||||
|
|
||||||
def parse_netplan_configs(self, netplan_root):
|
def parse_netplan_configs(self, netplan_root):
|
||||||
self.config = netplan.Config()
|
self.config = netplan.Config()
|
||||||
|
|
|
@ -23,8 +23,6 @@ import logging
|
||||||
|
|
||||||
from urwid import (
|
from urwid import (
|
||||||
connect_signal,
|
connect_signal,
|
||||||
LineBox,
|
|
||||||
ProgressBar,
|
|
||||||
Text,
|
Text,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -35,14 +33,13 @@ from subiquitycore.models.network import (
|
||||||
from subiquitycore.ui.actionmenu import ActionMenu
|
from subiquitycore.ui.actionmenu import ActionMenu
|
||||||
from subiquitycore.ui.buttons import (
|
from subiquitycore.ui.buttons import (
|
||||||
back_btn,
|
back_btn,
|
||||||
cancel_btn,
|
|
||||||
done_btn,
|
done_btn,
|
||||||
menu_btn,
|
menu_btn,
|
||||||
)
|
)
|
||||||
from subiquitycore.ui.container import (
|
from subiquitycore.ui.container import (
|
||||||
Pile,
|
Pile,
|
||||||
WidgetWrap,
|
|
||||||
)
|
)
|
||||||
|
from subiquitycore.ui.spinner import Spinner
|
||||||
from subiquitycore.ui.stretchy import StretchyOverlay
|
from subiquitycore.ui.stretchy import StretchyOverlay
|
||||||
from subiquitycore.ui.table import ColSpec, TablePile, TableRow
|
from subiquitycore.ui.table import ColSpec, TablePile, TableRow
|
||||||
from subiquitycore.ui.utils import (
|
from subiquitycore.ui.utils import (
|
||||||
|
@ -51,6 +48,7 @@ from subiquitycore.ui.utils import (
|
||||||
make_action_menu_row,
|
make_action_menu_row,
|
||||||
screen,
|
screen,
|
||||||
)
|
)
|
||||||
|
from subiquitycore.ui.width import widget_width
|
||||||
from .network_configure_manual_interface import (
|
from .network_configure_manual_interface import (
|
||||||
AddVlanStretchy,
|
AddVlanStretchy,
|
||||||
BondStretchy,
|
BondStretchy,
|
||||||
|
@ -65,26 +63,6 @@ from subiquitycore.view import BaseView
|
||||||
log = logging.getLogger('subiquitycore.views.network')
|
log = logging.getLogger('subiquitycore.views.network')
|
||||||
|
|
||||||
|
|
||||||
class ApplyingConfigWidget(WidgetWrap):
|
|
||||||
|
|
||||||
def __init__(self, step_count, cancel_func):
|
|
||||||
self.cancel_func = cancel_func
|
|
||||||
button = cancel_btn(_("Cancel"), on_press=self.do_cancel)
|
|
||||||
self.bar = ProgressBar(normal='progress_incomplete',
|
|
||||||
complete='progress_complete',
|
|
||||||
current=0, done=step_count)
|
|
||||||
box = LineBox(Pile([self.bar,
|
|
||||||
button_pile([button])]),
|
|
||||||
title=_("Applying network config"))
|
|
||||||
super().__init__(box)
|
|
||||||
|
|
||||||
def advance(self):
|
|
||||||
self.bar.current += 1
|
|
||||||
|
|
||||||
def do_cancel(self, sender):
|
|
||||||
self.cancel_func()
|
|
||||||
|
|
||||||
|
|
||||||
def _stretchy_shower(cls, *args):
|
def _stretchy_shower(cls, *args):
|
||||||
def impl(self, device):
|
def impl(self, device):
|
||||||
self.show_stretchy_overlay(cls(self, device, *args))
|
self.show_stretchy_overlay(cls(self, device, *args))
|
||||||
|
@ -125,14 +103,17 @@ class NetworkView(BaseView):
|
||||||
bp,
|
bp,
|
||||||
]
|
]
|
||||||
|
|
||||||
buttons = button_pile([
|
self.buttons = button_pile([
|
||||||
done_btn(_("Done"), on_press=self.done),
|
done_btn("TBD", on_press=self.done), # See _route_watcher
|
||||||
back_btn(_("Back"), on_press=self.cancel),
|
back_btn(_("Back"), on_press=self.cancel),
|
||||||
])
|
])
|
||||||
self.bottom = Pile([
|
self.bottom = Pile([
|
||||||
('pack', buttons),
|
('pack', self.buttons),
|
||||||
])
|
])
|
||||||
|
|
||||||
|
self.controller.network_event_receiver.add_default_route_watcher(
|
||||||
|
self._route_watcher)
|
||||||
|
|
||||||
self.error_showing = False
|
self.error_showing = False
|
||||||
|
|
||||||
super().__init__(screen(
|
super().__init__(screen(
|
||||||
|
@ -157,12 +138,44 @@ class NetworkView(BaseView):
|
||||||
self.del_link(device)
|
self.del_link(device)
|
||||||
for dev in touched_devs:
|
for dev in touched_devs:
|
||||||
self.update_link(dev)
|
self.update_link(dev)
|
||||||
|
self.controller.apply_config()
|
||||||
|
|
||||||
def _action(self, sender, action, device):
|
def _action(self, sender, action, device):
|
||||||
action, meth = action
|
action, meth = action
|
||||||
log.debug("_action %s %s", action.name, device.name)
|
log.debug("_action %s %s", action.name, device.name)
|
||||||
meth(device)
|
meth(device)
|
||||||
|
|
||||||
|
def _route_watcher(self, routes):
|
||||||
|
log.debug('view route_watcher %s', routes)
|
||||||
|
if routes:
|
||||||
|
label = _("Done")
|
||||||
|
else:
|
||||||
|
label = _("Continue without network")
|
||||||
|
self.buttons.base_widget[0].set_label(label)
|
||||||
|
self.buttons.width = max(
|
||||||
|
14,
|
||||||
|
widget_width(self.buttons.base_widget[0]),
|
||||||
|
widget_width(self.buttons.base_widget[1]),
|
||||||
|
)
|
||||||
|
|
||||||
|
def show_apply_spinner(self):
|
||||||
|
s = Spinner(self.controller.loop)
|
||||||
|
s.start()
|
||||||
|
c = TablePile([
|
||||||
|
TableRow([
|
||||||
|
Text(_("Applying changes")),
|
||||||
|
s,
|
||||||
|
]),
|
||||||
|
], align='center')
|
||||||
|
self.bottom.contents[0:0] = [
|
||||||
|
(c, self.bottom.options()),
|
||||||
|
(Text(""), self.bottom.options()),
|
||||||
|
]
|
||||||
|
|
||||||
|
def hide_apply_spinner(self):
|
||||||
|
if len(self.bottom.contents) > 2:
|
||||||
|
self.bottom.contents[0:2] = []
|
||||||
|
|
||||||
def _notes_for_device(self, dev):
|
def _notes_for_device(self, dev):
|
||||||
notes = []
|
notes = []
|
||||||
if dev.type == "eth" and not dev.info.is_connected:
|
if dev.type == "eth" and not dev.info.is_connected:
|
||||||
|
@ -189,10 +202,19 @@ class NetworkView(BaseView):
|
||||||
if addrs:
|
if addrs:
|
||||||
address_info.extend(
|
address_info.extend(
|
||||||
[(label, Text(addr)) for addr in addrs])
|
[(label, Text(addr)) for addr in addrs])
|
||||||
|
elif dev.dhcp_state(v) == "PENDING":
|
||||||
|
s = Spinner(self.controller.loop, align='left')
|
||||||
|
s.rate = 0.3
|
||||||
|
s.start()
|
||||||
|
address_info.append((label, s))
|
||||||
|
elif dev.dhcp_state(v) == "TIMEDOUT":
|
||||||
|
address_info.append((label, Text(_("timed out"))))
|
||||||
|
elif dev.dhcp_state(v) == "RECONFIGURE":
|
||||||
|
address_info.append((label, Text(_("-"))))
|
||||||
else:
|
else:
|
||||||
address_info.append((
|
address_info.append((
|
||||||
label,
|
label,
|
||||||
Text(_("no address")),
|
Text(_("unknown state {}".format(dev.dhcp_state(v))))
|
||||||
))
|
))
|
||||||
else:
|
else:
|
||||||
addrs = []
|
addrs = []
|
||||||
|
@ -205,20 +227,20 @@ class NetworkView(BaseView):
|
||||||
if len(address_info) == 0:
|
if len(address_info) == 0:
|
||||||
# Do not show an interface as disabled if it is part of a bond or
|
# Do not show an interface as disabled if it is part of a bond or
|
||||||
# has a vlan on it.
|
# has a vlan on it.
|
||||||
for dev2 in self.model.get_all_netdevs():
|
if not dev.is_used:
|
||||||
if dev2.type == "bond" and \
|
reason = dev.disabled_reason
|
||||||
dev.name in dev2.config.get('interfaces', []):
|
if reason is None:
|
||||||
break
|
reason = ""
|
||||||
if dev2.type == "vlan" and dev.name == dev2.config.get('link'):
|
address_info.append((Text(_("disabled")), Text(reason)))
|
||||||
break
|
|
||||||
else:
|
|
||||||
address_info.append((Text(_("disabled")), Text("")))
|
|
||||||
rows = []
|
rows = []
|
||||||
for label, value in address_info:
|
for label, value in address_info:
|
||||||
rows.append(TableRow([Text(""), label, (2, value)]))
|
rows.append(TableRow([Text(""), label, (2, value)]))
|
||||||
return rows
|
return rows
|
||||||
|
|
||||||
def new_link(self, new_dev):
|
def new_link(self, new_dev):
|
||||||
|
log.debug(
|
||||||
|
"new_link %s %s %s",
|
||||||
|
new_dev.name, new_dev.ifindex, (new_dev in self.cur_netdevs))
|
||||||
if new_dev in self.dev_to_table:
|
if new_dev in self.dev_to_table:
|
||||||
self.update_link(new_dev)
|
self.update_link(new_dev)
|
||||||
return
|
return
|
||||||
|
@ -233,6 +255,11 @@ class NetworkView(BaseView):
|
||||||
(w, self.device_pile.options('pack'))]
|
(w, self.device_pile.options('pack'))]
|
||||||
|
|
||||||
def update_link(self, dev):
|
def update_link(self, dev):
|
||||||
|
log.debug(
|
||||||
|
"update_link %s %s %s",
|
||||||
|
dev.name, dev.ifindex, (dev in self.cur_netdevs))
|
||||||
|
if dev not in self.cur_netdevs:
|
||||||
|
return
|
||||||
# Update the display of dev to represent the current state.
|
# Update the display of dev to represent the current state.
|
||||||
#
|
#
|
||||||
# The easiest way of doing this would be to just create a new table
|
# The easiest way of doing this would be to just create a new table
|
||||||
|
@ -266,11 +293,18 @@ class NetworkView(BaseView):
|
||||||
self.device_pile.focus._select_first_selectable()
|
self.device_pile.focus._select_first_selectable()
|
||||||
|
|
||||||
def del_link(self, dev):
|
def del_link(self, dev):
|
||||||
log.debug("del_link %s", (dev in self.cur_netdevs))
|
log.debug(
|
||||||
|
"del_link %s %s %s",
|
||||||
|
dev.name, dev.ifindex, (dev in self.cur_netdevs))
|
||||||
|
# If a virtual device disappears while we still have config
|
||||||
|
# for it, we assume it will be back soon.
|
||||||
|
if dev.is_virtual and dev.config is not None:
|
||||||
|
return
|
||||||
if dev in self.cur_netdevs:
|
if dev in self.cur_netdevs:
|
||||||
netdev_i = self.cur_netdevs.index(dev)
|
netdev_i = self.cur_netdevs.index(dev)
|
||||||
self._remove_row(netdev_i+1)
|
self._remove_row(netdev_i+1)
|
||||||
del self.cur_netdevs[netdev_i]
|
del self.cur_netdevs[netdev_i]
|
||||||
|
del self.dev_to_table[dev]
|
||||||
if isinstance(self._w, StretchyOverlay):
|
if isinstance(self._w, StretchyOverlay):
|
||||||
stretchy = self._w.stretchy
|
stretchy = self._w.stretchy
|
||||||
if getattr(stretchy, 'device', None) is dev:
|
if getattr(stretchy, 'device', None) is dev:
|
||||||
|
@ -378,7 +412,11 @@ class NetworkView(BaseView):
|
||||||
def done(self, result=None):
|
def done(self, result=None):
|
||||||
if self.error_showing:
|
if self.error_showing:
|
||||||
self.bottom.contents[0:2] = []
|
self.bottom.contents[0:2] = []
|
||||||
self.controller.network_finish(self.model.render())
|
self.controller.network_event_receiver.remove_default_route_watcher(
|
||||||
|
self._route_watcher)
|
||||||
|
self.controller.done()
|
||||||
|
|
||||||
def cancel(self, button=None):
|
def cancel(self, button=None):
|
||||||
|
self.controller.network_event_receiver.remove_default_route_watcher(
|
||||||
|
self._route_watcher)
|
||||||
self.controller.cancel()
|
self.controller.cancel()
|
||||||
|
|
|
@ -247,6 +247,7 @@ class EditNetworkStretchy(Stretchy):
|
||||||
self.device.config['dhcp{v}'.format(v=self.ip_version)] = True
|
self.device.config['dhcp{v}'.format(v=self.ip_version)] = True
|
||||||
else:
|
else:
|
||||||
pass
|
pass
|
||||||
|
self.parent.controller.apply_config()
|
||||||
self.parent.update_link(self.device)
|
self.parent.update_link(self.device)
|
||||||
self.parent.remove_overlay()
|
self.parent.remove_overlay()
|
||||||
|
|
||||||
|
@ -300,6 +301,7 @@ class AddVlanStretchy(Stretchy):
|
||||||
dev = self.parent.controller.add_vlan(
|
dev = self.parent.controller.add_vlan(
|
||||||
self.device, self.form.vlan.value)
|
self.device, self.form.vlan.value)
|
||||||
self.parent.new_link(dev)
|
self.parent.new_link(dev)
|
||||||
|
self.parent.controller.apply_config()
|
||||||
|
|
||||||
def cancel(self, sender=None):
|
def cancel(self, sender=None):
|
||||||
self.parent.remove_overlay()
|
self.parent.remove_overlay()
|
||||||
|
@ -479,6 +481,7 @@ class BondStretchy(Stretchy):
|
||||||
for dev in touched_devices:
|
for dev in touched_devices:
|
||||||
self.parent.update_link(dev)
|
self.parent.update_link(dev)
|
||||||
self.parent.remove_overlay()
|
self.parent.remove_overlay()
|
||||||
|
self.parent.controller.apply_config()
|
||||||
|
|
||||||
def cancel(self, sender=None):
|
def cancel(self, sender=None):
|
||||||
self.parent.remove_overlay()
|
self.parent.remove_overlay()
|
||||||
|
|
|
@ -3,6 +3,7 @@ from unittest import mock
|
||||||
|
|
||||||
import urwid
|
import urwid
|
||||||
|
|
||||||
|
from subiquitycore.controllers.network import NetworkController
|
||||||
from subiquitycore.models.network import NetworkDev
|
from subiquitycore.models.network import NetworkDev
|
||||||
from subiquitycore.testing import view_helpers
|
from subiquitycore.testing import view_helpers
|
||||||
from subiquitycore.ui.views.network_configure_manual_interface import (
|
from subiquitycore.ui.views.network_configure_manual_interface import (
|
||||||
|
@ -28,6 +29,7 @@ class TestNetworkConfigureIPv4InterfaceView(unittest.TestCase):
|
||||||
device.config = {}
|
device.config = {}
|
||||||
base_view = BaseView(urwid.Text(""))
|
base_view = BaseView(urwid.Text(""))
|
||||||
base_view.update_link = lambda device: None
|
base_view.update_link = lambda device: None
|
||||||
|
base_view.controller = mock.create_autospec(spec=NetworkController)
|
||||||
stretchy = EditNetworkStretchy(base_view, device, 4)
|
stretchy = EditNetworkStretchy(base_view, device, 4)
|
||||||
base_view.show_stretchy_overlay(stretchy)
|
base_view.show_stretchy_overlay(stretchy)
|
||||||
stretchy.method_form.method.value = "manual"
|
stretchy.method_form.method.value = "manual"
|
||||||
|
|
Loading…
Reference in New Issue