diff options
| author |   QiLiang <liangqi1@huawei.com> | 2016-01-14 08:09:40 +0000 |
|---|---|---|
| committer | qi liang <liangqi1@huawei.com> | 2016-01-15 01:10:25 +0000 |
| commit | 9d36842e3966185e97cc5732aa7a0edd2050bfe2 (patch) | |
| tree | dfe51fed8fe84188eb89bd4fd323d1c722967ab5 /tests/unit | |
| parent | 9b8b765373abbb10289415312a24574ff122541a (diff) | |
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 <liangqi1@huawei.com>
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/benchmark/contexts/test_model.py | 2 | ||||
| -rw-r--r-- | tests/unit/benchmark/scenarios/storage/test_fio.py | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/tests/unit/benchmark/contexts/test_model.py b/tests/unit/benchmark/contexts/test_model.py index 48584cf33..a1978e320 100644 --- a/tests/unit/benchmark/contexts/test_model.py +++ b/tests/unit/benchmark/contexts/test_model.py @@ -167,6 +167,7 @@ class ServerTestCase(unittest.TestCase): self.mock_context.name = 'bar' self.mock_context.keypair_name = 'some-keys' self.mock_context.secgroup_name = 'some-secgroup' + self.mock_context.user = "some-user" def test_construct_defaults(self): @@ -215,6 +216,7 @@ class ServerTestCase(unittest.TestCase): mock_template.add_server.assert_called_with( 'some-server', 'some-image', 'some-flavor', ports=['some-server-some-network-port'], + user=self.mock_context.user, key_name=self.mock_context.keypair_name, scheduler_hints='hints') 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 |