diff options
author | Shobhi Jain <shobhi.jain@intel.com> | 2018-01-29 11:49:02 +0000 |
---|---|---|
committer | Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-02-09 18:03:24 +0000 |
commit | 1b6ef8fb3a3bec72414cac2e6fdf66270abacdc4 (patch) | |
tree | d633cfc3c48b568a86ce7c32c7dee9626533150b /yardstick/tests/unit | |
parent | 35d2f095fa3948293e8f74e41b3fec39a05e7034 (diff) |
Replace neutron get network id with shade.
Function get_network_id now uses shade client instead of shade client.
Removed redundant function: get_port_id.
JIRA: YARDSTICK-890
Change-Id: I6081477fee39fa78131187e65daf3d7d3a9e439f
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
Diffstat (limited to 'yardstick/tests/unit')
-rw-r--r-- | yardstick/tests/unit/common/test_openstack_utils.py | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/yardstick/tests/unit/common/test_openstack_utils.py b/yardstick/tests/unit/common/test_openstack_utils.py index bf468489e..b685e63be 100644 --- a/yardstick/tests/unit/common/test_openstack_utils.py +++ b/yardstick/tests/unit/common/test_openstack_utils.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python - ############################################################################## # Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. # @@ -9,9 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -# Unittest for yardstick.common.openstack_utils - -from __future__ import absolute_import +from oslo_utils import uuidutils import unittest import mock @@ -38,9 +34,23 @@ class GetHeatApiVersionTestCase(unittest.TestCase): self.assertEqual(api_version, expected_result) -def main(): - unittest.main() +class GetNetworkIdTestCase(unittest.TestCase): + + def test_get_network_id(self): + _uuid = uuidutils.generate_uuid() + mock_shade_client = mock.Mock() + mock_shade_client.list_networks = mock.Mock() + mock_shade_client.list_networks.return_value = [{'id': _uuid}] + + output = openstack_utils.get_network_id(mock_shade_client, + 'network_name') + self.assertEqual(_uuid, output) + def test_get_network_id_no_network(self): + mock_shade_client = mock.Mock() + mock_shade_client.list_networks = mock.Mock() + mock_shade_client.list_networks.return_value = None -if __name__ == '__main__': - main() + output = openstack_utils.get_network_id(mock_shade_client, + 'network_name') + self.assertEqual(None, output) |