From 9d36842e3966185e97cc5732aa7a0edd2050bfe2 Mon Sep 17 00:00:00 2001 From: QiLiang Date: Thu, 14 Jan 2016 08:09:40 +0000 Subject: HeatContext model update to match heat code update In Heat Liberty release OS::Nova::Server will always use the user pre-configured in the image (e.g. "fedora" for stock Fedora cloud images, "ubuntu" for stock Ubuntu cloud images, "cloud-user" for stock CentOS cloud images etc) Change all ec2-user -> ubuntu Add admin-user in Heat model for backwards compatibility. Refer below links for detalis: https://etherpad.opnfv.org/p/yardstick_release_b_troubleshooting https://github.com/openstack/heat/commit/e423bec7f10b0f5d07f05d195b3b7860f6bceb00 http://blog.scottlowe.org/2015/04/23/ubuntu-openstack-heat-cloud-init/ JIRA: - Change-Id: I6b8b2b21daf113a3a86aee1126b0c3e74737ef4f Signed-off-by: QiLiang --- tests/unit/benchmark/scenarios/storage/test_fio.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tests/unit/benchmark/scenarios') diff --git a/tests/unit/benchmark/scenarios/storage/test_fio.py b/tests/unit/benchmark/scenarios/storage/test_fio.py index ac8aa0684..153d15052 100644 --- a/tests/unit/benchmark/scenarios/storage/test_fio.py +++ b/tests/unit/benchmark/scenarios/storage/test_fio.py @@ -39,7 +39,7 @@ class FioTestCase(unittest.TestCase): def test_fio_successful_setup(self, mock_ssh): options = { - 'filename': '/home/ec2-user/data.raw', + 'filename': '/home/ubuntu/data.raw', 'bs': '4k', 'rw': 'rw', 'ramp_time': 10 @@ -55,7 +55,7 @@ class FioTestCase(unittest.TestCase): def test_fio_successful_no_sla(self, mock_ssh): options = { - 'filename': '/home/ec2-user/data.raw', + 'filename': '/home/ubuntu/data.raw', 'bs': '4k', 'rw': 'rw', 'ramp_time': 10 @@ -80,7 +80,7 @@ class FioTestCase(unittest.TestCase): def test_fio_successful_read_no_sla(self, mock_ssh): options = { - 'filename': '/home/ec2-user/data.raw', + 'filename': '/home/ubuntu/data.raw', 'bs': '4k', 'rw': "read", 'ramp_time': 10 @@ -104,7 +104,7 @@ class FioTestCase(unittest.TestCase): def test_fio_successful_write_no_sla(self, mock_ssh): options = { - 'filename': '/home/ec2-user/data.raw', + 'filename': '/home/ubuntu/data.raw', 'bs': '4k', 'rw': 'write', 'ramp_time': 10 @@ -128,7 +128,7 @@ class FioTestCase(unittest.TestCase): def test_fio_successful_lat_sla(self, mock_ssh): options = { - 'filename': '/home/ec2-user/data.raw', + 'filename': '/home/ubuntu/data.raw', 'bs': '4k', 'rw': 'rw', 'ramp_time': 10 @@ -157,7 +157,7 @@ class FioTestCase(unittest.TestCase): def test_fio_unsuccessful_lat_sla(self, mock_ssh): options = { - 'filename': '/home/ec2-user/data.raw', + 'filename': '/home/ubuntu/data.raw', 'bs': '4k', 'rw': 'rw', 'ramp_time': 10 @@ -178,7 +178,7 @@ class FioTestCase(unittest.TestCase): def test_fio_successful_bw_iops_sla(self, mock_ssh): options = { - 'filename': '/home/ec2-user/data.raw', + 'filename': '/home/ubuntu/data.raw', 'bs': '4k', 'rw': 'rw', 'ramp_time': 10 @@ -206,7 +206,7 @@ class FioTestCase(unittest.TestCase): def test_fio_unsuccessful_bw_iops_sla(self, mock_ssh): options = { - 'filename': '/home/ec2-user/data.raw', + 'filename': '/home/ubuntu/data.raw', 'bs': '4k', 'rw': 'rw', 'ramp_time': 10 @@ -227,7 +227,7 @@ class FioTestCase(unittest.TestCase): def test_fio_unsuccessful_script_error(self, mock_ssh): options = { - 'filename': '/home/ec2-user/data.raw', + 'filename': '/home/ubuntu/data.raw', 'bs': '4k', 'rw': 'rw', 'ramp_time': 10 -- cgit 1.2.3-korg