commit a182e8637dcd341f3ab9c6724ab9bf5563cdda2e
author Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> Wed Jan 21 01:16:37 2015 +0000
committer Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp> Thu Jan 22 01:54:05 2015 +0000
tree 53bf6acd9b907bbb0f6fa9e3e4c8d25a7c56eda8
parent 4771cbcefba4de42a901281cac7560397340cb6d

Remove CONF values from network client

To move network client to tempest-lib, this patch moves
CONF values from network client to the client setting.

Change-Id: I221db92f0137b2333df5c6be2be352a697bdf42d

tempest/clients.py

diff --git a/tempest/clients.py b/tempest/clients.py
index 28e19c3..7679b4b 100644
--- a/tempest/clients.py
+++ b/tempest/clients.py
@@ -153,7 +153,14 @@
         self._set_volume_clients()
 
         self.baremetal_client = BaremetalClientJSON(self.auth_provider)
-        self.network_client = NetworkClientJSON(self.auth_provider)
+        self.network_client = NetworkClientJSON(
+            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.database_flavors_client = DatabaseFlavorsClientJSON(
             self.auth_provider)
         self.database_versions_client = DatabaseVersionsClientJSON(

tempest/cmd/javelin.py

diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py
index 79f8141..e5ffb1b 100755
--- a/tempest/cmd/javelin.py
+++ b/tempest/cmd/javelin.py
@@ -176,7 +176,14 @@
         self.images = image_client.ImageClientV2JSON(_auth)
         self.telemetry = telemetry_client.TelemetryClientJSON(_auth)
         self.volumes = volumes_client.VolumesClientJSON(_auth)
-        self.networks = network_client.NetworkClientJSON(_auth)
+        self.networks = network_client.NetworkClientJSON(
+            _auth,
+            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,
+            **default_params)
 
 
 def load_resources(fname):

tempest/services/network/json/network_client.py

diff --git a/tempest/services/network/json/network_client.py b/tempest/services/network/json/network_client.py
index 8602513..c7ee5f7 100644
--- a/tempest/services/network/json/network_client.py
+++ b/tempest/services/network/json/network_client.py
@@ -16,11 +16,8 @@
 
 from tempest.common import service_client
 from tempest.common.utils import misc
-from tempest import config
 from tempest import exceptions
 
-CONF = config.CONF
-
 
 class NetworkClientJSON(service_client.ServiceClient):
 
@@ -37,16 +34,8 @@
     quotas
     """
 
-    def __init__(self, auth_provider):
-        super(NetworkClientJSON, self).__init__(
-            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.version = '2.0'
-        self.uri_prefix = "v%s" % (self.version)
+    version = '2.0'
+    uri_prefix = "v2.0"
 
     def get_uri(self, plural_name):
         # get service prefix from resource name