Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #313 from ajkavanagh/bug/274/storage-pool-methods
Implementation of storage pools for pylxd
- Loading branch information
Showing
22 changed files
with
1,582 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| # Copyright (c) 2016 Canonical Ltd | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
| # not use this file except in compliance with the License. You may obtain | ||
| # a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| # License for the specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| import random | ||
| import string | ||
| import unittest | ||
|
|
||
| import six | ||
|
|
||
| from integration.testing import IntegrationTestCase | ||
| import pylxd.exceptions as exceptions | ||
|
|
||
|
|
||
| class StorageTestCase(IntegrationTestCase): | ||
|
|
||
| def setUp(self): | ||
| super(StorageTestCase, self).setUp() | ||
|
|
||
| if not self.client.has_api_extension('storage'): | ||
| self.skipTest('Required LXD API extension not available!') | ||
|
|
||
| def create_storage_pool(self): | ||
| # create a storage pool in the form of 'xxx1' as a dir. | ||
| name = ''.join(random.sample(string.ascii_lowercase, 3)) + '1' | ||
| self.lxd.storage_pools.post(json={ | ||
| "config": {}, | ||
| "driver": "dir", | ||
| "name": name, | ||
| }) | ||
| return name | ||
|
|
||
| def delete_storage_pool(self, name): | ||
| # delete the named storage pool | ||
| try: | ||
| self.lxd.storage_pools[name].delete() | ||
| except exceptions.NotFound: | ||
| pass | ||
|
|
||
|
|
||
| class TestStoragePools(StorageTestCase): | ||
| """Tests for :py:class:`pylxd.models.storage_pools.StoragePools""" | ||
| # note create and delete are tested in every method | ||
|
|
||
| def test_get(self): | ||
| name = self.create_storage_pool() | ||
| self.addCleanup(self.delete_storage_pool, name) | ||
|
|
||
| storage_pool = self.client.storage_pools.get(name) | ||
| self.assertEqual(name, storage_pool.name) | ||
|
|
||
| def test_all(self): | ||
| name = self.create_storage_pool() | ||
| self.addCleanup(self.delete_storage_pool, name) | ||
|
|
||
| storage_pools = self.client.storage_pools.all() | ||
| self.assertIn(name, [p.name for p in storage_pools]) | ||
|
|
||
| def test_save(self): | ||
| name = self.create_storage_pool() | ||
| self.addCleanup(self.delete_storage_pool, name) | ||
|
|
||
| storage_pool = self.client.storage_pools.get(name) | ||
| storage_pool.description = "My storage pool" | ||
| storage_pool.save() | ||
|
|
||
| p = self.client.storage_pools.get(name) | ||
| self.assertEqual(p.description, "My storage pool") | ||
|
|
||
| def test_put(self): | ||
| name = self.create_storage_pool() | ||
| self.addCleanup(self.delete_storage_pool, name) | ||
|
|
||
| storage_pool = self.client.storage_pools.get(name) | ||
| new_desc = "new description" | ||
| put_object = { | ||
| "description": new_desc, | ||
| "config": storage_pool.config, | ||
| } | ||
| storage_pool.put(put_object) | ||
| self.assertEqual(storage_pool.description, new_desc) | ||
| p = self.client.storage_pools.get(name) | ||
| self.assertEqual(p.description, new_desc) | ||
|
|
||
| # can't test this as patch doesn't seem to work for storage pools. | ||
| # Need to wait until bug: https://github.com/lxc/lxd/issues/4709 | ||
| # fix is released. | ||
| @unittest.skip("Can't test until fix to lxd bug #4709 is released") | ||
| def test_patch(self): | ||
| name = self.create_storage_pool() | ||
| self.addCleanup(self.delete_storage_pool, name) | ||
|
|
||
| desc = "My storage pool" | ||
| storage_pool = self.client.storage_pools.get(name) | ||
| patch = {"description": "hello world"} | ||
| storage_pool.patch(patch) | ||
| self.assertEqual(storage_pool.description, desc) | ||
|
|
||
| p = self.client.storage_pools.get(name) | ||
| self.assertEqual(p.description, "hello world") | ||
|
|
||
|
|
||
| class TestStorageResources(StorageTestCase): | ||
| """Tests for :py:class:`pylxd.models.storage_pools.StorageResources""" | ||
|
|
||
| def test_get(self): | ||
| name = self.create_storage_pool() | ||
| self.addCleanup(self.delete_storage_pool, name) | ||
|
|
||
| storage_pool = self.client.storage_pools.get(name) | ||
| # just assert that it can be fetched and that a key exists | ||
| resources = storage_pool.resources.get() | ||
| self.assertIsInstance(resources.space, dict) | ||
| self.assertIsInstance(resources.inodes, dict) | ||
|
|
||
|
|
||
| class TestStorageVolume(StorageTestCase): | ||
| """Tests for :py:class:`pylxd.models.storage_pools.StorageVolume""" | ||
| # note create and delete are tested in every method | ||
|
|
||
| def create_storage_volume(self, pool): | ||
| # note 'pool' needs to be storage_pool object or a string | ||
| if isinstance(pool, six.string_types): | ||
| pool = self.client.storage_pools.get(pool) | ||
| vol_input = { | ||
| "config": {}, | ||
| "type": "custom", | ||
| # "pool": name, | ||
| "name": "vol1", | ||
| } | ||
| volume = pool.volumes.create(vol_input) | ||
| return volume | ||
|
|
||
| def delete_storage_volume(self, pool, volume): | ||
| # pool is either string or storage_pool object | ||
| # volume is either a string of storage_pool object | ||
| if isinstance(volume, six.string_types): | ||
| if isinstance(pool, six.string_types): | ||
| pool = self.client.storage_pools.get(pool) | ||
| volume = pool.volumes.get('custom', volume) | ||
| volume.delete() | ||
|
|
||
| def test_create_and_get_and_delete(self): | ||
| pool_name = self.create_storage_pool() | ||
| self.addCleanup(self.delete_storage_pool, pool_name) | ||
|
|
||
| storage_pool = self.client.storage_pools.get(pool_name) | ||
| volume = self.create_storage_volume(storage_pool) | ||
| vol_copy = storage_pool.volumes.get("custom", "vol1") | ||
| self.assertEqual(vol_copy.name, volume.name) | ||
| volume.delete() | ||
|
|
||
| @unittest.skip("Can't test PUT on volumes as it doesn't make sense yet") | ||
| def test_put(self): | ||
| pass | ||
|
|
||
| @unittest.skip("Can't test .save() on volumes yet - doesn't make sense") | ||
| def test_save(self): | ||
| pass | ||
|
|
||
| @unittest.skip("Can't test PATCH on volumes yet - doesn't make sense") | ||
| def test_patch(self): | ||
| # as we're not using ZFS (and can't in these integration tests) we | ||
| # can't really patch anything on a dir volume. | ||
| pass |
Oops, something went wrong.