openstack/rally-openstack
Code Issues Proposed changes

Merge "[Manila] Add benchmark for Manila list share servers operation"

Browse Source
This commit is contained in:
Jenkins 2015-06-20 03:33:54 +00:00 committed by Gerrit Code Review
commit e655b3de1c
7 changed files with 93 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rally-jobs/rally-manila.yaml
View File

@ -73,3 +73,15 @@
sla:
failure_rate:
max: 0
ManilaShares.list_share_servers:
-
args:
search_opts: {}
runner:
type: "constant"
times: 10
concurrency: 10
sla:
failure_rate:
max: 0

13
rally/plugins/openstack/scenarios/manila/shares.py
View File

@ -121,3 +121,16 @@ class ManilaShares(utils.ManilaScenario):
detailed=detailed,
search_opts=search_opts,
)
@validation.required_services(consts.Service.MANILA)
@validation.required_openstack(admin=True)
@base.scenario()
def list_share_servers(self, search_opts=None):
"""Lists share servers.
Requires admin creds.
:param search_opts: container of following search opts:
"host", "status", "share_network" and "project_id".
"""
self._list_share_servers(search_opts=search_opts)

12
rally/plugins/openstack/scenarios/manila/utils.py
View File

@ -160,3 +160,15 @@ class ManilaScenario(base.Scenario):
share_networks = self.clients("manila").share_networks.list(
detailed=detailed, search_opts=search_opts)
return share_networks
@base.atomic_action_timer("manila.list_share_servers")
def _list_share_servers(self, search_opts=None):
"""List share servers. Admin only.
:param search_opts: set of key-value pairs to filter share servers by.
Example: {"share_network": "share_network_name_or_id"}
:returns: list of instances of :class:`ShareServer`
"""
share_servers = self.admin_clients("manila").share_servers.list(
search_opts=search_opts)
return share_servers

14
samples/tasks/scenarios/manila/list-share-servers.json Normal file
View File

@ -0,0 +1,14 @@
{
"ManilaShares.list_share_servers": [
{
"args": {
"search_opts": {}
},
"runner": {
"type": "constant",
"times": 10,
"concurrency": 10
}
}
]
}

9
samples/tasks/scenarios/manila/list-share-servers.yaml Normal file
View File

@ -0,0 +1,9 @@
---
ManilaShares.list_share_servers:
-
args:
search_opts: {}
runner:
type: "constant"
times: 10
concurrency: 10

16
tests/unit/plugins/openstack/scenarios/manila/test_shares.py
View File

@ -132,3 +132,19 @@ class ManilaSharesTestCase(test.TestCase):
**expected_create_params)
scenario._list_share_networks.assert_called_once_with(
**expected_list_params)
@ddt.data(
{},
{"search_opts": None},
{"search_opts": {}},
{"search_opts": {"foo": "bar"}},
)
def test_list_share_servers(self, search_opts):
scenario = shares.ManilaShares()
scenario.context = {"admin": {"endpoint": "fake_endpoint"}}
scenario._list_share_servers = mock.MagicMock()
scenario.list_share_servers(search_opts=search_opts)
scenario._list_share_servers.assert_called_once_with(
search_opts=search_opts)

17
tests/unit/plugins/openstack/scenarios/manila/test_utils.py
View File

@ -131,3 +131,20 @@ class ManilaScenarioTestCase(test.ClientsTestCase):
self.clients("manila").share_networks.list.assert_called_once_with(
detailed=params.get("detailed", True),
search_opts=params.get("search_opts", None))
@ddt.data(
{},
{"search_opts": None},
{"search_opts": {"project_id": "fake_project"}},
)
def test__list_share_servers(self, params):
fake_share_servers = ["foo", "bar"]
self.admin_clients("manila").share_servers.list.return_value = (
fake_share_servers)
result = self.scenario._list_share_servers(**params)
self.assertEqual(fake_share_servers, result)
self.admin_clients(
"manila").share_servers.list.assert_called_once_with(
search_opts=params.get("search_opts", None))