chore(tests): Testing for labels & server groups, version 2.5.0

Antti Myyrä · Antti Myyrä · commit e4e11768c3df · 2023-08-07T15:28:06.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ----
 
+## [2.5.0] - 2023-07-31
+
+### Added
+
+- Server group support
+- Support for labels in servers, storages and server groups
+
+## [2.0.1] - 2023-03-22
+
+### Added
+
+Support for metadata in server objects and server creation.
+
 ## [2.0.0] - 2021-05-05
 
 Python 2 is no longer supported. This is a maintenance release without
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Alternatively, if you want the newest (possibly not yet released) stuff, clone t
 python setup.py install
 ```
 
-### Supported Python versions in API v2.0.1
+### Supported Python versions in API v2.5.0
 
 - Python 3.7
 - Python 3.8
@@ -31,7 +31,7 @@ python setup.py install
 
 **Python 2 has been deprecated**
 
-- Python 2.7 is supported in older API versions (< v2.0.0), still available in [PyPI](https://pypi.org/project/upcloud-api/1.0.1/).
+- Python 2.7 is no longer supported, but available in older API versions (< v2.0.0).
 
 ## Changelog
 
diff --git a/test/json_data/server-group_0b5169fc-23aa-4ba7-aaab-f38868ce99cd.json b/test/json_data/server-group_0b5169fc-23aa-4ba7-aaab-f38868ce99cd.json
@@ -0,0 +1,31 @@
+{
+    "server_group": {
+        "anti_affinity": "yes",
+        "anti_affinity_status": [
+            {
+                "uuid": "0016dadf-eba4-4331-bd34-a361841f7af1",
+                "status": "met"
+            },
+            {
+                "uuid": "00c77bbe-fc0e-436f-a753-37f5b5b76270",
+                "status": "met"
+            }
+        ],
+        "labels": {
+            "label": [
+                {
+                    "key": "foo",
+                    "value": "bar"
+                }
+            ]
+        },
+        "servers": {
+            "server": [
+                "0016dadf-eba4-4331-bd34-a361841f7af2",
+                "00c77bbe-fc0e-436f-a753-37f5b5b76271"
+            ]
+        },
+        "title": "test group",
+        "uuid": "0b5169fc-23aa-4ba7-aaab-f38868ce99cd"
+    }
+}
diff --git a/test/json_data/server-group_post.json b/test/json_data/server-group_post.json
@@ -0,0 +1,15 @@
+{
+    "server_group": {
+        "anti_affinity": "yes",
+        "labels": {
+            "label": [
+                {
+                    "key": "foo",
+                    "value": "bar"
+                }
+            ]
+        },
+        "title": "foo",
+        "uuid": "0b5169fc-23aa-4ba7-aaab-f38868ce99cd"
+    }
+}
diff --git a/test/json_data/server.json b/test/json_data/server.json
@@ -7,6 +7,14 @@
 				"core_number" : "0",
 				"title" : "Helsinki server",
 				"hostname" : "fi.example.com",
+                "labels": {
+                    "label": [
+                        {
+                            "key": "test",
+                            "value": "example"
+                        }
+                    ]
+                },
 				"memory_amount" : "1024",
 				"uuid" : "00798b85-efdc-41ca-8021-f6ef457b8531",
 				"state" : "started",
@@ -22,6 +30,9 @@
 				"core_number" : "0",
 				"title" : "London server",
 				"hostname" : "uk.example.com",
+                "labels": {
+                    "label": []
+                },
 				"memory_amount" : "1024",
 				"uuid" : "009d64ef-31d1-4684-a26b-c86c955cbf46",
 				"state" : "stopped",
diff --git a/test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531.json b/test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531.json
@@ -18,6 +18,14 @@
 				}
 			]
 		},
+        "labels": {
+            "label": [
+                {
+                    "key": "test",
+                    "value": "example"
+                }
+            ]
+        },
 		"license" : 0,
 		"memory_amount" : "1024",
 		"nic_model" : "e1000",
diff --git a/test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531_cdrom_eject_post.json b/test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531_cdrom_eject_post.json
@@ -18,6 +18,14 @@
 				}
 			]
 		},
+        "labels": {
+            "label": [
+                {
+                    "key": "test",
+                    "value": "example"
+                }
+            ]
+        },
 		"license" : 0,
 		"memory_amount" : "1024",
 		"nic_model" : "e1000",
diff --git a/test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531_cdrom_load_post.json b/test/json_data/server_00798b85-efdc-41ca-8021-f6ef457b8531_cdrom_load_post.json
@@ -18,6 +18,14 @@
 				}
 			]
 		},
+        "labels": {
+            "label": [
+                {
+                    "key": "test",
+                    "value": "example"
+                }
+            ]
+        },
 		"license" : 0,
 		"memory_amount" : "1024",
 		"nic_model" : "e1000",
diff --git a/test/json_data/server_009d64ef-31d1-4684-a26b-c86c955cbf46.json b/test/json_data/server_009d64ef-31d1-4684-a26b-c86c955cbf46.json
@@ -16,6 +16,14 @@
 				}
 			]
 		},
+        "labels": {
+            "label": [
+                {
+                    "key": "test",
+                    "value": "example"
+                }
+            ]
+        },
 		"license" : 0,
 		"memory_amount" : "1024",
 		"nic_model" : "e1000",
diff --git a/test/json_data/server_create.json b/test/json_data/server_create.json
@@ -16,6 +16,14 @@
 				}
 			]
 		},
+        "labels": {
+            "label": [
+                {
+                    "key": "test",
+                    "value": "example"
+                }
+            ]
+        },
 		"license" : 0,
 		"memory_amount" : "1024",
 		"nic_model" : "virtio",
diff --git a/test/json_data/storage_01350eec-6ebf-4418-abe4-e8bb1d5c9643.json b/test/json_data/storage_01350eec-6ebf-4418-abe4-e8bb1d5c9643.json
@@ -1,16 +1,24 @@
-{"storage":
-  {
-  "access": "private",
-  "created": "2020-09-21T17:36:50Z",
-  "license": 0,
-  "origin": "01ec5c26-a25d-4752-94e4-27bd88b62816",
-  "progress": "0",
-  "servers": {"server": []},
-  "size": 666,
-  "state": "maintenance",
-  "title": "test-backup",
-  "type": "backup",
-  "uuid": "01350eec-6ebf-4418-abe4-e8bb1d5c9643",
-  "zone": "fi-hel1"
+{
+    "storage": {
+        "access": "private",
+        "created": "2020-09-21T17:36:50Z",
+        "labels": [
+            {
+                "key": "role",
+                "value": "primary"
+            }
+        ],
+        "license": 0,
+        "origin": "01ec5c26-a25d-4752-94e4-27bd88b62816",
+        "progress": "0",
+        "servers": {
+            "server": []
+        },
+        "size": 666,
+        "state": "maintenance",
+        "title": "test-backup",
+        "type": "backup",
+        "uuid": "01350eec-6ebf-4418-abe4-e8bb1d5c9643",
+        "zone": "fi-hel1"
   }
 }
diff --git a/test/json_data/storage_01d4fcd4-e446-433b-8a9c-551a1284952e.json b/test/json_data/storage_01d4fcd4-e446-433b-8a9c-551a1284952e.json
@@ -5,6 +5,12 @@
 		"backups" : {
 			"backup" : []
 			},
+        "labels": [
+            {
+                "key": "role",
+                "value": "primary"
+            }
+        ],
 		"license" : 0,
 		"servers" : {
 			"server" : [
@@ -19,4 +25,4 @@
 		"uuid" : "01d4fcd4-e446-433b-8a9c-551a1284952e",
 		"zone" : "fi-hel1"
 	}
-}
+}
diff --git a/test/json_data/storage_01d4fcd4-e446-433b-8a9c-551a1284952e_backup_post.json b/test/json_data/storage_01d4fcd4-e446-433b-8a9c-551a1284952e_backup_post.json
@@ -1,16 +1,24 @@
 {"storage":
   {
-  "access": "private",
-  "created": "2020-09-21T17:36:50Z",
-  "license": 0,
-  "origin": "01ec5c26-a25d-4752-94e4-27bd88b62816",
-  "progress": "0",
-  "servers": {"server": []},
-  "size": 666,
-  "state": "maintenance",
-  "title": "test-backup",
-  "type": "backup",
-  "uuid": "01350eec-6ebf-4418-abe4-e8bb1d5c9643",
-  "zone": "fi-hel1"
+      "access": "private",
+      "created": "2020-09-21T17:36:50Z",
+      "labels": [
+          {
+              "key": "role",
+              "value": "primary"
+          }
+      ],
+      "license": 0,
+      "origin": "01ec5c26-a25d-4752-94e4-27bd88b62816",
+      "progress": "0",
+      "servers": {
+          "server": []
+      },
+      "size": 666,
+      "state": "maintenance",
+      "title": "test-backup",
+      "type": "backup",
+      "uuid": "01350eec-6ebf-4418-abe4-e8bb1d5c9643",
+      "zone": "fi-hel1"
   }
 }
diff --git a/test/json_data/storage_01d4fcd4-e446-433b-8a9c-551a1284952e_clone_post.json b/test/json_data/storage_01d4fcd4-e446-433b-8a9c-551a1284952e_clone_post.json
@@ -4,7 +4,13 @@
 		"backup_rule": "",
 		"backups" : {
 			"backup" : []
-			},
+        },
+        "labels": [
+            {
+                "key": "role",
+                "value": "primary"
+            }
+        ],
 		"license" : 0,
 		"servers" : {
 			"server" : [
diff --git a/test/json_data/storage_01d4fcd4-e446-433b-8a9c-551a1284952e_templatize_post.json b/test/json_data/storage_01d4fcd4-e446-433b-8a9c-551a1284952e_templatize_post.json
@@ -1,14 +1,22 @@
 {
   "storage": {
-    "access": "private",
-    "license": 0,
-    "servers": {"server": []},
-    "size": 666,
-    "state": "maintenance",
-    "tier": "maxiops",
-    "title": "my server template",
-    "type": "template",
-    "uuid": "013721b5-07ca-4d7b-b4ff-e21262223e5b",
-    "zone": "fi-hel1"
+      "access": "private",
+      "labels": [
+          {
+              "key": "role",
+              "value": "primary"
+          }
+      ],
+      "license": 0,
+      "servers": {
+          "server": []
+      },
+      "size": 666,
+      "state": "maintenance",
+      "tier": "maxiops",
+      "title": "my server template",
+      "type": "template",
+      "uuid": "013721b5-07ca-4d7b-b4ff-e21262223e5b",
+      "zone": "fi-hel1"
   }
 }
diff --git a/test/json_data/storage_attach.json b/test/json_data/storage_attach.json
@@ -16,6 +16,14 @@
 				}
 			]
 		},
+        "labels": {
+            "label": [
+                {
+                    "key": "test",
+                    "value": "example"
+                }
+            ]
+        },
 		"license" : 0,
 		"memory_amount" : "1024",
 		"nic_model" : "e1000",
@@ -24,12 +32,24 @@
 			"storage_device" : [
 				{
 					"address" : "virtio:0",
+                    "labels": [
+                        {
+                            "key": "role",
+                            "value": "primary"
+                        }
+                    ],
 					"storage" : "012580a1-32a1-466e-a323-689ca16f2d43",
 					"storage_size" : 100,
 					"storage_title" : "Storage for server1.example.com",
 					"type" : "disk"
 				},
 				{
+                    "labels": [
+                        {
+                            "key": "role",
+                            "value": "secondary"
+                        }
+                    ],
 					"storage_size": 10,
 					"storage": "01d4fcd4-e446-433b-8a9c-551a1284952e",
 					"storage_title": "Operating system disk",
@@ -48,4 +68,4 @@
 		"vnc_port" : "00000",
 		"zone" : "fi-hel1"
 	}
-}
+}
diff --git a/test/json_data/storage_detach.json b/test/json_data/storage_detach.json
diff --git a/test/json_data/storage_post.json b/test/json_data/storage_post.json
diff --git a/test/test_server.py b/test/test_server.py
diff --git a/test/test_server_group.py b/test/test_server_group.py
diff --git a/upcloud_api/__init__.py b/upcloud_api/__init__.py
diff --git a/upcloud_api/cloud_manager/server_mixin.py b/upcloud_api/cloud_manager/server_mixin.py
