diff --git a/device-types/ADVA/XG120-PRO-SH.yaml b/device-types/ADVA/XG120-PRO-SH.yaml
new file mode 100644
index 000000000..623d7bab7
--- /dev/null
+++ b/device-types/ADVA/XG120-PRO-SH.yaml
@@ -0,0 +1,71 @@
+---
+manufacturer: ADVA
+model: XG120-PRO-SH
+slug: xg120-pro-sh
+part_number: 1078904481-01
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU-1
+    type: iec-60320-c14
+  - name: PSU-2
+    type: iec-60320-c14
+interfaces:
+  - name: 1
+    type: 1000base-x-sfp
+  - name: 2
+    type: 1000base-x-sfp
+  - name: 3
+    type: 1000base-x-sfp
+  - name: 4
+    type: 1000base-x-sfp
+  - name: 5
+    type: 1000base-x-sfp
+  - name: 6
+    type: 1000base-x-sfp
+  - name: 7
+    type: 1000base-x-sfp
+  - name: 8
+    type: 1000base-x-sfp
+  - name: 9
+    type: 1000base-x-sfp
+  - name: 10
+    type: 1000base-x-sfp
+  - name: 11
+    type: 1000base-x-sfp
+  - name: 12
+    type: 1000base-x-sfp
+  - name: 13
+    type: 1000base-x-sfp
+  - name: 14
+    type: 1000base-x-sfp
+  - name: 15
+    type: 1000base-x-sfp
+  - name: 16
+    type: 1000base-x-sfp
+  - name: 17
+    type: 1000base-x-sfp
+  - name: 18
+    type: 1000base-x-sfp
+  - name: 19
+    type: 1000base-x-sfp
+  - name: 20
+    type: 1000base-x-sfp
+  - name: 21
+    type: 10gbase-x-sfpp
+  - name: 22
+    type: 10gbase-x-sfpp
+  - name: 23
+    type: 10gbase-x-sfpp
+  - name: 24
+    type: 10gbase-x-sfpp
+  - name: 25
+    type: 10gbase-x-sfpp
+  - name: 26
+    type: 10gbase-x-sfpp
+  - name: MGMT
+    type: 100base-tx
+    mgmt_only: true
diff --git a/device-types/ADVA/XG418-100G-CFP2.yaml b/device-types/ADVA/XG418-100G-CFP2.yaml
new file mode 100644
index 000000000..b6dbf8a1a
--- /dev/null
+++ b/device-types/ADVA/XG418-100G-CFP2.yaml
@@ -0,0 +1,59 @@
+---
+manufacturer: ADVA
+model: XG418-100G-CFP2
+slug: xg418-100g-cfp2
+part_number: 1078901052-01
+comments: FSP 150-XG418 Carrier Ethernet Aggregation Device 1RU 12 x SFP+ 4 x SFP28 and 2 x CFP2
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU-1
+    type: iec-60320-c14
+  - name: PSU-2
+    type: iec-60320-c14
+interfaces:
+  - name: 1
+    type: 10gbase-x-sfpp
+  - name: 2
+    type: 10gbase-x-sfpp
+  - name: 3
+    type: 10gbase-x-sfpp
+  - name: 4
+    type: 10gbase-x-sfpp
+  - name: 5
+    type: 10gbase-x-sfpp
+  - name: 6
+    type: 10gbase-x-sfpp
+  - name: 7
+    type: 10gbase-x-sfpp
+  - name: 8
+    type: 10gbase-x-sfpp
+  - name: 9
+    type: 10gbase-x-sfpp
+  - name: 10
+    type: 10gbase-x-sfpp
+  - name: 11
+    type: 10gbase-x-sfpp
+  - name: 12
+    type: 10gbase-x-sfpp
+  - name: 13
+    type: 25gbase-x-sfp28
+  - name: 14
+    type: 25gbase-x-sfp28
+  - name: 15
+    type: 25gbase-x-sfp28
+  - name: 16
+    type: 25gbase-x-sfp28
+  - name: 17
+    type: 100gbase-x-cfp2
+  - name: 18
+    type: 100gbase-x-cfp2
+  - name: DCN1
+    type: 1000base-t
+    mgmt_only: true
+  - name: DCN2
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/ADVA/XG418-100G.yaml b/device-types/ADVA/XG418-100G.yaml
new file mode 100644
index 000000000..88cca9078
--- /dev/null
+++ b/device-types/ADVA/XG418-100G.yaml
@@ -0,0 +1,59 @@
+---
+manufacturer: ADVA
+model: XG418-100G
+slug: xg418-100g
+part_number: 1078901053-01
+comments: FSP 150-XG418 Carrier Ethernet Aggregation Device 1RU 12 X SFP+ 4 X SFP28 and 2 x QSF28
+u_height: 1
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU-1
+    type: iec-60320-c14
+  - name: PSU-2
+    type: iec-60320-c14
+interfaces:
+  - name: 1
+    type: 10gbase-x-sfpp
+  - name: 2
+    type: 10gbase-x-sfpp
+  - name: 3
+    type: 10gbase-x-sfpp
+  - name: 4
+    type: 10gbase-x-sfpp
+  - name: 5
+    type: 10gbase-x-sfpp
+  - name: 6
+    type: 10gbase-x-sfpp
+  - name: 7
+    type: 10gbase-x-sfpp
+  - name: 8
+    type: 10gbase-x-sfpp
+  - name: 9
+    type: 10gbase-x-sfpp
+  - name: 10
+    type: 10gbase-x-sfpp
+  - name: 11
+    type: 10gbase-x-sfpp
+  - name: 12
+    type: 10gbase-x-sfpp
+  - name: 13
+    type: 25gbase-x-sfp28
+  - name: 14
+    type: 25gbase-x-sfp28
+  - name: 15
+    type: 25gbase-x-sfp28
+  - name: 16
+    type: 25gbase-x-sfp28
+  - name: 17
+    type: 100gbase-x-qsfp28
+  - name: 21
+    type: 100gbase-x-qsfp28
+  - name: DCN1
+    type: 1000base-t
+    mgmt_only: true
+  - name: DCN2
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/ADVA/XG480-100G-CFP2.yaml b/device-types/ADVA/XG480-100G-CFP2.yaml
new file mode 100644
index 000000000..6ed520d0d
--- /dev/null
+++ b/device-types/ADVA/XG480-100G-CFP2.yaml
@@ -0,0 +1,135 @@
+---
+manufacturer: ADVA
+model: XG480-100G-CFP2
+slug: xg480-100g-cfp2
+part_number: 1078901003-01
+comments: FSP 150-XG480 Carrier Ethernet Aggregation Device 2RU 52x10G + 4x100G (2xQSF28+2xCFP2)
+u_height: 2
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU-1
+    type: iec-60320-c14
+  - name: PSU-2
+    type: iec-60320-c14
+interfaces:
+  - name: 1
+    type: 10gbase-x-sfpp
+  - name: 2
+    type: 10gbase-x-sfpp
+  - name: 3
+    type: 10gbase-x-sfpp
+  - name: 4
+    type: 10gbase-x-sfpp
+  - name: 5
+    type: 10gbase-x-sfpp
+  - name: 6
+    type: 10gbase-x-sfpp
+  - name: 7
+    type: 10gbase-x-sfpp
+  - name: 8
+    type: 10gbase-x-sfpp
+  - name: 9
+    type: 10gbase-x-sfpp
+  - name: 10
+    type: 10gbase-x-sfpp
+  - name: 11
+    type: 10gbase-x-sfpp
+  - name: 12
+    type: 10gbase-x-sfpp
+  - name: 13
+    type: 10gbase-x-sfpp
+  - name: 14
+    type: 10gbase-x-sfpp
+  - name: 15
+    type: 10gbase-x-sfpp
+  - name: 16
+    type: 10gbase-x-sfpp
+  - name: 17
+    type: 10gbase-x-sfpp
+  - name: 18
+    type: 10gbase-x-sfpp
+  - name: 19
+    type: 10gbase-x-sfpp
+  - name: 20
+    type: 10gbase-x-sfpp
+  - name: 21
+    type: 10gbase-x-sfpp
+  - name: 22
+    type: 10gbase-x-sfpp
+  - name: 23
+    type: 10gbase-x-sfpp
+  - name: 24
+    type: 10gbase-x-sfpp
+  - name: 25
+    type: 10gbase-x-sfpp
+  - name: 26
+    type: 10gbase-x-sfpp
+  - name: 27
+    type: 10gbase-x-sfpp
+  - name: 28
+    type: 10gbase-x-sfpp
+  - name: 29
+    type: 10gbase-x-sfpp
+  - name: 30
+    type: 10gbase-x-sfpp
+  - name: 31
+    type: 10gbase-x-sfpp
+  - name: 32
+    type: 10gbase-x-sfpp
+  - name: 33
+    type: 10gbase-x-sfpp
+  - name: 34
+    type: 10gbase-x-sfpp
+  - name: 35
+    type: 10gbase-x-sfpp
+  - name: 36
+    type: 10gbase-x-sfpp
+  - name: 37
+    type: 10gbase-x-sfpp
+  - name: 38
+    type: 10gbase-x-sfpp
+  - name: 39
+    type: 10gbase-x-sfpp
+  - name: 40
+    type: 10gbase-x-sfpp
+  - name: 41
+    type: 10gbase-x-sfpp
+  - name: 42
+    type: 10gbase-x-sfpp
+  - name: 43
+    type: 10gbase-x-sfpp
+  - name: 44
+    type: 10gbase-x-sfpp
+  - name: 45
+    type: 10gbase-x-sfpp
+  - name: 46
+    type: 10gbase-x-sfpp
+  - name: 47
+    type: 10gbase-x-sfpp
+  - name: 48
+    type: 10gbase-x-sfpp
+  - name: 49
+    type: 10gbase-x-sfpp
+  - name: 50
+    type: 10gbase-x-sfpp
+  - name: 51
+    type: 10gbase-x-sfpp
+  - name: 52
+    type: 10gbase-x-sfpp
+  - name: 53
+    type: 100gbase-x-qsfp28
+  - name: 57
+    type: 100gbase-x-qsfp28
+  - name: 61
+    type: 100gbase-x-cfp2
+  - name: 62
+    type: 100gbase-x-cfp2
+  - name: DCN1
+    type: 1000base-t
+    mgmt_only: true
+  - name: DCN2
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/ADVA/XG480-100G.yaml b/device-types/ADVA/XG480-100G.yaml
new file mode 100644
index 000000000..4fd701a27
--- /dev/null
+++ b/device-types/ADVA/XG480-100G.yaml
@@ -0,0 +1,135 @@
+---
+manufacturer: ADVA
+model: XG480-100G
+slug: xg480-100g
+part_number: 1078901001-01
+comments: FSP 150-XG480 Carrier Ethernet Aggregation Device 2RU 52x10G + 4x100G (QSF28)
+u_height: 2
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU-1
+    type: iec-60320-c14
+  - name: PSU-2
+    type: iec-60320-c14
+interfaces:
+  - name: 1
+    type: 10gbase-x-sfpp
+  - name: 2
+    type: 10gbase-x-sfpp
+  - name: 3
+    type: 10gbase-x-sfpp
+  - name: 4
+    type: 10gbase-x-sfpp
+  - name: 5
+    type: 10gbase-x-sfpp
+  - name: 6
+    type: 10gbase-x-sfpp
+  - name: 7
+    type: 10gbase-x-sfpp
+  - name: 8
+    type: 10gbase-x-sfpp
+  - name: 9
+    type: 10gbase-x-sfpp
+  - name: 10
+    type: 10gbase-x-sfpp
+  - name: 11
+    type: 10gbase-x-sfpp
+  - name: 12
+    type: 10gbase-x-sfpp
+  - name: 13
+    type: 10gbase-x-sfpp
+  - name: 14
+    type: 10gbase-x-sfpp
+  - name: 15
+    type: 10gbase-x-sfpp
+  - name: 16
+    type: 10gbase-x-sfpp
+  - name: 17
+    type: 10gbase-x-sfpp
+  - name: 18
+    type: 10gbase-x-sfpp
+  - name: 19
+    type: 10gbase-x-sfpp
+  - name: 20
+    type: 10gbase-x-sfpp
+  - name: 21
+    type: 10gbase-x-sfpp
+  - name: 22
+    type: 10gbase-x-sfpp
+  - name: 23
+    type: 10gbase-x-sfpp
+  - name: 24
+    type: 10gbase-x-sfpp
+  - name: 25
+    type: 10gbase-x-sfpp
+  - name: 26
+    type: 10gbase-x-sfpp
+  - name: 27
+    type: 10gbase-x-sfpp
+  - name: 28
+    type: 10gbase-x-sfpp
+  - name: 29
+    type: 10gbase-x-sfpp
+  - name: 30
+    type: 10gbase-x-sfpp
+  - name: 31
+    type: 10gbase-x-sfpp
+  - name: 32
+    type: 10gbase-x-sfpp
+  - name: 33
+    type: 10gbase-x-sfpp
+  - name: 34
+    type: 10gbase-x-sfpp
+  - name: 35
+    type: 10gbase-x-sfpp
+  - name: 36
+    type: 10gbase-x-sfpp
+  - name: 37
+    type: 10gbase-x-sfpp
+  - name: 38
+    type: 10gbase-x-sfpp
+  - name: 39
+    type: 10gbase-x-sfpp
+  - name: 40
+    type: 10gbase-x-sfpp
+  - name: 41
+    type: 10gbase-x-sfpp
+  - name: 42
+    type: 10gbase-x-sfpp
+  - name: 43
+    type: 10gbase-x-sfpp
+  - name: 44
+    type: 10gbase-x-sfpp
+  - name: 45
+    type: 10gbase-x-sfpp
+  - name: 46
+    type: 10gbase-x-sfpp
+  - name: 47
+    type: 10gbase-x-sfpp
+  - name: 48
+    type: 10gbase-x-sfpp
+  - name: 49
+    type: 10gbase-x-sfpp
+  - name: 50
+    type: 10gbase-x-sfpp
+  - name: 51
+    type: 10gbase-x-sfpp
+  - name: 52
+    type: 10gbase-x-sfpp
+  - name: 53
+    type: 100gbase-x-qsfp28
+  - name: 57
+    type: 100gbase-x-qsfp28
+  - name: 61
+    type: 100gbase-x-qsfp28
+  - name: 62
+    type: 100gbase-x-qsfp28
+  - name: DCN1
+    type: 1000base-t
+    mgmt_only: true
+  - name: DCN2
+    type: 1000base-t
+    mgmt_only: true
diff --git a/device-types/ADVA/XG480-25G-100G.yaml b/device-types/ADVA/XG480-25G-100G.yaml
new file mode 100644
index 000000000..493b67984
--- /dev/null
+++ b/device-types/ADVA/XG480-25G-100G.yaml
@@ -0,0 +1,147 @@
+---
+manufacturer: ADVA
+model: XG480-25G-100G
+slug: xg480-25g-100g
+part_number: 1078901002-01
+comments: FSP 150-XG480 Carrier Ethernet Aggregation Device 2RU 52x10G + 8x25G + 2x100G (QSFP28)
+u_height: 2
+is_full_depth: false
+console-ports:
+  - name: Console
+    type: rj-45
+power-ports:
+  - name: PSU-1
+    type: iec-60320-c14
+  - name: PSU-2
+    type: iec-60320-c14
+interfaces:
+  - name: 1
+    type: 10gbase-x-sfpp
+  - name: 2
+    type: 10gbase-x-sfpp
+  - name: 3
+    type: 10gbase-x-sfpp
+  - name: 4
+    type: 10gbase-x-sfpp
+  - name: 5
+    type: 10gbase-x-sfpp
+  - name: 6
+    type: 10gbase-x-sfpp
+  - name: 7
+    type: 10gbase-x-sfpp
+  - name: 8
+    type: 10gbase-x-sfpp
+  - name: 9
+    type: 10gbase-x-sfpp
+  - name: 10
+    type: 10gbase-x-sfpp
+  - name: 11
+    type: 10gbase-x-sfpp
+  - name: 12
+    type: 10gbase-x-sfpp
+  - name: 13
+    type: 10gbase-x-sfpp
+  - name: 14
+    type: 10gbase-x-sfpp
+  - name: 15
+    type: 10gbase-x-sfpp
+  - name: 16
+    type: 10gbase-x-sfpp
+  - name: 17
+    type: 10gbase-x-sfpp
+  - name: 18
+    type: 10gbase-x-sfpp
+  - name: 19
+    type: 10gbase-x-sfpp
+  - name: 20
+    type: 10gbase-x-sfpp
+  - name: 21
+    type: 10gbase-x-sfpp
+  - name: 22
+    type: 10gbase-x-sfpp
+  - name: 23
+    type: 10gbase-x-sfpp
+  - name: 24
+    type: 10gbase-x-sfpp
+  - name: 25
+    type: 10gbase-x-sfpp
+  - name: 26
+    type: 10gbase-x-sfpp
+  - name: 27
+    type: 10gbase-x-sfpp
+  - name: 28
+    type: 10gbase-x-sfpp
+  - name: 29
+    type: 10gbase-x-sfpp
+  - name: 30
+    type: 10gbase-x-sfpp
+  - name: 31
+    type: 10gbase-x-sfpp
+  - name: 32
+    type: 10gbase-x-sfpp
+  - name: 33
+    type: 10gbase-x-sfpp
+  - name: 34
+    type: 10gbase-x-sfpp
+  - name: 35
+    type: 10gbase-x-sfpp
+  - name: 36
+    type: 10gbase-x-sfpp
+  - name: 37
+    type: 10gbase-x-sfpp
+  - name: 38
+    type: 10gbase-x-sfpp
+  - name: 39
+    type: 10gbase-x-sfpp
+  - name: 40
+    type: 10gbase-x-sfpp
+  - name: 41
+    type: 10gbase-x-sfpp
+  - name: 42
+    type: 10gbase-x-sfpp
+  - name: 43
+    type: 10gbase-x-sfpp
+  - name: 44
+    type: 10gbase-x-sfpp
+  - name: 45
+    type: 10gbase-x-sfpp
+  - name: 46
+    type: 10gbase-x-sfpp
+  - name: 47
+    type: 10gbase-x-sfpp
+  - name: 48
+    type: 10gbase-x-sfpp
+  - name: 49
+    type: 10gbase-x-sfpp
+  - name: 50
+    type: 10gbase-x-sfpp
+  - name: 51
+    type: 10gbase-x-sfpp
+  - name: 52
+    type: 10gbase-x-sfpp
+  - name: 53
+    type: 25gbase-x-sfp28
+  - name: 54
+    type: 25gbase-x-sfp28
+  - name: 55
+    type: 25gbase-x-sfp28
+  - name: 56
+    type: 25gbase-x-sfp28
+  - name: 57
+    type: 25gbase-x-sfp28
+  - name: 58
+    type: 25gbase-x-sfp28
+  - name: 59
+    type: 25gbase-x-sfp28
+  - name: 60
+    type: 25gbase-x-sfp28
+  - name: 61
+    type: 100gbase-x-qsfp28
+  - name: 65
+    type: 100gbase-x-qsfp28
+  - name: DCN1
+    type: 1000base-t
+    mgmt_only: true
+  - name: DCN2
+    type: 1000base-t
+    mgmt_only: true