work to facilitate generic json command

src/exabgp/application/validate.py

@@ -10,6 +10,7 @@
 from exabgp.environment import getconf
 
 from exabgp.configuration.configuration import Configuration
+from exabgp.reactor.api.command.neighbor import NeighborTemplate
 
 from exabgp.debug import trace_interceptor
 from exabgp.logger import log
@@ -61,7 +62,7 @@ def cmdline(cmdarg):
         if cmdarg.neighbor:
             log.warning('checking neighbors', 'configuration')
             for name, neighbor in config.neighbors.items():
-                reparsed = neighbor.string()
+                reparsed = NeighborTemplate.configuration(neighbor)
                 log.debug(reparsed, configuration)
                 log.info(f'\u2713 neighbor  {name.split()[1]}', 'configuration')
 

src/exabgp/bgp/neighbor.py

@@ -25,6 +25,7 @@
 
 from exabgp.rib import RIB
 
+from exabgp.reactor.api.command.neighbor import NeighborTemplate
 
 # class Section(dict):
 #     name = ''
@@ -290,182 +291,6 @@ def __eq__(self, other):
     def __ne__(self, other):
         return not self.__eq__(other)
 
-    def string(self, with_changes=True):
-        changes = ''
-        if with_changes:
-            changes += '\nstatic { '
-            for change in self.rib.outgoing.queued_changes():
-                changes += '\n\t\t%s' % change.extensive()
-            changes += '\n}'
-
-        families = ''
-        for afi, safi in self.families():
-            families += '\n\t\t%s %s;' % (afi.name(), safi.name())
-
-        nexthops = ''
-        for afi, safi, nexthop in self.nexthops():
-            nexthops += '\n\t\t%s %s %s;' % (afi.name(), safi.name(), nexthop.name())
-
-        addpaths = ''
-        for afi, safi in self.addpaths():
-            addpaths += '\n\t\t%s %s;' % (afi.name(), safi.name())
-
-        codes = Message.CODE
-
-        _extension_global = {
-            'neighbor-changes': 'neighbor-changes',
-            'negotiated': 'negotiated',
-            'fsm': 'fsm',
-            'signal': 'signal',
-        }
-
-        _extension_receive = {
-            'receive-packets': 'packets',
-            'receive-parsed': 'parsed',
-            'receive-consolidate': 'consolidate',
-            'receive-%s' % codes.NOTIFICATION.SHORT: 'notification',
-            'receive-%s' % codes.OPEN.SHORT: 'open',
-            'receive-%s' % codes.KEEPALIVE.SHORT: 'keepalive',
-            'receive-%s' % codes.UPDATE.SHORT: 'update',
-            'receive-%s' % codes.ROUTE_REFRESH.SHORT: 'refresh',
-            'receive-%s' % codes.OPERATIONAL.SHORT: 'operational',
-        }
-
-        _extension_send = {
-            'send-packets': 'packets',
-            'send-parsed': 'parsed',
-            'send-consolidate': 'consolidate',
-            'send-%s' % codes.NOTIFICATION.SHORT: 'notification',
-            'send-%s' % codes.OPEN.SHORT: 'open',
-            'send-%s' % codes.KEEPALIVE.SHORT: 'keepalive',
-            'send-%s' % codes.UPDATE.SHORT: 'update',
-            'send-%s' % codes.ROUTE_REFRESH.SHORT: 'refresh',
-            'send-%s' % codes.OPERATIONAL.SHORT: 'operational',
-        }
-
-        apis = ''
-
-        for process in self.api.get('processes', []):
-            _global = []
-            _receive = []
-            _send = []
-
-            for api, name in _extension_global.items():
-                _global.extend(
-                    [
-                        '\t\t%s;\n' % name,
-                    ]
-                    if process in self.api[api]
-                    else []
-                )
-
-            for api, name in _extension_receive.items():
-                _receive.extend(
-                    [
-                        '\t\t\t%s;\n' % name,
-                    ]
-                    if process in self.api[api]
-                    else []
-                )
-
-            for api, name in _extension_send.items():
-                _send.extend(
-                    [
-                        '\t\t\t%s;\n' % name,
-                    ]
-                    if process in self.api[api]
-                    else []
-                )
-
-            _api = '\tapi {\n'
-            _api += '\t\tprocesses [ %s ];\n' % process
-            _api += ''.join(_global)
-            if _receive:
-                _api += '\t\treceive {\n'
-                _api += ''.join(_receive)
-                _api += '\t\t}\n'
-            if _send:
-                _api += '\t\tsend {\n'
-                _api += ''.join(_send)
-                _api += '\t\t}\n'
-            _api += '\t}\n'
-
-            apis += _api
-
-        returned = (
-            'neighbor %s {\n'
-            '\tdescription "%s";\n'
-            '\trouter-id %s;\n'
-            '\thost-name %s;\n'
-            '\tdomain-name %s;\n'
-            '\tlocal-address %s;\n'
-            '\tsource-interface %s;\n'
-            '\tlocal-as %s;\n'
-            '\tpeer-as %s;\n'
-            '\thold-time %s;\n'
-            '\trate-limit %s;\n'
-            '\tmanual-eor %s;\n'
-            '%s%s%s%s%s%s%s%s%s%s%s\n'
-            '\tcapability {\n'
-            '%s%s%s%s%s%s%s%s%s%s\t}\n'
-            '\tfamily {%s\n'
-            '\t}\n'
-            '\tnexthop {%s\n'
-            '\t}\n'
-            '\tadd-path {%s\n'
-            '\t}\n'
-            '%s'
-            '%s'
-            '}'
-            % (
-                self['peer-address'],
-                self['description'],
-                self['router-id'],
-                self['host-name'],
-                self['domain-name'],
-                self['local-address'] if not self.auto_discovery else 'auto',
-                self['source-interface'],
-                self['local-as'],
-                self['peer-as'],
-                self['hold-time'],
-                'disable' if self['rate-limit'] == 0 else self['rate-limit'],
-                'true' if self['manual-eor'] else 'false',
-                '\n\tpassive %s;\n' % ('true' if self['passive'] else 'false'),
-                '\n\tlisten %d;\n' % self['listen'] if self['listen'] else '',
-                '\n\tconnect %d;\n' % self['connect'] if self['connect'] else '',
-                '\tgroup-updates %s;\n' % ('true' if self['group-updates'] else 'false'),
-                '\tauto-flush %s;\n' % ('true' if self['auto-flush'] else 'false'),
-                '\tadj-rib-in %s;\n' % ('true' if self['adj-rib-in'] else 'false'),
-                '\tadj-rib-out %s;\n' % ('true' if self['adj-rib-out'] else 'false'),
-                '\tmd5-password "%s";\n' % self['md5-password'] if self['md5-password'] else '',
-                '\tmd5-base64 %s;\n'
-                % ('true' if self['md5-base64'] is True else 'false' if self['md5-base64'] is False else 'auto'),
-                '\tmd5-ip "%s";\n' % self['md5-ip'] if not self.auto_discovery else '',
-                '\toutgoing-ttl %s;\n' % self['outgoing-ttl'] if self['outgoing-ttl'] else '',
-                '\tincoming-ttl %s;\n' % self['incoming-ttl'] if self['incoming-ttl'] else '',
-                '\t\tasn4 %s;\n' % ('enable' if self['capability']['asn4'] else 'disable'),
-                '\t\troute-refresh %s;\n' % ('enable' if self['capability']['route-refresh'] else 'disable'),
-                '\t\tgraceful-restart %s;\n'
-                % (self['capability']['graceful-restart'] if self['capability']['graceful-restart'] else 'disable'),
-                '\t\tsoftware-version %s;\n' % ('enable' if self['capability']['software-version'] else 'disable'),
-                '\t\tnexthop %s;\n' % ('enable' if self['capability']['nexthop'] else 'disable'),
-                '\t\tadd-path %s;\n'
-                % (AddPath.string[self['capability']['add-path']] if self['capability']['add-path'] else 'disable'),
-                '\t\tmulti-session %s;\n' % ('enable' if self['capability']['multi-session'] else 'disable'),
-                '\t\toperational %s;\n' % ('enable' if self['capability']['operational'] else 'disable'),
-                '\t\taigp %s;\n' % ('enable' if self['capability']['aigp'] else 'disable'),
-                families,
-                nexthops,
-                addpaths,
-                apis,
-                changes,
-            )
-        )
-
-        # '\t\treceive {\n%s\t\t}\n' % receive if receive else '',
-        # '\t\tsend {\n%s\t\t}\n' % send if send else '',
-        return returned.replace('\t', '  ')
-
     def ip_self(self, afi):
         if afi == self['local-address'].afi:
             return self['local-address']
