diff --git a/device-types/MikroTik/CCR1009-7G-1C-1S+.yaml b/device-types/MikroTik/CCR1009-7G-1C-1S+.yaml index c11d71365..5e8960453 100644 --- a/device-types/MikroTik/CCR1009-7G-1C-1S+.yaml +++ b/device-types/MikroTik/CCR1009-7G-1C-1S+.yaml @@ -17,7 +17,7 @@ interfaces: - name: ether7 type: 1000base-t - name: sfp-sfpplus1 - type: 10gbase-x-sfpp + type: 10gbase-x-sfppp - name: combo1 type: 1000base-x-sfp" console-ports: diff --git a/device-types/MikroTik/CCR1009-7G-1C-1S+PC.yaml b/device-types/MikroTik/CCR1009-7G-1C-1S+PC.yaml index 44abf69f8..45a01ce57 100644 --- a/device-types/MikroTik/CCR1009-7G-1C-1S+PC.yaml +++ b/device-types/MikroTik/CCR1009-7G-1C-1S+PC.yaml @@ -17,7 +17,7 @@ interfaces: - name: ether7 type: 1000base-t - name: sfp-sfpplus1 - type: 10gbase-x-sfpp + type: 10gbase-x-sfppp - name: combo1 type: 1000base-x-sfp" console-ports: diff --git a/device-types/MikroTik/CCR1016-12S-1S+.yaml b/device-types/MikroTik/CCR1016-12S-1S+.yaml index 8609cc681..8a5a88353 100644 --- a/device-types/MikroTik/CCR1016-12S-1S+.yaml +++ b/device-types/MikroTik/CCR1016-12S-1S+.yaml @@ -27,7 +27,7 @@ interfaces: - name: sfp12 type: 1000base-x-sfp - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp console-ports: - name: serial0 type: rj-45 diff --git a/device-types/MikroTik/CCR1036-8G-2S+.yaml b/device-types/MikroTik/CCR1036-8G-2S+.yaml index 49ceb9ae9..a9b9f0d2a 100644 --- a/device-types/MikroTik/CCR1036-8G-2S+.yaml +++ b/device-types/MikroTik/CCR1036-8G-2S+.yaml @@ -19,9 +19,9 @@ interfaces: - name: ether8 type: 1000base-t - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp console-ports: - name: serial0 type: rj-45 diff --git a/device-types/MikroTik/CCR1036-8G-2S+EM.yaml b/device-types/MikroTik/CCR1036-8G-2S+EM.yaml index 8a4b91ece..e7e777a16 100644 --- a/device-types/MikroTik/CCR1036-8G-2S+EM.yaml +++ b/device-types/MikroTik/CCR1036-8G-2S+EM.yaml @@ -19,9 +19,9 @@ interfaces: - name: ether8 type: 1000base-t - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp console-ports: - name: serial0 type: rj-45 diff --git a/device-types/MikroTik/CCR1072-1G-8S+.yaml b/device-types/MikroTik/CCR1072-1G-8S+.yaml index beeed3a03..ef5373143 100644 --- a/device-types/MikroTik/CCR1072-1G-8S+.yaml +++ b/device-types/MikroTik/CCR1072-1G-8S+.yaml @@ -5,21 +5,21 @@ interfaces: - name: ether1 type: 1000base-t - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus3 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus4 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus5 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus6 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus7 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus8 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp console-ports: - name: serial0 type: rj-45 diff --git a/device-types/MikroTik/CRS212-1G-10S-1S+IN.yaml b/device-types/MikroTik/CRS212-1G-10S-1S+IN.yaml index 169435935..fcaad924b 100644 --- a/device-types/MikroTik/CRS212-1G-10S-1S+IN.yaml +++ b/device-types/MikroTik/CRS212-1G-10S-1S+IN.yaml @@ -23,7 +23,7 @@ interfaces: - name: sfp10 type: 1000base-x-sfp - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: ether1 type: 1000base-t console-ports: diff --git a/device-types/MikroTik/CRS305-1G-4S+IN.yaml b/device-types/MikroTik/CRS305-1G-4S+IN.yaml index 0fd0b5e44..f8e676ec4 100644 --- a/device-types/MikroTik/CRS305-1G-4S+IN.yaml +++ b/device-types/MikroTik/CRS305-1G-4S+IN.yaml @@ -3,13 +3,13 @@ model: CRS305-1G-4S+IN slug: crs305-1g-4splus-in interfaces: - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus3 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus4 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: ether1 type: 1000base-t console-ports: diff --git a/device-types/MikroTik/CRS309-1G-8S+IN.yaml b/device-types/MikroTik/CRS309-1G-8S+IN.yaml index 92fbbb75c..727630c53 100644 --- a/device-types/MikroTik/CRS309-1G-8S+IN.yaml +++ b/device-types/MikroTik/CRS309-1G-8S+IN.yaml @@ -3,21 +3,21 @@ model: CRS309-1G-8S+IN slug: crs309-1g-8splus-in interfaces: - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus3 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus4 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus5 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus6 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus7 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus8 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: ether1 type: 1000base-t console-ports: diff --git a/device-types/MikroTik/CRS312-4C+8XG-RM.yaml b/device-types/MikroTik/CRS312-4C+8XG-RM.yaml index a6162d2d5..897acdfd8 100644 --- a/device-types/MikroTik/CRS312-4C+8XG-RM.yaml +++ b/device-types/MikroTik/CRS312-4C+8XG-RM.yaml @@ -3,29 +3,29 @@ model: CRS312-4C+8XG-RM slug: crs312-4cplus-8xg-rm interfaces: - name: xether1 - type: 10gbase-x-sfpp + type: 10gbase-x-sfppp - name: xether2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: xether3 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: xether4 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: xether5 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: xether6 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: xether7 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: xether8 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: combo1 - type: 10gbase-x-sfpp + type: 10gbase-x-sfppp - name: combo2 - type: 10gbase-x-sfpp + type: 10gbase-x-sfppp - name: combo3 - type: 10gbase-x-sfpp + type: 10gbase-x-sfppp - name: combo4 - type: 10gbase-x-sfpp + type: 10gbase-x-sfppp console-ports: - name: serial0 type: rj-45 diff --git a/device-types/MikroTik/CRS317-1G-16S+RM.yaml b/device-types/MikroTik/CRS317-1G-16S+RM.yaml index a0342e32a..1e09b486d 100644 --- a/device-types/MikroTik/CRS317-1G-16S+RM.yaml +++ b/device-types/MikroTik/CRS317-1G-16S+RM.yaml @@ -3,37 +3,37 @@ model: CRS317-1G-16S+RM slug: crs317-1g-16splus-rm interfaces: - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus3 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus4 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus5 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus6 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus7 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus8 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus9 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus10 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus11 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus12 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus13 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus14 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus15 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus16 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: ether1 type: 1000base-t console-ports: diff --git a/device-types/MikroTik/CRS326-24G-2S+RM.yaml b/device-types/MikroTik/CRS326-24G-2S+RM.yaml index ccb50a401..da1e1ba7c 100644 --- a/device-types/MikroTik/CRS326-24G-2S+RM.yaml +++ b/device-types/MikroTik/CRS326-24G-2S+RM.yaml @@ -51,9 +51,9 @@ interfaces: - name: ether24 type: 1000base-t - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp console-ports: - name: serial0 type: rj-45 \ No newline at end of file diff --git a/device-types/MikroTik/CRS326-24S+2Q+RM.yaml b/device-types/MikroTik/CRS326-24S+2Q+RM.yaml index 6d252d926..43b90cf29 100644 --- a/device-types/MikroTik/CRS326-24S+2Q+RM.yaml +++ b/device-types/MikroTik/CRS326-24S+2Q+RM.yaml @@ -3,53 +3,53 @@ model: CRS326-24S+2Q+RM slug: crs326-24splus-2qplus-rm interfaces: - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus3 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus4 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus5 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus6 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus7 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus8 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus9 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus10 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus11 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus12 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus13 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus14 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus15 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus16 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus17 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus18 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus19 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus20 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus21 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus22 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus23 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus24 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: qsfp-qsfpplus1 type: 40gbase-x-qsfpp - name: qsfp-qsfpplus2 diff --git a/device-types/MikroTik/CRS328-24P-4S+RM.yaml b/device-types/MikroTik/CRS328-24P-4S+RM.yaml index ed39d7355..f7bb2c2f1 100644 --- a/device-types/MikroTik/CRS328-24P-4S+RM.yaml +++ b/device-types/MikroTik/CRS328-24P-4S+RM.yaml @@ -51,13 +51,13 @@ interfaces: - name: ether24 type: 1000base-t - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus3 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus4 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp console-ports: - name: serial0 type: rj-45 diff --git a/device-types/MikroTik/CRS328-4C-20S-4S+RM.yaml b/device-types/MikroTik/CRS328-4C-20S-4S+RM.yaml index ae0d223ff..9deed0145 100644 --- a/device-types/MikroTik/CRS328-4C-20S-4S+RM.yaml +++ b/device-types/MikroTik/CRS328-4C-20S-4S+RM.yaml @@ -43,13 +43,13 @@ interfaces: - name: sfp20 type: 1000base-x-sfp - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus3 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus4 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: combo1 type: 1000base-x-sfp - name: combo2 diff --git a/device-types/MikroTik/CSS326-24G-2S+RM.yaml b/device-types/MikroTik/CSS326-24G-2S+RM.yaml index 9ef15c608..22fb2f244 100644 --- a/device-types/MikroTik/CSS326-24G-2S+RM.yaml +++ b/device-types/MikroTik/CSS326-24G-2S+RM.yaml @@ -51,6 +51,6 @@ interfaces: - name: ether24 type: 1000base-t - name: sfp-sfpplus1 - type: 10gbase-x-sfp + type: 10gbase-x-sfpp - name: sfp-sfpplus2 - type: 10gbase-x-sfp \ No newline at end of file + type: 10gbase-x-sfpp \ No newline at end of file diff --git a/device-types/MikroTik/RB4011iGS+RM.yaml b/device-types/MikroTik/RB4011iGS+RM.yaml index c12b398d0..828485dff 100644 --- a/device-types/MikroTik/RB4011iGS+RM.yaml +++ b/device-types/MikroTik/RB4011iGS+RM.yaml @@ -23,4 +23,4 @@ interfaces: - name: ether10 type: 1000base-t - name: sfp-sfpplus1 - type: 10gbase-x-sfpp + type: 10gbase-x-sfppp