diff options
| -rw-r--r-- | vio/vio/tests/test_capacity_view.py | 29 | ||||
| -rw-r--r-- | vio/vio/tests/test_vsphere_utils.py | 132 | ||||
| -rw-r--r-- | vio/vio/vsphere/utils.py | 4 |
3 files changed, 156 insertions, 9 deletions
diff --git a/vio/vio/tests/test_capacity_view.py b/vio/vio/tests/test_capacity_view.py index 3079bac..c84c5b4 100644 --- a/vio/vio/tests/test_capacity_view.py +++ b/vio/vio/tests/test_capacity_view.py @@ -19,7 +19,7 @@ from vio.pub.msapi import extsys from vio.pub.vim.vimapi.nova import OperateHypervisor from vio.pub.vim.vimapi.nova import OperateLimits from vio.pub.vim.vimapi.nova import OperateNova -from vio.swagger.views.capacity.views import CapacityCheck +from vio.swagger.views.capacity.views import CapacityCheck, CapacityCheckV1 from cinderclient import client @@ -33,6 +33,9 @@ class CapacityCheckTest(unittest.TestCase): def setUp(self): self.view = CapacityCheck() + def _vim_id(self): + return ["vmware_nova"] + @mock.patch.object(OperateNova, "OperateAZ") @mock.patch.object(OperateHypervisor, "OperateHypervisor") @mock.patch.object(OperateLimits, "OperateLimits") @@ -65,7 +68,8 @@ class CapacityCheckTest(unittest.TestCase): cclient.limits.get.return_value = climits mock_cinder.return_value = cclient - nazs = [mock.Mock(name="nova", hosts={"compute01": {}})] + nazs = [mock.Mock(name="nova", hosts={"compute01": { + "name": "compute01"}})] nclient = mock.Mock() nclient.list_availability_zones.return_value = nazs mock_az.return_value = nclient @@ -80,14 +84,16 @@ class CapacityCheckTest(unittest.TestCase): "vcpus_used": 1, "memory_size": 128*1024, "memory_used": 4*1024, + "memory_free": 64*1024, "local_disk_size": 5000, - "local_disk_used": 100 + "local_disk_used": 100, + "local_disk_free": 3000, } ophypervisor.get_hypervisor.return_value = hyper mock_hypervisor.return_value = ophypervisor - resp = self.view.post(req, "openstack_regionone") + resp = self.view.post(req, *self._vim_id()) self.assertEqual(status.HTTP_200_OK, resp.status_code) - self.assertEqual({"result": True}, resp.data) + self.assertTrue(resp.data["result"]) @mock.patch.object(OperateLimits, "OperateLimits") @mock.patch.object(extsys, "get_vim_by_id") @@ -107,7 +113,7 @@ class CapacityCheckTest(unittest.TestCase): oplimits.get_limits.return_value = mock.Mock(absolute=absolute) mock_limit.return_value = oplimits - resp = self.view.post(req, "openstack_regionone") + resp = self.view.post(req, *self._vim_id()) self.assertEqual(status.HTTP_200_OK, resp.status_code) self.assertEqual({"result": False}, resp.data) @@ -115,5 +121,14 @@ class CapacityCheckTest(unittest.TestCase): req = mock.Mock() req.body = "hello world" - resp = self.view.post(req, "openstack_regionone") + resp = self.view.post(req, *self._vim_id()) self.assertEqual(status.HTTP_400_BAD_REQUEST, resp.status_code) + + +class CapacityCheckV1Test(CapacityCheckTest): + + def setUp(self): + self.view = CapacityCheckV1() + + def _vim_id(self): + return ["vmware", "nova"] diff --git a/vio/vio/tests/test_vsphere_utils.py b/vio/vio/tests/test_vsphere_utils.py new file mode 100644 index 0000000..fe66756 --- /dev/null +++ b/vio/vio/tests/test_vsphere_utils.py @@ -0,0 +1,132 @@ +# Copyright (c) 2019 VMware, Inc. +# +# 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. + +import unittest +import mock + +from vio.vsphere import utils + +from pyVim import connect +from pyVmomi import vim + + +vsphere_conf = """ +vsphere: + host: localhost + username: user + password: pass +""" + +vmdk_meta = """ +version=1 +CID=cid +parentCID=pcid +ddb.adapterType="lsilogic" +createType="streamOptimized" +ddb.virtualHWVersion="11" +ddb.thinProvisioned="true" +ddb.deletable="true" +ddb.longContentID="lcid" +RDONLY 20971520 SPARSE "call-me-stream.vmdk" +""" + + +class VsphereUtilsTest(unittest.TestCase): + + def test_get_obj(self): + content = mock.Mock() + mock_obj_a = mock.Mock() + mock_obj_a.name = "a" + mock_obj_b = mock.Mock() + mock_obj_b.name = "b" + content.viewManager.CreateContainerView.return_value = mock.Mock( + view=[mock_obj_a, mock_obj_b] + ) + obj = utils.get_obj(content, "server", "b") + self.assertEqual(obj.name, "b") + obj = utils.get_obj(content, "server", None) + self.assertEqual(obj.name, "a") + obj = utils.get_obj(content, "server", "c") + self.assertIsNone(obj) + + def test_get_objs(self): + mock_obj = mock.Mock() + mock_obj.name = "a" + content = mock.Mock() + content.viewManager.CreateContainerView.return_value = mock.Mock( + view=[mock_obj] + ) + objs = utils.get_objs(content, "server") + exp_objs = { + "a": mock_obj + } + self.assertEqual(exp_objs, objs) + + def test_wait_for_task_success(self): + task = mock.Mock() + task.info.state = "success" + task.info.result = "result" + ret = utils.wait_for_task(task) + self.assertEqual(ret, task.info.result) + + def test_wait_for_task_error(self): + task = mock.Mock() + task.info.state = "error" + task.info.result = "result" + ret = utils.wait_for_task(task) + self.assertIsNone(ret) + + @mock.patch.object(connect, "SmartConnectNoSSL") + @mock.patch.object(utils, "open") + def test_get_client(self, mock_open, mock_conn): + mock_open.return_value = vsphere_conf + si = mock.Mock() + si.RetrieveContent.return_value = "lalala" + mock_conn.return_value = si + ret = utils.GetClient() + self.assertEqual(ret, "lalala") + + @mock.patch.object(vim, "vm") + @mock.patch.object(utils, "get_obj") + @mock.patch.object(utils, "GetClient") + def test_clone_vm(self, mock_client, mock_getobj, mock_vm): + client = mock.Mock() + vm = mock.Mock() + mock_client.return_value = client + mock_getobj.return_value = vm + mock_vm.RelocateSpec.return_value = {} + mock_vm.CloneSpec.return_value = mock.Mock(power_on=False) + task = mock.Mock() + task.info.state = "success" + task.info.result = "result" + vm.Clone.return_value = task + ret = utils.CloneVM("src", "dst") + self.assertEqual(ret, task) + + @mock.patch.object(utils, "open") + def test_read_vmdk_meta(self, mock_open): + mock_file = mock.mock_open(read_data=vmdk_meta) + mock_open.side_effect = [mock_file.return_value] + exp_dict = {'CID': 'cid', + 'adapterType': 'lsilogic', + 'createType': 'streamOptimized', + 'deletable': 'true', + 'diskType': 'SPARSE', + 'longContentID': 'lcid', + 'parentCID': 'pcid', + 'rwMode': 'RDONLY', + 'size': '20971520', + 'thinProvisioned': 'true', + 'version': '1', + 'virtualHWVersion': '11'} + ret = utils.vmdk_metadata("aaaa") + self.assertDictEqual(ret, exp_dict) diff --git a/vio/vio/vsphere/utils.py b/vio/vio/vsphere/utils.py index 77bcccd..7544313 100644 --- a/vio/vio/vsphere/utils.py +++ b/vio/vio/vsphere/utils.py @@ -49,7 +49,7 @@ def get_objs(content, vimtype): container = content.viewManager.CreateContainerView( content.rootFolder, vimtype, True) for c in container.view: - obj.update({c: c.name}) + obj.update({c.name: c}) return obj @@ -73,7 +73,7 @@ def GetClient(): if vcontent is not None: return vcontent vsphere_conf_path = os.getenv("VSPHERE_CONF", "/opt/etc/vsphere.yml") - vsphere_conf = yaml.load(open(vsphere_conf_path, "r"))['vsphere'] + vsphere_conf = yaml.safe_load(open(vsphere_conf_path, "r"))['vsphere'] # vsphere_conf = json.load(open(vsphere_conf_path, "r"))['vsphere'] host = vsphere_conf['host'] username = vsphere_conf['username'] |