Closes #20068: Enable defining profile attributes when importing module types

netbox/core/choices.py

@@ -13,7 +13,6 @@ class DataSourceStatusChoices(ChoiceSet):
     SYNCING = 'syncing'
     COMPLETED = 'completed'
     FAILED = 'failed'
-    READY = 'ready'
 
     CHOICES = (
         (NEW, _('New'), 'blue'),
@@ -21,7 +20,6 @@ class DataSourceStatusChoices(ChoiceSet):
         (SYNCING, _('Syncing'), 'cyan'),
         (COMPLETED, _('Completed'), 'green'),
         (FAILED, _('Failed'), 'red'),
-        (READY, _('Ready'), 'green'),
     )
 
 

netbox/core/forms/model_forms.py

@@ -16,7 +16,6 @@ from utilities.forms import get_field_value
 from utilities.forms.fields import CommentField, JSONField
 from utilities.forms.rendering import FieldSet
 from utilities.forms.widgets import HTMXSelect
-from core.choices import DataSourceStatusChoices
 
 __all__ = (
     'ConfigRevisionForm',
@@ -80,24 +79,14 @@ class DataSourceForm(NetBoxModelForm):
                 if self.instance and self.instance.parameters:
                     self.fields[field_name].initial = self.instance.parameters.get(name)
 
-    def clean(self):
-        super().clean()
-        if not self.instance.pk:
-            self.cleaned_data['status'] = DataSourceStatusChoices.NEW
-        else:
-            if not self.data.get('sync_interval'):
-                self.cleaned_data['status'] = DataSourceStatusChoices.READY
-
     def save(self, *args, **kwargs):
+
         parameters = {}
         for name in self.fields:
             if name.startswith('backend_'):
                 parameters[name[8:]] = self.cleaned_data[name]
         self.instance.parameters = parameters
 
-        # update status
-        self.instance.status = self.cleaned_data.get('status', self.instance.status)
-
         return super().save(*args, **kwargs)
 
 

netbox/core/models/data.py

@@ -111,7 +111,10 @@ class DataSource(JobsMixin, PrimaryModel):
 
     @property
     def ready_for_sync(self):
-        return self.enabled and self.status != DataSourceStatusChoices.SYNCING
+        return self.enabled and self.status not in (
+            DataSourceStatusChoices.QUEUED,
+            DataSourceStatusChoices.SYNCING
+        )
 
     def clean(self):
         super().clean()

netbox/dcim/forms/bulk_import.py

@@ -472,14 +472,30 @@ class ModuleTypeImportForm(NetBoxModelImportForm):
         required=False,
         help_text=_('Unit for module weight')
     )
+    attribute_data = forms.JSONField(
+        label=_('Attributes'),
+        required=False,
+        help_text=_('Attribute values for the assigned profile, passed as a dictionary')
+    )
 
     class Meta:
         model = ModuleType
         fields = [
             'manufacturer', 'model', 'part_number', 'description', 'airflow', 'weight', 'weight_unit', 'profile',
-            'comments', 'tags'
+            'attribute_data', 'comments', 'tags',
         ]
 
+    def clean(self):
+        super().clean()
+
+        # Attribute data may be included only if a profile is specified
+        if self.cleaned_data.get('attribute_data') and not self.cleaned_data.get('profile'):
+            raise forms.ValidationError(_("Profile must be specified if attribute data is provided."))
+
+        # Default attribute_data to an empty dictionary if a profile is specified (to enforce schema validation)
+        if self.cleaned_data.get('profile') and not self.cleaned_data.get('attribute_data'):
+            self.cleaned_data['attribute_data'] = {}
+
 
 class DeviceRoleImportForm(NetBoxModelImportForm):
     parent = CSVModelChoiceField(