Merge "Use a specific network for the test"
This commit is contained in:
commit
96cbf434db
|
@ -588,6 +588,7 @@ class StartInstanceWithConfiguration(ConfigurationsTestBase):
|
|||
configuration_instance.dbaas_datastore = instance_info.dbaas_datastore
|
||||
configuration_instance.dbaas_datastore_version = \
|
||||
instance_info.dbaas_datastore_version
|
||||
configuration_instance.nics = instance_info.nics
|
||||
|
||||
result = instance_info.dbaas.instances.create(
|
||||
configuration_instance.name,
|
||||
|
@ -595,6 +596,7 @@ class StartInstanceWithConfiguration(ConfigurationsTestBase):
|
|||
configuration_instance.volume,
|
||||
configuration_instance.databases,
|
||||
configuration_instance.users,
|
||||
nics=configuration_instance.nics,
|
||||
availability_zone="nova",
|
||||
datastore=configuration_instance.dbaas_datastore,
|
||||
datastore_version=configuration_instance.dbaas_datastore_version,
|
||||
|
|
|
@ -85,6 +85,7 @@ class InstanceTestInfo(object):
|
|||
self.id = None # The ID of the instance in the database.
|
||||
self.local_id = None
|
||||
self.address = None
|
||||
self.nics = None # The dict of type/id for nics used on the intance.
|
||||
self.initial_result = None # The initial result from the create call.
|
||||
self.user_ip = None # The IP address of the instance, given to user.
|
||||
self.infra_ip = None # The infrastructure network IP address.
|
||||
|
@ -656,6 +657,10 @@ class CreateInstance(object):
|
|||
else:
|
||||
instance_info.volume = None
|
||||
|
||||
shared_network = CONFIG.get('shared_network', None)
|
||||
if shared_network:
|
||||
instance_info.nics = [{'net-id': shared_network}]
|
||||
|
||||
if create_new_instance():
|
||||
instance_info.initial_result = dbaas.instances.create(
|
||||
instance_info.name,
|
||||
|
@ -663,6 +668,7 @@ class CreateInstance(object):
|
|||
instance_info.volume,
|
||||
databases,
|
||||
users,
|
||||
nics=instance_info.nics,
|
||||
availability_zone="nova",
|
||||
datastore=instance_info.dbaas_datastore,
|
||||
datastore_version=instance_info.dbaas_datastore_version)
|
||||
|
|
|
@ -90,6 +90,7 @@ def create_slave():
|
|||
instance_info.name + "_slave",
|
||||
instance_info.dbaas_flavor_href,
|
||||
instance_info.volume,
|
||||
nics=instance_info.nics,
|
||||
datastore=instance_info.dbaas_datastore,
|
||||
datastore_version=instance_info.dbaas_datastore_version,
|
||||
slave_of=instance_info.id)
|
||||
|
|
|
@ -50,6 +50,7 @@ class TestRootOnCreate(object):
|
|||
instance_info.volume,
|
||||
instance_info.databases,
|
||||
instance_info.users,
|
||||
nics=instance_info.nics,
|
||||
availability_zone="nova",
|
||||
datastore=instance_info.dbaas_datastore,
|
||||
datastore_version=instance_info.dbaas_datastore_version)
|
||||
|
|
|
@ -268,6 +268,7 @@ class BackupRunner(TestRunner):
|
|||
self.instance_info.name + '_restore',
|
||||
self.instance_info.dbaas_flavor_href,
|
||||
self.instance_info.volume,
|
||||
nics=self.instance_info.nics,
|
||||
restorePoint=restore_point)
|
||||
return result
|
||||
|
||||
|
|
|
@ -163,10 +163,15 @@ class InstanceCreateRunner(TestRunner):
|
|||
else:
|
||||
instance_info.volume = None
|
||||
|
||||
shared_network = CONFIG.get('shared_network', None)
|
||||
if shared_network:
|
||||
instance_info.nics = [{'net-id': shared_network}]
|
||||
|
||||
self.report.log("Testing create instance: %s"
|
||||
% {'name': name,
|
||||
'flavor': flavor.id,
|
||||
'volume': trove_volume_size,
|
||||
'nics': instance_info.nics,
|
||||
'databases': databases,
|
||||
'users': users,
|
||||
'configuration': configuration_id,
|
||||
|
@ -187,6 +192,7 @@ class InstanceCreateRunner(TestRunner):
|
|||
instance_info.volume,
|
||||
instance_info.databases,
|
||||
instance_info.users,
|
||||
nics=instance_info.nics,
|
||||
configuration=configuration_id,
|
||||
availability_zone="nova",
|
||||
datastore=instance_info.dbaas_datastore,
|
||||
|
|
|
@ -66,6 +66,7 @@ class ReplicationRunner(TestRunner):
|
|||
self.instance_info.name + replica_name,
|
||||
self.instance_info.dbaas_flavor_href,
|
||||
self.instance_info.volume, slave_of=master_id,
|
||||
nics=self.instance_info.nics,
|
||||
replica_count=replica_count)
|
||||
replica_id = replica.id
|
||||
|
||||
|
|
Loading…
Reference in New Issue