Remove configurability

The tests provided the option to configure the amount of RAM, CPU, etc.
used, but this configuration wasn't being exercised. Simplify the code
by removing these knobs. They can be re-added in the future if the need
arises.

Change-Id: Ie14ed284c10d0c12f6bd851c689ae2738044d793
This commit is contained in:
Stephen Finucane 2016-12-09 13:54:56 +00:00
parent 4e58eb7df3
commit b0d2756732
1 changed files with 10 additions and 11 deletions

View File

@ -50,16 +50,16 @@ class TestServerNumaBase(manager.NetworkScenarioTest):
image=self.image_ref, flavor=self.flavor_ref,
ssh=self.run_ssh, ssh_user=self.ssh_user))
def create_flavor_with_numa(self,
numa_nodes=2,
ram=2048,
vcpus=4,
disk=0,
specs=dict()):
def create_flavor_with_numa(self):
flavor_with_numa = data_utils.rand_name('numa_flavor')
flavor_with_numa_id = data_utils.rand_int_id(start=1000)
extra_specs = specs
extra_specs["hw:numa_nodes"] = str(numa_nodes)
ram = 2048
vcpus = 4
disk = 0
extra_specs = {
"hw:numa_nodes": "2",
}
# Create a flavor with extra specs
resp = (self.flavors_client.create_flavor(name=flavor_with_numa,
@ -78,15 +78,14 @@ class TestServerNumaBase(manager.NetworkScenarioTest):
self.assertEqual(resp.response.status, 202)
self.flavors_client.wait_for_resource_deletion(flavor_id)
def boot_instance(self, flavor=None):
def boot_instance(self):
# Create server with image and flavor from input scenario
security_groups = [{'name': self.security_group['name']}]
create_kwargs = {
'key_name': self.keypair['name'],
'security_groups': security_groups
}
if flavor is None:
flavor = self.create_flavor_with_numa()
flavor = self.create_flavor_with_numa()
self.instance = self.create_server(
image_id=self.image_ref,
flavor=flavor,