From f4bf5f90437db30ee44013414810054624b73359 Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Thu, 7 Dec 2017 07:39:46 +0000 Subject: Set the ram of flavor to 1024 The setting of hw:mem_page_size=large indicates larger page sizes for guest RAM, eg., either 2MB or 1GB on x86. When tested on compass, 1GB is required Change-Id: I22d2fcab190e465dd1c36bc4264c75c724c6f64d Signed-off-by: Linda Wang --- snaps/openstack/tests/create_instance_tests.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'snaps/openstack/tests/create_instance_tests.py') diff --git a/snaps/openstack/tests/create_instance_tests.py b/snaps/openstack/tests/create_instance_tests.py index 6eb21b5..b4fe136 100644 --- a/snaps/openstack/tests/create_instance_tests.py +++ b/snaps/openstack/tests/create_instance_tests.py @@ -328,10 +328,14 @@ class SimpleHealthCheck(OSIntegrationTestCase): self.network_creator.create() # Create Flavor + self.flavor_ram = 256 + if (self.flavor_metadata and + self.flavor_metadata.get('hw:mem_page_size') == 'large'): + self.flavor_ram = 1024 self.flavor_creator = OpenStackFlavor( self.admin_os_creds, - FlavorConfig(name=guid + '-flavor-name', ram=256, disk=10, - vcpus=1, metadata=self.flavor_metadata)) + FlavorConfig(name=guid + '-flavor-name', ram=self.flavor_ram, + disk=10, vcpus=1, metadata=self.flavor_metadata)) self.flavor_creator.create() except Exception as e: self.tearDown() -- cgit 1.2.3-korg