openstack/tempest
Code Issues Proposed changes

Define _set_network_clients

Browse Source 
Align client setup for the network service in the client manager to
the other services. This will be useful for further refactor later.

Partially-implements: bp client-manager-refactor

Change-Id: I28dfe56cf45737192fd3cfb754e288644011b65d
This commit is contained in:
Andrea Frittoli (andreaf) 2016-06-07 18:35:58 +01:00
parent 591e85411d
commit 11e1e88660
1 changed files with 37 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
tempest/clients.py
View File

@ -221,6 +221,7 @@ class Manager(manager.Manager):
self._set_volume_clients()
self._set_object_storage_clients()
self._set_image_clients()
self._set_network_clients()
self.baremetal_client = BaremetalClient(
self.auth_provider,
@ -228,110 +229,6 @@ class Manager(manager.Manager):
CONF.identity.region,
endpoint_type=CONF.baremetal.endpoint_type,
**self.default_params_with_timeout_values)
self.network_agents_client = NetworkAgentsClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.network_extensions_client = NetworkExtensionsClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.networks_client = NetworksClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.subnetpools_client = SubnetpoolsClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.subnets_client = SubnetsClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.ports_client = PortsClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.network_quotas_client = NetworkQuotasClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.floating_ips_client = FloatingIPsClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.metering_labels_client = MeteringLabelsClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.metering_label_rules_client = MeteringLabelRulesClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.routers_client = RoutersClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.security_group_rules_client = SecurityGroupRulesClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.security_groups_client = SecurityGroupsClient(
self.auth_provider,
CONF.network.catalog_type,
CONF.network.region or CONF.identity.region,
endpoint_type=CONF.network.endpoint_type,
build_interval=CONF.network.build_interval,
build_timeout=CONF.network.build_timeout,
**self.default_params)
self.orchestration_client = OrchestrationClient(
self.auth_provider,
CONF.orchestration.catalog_type,
@ -349,6 +246,42 @@ class Manager(manager.Manager):
self.negative_client = negative_rest_client.NegativeRestClient(
self.auth_provider, service, **self.default_params)
def _set_network_clients(self):
params = {
'service': CONF.network.catalog_type,
'region': CONF.network.region or CONF.identity.region,
'endpoint_type': CONF.network.endpoint_type,
'build_interval': CONF.network.build_interval,
'build_timeout': CONF.network.build_timeout
}
params.update(self.default_params)
self.network_agents_client = NetworkAgentsClient(
self.auth_provider, **params)
self.network_extensions_client = NetworkExtensionsClient(
self.auth_provider, **params)
self.networks_client = NetworksClient(
self.auth_provider, **params)
self.subnetpools_client = SubnetpoolsClient(
self.auth_provider, **params)
self.subnets_client = SubnetsClient(
self.auth_provider, **params)
self.ports_client = PortsClient(
self.auth_provider, **params)
self.network_quotas_client = NetworkQuotasClient(
self.auth_provider, **params)
self.floating_ips_client = FloatingIPsClient(
self.auth_provider, **params)
self.metering_labels_client = MeteringLabelsClient(
self.auth_provider, **params)
self.metering_label_rules_client = MeteringLabelRulesClient(
self.auth_provider, **params)
self.routers_client = RoutersClient(
self.auth_provider, **params)
self.security_group_rules_client = SecurityGroupRulesClient(
self.auth_provider, **params)
self.security_groups_client = SecurityGroupsClient(
self.auth_provider, **params)
def _set_image_clients(self):
params = {
'service': CONF.image.catalog_type,