From: jack2 Date: Sat, 27 Oct 2007 17:45:19 +0000 (-0300) Subject: Merge branch 'master' of or3st3s@baryon.com.ar:workspace/pymin into suse X-Git-Url: https://git.llucax.com/software/pymin.git/commitdiff_plain/c3862dc0f135a52327fbf9511c22392555e84f3f?ds=sidebyside;hp=-c Merge branch 'master' of or3st3s@baryon.com.ar:workspace/pymin into suse Conflicts: config.py --- c3862dc0f135a52327fbf9511c22392555e84f3f diff --combined config.py index ee3c174,8e7715e..db3151b --- a/config.py +++ b/config.py @@@ -10,45 -10,32 +10,46 @@@ pickle_path = join(base_path, 'pickle' config_path = join(base_path, 'config') class Root(Handler): -- ip = IpHandler( -- pickle_dir = join(pickle_path, 'ip'), -- config_dir = join(config_path, 'ip')) + firewall = FirewallHandler( pickle_dir = join(pickle_path, 'firewall'), - config_dir = join(config_path, 'firewall')) + config_dir = '/tmp') + - dhcp = DhcpHandler( - pickle_dir = join(pickle_path, 'dhcp'), - config_dir = '/etc') + nat = NatHandler(pickle_dir = join(pickle_path, 'nat')) ++ ++ ppp = PppHandler( ++ pickle_dir = join(pickle_path, 'ppp'), ++ config_dir = { ++ 'pap-secrets': '/etc/ppp', ++ 'chap-secrets': '/etc/ppp', ++ 'options.X': '/etc/ppp', ++ 'nameX': '/etc/ppp/peers', ++ }) ++ ++ ip = IpHandler( ++ pickle_dir = join(pickle_path, 'ip'), ++ config_dir = join(config_path, 'ip')) + dns = DnsHandler( pickle_dir = join(pickle_path, 'dns'), config_dir = { - 'named.conf': join(config_path, 'dns'), - 'zoneX.zone': join(config_path, 'dns', 'zones'), + 'named.conf': '/etc', + 'zoneX.zone': '/var/lib/named', }) + - nat = NatHandler(pickle_dir = join(pickle_path, 'nat')) + dhcp = DhcpHandler( + pickle_dir = join(pickle_path, 'dhcp'), - config_dir = join(config_path, 'dhcp')) - ppp = PppHandler( - pickle_dir = join(pickle_path, 'ppp'), - config_dir = join(config_path, 'ppp')) - vrrp = VrrpHandler( - pickle_dir = join(pickle_path, 'vrrp'), - config_dir = join(config_path, 'vrrp')) ++ config_dir = '/etc') + proxy = ProxyHandler( pickle_dir = join(pickle_path, 'proxy'), - config_dir = join(config_path, 'proxy')) + config_dir = '/etc/squid') + + vrrp = VrrpHandler( + pickle_dir = join(pickle_path, 'vrrp'), + config_dir = join(config_path, 'vrrp'), + pid_dir = '/var/run') - ppp = PppHandler( - pickle_dir = join(pickle_path, 'ppp'), - config_dir = { - 'pap-secrets': '/etc/ppp', - 'chap-secrets': '/etc/ppp', - 'options.X': '/etc/ppp', - 'nameX': '/etc/ppp/peers', - }) - bind_addr = \ ( '', # Bind IP ('' is ANY) diff --combined pymin/services/util.py index d1788fc,6e09148..abf30e9 --- a/pymin/services/util.py +++ b/pymin/services/util.py @@@ -12,8 -12,8 +12,8 @@@ except ImportError from pymin.dispatcher import Handler, handler, HandlerError, \ CommandNotFoundError -#DEBUG = False -DEBUG = True +DEBUG = False +#DEBUG = True __ALL__ = ('Error', 'ReturnNot0Error', 'ExecutionError', 'ItemError', 'ItemAlreadyExistsError', 'ItemNotFoundError', 'ContainerError', @@@ -154,18 -154,26 +154,26 @@@ class ContainerNotFoundError(ContainerE def get_network_devices(): - p = subprocess.Popen(('ip', 'link', 'list'), stdout=subprocess.PIPE, + p = subprocess.Popen(('ip', '-o', 'link'), stdout=subprocess.PIPE, close_fds=True) string = p.stdout.read() p.wait() d = dict() - i = string.find('eth') - while i != -1: - eth = string[i:i+4] - m = string.find('link/ether', i+4) - mac = string[ m+11 : m+11+17] - d[eth] = mac - i = string.find('eth', m+11+17) + devices = string.splitlines() + for dev in devices: + mac = '' + if dev.find('link/ether') != -1: + i = dev.find('link/ether') + mac = dev[i+11 : i+11+17] + i = dev.find(':',2) + name = dev[3: i] + d[name] = mac + elif dev.find('link/ppp') != -1: + i = dev.find('link/ppp') + mac = '00:00:00:00:00:00' + i = dev.find(':',2) + name = dev[3 : i] + d[name] = mac return d def call(command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, @@@ -177,7 -185,6 +185,7 @@@ print 'Executing command:', command return try: + print 'Executing command:', command r = subprocess.call(command, stdin=stdin, stdout=stdout, stderr=stderr, universal_newlines=universal_newlines, close_fds=close_fds, **kw) @@@ -294,9 -301,6 +302,6 @@@ class Restorable(Persistent) r"_restore() -> bool :: Restore persistent data or create a default." try: self._load() - # TODO tener en cuenta servicios que hay que levantar y los que no - if hasattr(self, 'commit'): # TODO deberia ser reload y/o algo para comandos - self.commit() return True except IOError: for (k, v) in self._restorable_defaults.items(): @@@ -308,8 -312,6 +313,6 @@@ self._dump() if hasattr(self, '_write_config'): self._write_config() - if hasattr(self, 'reload'): - self.reload() return False class ConfigWriter: @@@ -437,7 -439,7 +440,7 @@@ self._write_single_config(t) - class ServiceHandler(Handler): + class ServiceHandler(Handler, Restorable): r"""ServiceHandler([start[, stop[, restart[, reload]]]]) -> ServiceHandler. This is a helper class to inherit from to automatically handle services @@@ -468,26 -470,63 +471,63 @@@ reload=reload).items(): if action is not None: setattr(self, '_service_%s' % name, action) + self._persistent_attrs = list(self._persistent_attrs) + self._persistent_attrs.append('_service_running') + if '_service_running' not in self._restorable_defaults: + self._restorable_defaults['_service_running'] = False + self._restore() + if self._service_running: + self._service_running = False + self.start() @handler(u'Start the service.') def start(self): r"start() -> None :: Start the service." - call(self._service_start) + if not self._service_running: + if callable(self._service_start): + self._service_start() + else: + call(self._service_start) + self._service_running = True + self._dump_attr('_service_running') @handler(u'Stop the service.') def stop(self): r"stop() -> None :: Stop the service." - call(self._service_stop) + if self._service_running: + if callable(self._service_stop): + self._service_stop() + else: + call(self._service_stop) + self._service_running = False + self._dump_attr('_service_running') @handler(u'Restart the service.') def restart(self): r"restart() -> None :: Restart the service." - call(self._service_restart) + if callable(self._service_restart): + self._service_restart() + else: + call(self._service_restart) + self._service_running = True + self._dump_attr('_service_running') @handler(u'Reload the service config (without restarting, if possible).') def reload(self): r"reload() -> None :: Reload the configuration of the service." - call(self._service_reload) + if self._service_running: + if callable(self._service_reload): + self._service_reload() + else: + call(self._service_reload) + + @handler(u'Tell if the service is running.') + def running(self): + r"reload() -> None :: Reload the configuration of the service." + if self._service_running: + return 1 + else: + return 0 class RestartHandler(Handler): r"""RestartHandler() -> RestartHandler :: Provides generic restart command. @@@ -513,9 -552,11 +553,11 @@@ class ReloadHandler(Handler) @handler(u'Reload the service config (alias to restart).') def reload(self): r"reload() -> None :: Reload the configuration of the service." - self.restart() + if hasattr(self, '_service_running') and self._service_running: + self.restart() - class InitdHandler(Handler): + class InitdHandler(ServiceHandler): + # TODO update docs, declarative style is depracated r"""InitdHandler([initd_name[, initd_dir]]) -> InitdHandler. This is a helper class to inherit from to automatically handle services @@@ -544,26 -585,11 +586,11 @@@ self._initd_name = initd_name if initd_dir is not None: self._initd_dir = initd_dir - - @handler(u'Start the service.') - def start(self): - r"start() -> None :: Start the service." - call((path.join(self._initd_dir, self._initd_name), 'start')) - - @handler(u'Stop the service.') - def stop(self): - r"stop() -> None :: Stop the service." - call((path.join(self._initd_dir, self._initd_name), 'stop')) - - @handler(u'Restart the service.') - def restart(self): - r"restart() -> None :: Restart the service." - call((path.join(self._initd_dir, self._initd_name), 'restart')) - - @handler(u'Reload the service config (without restarting, if possible).') - def reload(self): - r"reload() -> None :: Reload the configuration of the service." - call((path.join(self._initd_dir, self._initd_name), 'reload')) + actions = dict() + for action in ('start', 'stop', 'restart', 'reload'): + actions[action] = (path.join(self._initd_dir, self._initd_name), + action) + ServiceHandler.__init__(self, **actions) class TransactionalHandler(Handler): r"""Handle command transactions providing a commit and rollback commands. @@@ -586,9 -612,10 +613,10 @@@ r"commit() -> None :: Commit the changes and reload the service." if hasattr(self, '_dump'): self._dump() + unchanged = False if hasattr(self, '_write_config'): - self._write_config() - if hasattr(self, 'reload'): + unchanged = self._write_config() + if not unchanged and hasattr(self, 'reload'): self.reload() @handler(u'Discard all the uncommited changes.') @@@ -627,6 -654,8 +655,8 @@@ class ParametersHandler(Handler) if not param in self.params: raise ParameterNotFoundError(param) self.params[param] = value + if hasattr(self, '_update'): + self._update = True @handler(u'Get a service parameter.') def get(self, param):