Merge pull request #3783 from hipek8/extra_datacenter_fields

Additional fields in DataCenter model

src/ralph/data_center/admin.py

@@ -256,8 +256,11 @@ def get_masters_summary(self, obj):
 
 @register(DataCenter)
 class DataCenterAdmin(RalphAdmin):
-
-    search_fields = ['name']
+    list_display = ['name', 'company', 'country', 'city', 'address',
+                    'latitude', 'longitude', 'type', 'shortcut']
+    search_fields = ['name', 'shortcut']
+    list_filter = ['name', 'company', 'country', 'city', 'address', 'type',
+                   'shortcut']
 
 
 class NetworkTerminatorReadOnlyInline(RalphTabularM2MInline):

src/ralph/data_center/migrations/0027_auto_20230831_1234.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data_center', '0026_auto_20170614_1237'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='datacenter',
+            name='address',
+            field=models.CharField(verbose_name='address', max_length=256, blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='datacenter',
+            name='city',
+            field=models.CharField(verbose_name='city', max_length=256, blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='datacenter',
+            name='company',
+            field=models.CharField(verbose_name='company', max_length=256, blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='datacenter',
+            name='country',
+            field=models.PositiveIntegerField(verbose_name='country', blank=True, null=True, choices=[(1, 'Afghanistan'), (2, 'Albania'), (3, 'Algeria'), (4, 'American Samoa'), (5, 'Andorra'), (6, 'Angola'), (7, 'Anguilla'), (8, 'Antarctica'), (9, 'Antigua and Barbuda'), (10, 'Argentina'), (11, 'Armenia'), (12, 'Aruba'), (13, 'Australia'), (14, 'Austria'), (15, 'Azerbaijan'), (16, 'Bahamas'), (17, 'Bahrain'), (18, 'Bangladesh'), (19, 'Barbados'), (20, 'Belarus'), (21, 'Belgium'), (22, 'Belize'), (23, 'Benin'), (24, 'Bermuda'), (25, 'Bhutan'), (26, 'Bolivia'), (27, 'Bosnia and Herzegovina'), (28, 'Botswana'), (29, 'Brazil'), (30, 'Brunei'), (31, 'Bulgaria'), (32, 'Burkina Faso'), (33, 'Burundi'), (34, 'Cambodia'), (35, 'Cameroon'), (36, 'Canada'), (37, 'Cape Verde'), (38, 'Cayman Islands'), (39, 'Central African Republic'), (40, 'Chad'), (41, 'Chile'), (42, 'China'), (43, 'Colombia'), (44, 'Comoros'), (45, 'Congo Brazzaville'), (46, 'Congo Kinshasa'), (47, 'Cook Islands'), (48, 'Costa Rica'), (49, 'Cote Divoire'), (50, 'Croatia'), (51, 'Cuba'), (52, 'Cyprus'), (53, 'Czech Republic'), (54, 'Denmark'), (55, 'Djibouti'), (56, 'Dominica'), (57, 'Dominican Republic'), (58, 'Ecuador'), (59, 'Egypt'), (60, 'El Salvador'), (61, 'Equatorial Guinea'), (62, 'Eritrea'), (63, 'Estonia'), (64, 'Ethiopia'), (65, 'Faroe Islands'), (66, 'Fiji'), (67, 'Finland'), (68, 'France'), (69, 'French Polynesia'), (70, 'Gabon'), (71, 'Gambia'), (72, 'Georgia'), (73, 'Germany'), (74, 'Ghana'), (75, 'Gibraltar'), (76, 'Greece'), (77, 'Grenada'), (78, 'Guam'), (79, 'Guatemala'), (80, 'Guinea Bissau'), (81, 'Guinea'), (82, 'Guyana'), (83, 'Haiti'), (84, 'Honduras'), (85, 'Hong Kong'), (86, 'Hungary'), (87, 'Iceland'), (88, 'India'), (89, 'Indonesia'), (90, 'Iran'), (91, 'Iraq'), (92, 'Ireland'), (93, 'Israel'), (94, 'Italy'), (95, 'Jamaica'), (96, 'Japan'), (97, 'Jersey'), (98, 'Jordan'), (99, 'Kazakhstan'), (100, 'Kenya'), (101, 'Kiribati'), (102, 'Kuwait'), (103, 'Kyrgyzstan'), (104, 'Laos'), (105, 'Latvia'), (106, 'Lebanon'), (107, 'Lesotho'), (108, 'Liberia'), (109, 'Libya'), (110, 'Liechtenstein'), (111, 'Lithuania'), (112, 'Luxembourg'), (113, 'Macau'), (114, 'Macedonia'), (115, 'Madagascar'), (116, 'Malawi'), (117, 'Malaysia'), (118, 'Maldives'), (119, 'Mali'), (120, 'Malta'), (121, 'Marshall Islands'), (122, 'Mauritania'), (123, 'Mauritius'), (124, 'Mexico'), (125, 'Micronesia'), (126, 'Moldova'), (127, 'Monaco'), (128, 'Mongolia'), (129, 'Montenegro'), (130, 'Montserrat'), (131, 'Morocco'), (132, 'Mozambique'), (133, 'Myanmar'), (134, 'Namibia'), (135, 'Nauru'), (136, 'Nepal'), (137, 'Netherlands Antilles'), (138, 'Netherlands'), (139, 'New Zealand'), (140, 'Nicaragua'), (141, 'Niger'), (142, 'Nigeria'), (143, 'North Korea'), (144, 'Norway'), (145, 'Oman'), (146, 'Pakistan'), (147, 'Palau'), (148, 'Panama'), (149, 'Papua New Guinea'), (150, 'Paraguay'), (151, 'Peru'), (152, 'Philippines'), (153, 'Poland'), (154, 'Portugal'), (155, 'Puerto Rico'), (156, 'Qatar'), (157, 'Romania'), (158, 'Russian Federation'), (159, 'Rwanda'), (160, 'Saint Lucia'), (161, 'Samoa'), (162, 'San Marino'), (163, 'Sao Tome and Principe'), (164, 'Saudi Arabia'), (165, 'Senegal'), (166, 'Serbia'), (167, 'Seychelles'), (168, 'Sierra Leone'), (169, 'Singapore'), (170, 'Slovakia'), (171, 'Slovenia'), (172, 'Solomon Islands'), (173, 'Somalia'), (174, 'South Africa'), (175, 'South Korea'), (176, 'Spain'), (177, 'Sri Lanka'), (178, 'St Kitts and Nevis'), (179, 'St Vincent and the Grenadines'), (180, 'Sudan'), (181, 'Suriname'), (182, 'Swaziland'), (183, 'Sweden'), (184, 'Switzerland'), (185, 'Syria'), (186, 'Tajikistan'), (187, 'Taiwan'), (188, 'Tanzania'), (189, 'Thailand'), (190, 'Timor Leste'), (191, 'Togo'), (192, 'Tonga'), (193, 'Trinidad and Tobago'), (194, 'Tunisia'), (195, 'Turkey'), (196, 'Turkmenistan'), (197, 'Turks and Caicos Islands'), (198, 'Tuvalu'), (199, 'Uganda'), (200, 'Ukraine'), (201, 'United Arab Emirates'), (202, 'United Kingdom'), (203, 'United States of America'), (204, 'Uruguay'), (205, 'Uzbekistan'), (206, 'Vanuatu'), (207, 'Vatican City'), (208, 'Venezuela'), (209, 'Viet Nam'), (210, 'Virgin Islands British'), (211, 'Virgin Islands US'), (212, 'Western Sahara'), (213, 'Yemen'), (214, 'Zambia'), (215, 'Zimbabwe'), (301, 'England'), (302, 'Northern Ireland'), (303, 'Wales'), (304, 'Scotland'), (601, 'Northern Cyprus'), (602, 'Palestine'), (603, 'Somaliland'), (901, 'African Union'), (902, 'Arab League'), (903, 'Association of Southeast Asian Nations'), (904, 'Caricom'), (905, 'Commonwealth of Independent States'), (906, 'Commonwealth of Nations'), (907, 'European Union'), (908, 'Islamic Conference'), (909, 'NATO'), (910, 'Olimpic Movement'), (911, 'OPEC'), (912, 'Red Cross'), (913, 'United Nations')]),
+        ),
+        migrations.AddField(
+            model_name='datacenter',
+            name='latitude',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='datacenter',
+            name='longitude',
+            field=models.FloatField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='datacenter',
+            name='shortcut',
+            field=models.CharField(verbose_name='shortcut', max_length=256, blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='datacenter',
+            name='type',
+            field=models.PositiveIntegerField(verbose_name='data center type', blank=True, null=True, choices=[(1, 'Data Center'), (2, 'Coworking space'), (3, 'Call center'), (4, 'Depot'), (5, 'Warehouse'), (6, 'Retail'), (7, 'Office')]),
+        ),
+    ]

src/ralph/data_center/migrations/0028_auto_20230831_1354.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('data_center', '0027_auto_20230831_1234'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='datacenter',
+            name='type',
+            field=models.PositiveIntegerField(verbose_name='data center type', blank=True, null=True, choices=[(1, 'dc'), (2, 'cowork'), (3, 'call_center'), (4, 'depot'), (5, 'warehouse'), (6, 'retail'), (7, 'office')]),
+        ),
+    ]

src/ralph/data_center/models/physical.py

@@ -4,6 +4,7 @@
 from collections import namedtuple, OrderedDict
 from itertools import chain
 
+from dj.choices import Choices, Country
 from django import forms
 from django.conf import settings
 from django.core.exceptions import ValidationError
@@ -125,11 +126,45 @@ def handle_missing(slot_no):
         return items
 
 
+class DataCenterType(Choices):
+    _ = Choices.Choice
+
+    dc = _("dc")
+    cowork = _("cowork")
+    call_center = _("call_center")
+    depot = _("depot")
+    warehouse = _("warehouse")
+    retail = _("retail")
+    office = _("office")
+
+
 class DataCenter(AdminAbsoluteUrlMixin, NamedMixin, models.Model):
     _allow_in_dashboard = True
 
     show_on_dashboard = models.BooleanField(default=True)
 
+    company = models.CharField(
+        verbose_name=_('company'), max_length=256, blank=True, null=True)
+    country = models.PositiveIntegerField(
+        verbose_name=_('country'),
+        choices=Country(),
+        blank=True,
+        null=True
+    )
+    city = models.CharField(
+        verbose_name=_('city'), max_length=256, blank=True, null=True)
+    address = models.CharField(
+        verbose_name=_('address'), max_length=256, blank=True, null=True)
+    latitude = models.FloatField(null=True, blank=True)
+    longitude = models.FloatField(null=True, blank=True)
+    type = models.PositiveIntegerField(
+        verbose_name=_("data center type"), choices=DataCenterType(),
+        blank=True, null=True
+    )
+    shortcut = models.CharField(
+        verbose_name=_("shortcut"), max_length=256, blank=True, null=True
+    )
+
     @property
     def rack_set(self):
         return Rack.objects.select_related(