From 98506c961b9e0d155c1e0d124bb95d72cbb1d8c3 Mon Sep 17 00:00:00 2001
From: Jhon Honce <jhonce@redhat.com>
Date: Wed, 27 Oct 2021 11:42:25 -0700
Subject: Allow label and labels when creating volumes

JSON payload may have either key. Labels will override any values set
via Label.

Fixes #12102

Signed-off-by: Jhon Honce <jhonce@redhat.com>
---
 test/apiv2/python/rest_api/test_v2_0_0_volume.py | 67 +++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

(limited to 'test/apiv2/python/rest_api')

diff --git a/test/apiv2/python/rest_api/test_v2_0_0_volume.py b/test/apiv2/python/rest_api/test_v2_0_0_volume.py
index f5231e17c..2156318b0 100644
--- a/test/apiv2/python/rest_api/test_v2_0_0_volume.py
+++ b/test/apiv2/python/rest_api/test_v2_0_0_volume.py
@@ -7,7 +7,7 @@ from .fixtures import APITestCase
 
 
 class VolumeTestCase(APITestCase):
-    def test_volume(self):
+    def test_volume_crud(self):
         name = f"Volume_{random.getrandbits(160):x}"
 
         ls = requests.get(self.podman_url + "/v1.40/volumes")
@@ -70,6 +70,71 @@ class VolumeTestCase(APITestCase):
         self.assertIn(name, payload["VolumesDeleted"])
         self.assertGreater(payload["SpaceReclaimed"], 0)
 
+    def test_volume_label(self):
+        name = f"Volume_{random.getrandbits(160):x}"
+        expected = {
+            "Production": "False",
+            "Database": "Foxbase",
+        }
+
+        create = requests.post(
+            self.podman_url + "/v4.0.0/libpod/volumes/create",
+            json={"name": name, "label": expected},
+        )
+        self.assertEqual(create.status_code, 201, create.text)
+
+        inspect = requests.get(self.podman_url + f"/v4.0.0/libpod/volumes/{name}/json")
+        self.assertEqual(inspect.status_code, 200, inspect.text)
+
+        volume = inspect.json()
+        self.assertIn("Labels", volume)
+        self.assertNotIn("Label", volume)
+        self.assertDictEqual(expected, volume["Labels"])
+
+    def test_volume_labels(self):
+        name = f"Volume_{random.getrandbits(160):x}"
+        expected = {
+            "Production": "False",
+            "Database": "Foxbase",
+        }
+
+        create = requests.post(
+            self.podman_url + "/v4.0.0/libpod/volumes/create",
+            json={"name": name, "labels": expected},
+        )
+        self.assertEqual(create.status_code, 201, create.text)
+
+        inspect = requests.get(self.podman_url + f"/v4.0.0/libpod/volumes/{name}/json")
+        self.assertEqual(inspect.status_code, 200, inspect.text)
+
+        volume = inspect.json()
+        self.assertIn("Labels", volume)
+        self.assertDictEqual(expected, volume["Labels"])
+
+    def test_volume_label_override(self):
+        name = f"Volume_{random.getrandbits(160):x}"
+        create = requests.post(
+            self.podman_url + "/v4.0.0/libpod/volumes/create",
+            json={
+                "Name": name,
+                "Label": {
+                    "Database": "dbase",
+                },
+                "Labels": {
+                    "Database": "sqlserver",
+                },
+            },
+        )
+        self.assertEqual(create.status_code, 201, create.text)
+
+        inspect = requests.get(self.podman_url + f"/v4.0.0/libpod/volumes/{name}/json")
+        self.assertEqual(inspect.status_code, 200, inspect.text)
+
+        volume = inspect.json()
+        self.assertIn("Labels", volume)
+        self.assertNotIn("Label", volume)
+        self.assertDictEqual({"Database": "sqlserver"}, volume["Labels"])
+
 
 if __name__ == "__main__":
     unittest.main()
-- 
cgit v1.2.3-54-g00ecf