Merge "Change flavor RAM size" into stable/4.1
This commit is contained in:
commit
2b7b39e4b6
|
@ -41,10 +41,18 @@ class MuranoTest(fuel_health.nmanager.OfficialClientTest):
|
|||
self.compute_available = False
|
||||
self.fail('There are no compute nodes')
|
||||
|
||||
for hypervisor in self.compute_client.hypervisors.list():
|
||||
if hypervisor.free_ram_mb >= 2048:
|
||||
self.flavor_reqs = True
|
||||
break
|
||||
else:
|
||||
self.flavor_reqs = False
|
||||
|
||||
self.flavor_name = rand_name("ost1_test_Murano")
|
||||
self.flavor = self.compute_client.flavors.create(self.flavor_name,
|
||||
disk=60, ram=2,
|
||||
vcpus=1)
|
||||
if self.flavor_reqs:
|
||||
self.flavor = self.compute_client.flavors.create(self.flavor_name,
|
||||
disk=60, ram=2048,
|
||||
vcpus=1)
|
||||
|
||||
self.murano_available = True
|
||||
if 'ha' in self.manager.config.compute.deployment_mode:
|
||||
|
@ -64,7 +72,8 @@ class MuranoTest(fuel_health.nmanager.OfficialClientTest):
|
|||
super(MuranoTest, self).tearDown()
|
||||
|
||||
if self.compute_available:
|
||||
self.compute_client.flavors.delete(self.flavor.id)
|
||||
if self.flavor_reqs:
|
||||
self.compute_client.flavors.delete(self.flavor.id)
|
||||
|
||||
if self.murano_available:
|
||||
for env in self.list_environments():
|
||||
|
|
|
@ -32,6 +32,11 @@ class MuranoDeploymentSmokeTests(murano.MuranoTest):
|
|||
def setUp(self):
|
||||
super(MuranoDeploymentSmokeTests, self).setUp()
|
||||
self.check_clients_state()
|
||||
|
||||
if not self.flavor_reqs:
|
||||
self.fail("This test requires more resources on compute node"
|
||||
"(>=2048MB of free RAM)")
|
||||
|
||||
if not self.config.compute.compute_nodes:
|
||||
self.fail('There are no compute nodes')
|
||||
msg = ("Windows Server 2012 image with Murano "
|
||||
|
|
|
@ -115,6 +115,11 @@ class MuranoDeployLinuxServicesTests(murano.MuranoTest):
|
|||
def setUp(self):
|
||||
super(MuranoDeployLinuxServicesTests, self).setUp()
|
||||
self.check_clients_state()
|
||||
|
||||
if not self.flavor_reqs:
|
||||
self.fail("This test requires more resources on compute node"
|
||||
"(>=2048MB of free RAM)")
|
||||
|
||||
msg = ("Linux image with Murano "
|
||||
"tag isn't available. Need to import this image into "
|
||||
"glance and mark with Murano metadata tag. Please refer to"
|
||||
|
|
Loading…
Reference in New Issue