@@ -1497,8 +1497,9 @@ class PortTypeChoices(ChoiceSet):
1497
1497
# Cables/links
1498
1498
#
1499
1499
1500
- class CableTypeChoices (ChoiceSet ):
1501
1500
1501
+ class CableTypeChoices (ChoiceSet ):
1502
+ # Copper - Twisted Pair (UTP/STP)
1502
1503
TYPE_CAT3 = 'cat3'
1503
1504
TYPE_CAT5 = 'cat5'
1504
1505
TYPE_CAT5E = 'cat5e'
@@ -1507,26 +1508,41 @@ class CableTypeChoices(ChoiceSet):
1507
1508
TYPE_CAT7 = 'cat7'
1508
1509
TYPE_CAT7A = 'cat7a'
1509
1510
TYPE_CAT8 = 'cat8'
1511
+ TYPE_MRJ21_TRUNK = 'mrj21-trunk'
1512
+
1513
+ # Copper - Twinax (DAC)
1510
1514
TYPE_DAC_ACTIVE = 'dac-active'
1511
1515
TYPE_DAC_PASSIVE = 'dac-passive'
1512
- TYPE_MRJ21_TRUNK = 'mrj21-trunk'
1516
+
1517
+ # Copper - Coaxial
1513
1518
TYPE_COAXIAL = 'coaxial'
1519
+
1520
+ # Fiber Optic - Multimode
1514
1521
TYPE_MMF = 'mmf'
1515
1522
TYPE_MMF_OM1 = 'mmf-om1'
1516
1523
TYPE_MMF_OM2 = 'mmf-om2'
1517
1524
TYPE_MMF_OM3 = 'mmf-om3'
1518
1525
TYPE_MMF_OM4 = 'mmf-om4'
1519
1526
TYPE_MMF_OM5 = 'mmf-om5'
1527
+
1528
+ # Fiber Optic - Single-mode
1520
1529
TYPE_SMF = 'smf'
1521
1530
TYPE_SMF_OS1 = 'smf-os1'
1522
1531
TYPE_SMF_OS2 = 'smf-os2'
1532
+
1533
+ # Fiber Optic - Other
1523
1534
TYPE_AOC = 'aoc'
1535
+
1536
+ # Power
1524
1537
TYPE_POWER = 'power'
1538
+
1539
+ # USB
1525
1540
TYPE_USB = 'usb'
1526
1541
1527
1542
CHOICES = (
1528
1543
(
1529
- _ ('Copper' ), (
1544
+ _ ('Copper - Twisted Pair (UTP/STP)' ),
1545
+ (
1530
1546
(TYPE_CAT3 , 'CAT3' ),
1531
1547
(TYPE_CAT5 , 'CAT5' ),
1532
1548
(TYPE_CAT5E , 'CAT5e' ),
@@ -1535,28 +1551,57 @@ class CableTypeChoices(ChoiceSet):
1535
1551
(TYPE_CAT7 , 'CAT7' ),
1536
1552
(TYPE_CAT7A , 'CAT7a' ),
1537
1553
(TYPE_CAT8 , 'CAT8' ),
1554
+ (TYPE_MRJ21_TRUNK , 'MRJ21 Trunk' ),
1555
+ ),
1556
+ ),
1557
+ (
1558
+ _ ('Copper - Twinax (DAC)' ),
1559
+ (
1538
1560
(TYPE_DAC_ACTIVE , 'Direct Attach Copper (Active)' ),
1539
1561
(TYPE_DAC_PASSIVE , 'Direct Attach Copper (Passive)' ),
1540
- (TYPE_MRJ21_TRUNK , 'MRJ21 Trunk' ),
1562
+ ),
1563
+ ),
1564
+ (
1565
+ _ ('Copper - Coaxial' ),
1566
+ (
1541
1567
(TYPE_COAXIAL , 'Coaxial' ),
1542
1568
),
1543
1569
),
1544
1570
(
1545
- _ ('Fiber' ), (
1571
+ _ ('Fiber - Multimode' ),
1572
+ (
1546
1573
(TYPE_MMF , 'Multimode Fiber' ),
1547
1574
(TYPE_MMF_OM1 , 'Multimode Fiber (OM1)' ),
1548
1575
(TYPE_MMF_OM2 , 'Multimode Fiber (OM2)' ),
1549
1576
(TYPE_MMF_OM3 , 'Multimode Fiber (OM3)' ),
1550
1577
(TYPE_MMF_OM4 , 'Multimode Fiber (OM4)' ),
1551
1578
(TYPE_MMF_OM5 , 'Multimode Fiber (OM5)' ),
1552
- (TYPE_SMF , 'Singlemode Fiber' ),
1553
- (TYPE_SMF_OS1 , 'Singlemode Fiber (OS1)' ),
1554
- (TYPE_SMF_OS2 , 'Singlemode Fiber (OS2)' ),
1555
- (TYPE_AOC , 'Active Optical Cabling (AOC)' ),
1556
1579
),
1557
1580
),
1558
- (TYPE_USB , _ ('USB' )),
1559
- (TYPE_POWER , _ ('Power' )),
1581
+ (
1582
+ _ ('Fiber - Single-mode' ),
1583
+ (
1584
+ (TYPE_SMF , 'Single-mode Fiber' ),
1585
+ (TYPE_SMF_OS1 , 'Single-mode Fiber (OS1)' ),
1586
+ (TYPE_SMF_OS2 , 'Single-mode Fiber (OS2)' ),
1587
+ ),
1588
+ ),
1589
+ (
1590
+ _ ('Fiber - Other' ),
1591
+ ((TYPE_AOC , 'Active Optical Cabling (AOC)' ),),
1592
+ ),
1593
+ (
1594
+ _ ('Power' ),
1595
+ (
1596
+ (TYPE_POWER , 'Power' ),
1597
+ ),
1598
+ ),
1599
+ (
1600
+ _ ('USB' ),
1601
+ (
1602
+ (TYPE_USB , 'USB' ),
1603
+ ),
1604
+ ),
1560
1605
)
1561
1606
1562
1607
0 commit comments