Merging upstream version 9.5.1+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 365 insertions, 39 deletions

diff --git a/ansible_collections/community/routeros/plugins/module_utils/_api_data.py b/ansible_collections/community/routeros/plugins/module_utils/_api_data.py
index a421cffee..fdf5cba58 100644
--- a/ansible_collections/community/routeros/plugins/module_utils/_api_data.py
+++ b/ansible_collections/community/routeros/plugins/module_utils/_api_data.py
@@ -729,6 +729,23 @@ PATHS = {
             },
         ),
     ),
+    ('ip', 'route', 'rule'): APIData(
+        versioned=[
+            ('7', '<', VersionedAPIData(
+                fully_understood=True,
+                fields={
+                    'action': KeyInfo(default='lookup'),
+                    'comment': KeyInfo(can_disable=True, remove_value=''),
+                    'disabled': KeyInfo(default=False),
+                    'dst-address': KeyInfo(can_disable=True),
+                    'interface': KeyInfo(can_disable=True),
+                    'routing-mark': KeyInfo(can_disable=True),
+                    'src-address': KeyInfo(can_disable=True),
+                    'table': KeyInfo(default='main'),
+                },
+            )),
+        ],
+    ),
     ('ip', 'vrf'): APIData(
         versioned=[
             ('7', '>=', VersionedAPIData(
@@ -787,6 +804,73 @@ PATHS = {
             },
         ),
     ),
+    ('routing', 'filter'): APIData(
+        versioned=[
+            ('7', '<', VersionedAPIData(
+                fully_understood=True,
+                fields={
+                    'action': KeyInfo(default='passthrough'),
+                    'address-family': KeyInfo(can_disable=True),
+                    'append-bgp-communities': KeyInfo(can_disable=True),
+                    'append-route-targets': KeyInfo(can_disable=True),
+                    'bgp-as-path': KeyInfo(can_disable=True),
+                    'bgp-as-path-length': KeyInfo(can_disable=True),
+                    'bgp-atomic-aggregate': KeyInfo(can_disable=True),
+                    'bgp-communities': KeyInfo(can_disable=True),
+                    'bgp-local-pref': KeyInfo(can_disable=True),
+                    'bgp-med': KeyInfo(can_disable=True),
+                    'bgp-origin': KeyInfo(can_disable=True),
+                    'bgp-weight': KeyInfo(can_disable=True),
+                    'chain': KeyInfo(required=True),
+                    'comment': KeyInfo(can_disable=True, remove_value=''),
+                    'disabled': KeyInfo(default=False),
+                    'distance': KeyInfo(can_disable=True),
+                    'invert-match': KeyInfo(default=False),
+                    'jump-target': KeyInfo(),
+                    'locally-originated-bgp': KeyInfo(can_disable=True),
+                    'match-chain': KeyInfo(can_disable=True),
+                    'ospf-type': KeyInfo(can_disable=True),
+                    'pref-src': KeyInfo(can_disable=True),
+                    'prefix': KeyInfo(default='0.0.0.0/0'),
+                    'prefix-length': KeyInfo(can_disable=True),
+                    'protocol': KeyInfo(can_disable=True),
+                    'route-comment': KeyInfo(can_disable=True),
+                    'route-tag': KeyInfo(can_disable=True),
+                    'route-targets': KeyInfo(can_disable=True),
+                    'routing-mark': KeyInfo(can_disable=True),
+                    'scope': KeyInfo(can_disable=True),
+                    'set-bgp-communities': KeyInfo(can_disable=True),
+                    'set-bgp-local-pref': KeyInfo(can_disable=True),
+                    'set-bgp-med': KeyInfo(can_disable=True),
+                    'set-bgp-prepend': KeyInfo(can_disable=True),
+                    'set-bgp-prepend-path': KeyInfo(),
+                    'set-bgp-weight': KeyInfo(can_disable=True),
+                    'set-check-gateway': KeyInfo(can_disable=True),
+                    'set-disabled': KeyInfo(can_disable=True),
+                    'set-distance': KeyInfo(can_disable=True),
+                    'set-in-nexthop': KeyInfo(can_disable=True),
+                    'set-in-nexthop-direct': KeyInfo(can_disable=True),
+                    'set-in-nexthop-ipv6': KeyInfo(can_disable=True),
+                    'set-in-nexthop-linklocal': KeyInfo(can_disable=True),
+                    'set-out-nexthop': KeyInfo(can_disable=True),
+                    'set-out-nexthop-ipv6': KeyInfo(can_disable=True),
+                    'set-out-nexthop-linklocal': KeyInfo(can_disable=True),
+                    'set-pref-src': KeyInfo(can_disable=True),
+                    'set-route-comment': KeyInfo(can_disable=True),
+                    'set-route-tag': KeyInfo(can_disable=True),
+                    'set-route-targets': KeyInfo(can_disable=True),
+                    'set-routing-mark': KeyInfo(can_disable=True),
+                    'set-scope': KeyInfo(can_disable=True),
+                    'set-site-of-origin': KeyInfo(can_disable=True),
+                    'set-target-scope': KeyInfo(can_disable=True),
+                    'set-type': KeyInfo(can_disable=True),
+                    'set-use-te-nexthop': KeyInfo(can_disable=True),
+                    'site-of-origin': KeyInfo(can_disable=True),
+                    'target-scope': KeyInfo(can_disable=True),
+                },
+            )),
+        ],
+    ),
     ('routing', 'filter', 'rule'): APIData(
         versioned=[
             ('7', '>=', VersionedAPIData(
@@ -1397,7 +1481,7 @@ PATHS = {
                 'comment': KeyInfo(can_disable=True, remove_value=''),
                 'disabled': KeyInfo(default=False),
                 'eui-64': KeyInfo(default=False),
-                'from-pool': KeyInfo(),
+                'from-pool': KeyInfo(default=''),
                 'interface': KeyInfo(required=True),
                 'no-dad': KeyInfo(default=False),
             },
@@ -1497,6 +1581,28 @@ PATHS = {
             },
         ),
     ),
+    ('interface', 'pppoe-server', 'server'): APIData(
+        unversioned=VersionedAPIData(
+            fully_understood=True,
+            primary_keys=('interface', ),
+            fields={
+                'accept-empty-service': KeyInfo(default=True),
+                'authentication': KeyInfo(default='pap,chap,mschap1,mschap2'),
+                'comment': KeyInfo(can_disable=True, remove_value=''),
+                'default-profile': KeyInfo(default='default'),
+                'disabled': KeyInfo(default=True),
+                'interface': KeyInfo(required=True),
+                'keepalive-timeout': KeyInfo(default=10),
+                'max-mru': KeyInfo(default='auto'),
+                'max-mtu': KeyInfo(default='auto'),
+                'max-sessions': KeyInfo(default='unlimited'),
+                'mrru': KeyInfo(default='disabled'),
+                'one-session-per-host': KeyInfo(default=False),
+                'pado-delay': KeyInfo(default=0),
+                'service-name': KeyInfo(default=''),
+            },
+        ),
+    ),
     ('interface', 'pptp-server', 'server'): APIData(
         unversioned=VersionedAPIData(
             single_value=True,
@@ -2557,6 +2663,22 @@ PATHS = {
             },
         ),
     ),
+    ('ip', 'dhcp-relay'): APIData(
+        unversioned=VersionedAPIData(
+            fully_understood=True,
+            primary_keys=('name',),
+            fields={
+                'add-relay-info': KeyInfo(default=False),
+                'delay-threshold': KeyInfo(can_disable=True, remove_value='none'),
+                'dhcp-server': KeyInfo(required=True),
+                'disabled': KeyInfo(default=False),
+                'interface': KeyInfo(required=True),
+                'local-address': KeyInfo(can_disable=True, remove_value='0.0.0.0'),
+                'name': KeyInfo(),
+                'relay-info-remote-id': KeyInfo(),
+            },
+        ),
+    ),
     ('ip', 'dhcp-server', 'config'): APIData(
         unversioned=VersionedAPIData(
             single_value=True,
@@ -3591,29 +3713,90 @@ PATHS = {
     ),
     ('mpls', 'interface'): APIData(
         unversioned=VersionedAPIData(
-            unknown_mechanism=True,
-            # primary_keys=('default', ),
+            fully_understood=True,
             fields={
-                'default': KeyInfo(),
-                'disabled': KeyInfo(),
-                'interface': KeyInfo(),
+                'disabled': KeyInfo(default=False),
+                'comment': KeyInfo(can_disable=True, remove_value=''),
+                'interface': KeyInfo(required=True),
                 'mpls-mtu': KeyInfo(),
+                'info': KeyInfo(can_disable=True),
             },
         ),
     ),
     ('mpls', 'ldp'): APIData(
+        versioned=[
+            ('7.1', '>=', VersionedAPIData(
+                fully_understood=True,
+                primary_keys=('vrf', ),
+                fields={
+                    'afi': KeyInfo(can_disable=True),
+                    'distribute-for-default': KeyInfo(can_disable=True),
+                    'path-vector-limit': KeyInfo(can_disable=True),
+                    'vrf': KeyInfo(),
+                    'comment': KeyInfo(can_disable=True, remove_value=''),
+                    'hop-limit': KeyInfo(can_disable=True),
+                    'preferred-afi': KeyInfo(can_disable=True),
+                    'loop-detect': KeyInfo(can_disable=True),
+                    'transport-addresses': KeyInfo(can_disable=True),
+                    'disabled': KeyInfo(default=False),
+                    'lsr-id': KeyInfo(can_disable=True),
+                    'use-explicit-null': KeyInfo(can_disable=True),
+                },
+            )),
+            ('7.1', '<', VersionedAPIData(
+                single_value=True,
+                fully_understood=True,
+                fields={
+                    'distribute-for-default-route': KeyInfo(default=False),
+                    'enabled': KeyInfo(default=False),
+                    'hop-limit': KeyInfo(default=255),
+                    'loop-detect': KeyInfo(default=False),
+                    'lsr-id': KeyInfo(default='0.0.0.0'),
+                    'path-vector-limit': KeyInfo(default=255),
+                    'transport-address': KeyInfo(default='0.0.0.0'),
+                    'use-explicit-null': KeyInfo(default=False),
+                },
+            )),
+        ],
+    ),
+    ('mpls', 'ldp', 'accept-filter'): APIData(
         unversioned=VersionedAPIData(
-            single_value=True,
             fully_understood=True,
             fields={
-                'distribute-for-default-route': KeyInfo(default=False),
-                'enabled': KeyInfo(default=False),
-                'hop-limit': KeyInfo(default=255),
-                'loop-detect': KeyInfo(default=False),
-                'lsr-id': KeyInfo(default='0.0.0.0'),
-                'path-vector-limit': KeyInfo(default=255),
-                'transport-address': KeyInfo(default='0.0.0.0'),
-                'use-explicit-null': KeyInfo(default=False),
+                'accept': KeyInfo(can_disable=True),
+                'disabled': KeyInfo(default=False),
+                'comment': KeyInfo(can_disable=True, remove_value=''),
+                'neighbor': KeyInfo(can_disable=True),
+                'prefix': KeyInfo(can_disable=True),
+                'vrf': KeyInfo(can_disable=True),
+            },
+        ),
+    ),
+    ('mpls', 'ldp', 'advertise-filter'): APIData(
+        unversioned=VersionedAPIData(
+            fully_understood=True,
+            fields={
+                'advertise': KeyInfo(default=''),
+                'disabled': KeyInfo(default=False),
+                'comment': KeyInfo(can_disable=True, remove_value=''),
+                'neighbor': KeyInfo(),
+                'prefix': KeyInfo(),
+                'vrf': KeyInfo(),
+            },
+        ),
+    ),
+    ('mpls', 'ldp', 'interface'): APIData(
+        unversioned=VersionedAPIData(
+            fully_understood=True,
+            fields={
+                'disabled': KeyInfo(default=False),
+                'comment': KeyInfo(can_disable=True, remove_value=''),
+                'accept-dynamic-neighbors': KeyInfo(can_disable=True),
+                'afi': KeyInfo(can_disable=True),
+                'hello-interval': KeyInfo(can_disable=True),
+                'hold-time': KeyInfo(can_disable=True),
+                'interface': KeyInfo(required=True),
+                'transport-addresses': KeyInfo(can_disable=True),
             },
         ),
     ),
@@ -4239,6 +4422,30 @@ PATHS = {
             },
         ),
     ),
+    ('queue', 'simple'): APIData(
+        unversioned=VersionedAPIData(
+            primary_keys=('name', ),
+            fully_understood=True,
+            fields={
+                'comment': KeyInfo(can_disable=True, remove_value=''),
+                'dst': KeyInfo(can_disable=True, remove_value=''),
+                'time': KeyInfo(can_disable=True, remove_value=''),
+                'bucket-size': KeyInfo(default='0.1/0.1'),
+                'burst-limit': KeyInfo(default='0/0'),
+                'burst-threshold': KeyInfo(default='0/0'),
+                'burst-time': KeyInfo(default='0s/0s'),
+                'disabled': KeyInfo(default=False),
+                'limit-at': KeyInfo(default='0/0'),
+                'max-limit': KeyInfo(default='0/0'),
+                'name': KeyInfo(),
+                'packet-marks': KeyInfo(default=''),
+                'parent': KeyInfo(default='none'),
+                'priority': KeyInfo(default='8/8'),
+                'queue': KeyInfo(default='default-small/default-small'),
+                'target': KeyInfo(required=True),
+            },
+        ),
+    ),
     ('queue', 'tree'): APIData(
         unversioned=VersionedAPIData(
             primary_keys=('name', ),
@@ -4260,6 +4467,64 @@ PATHS = {
             },
         ),
     ),
+    ('queue', 'type'): APIData(
+        unversioned=VersionedAPIData(
+            primary_keys=('name', ),
+            fully_understood=True,
+            fields={
+                'name': KeyInfo(),
+                'kind': KeyInfo(required=True),
+                'bfifo-limit': KeyInfo(default=15000),
+                'cake-ack-filter': KeyInfo(default='none'),
+                'cake-atm': KeyInfo(default='none'),
+                'cake-autorate-ingress': KeyInfo(can_disable=True),
+                'cake-bandwidth': KeyInfo(can_disable=True, remove_value=0),
+                'cake-diffserv': KeyInfo(default='diffserv3'),
+                'cake-flowmode': KeyInfo(default='triple-isolate'),
+                'cake-memlimit': KeyInfo(default=0),
+                'cake-mpu': KeyInfo(can_disable=True, remove_value=''),
+                'cake-nat': KeyInfo(can_disable=True, remove_value=False),
+                'cake-overhead': KeyInfo(default=0),
+                'cake-overhead-scheme': KeyInfo(can_disable=True, remove_value=''),
+                'cake-rtt': KeyInfo(default='100ms'),
+                'cake-rtt-scheme': KeyInfo(default='none'),
+                'cake-wash': KeyInfo(can_disable=True, remove_value=False),
+                'codel-ce-threshold': KeyInfo(can_disable=True, remove_value=''),
+                'codel-ecn': KeyInfo(can_disable=True, remove_value=False),
+                'codel-interval': KeyInfo(default='100ms'),
+                'codel-limit': KeyInfo(default=1000),
+                'codel-target': KeyInfo(default='5ms'),
+                'fq-codel-ce-threshold': KeyInfo(can_disable=True, remove_value=''),
+                'fq-codel-ecn': KeyInfo(default=True),
+                'fq-codel-flows': KeyInfo(default=1024),
+                'fq-codel-interval': KeyInfo(default='100ms'),
+                'fq-codel-limit': KeyInfo(default=10240),
+                'fq-codel-memlimit': KeyInfo(default=33554432),
+                'fq-codel-quantum': KeyInfo(default=1514),
+                'fq-codel-target': KeyInfo(default='5ms'),
+                'mq-pfifo-limit': KeyInfo(default=50),
+                'pcq-burst-rate': KeyInfo(default=0),
+                'pcq-burst-threshold': KeyInfo(default=0),
+                'pcq-burst-time': KeyInfo(default='10s'),
+                'pcq-classifier': KeyInfo(can_disable=True, remove_value=''),
+                'pcq-dst-address-mask': KeyInfo(default=32),
+                'pcq-dst-address6-mask': KeyInfo(default=128),
+                'pcq-limit': KeyInfo(default=50),
+                'pcq-rate': KeyInfo(default=0),
+                'pcq-src-address-mask': KeyInfo(default=32),
+                'pcq-src-address6-mask': KeyInfo(default=128),
+                'pcq-total-limit': KeyInfo(default=2000),
+                'pfifo-limit': KeyInfo(default=50),
+                'red-avg-packet': KeyInfo(default=1000),
+                'red-burst': KeyInfo(default=20),
+                'red-limit': KeyInfo(default=60),
+                'red-max-threshold': KeyInfo(default=50),
+                'red-min-threshold': KeyInfo(default=10),
+                'sfq-allot': KeyInfo(default=1514),
+                'sfq-perturb': KeyInfo(default=5),
+            },
+        ),
+    ),
     ('interface', 'ethernet', 'switch'): APIData(
         unversioned=VersionedAPIData(
             fixed_entries=True,
@@ -4335,32 +4600,20 @@ PATHS = {
             },
         ),
     ),
-    ('queue', 'type'): APIData(
+    ('routing', 'bgp', 'aggregate'): APIData(
         unversioned=VersionedAPIData(
-            has_identifier=True,
+            primary_keys=('prefix',),
+            fully_understood=True,
             fields={
-                'kind': KeyInfo(),
-                'mq-pfifo-limit': KeyInfo(),
-                'name': KeyInfo(),
-                'pcq-burst-rate': KeyInfo(),
-                'pcq-burst-threshold': KeyInfo(),
-                'pcq-burst-time': KeyInfo(),
-                'pcq-classifier': KeyInfo(),
-                'pcq-dst-address-mask': KeyInfo(),
-                'pcq-dst-address6-mask': KeyInfo(),
-                'pcq-limit': KeyInfo(),
-                'pcq-rate': KeyInfo(),
-                'pcq-src-address-mask': KeyInfo(),
-                'pcq-src-address6-mask': KeyInfo(),
-                'pcq-total-limit': KeyInfo(),
-                'pfifo-limit': KeyInfo(),
-                'red-avg-packet': KeyInfo(),
-                'red-burst': KeyInfo(),
-                'red-limit': KeyInfo(),
-                'red-max-threshold': KeyInfo(),
-                'red-min-threshold': KeyInfo(),
-                'sfq-allot': KeyInfo(),
-                'sfq-perturb': KeyInfo(),
+                'advertise-filter': KeyInfo(),
+                'attribute-filter': KeyInfo(),
+                'disabled': KeyInfo(default=False),
+                'include-igp': KeyInfo(default=False),
+                'inherit-attributes': KeyInfo(default=True),
+                'instance': KeyInfo(required=True),
+                'prefix': KeyInfo(required=True),
+                'summary-only': KeyInfo(default=True),
+                'suppress-filter': KeyInfo(),
             },
         ),
     ),
@@ -4448,6 +4701,53 @@ PATHS = {
             },
         ),
     ),
+    ('routing', 'bgp', 'network'): APIData(
+        unversioned=VersionedAPIData(
+            primary_keys=('network',),
+            fully_understood=True,
+            fields={
+                'comment': KeyInfo(can_disable=True, remove_value=''),
+                'disabled': KeyInfo(default=False),
+                'network': KeyInfo(required=True),
+                'synchronize': KeyInfo(default=True),
+            },
+        ),
+    ),
+    ('routing', 'bgp', 'peer'): APIData(
+        unversioned=VersionedAPIData(
+            primary_keys=('name', ),
+            fully_understood=True,
+            fields={
+                'address-families': KeyInfo(default='ip'),
+                'allow-as-in': KeyInfo(can_disable=True, remove_value=''),
+                'as-override': KeyInfo(default=False),
+                'cisco-vpls-nlri-len-fmt': KeyInfo(),
+                'comment': KeyInfo(can_disable=True, remove_value=''),
+                'default-originate': KeyInfo(default='never'),
+                'disabled': KeyInfo(default=False),
+                'hold-time': KeyInfo(default='3m'),
+                'in-filter': KeyInfo(),
+                'instance': KeyInfo(),
+                'keepalive-time': KeyInfo(can_disable=True, remove_value=''),
+                'max-prefix-limit': KeyInfo(can_disable=True, remove_value=''),
+                'max-prefix-restart-time': KeyInfo(can_disable=True, remove_value=''),
+                'multihop': KeyInfo(default=False),
+                'name': KeyInfo(),
+                'nexthop-choice': KeyInfo(default='default'),
+                'passive': KeyInfo(default=False),
+                'out-filter': KeyInfo(),
+                'remote-address': KeyInfo(required=True),
+                'remote-as': KeyInfo(required=True),
+                'remote-port': KeyInfo(can_disable=True, remove_value=''),
+                'remove-private-as': KeyInfo(default=False),
+                'route-reflect': KeyInfo(default=False),
+                'tcp-md5-key': KeyInfo(),
+                'ttl': KeyInfo(default='default'),
+                'update-source': KeyInfo(can_disable=True, remove_value='none'),
+                'use-bfd': KeyInfo(default=False),
+            },
+        ),
+    ),
     ('routing', 'bgp', 'template'): APIData(
         unversioned=VersionedAPIData(
             primary_keys=('name', ),
diff --git a/ansible_collections/community/routeros/plugins/modules/api_info.py b/ansible_collections/community/routeros/plugins/modules/api_info.py
index f9a39464f..a3e800ee3 100644
--- a/ansible_collections/community/routeros/plugins/modules/api_info.py
+++ b/ansible_collections/community/routeros/plugins/modules/api_info.py
@@ -75,6 +75,7 @@ options:
         - interface ovpn-server server
         - interface ppp-client
         - interface pppoe-client
+        - interface pppoe-server server
         - interface pptp-server server
         - interface sstp-server server
         - interface vlan
@@ -120,6 +121,7 @@ options:
         - ip cloud advanced
         - ip dhcp-client
         - ip dhcp-client option
+        - ip dhcp-relay
         - ip dhcp-server
         - ip dhcp-server config
         - ip dhcp-server lease
@@ -147,6 +149,7 @@ options:
         - ip pool
         - ip proxy
         - ip route
+        - ip route rule
         - ip route vrf
         - ip service
         - ip settings
@@ -174,18 +177,28 @@ options:
         - ipv6 route
         - ipv6 settings
         - mpls
+        - mpls interface
         - mpls ldp
+        - mpls ldp accept-filter
+        - mpls ldp advertise-filter
+        - mpls ldp interface
         - port firmware
         - port remote-access
         - ppp aaa
         - ppp profile
         - queue interface
+        - queue simple
         - queue tree
+        - queue type
         - radius
         - radius incoming
+        - routing bgp aggregate
         - routing bgp connection
         - routing bgp instance
+        - routing bgp network
+        - routing bgp peer
         - routing bgp template
+        - routing filter
         - routing filter rule
         - routing filter select-rule
         - routing id
diff --git a/ansible_collections/community/routeros/plugins/modules/api_modify.py b/ansible_collections/community/routeros/plugins/modules/api_modify.py
index d71750073..cd5b3a93d 100644
--- a/ansible_collections/community/routeros/plugins/modules/api_modify.py
+++ b/ansible_collections/community/routeros/plugins/modules/api_modify.py
@@ -84,6 +84,7 @@ options:
         - interface ovpn-server server
         - interface ppp-client
         - interface pppoe-client
+        - interface pppoe-server server
         - interface pptp-server server
         - interface sstp-server server
         - interface vlan
@@ -129,6 +130,7 @@ options:
         - ip cloud advanced
         - ip dhcp-client
         - ip dhcp-client option
+        - ip dhcp-relay
         - ip dhcp-server
         - ip dhcp-server config
         - ip dhcp-server lease
@@ -156,6 +158,7 @@ options:
         - ip pool
         - ip proxy
         - ip route
+        - ip route rule
         - ip route vrf
         - ip service
         - ip settings
@@ -183,18 +186,28 @@ options:
         - ipv6 route
         - ipv6 settings
         - mpls
+        - mpls interface
         - mpls ldp
+        - mpls ldp accept-filter
+        - mpls ldp advertise-filter
+        - mpls ldp interface
         - port firmware
         - port remote-access
         - ppp aaa
         - ppp profile
         - queue interface
+        - queue simple
         - queue tree
+        - queue type
         - radius
         - radius incoming
+        - routing bgp aggregate
         - routing bgp connection
         - routing bgp instance
+        - routing bgp network
+        - routing bgp peer
         - routing bgp template
+        - routing filter
         - routing filter rule
         - routing filter select-rule
         - routing id