summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-25 10:08:44 +0000
committerGerrit Code Review <review@openstack.org>2017-07-25 10:08:44 +0000
commit95a7322ccdb1ae244093fa38e81c0ad730b69ef0 (patch)
treea687dc29c936629085117a93724bbc8008fc3340
parent1c6655e08903b896e4cf0ec6306a598c64d5bcf0 (diff)
parent17b6193be5e1ba8a8d35377a86b4ded2a4675fad (diff)
Merge "Replace the usage of 'manager' with 'os_primary'"
-rw-r--r--barbican_tempest_plugin/tests/scenario/manager.py42
1 files changed, 21 insertions, 21 deletions
diff --git a/barbican_tempest_plugin/tests/scenario/manager.py b/barbican_tempest_plugin/tests/scenario/manager.py
index 698c70d..e7957cb 100644
--- a/barbican_tempest_plugin/tests/scenario/manager.py
+++ b/barbican_tempest_plugin/tests/scenario/manager.py
@@ -41,44 +41,44 @@ class ScenarioTest(tempest.test.BaseTestCase):
41 def setup_clients(cls): 41 def setup_clients(cls):
42 super(ScenarioTest, cls).setup_clients() 42 super(ScenarioTest, cls).setup_clients()
43 # Clients (in alphabetical order) 43 # Clients (in alphabetical order)
44 cls.flavors_client = cls.manager.flavors_client 44 cls.flavors_client = cls.os_primary.flavors_client
45 cls.compute_floating_ips_client = ( 45 cls.compute_floating_ips_client = (
46 cls.manager.compute_floating_ips_client) 46 cls.os_primary.compute_floating_ips_client)
47 if CONF.service_available.glance: 47 if CONF.service_available.glance:
48 # Check if glance v1 is available to determine which client to use. 48 # Check if glance v1 is available to determine which client to use.
49 if CONF.image_feature_enabled.api_v1: 49 if CONF.image_feature_enabled.api_v1:
50 cls.image_client = cls.manager.image_client 50 cls.image_client = cls.os_primary.image_client
51 elif CONF.image_feature_enabled.api_v2: 51 elif CONF.image_feature_enabled.api_v2:
52 cls.image_client = cls.manager.image_client_v2 52 cls.image_client = cls.os_primary.image_client_v2
53 else: 53 else:
54 raise lib_exc.InvalidConfiguration( 54 raise lib_exc.InvalidConfiguration(
55 'Either api_v1 or api_v2 must be True in ' 55 'Either api_v1 or api_v2 must be True in '
56 '[image-feature-enabled].') 56 '[image-feature-enabled].')
57 # Compute image client 57 # Compute image client
58 cls.compute_images_client = cls.manager.compute_images_client 58 cls.compute_images_client = cls.os_primary.compute_images_client
59 cls.keypairs_client = cls.manager.keypairs_client 59 cls.keypairs_client = cls.os_primary.keypairs_client
60 # Nova security groups client 60 # Nova security groups client
61 cls.compute_security_groups_client = ( 61 cls.compute_security_groups_client = (
62 cls.manager.compute_security_groups_client) 62 cls.os_primary.compute_security_groups_client)
63 cls.compute_security_group_rules_client = ( 63 cls.compute_security_group_rules_client = (
64 cls.manager.compute_security_group_rules_client) 64 cls.os_primary.compute_security_group_rules_client)
65 cls.servers_client = cls.manager.servers_client 65 cls.servers_client = cls.os_primary.servers_client
66 # Neutron network client 66 # Neutron network client
67 cls.networks_client = cls.manager.networks_client 67 cls.networks_client = cls.os_primary.networks_client
68 cls.ports_client = cls.manager.ports_client 68 cls.ports_client = cls.os_primary.ports_client
69 cls.routers_client = cls.manager.routers_client 69 cls.routers_client = cls.os_primary.routers_client
70 cls.subnets_client = cls.manager.subnets_client 70 cls.subnets_client = cls.os_primary.subnets_client
71 cls.floating_ips_client = cls.manager.floating_ips_client 71 cls.floating_ips_client = cls.os_primary.floating_ips_client
72 cls.security_groups_client = cls.manager.security_groups_client 72 cls.security_groups_client = cls.os_primary.security_groups_client
73 cls.security_group_rules_client = ( 73 cls.security_group_rules_client = (
74 cls.manager.security_group_rules_client) 74 cls.os_primary.security_group_rules_client)
75 75
76 if CONF.volume_feature_enabled.api_v2: 76 if CONF.volume_feature_enabled.api_v2:
77 cls.volumes_client = cls.manager.volumes_v2_client 77 cls.volumes_client = cls.os_primary.volumes_v2_client
78 cls.snapshots_client = cls.manager.snapshots_v2_client 78 cls.snapshots_client = cls.os_primary.snapshots_v2_client
79 else: 79 else:
80 cls.volumes_client = cls.manager.volumes_client 80 cls.volumes_client = cls.os_primary.volumes_client
81 cls.snapshots_client = cls.manager.snapshots_client 81 cls.snapshots_client = cls.os_primary.snapshots_client
82 82
83 # ## Test functions library 83 # ## Test functions library
84 # 84 #
@@ -131,7 +131,7 @@ class ScenarioTest(tempest.test.BaseTestCase):
131 131
132 # Needed for the cross_tenant_traffic test: 132 # Needed for the cross_tenant_traffic test:
133 if clients is None: 133 if clients is None:
134 clients = self.manager 134 clients = self.os_primary
135 135
136 if name is None: 136 if name is None:
137 name = data_utils.rand_name(self.__class__.__name__ + "-server") 137 name = data_utils.rand_name(self.__class__.__name__ + "-server")