Accept extra kwargs in render. Fix DataCenterAssetResource

Author: hipek8

src/ralph/data_importer/widgets.py

@@ -45,7 +45,7 @@ def clean(self, value, *args, **kwargs):
                 logger.warning("User not found: %s create a new.", value)
         return result
 
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         if value:
             return value.username
         return ""
@@ -60,7 +60,7 @@ def clean(self, value, *args, **kwargs):
         usernames = value.split(self.separator)
         return get_user_model().objects.filter(username__in=usernames)
 
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         return self.separator.join([obj.username for obj in value.all()])
 
 
@@ -88,19 +88,19 @@ def clean(self, value, *args, **kwargs):
             return self.related_model.objects.none()
         return self.related_model.objects.filter(pk__in=value.split(self.separator))
 
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         return self.separator.join(
             [str(getattr(obj, self.through_field).pk) for obj in value.all()]
         )
 
 
 class ExportForeignKeyStrWidget(widgets.Widget):
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         return str(value)
 
 
 class ExportManyToManyStrWidget(widgets.ManyToManyWidget):
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         return self.separator.join([str(obj) for obj in value.all()])
 
 
@@ -110,7 +110,7 @@ class ExportManyToManyStrTroughWidget(ManyToManyThroughWidget):
     object instead of pk.
     """
 
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         return self.separator.join(
             [str(getattr(obj, self.through_field)) for obj in value.all()]
         )
@@ -206,7 +206,7 @@ def clean(self, value, *args, **kwargs):
             value = None
         return value
 
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         if value is None:
             return ""
         return "{}|{}".format(value.service.name, value.environment.name)
@@ -228,7 +228,7 @@ def clean(self, value, *args, **kwargs):
             value = None
         return value
 
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         if value is None:
             return ""
         return value.service.uid
@@ -250,22 +250,22 @@ class IPManagementWidget(widgets.ManyToManyWidget):
     def clean(self, value, *args, **kwargs):
         return value
 
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         return value or ""
 
 
 class BaseObjectServiceNamesM2MWidget(widgets.ManyToManyWidget):
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         return self.separator.join(
             [bo.service.name if bo.service else "-" for bo in value.all()]
         )
 
 
 class PriceAmountWidget(widgets.Widget):
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         return "{0:.2f}".format(value.amount)
 
 
 class PriceCurrencyWidget(widgets.Widget):
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         return str(value.currency)

src/ralph/lib/permissions/tests/test_permissions_by_field.py

@@ -72,21 +72,19 @@ def test_view_has_access_to_field(self):
 
     def test_superuser_allowed_fields(self):
         """Test allowed fields in permissions model."""
-        allowed_fields = set(
-            [
-                "name",
-                "type",
-                "manufacturer",
-                "category",
-                "power_consumption",
-                "height_of_device",
-                "cores_count",
-                "visualization_layout_front",
-                "visualization_layout_back",
-                "has_parent",
-                "id",
-            ]
-        )
+        allowed_fields = {
+            "name",
+            "type",
+            "manufacturer",
+            "category",
+            "power_consumption",
+            "height_of_device",
+            "cores_count",
+            "visualization_layout_front",
+            "visualization_layout_back",
+            "has_parent",
+            "id",
+        }
         fields_list = self.asset_model.allowed_fields(self.super_user, action="change")
         self.assertEqual(allowed_fields, fields_list)
 

src/ralph/reports/resources.py

@@ -10,9 +10,10 @@
 
 class ChoiceWidget(Widget):
     def __init__(self, choice: Type[Choices]) -> None:
+        super().__init__(coerce_to_string=True)
         self.choice = choice
 
-    def render(self, value, obj=None):
+    def render(self, value, obj=None, **kwargs):
         if value:
             return self.choice.from_id(value).name
         else:
@@ -75,7 +76,12 @@ def get_queryset(self):
 
     class Meta:
         model = DataCenterAsset
-        fields = DATA_CENTER_ASSET_FIELDS
+        fields = DATA_CENTER_ASSET_FIELDS + (
+            "service_uid",
+            "service",
+            "environment",
+            "configuration_path",
+        )
         export_order = DATA_CENTER_ASSET_FIELDS
 
     def _get_ip(self, dc_asset, is_management=True):