From cbeeb57a57aa29f89b53239ba6fcd9cdd16cb418 Mon Sep 17 00:00:00 2001
From: nayna-patel <nayna.patel@hp.com>
Date: Fri, 20 Feb 2015 07:58:59 +0000
Subject: [PATCH] Adds Designate server-list scenario

This submission adds method to
rally/benchmark/scenarios/designate/basic.py

1)def list_servers

Added configuration files for server operations under
samples/tasks/scenarios/designate

1) list-servers.json
2) list-servers.yaml
Also, added unittests to test_basic.py under
tests/unit/benchmark/scenarios/designate

Change-Id: I948f5e0c8beca963a9d6f1d388ea0410f2d107e3
---
 rally-jobs/rally-designate.yaml                 | 15 +++++++++++++++
 rally/benchmark/scenarios/designate/basic.py    | 11 +++++++++++
 .../tasks/scenarios/designate/list-servers.json | 17 +++++++++++++++++
 .../tasks/scenarios/designate/list-servers.yaml | 11 +++++++++++
 .../benchmark/scenarios/designate/test_basic.py |  8 ++++++++
 5 files changed, 62 insertions(+)
 create mode 100644 samples/tasks/scenarios/designate/list-servers.json
 create mode 100644 samples/tasks/scenarios/designate/list-servers.yaml

diff --git a/rally-jobs/rally-designate.yaml b/rally-jobs/rally-designate.yaml
index b25a48cc71..bdbe236020 100644
--- a/rally-jobs/rally-designate.yaml
+++ b/rally-jobs/rally-designate.yaml
@@ -100,3 +100,18 @@
       sla:
         failure_rate:
           max: 0
+
+  DesignateBasic.list_servers:
+    -
+      runner:
+        type: "constant"
+        times: 4
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
+      sla:
+        failure_rate:
+          max: 0
+
diff --git a/rally/benchmark/scenarios/designate/basic.py b/rally/benchmark/scenarios/designate/basic.py
index 0ab783b799..1fb462fafb 100644
--- a/rally/benchmark/scenarios/designate/basic.py
+++ b/rally/benchmark/scenarios/designate/basic.py
@@ -162,3 +162,14 @@ class DesignateBasic(utils.DesignateScenario):
         """
         server = self._create_server()
         self._delete_server(server["id"])
+
+    @validation.required_services(consts.Service.DESIGNATE)
+    @validation.required_openstack(admin=True)
+    @base.scenario(context={"cleanup": ["designate"]})
+    def list_servers(self):
+        """List Designate servers.
+
+        This simple scenario tests the designate server-list command by listing
+        all the servers.
+        """
+        self._list_servers()
diff --git a/samples/tasks/scenarios/designate/list-servers.json b/samples/tasks/scenarios/designate/list-servers.json
new file mode 100644
index 0000000000..2298de771a
--- /dev/null
+++ b/samples/tasks/scenarios/designate/list-servers.json
@@ -0,0 +1,17 @@
+{
+    "DesignateBasic.list_servers": [
+        {
+            "runner": {
+                "type": "constant",
+                "times": 3,
+                "concurrency": 2
+            },
+            "context": {
+                "users": {
+                    "tenants": 2,
+                    "users_per_tenant": 2
+                }
+            }
+        }
+    ]
+}
diff --git a/samples/tasks/scenarios/designate/list-servers.yaml b/samples/tasks/scenarios/designate/list-servers.yaml
new file mode 100644
index 0000000000..2d7780fa6c
--- /dev/null
+++ b/samples/tasks/scenarios/designate/list-servers.yaml
@@ -0,0 +1,11 @@
+---
+  DesignateBasic.list_servers:
+    -
+      runner:
+        type: "constant"
+        times: 3
+        concurrency: 2
+      context:
+        users:
+          tenants: 2
+          users_per_tenant: 2
diff --git a/tests/unit/benchmark/scenarios/designate/test_basic.py b/tests/unit/benchmark/scenarios/designate/test_basic.py
index 08cd0685f2..f8be14ee4b 100644
--- a/tests/unit/benchmark/scenarios/designate/test_basic.py
+++ b/tests/unit/benchmark/scenarios/designate/test_basic.py
@@ -134,3 +134,11 @@ class DesignateBasicTestCase(test.TestCase):
 
         mock_create.assert_called_once_with()
         mock_delete.assert_called_once_with("123")
+
+    @mock.patch(DESIGNATE_BASIC + "._list_servers")
+    def test_list_servers(self, mock_list):
+        scenario = basic.DesignateBasic()
+
+        # Default options
+        scenario.list_servers()
+        mock_list.assert_called_once_with()