@@ -490,4 +315,4 @@ def remove_self(self, changes):
         return change
 
     def __str__(self):
-        return self.string(False)
+        return NeighborTemplate.configuration(self, False)

src/exabgp/reactor/api/__init__.py

@@ -37,10 +37,28 @@ def log_failure(self, message, level='ERR'):
         report = '%s\nreason: %s' % (message, error) if error else message
         log.error(report, 'processes', level)
 
+    def process(self, reactor, service, command):
+        # it to allow a global "set encoding json"
+        # it to allow a global "set encoding text"
+        # to not have to set the encoding on each command
+        if ' json ' in command:
+            return self.json(reactor, service, command)
+        if ' text ' in command:
+            return self.text(reactor, service, command)
+        return self.text(reactor, service, command)
+
     def text(self, reactor, service, command):
         for registered in self.functions:
             if registered == command or command.endswith(' ' + registered) or registered + ' ' in command:
-                return self.callback['text'][registered](self, reactor, service, command)
+                return self.callback['text'][registered](self, reactor, service, command, False)
+        reactor.processes.answer_error(service)
+        log.warning('command from process not understood : %s' % command, 'api')
+        return False
+
+    def json(self, reactor, service, command):
+        for registered in self.functions:
+            if registered == command or command.endswith(' ' + registered) or registered + ' ' in command:
+                return self.callback['json'][registered](self, reactor, service, command, True)
         reactor.processes.answer_error(service)
         log.warning('command from process not understood : %s' % command, 'api')
         return False