[AIRFLOW-5048] Improve display of Kubernetes resources

apache · Jul 26, 2019 · 363142b · 363142b
1 parent b0a4e97
commit 363142b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/airflow/kubernetes/pod.py b/airflow/kubernetes/pod.py
@@ -37,6 +37,10 @@ def has_limits(self):
     def has_requests(self):
         return self.request_cpu is not None or self.request_memory is not None
 
+    def __str__(self):
+        return str({'request': {'memory': self.request_memory, 'cpu': self.request_cpu},
+                    'limit': {'memory': self.limit_memory}, 'cpu': self.limit_cpu})
+
 
 class Port:
     def __init__(

diff --git a/tests/kubernetes/kubernetes_request_factory/test_kubernetes_request_factory.py b/tests/kubernetes/kubernetes_request_factory/test_kubernetes_request_factory.py
@@ -246,6 +246,12 @@ def test_extract_requested_resources(self):
         KubernetesRequestFactory.extract_resources(pod, self.input_req)
         self.assertEqual(self.input_req, self.expected)
 
+    def test_display_resources(self):
+        resources_string = str(Resources('1Gi', 1))
+        self.assertEqual(
+            resources_string,
+            "{'request': {'memory': '1Gi', 'cpu': 1}, 'limit': {'memory': None}, 'cpu': None}")
+
     def test_extract_limits_resources(self):
         # Test when resources is not empty
         resources = Resources(limit_memory='2Gi', limit_cpu=2)