diff --git a/octavia/api/common/hooks.py b/octavia/api/common/hooks.py index 896eb08cbf..571e8e453d 100644 --- a/octavia/api/common/hooks.py +++ b/octavia/api/common/hooks.py @@ -23,7 +23,8 @@ class ContextHook(hooks.PecanHook): """Configures a request context and attaches it to the request.""" def on_route(self, state): - context_obj = context.Context.from_environ(state.request.environ) + context_obj = context.RequestContext.from_environ( + state.request.environ) state.request.context['octavia_context'] = context_obj diff --git a/octavia/common/context.py b/octavia/common/context.py index 14f20f5c14..4bc56612c7 100644 --- a/octavia/common/context.py +++ b/octavia/common/context.py @@ -22,7 +22,7 @@ from octavia.db import api as db_api CONF = cfg.CONF -class Context(common_context.RequestContext): +class RequestContext(common_context.RequestContext): _session = None diff --git a/octavia/controller/worker/v2/tasks/notification_tasks.py b/octavia/controller/worker/v2/tasks/notification_tasks.py index 8ec5fe6ac8..7a8fba14f3 100644 --- a/octavia/controller/worker/v2/tasks/notification_tasks.py +++ b/octavia/controller/worker/v2/tasks/notification_tasks.py @@ -29,7 +29,8 @@ class BaseNotificationTask(task.Task): self._rpc_notifier = rpc.get_notifier() def execute(self, loadbalancer): - ctx = context.Context(project_id=loadbalancer[constants.PROJECT_ID]) + ctx = context.RequestContext( + project_id=loadbalancer[constants.PROJECT_ID]) LOG.debug(f"Sending rpc notification: {self.event_type} " f"{loadbalancer[constants.LOADBALANCER_ID]}") self._rpc_notifier.info( diff --git a/octavia/tests/functional/api/v2/test_amphora.py b/octavia/tests/functional/api/v2/test_amphora.py index 1c13e8baed..135d32546a 100644 --- a/octavia/tests/functional/api/v2/test_amphora.py +++ b/octavia/tests/functional/api/v2/test_amphora.py @@ -173,7 +173,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -214,7 +215,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): self.delete(self.AMPHORA_PATH.format(amphora_id=amp.id), status=403) @@ -247,7 +249,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -276,7 +279,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.AMPHORA_PATH.format( amphora_id=self.amp_id), status=403) @@ -289,7 +293,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -320,7 +325,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.put(self.AMPHORA_FAILOVER_PATH.format( amphora_id=self.amp_id), body={}, status=403) @@ -349,7 +355,8 @@ class TestAmphora(base.BaseAPITest): def test_get_all_authorized(self): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): override_credentials = { 'service_user_id': None, @@ -378,7 +385,8 @@ class TestAmphora(base.BaseAPITest): def test_get_all_not_authorized(self): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): amps = self.get(self.AMPHORAE_PATH, status=403).json @@ -511,7 +519,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -539,7 +548,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.AMPHORA_STATS_PATH.format( amphora_id=self.amp_id), status=403) @@ -615,7 +625,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -647,7 +658,8 @@ class TestAmphora(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): self.put(self.AMPHORA_CONFIG_PATH.format( amphora_id=self.amp_id), body={}, status=403) diff --git a/octavia/tests/functional/api/v2/test_availability_zone_profiles.py b/octavia/tests/functional/api/v2/test_availability_zone_profiles.py index 1702d44a91..3e1309fc1f 100644 --- a/octavia/tests/functional/api/v2/test_availability_zone_profiles.py +++ b/octavia/tests/functional/api/v2/test_availability_zone_profiles.py @@ -110,7 +110,8 @@ class TestAvailabilityZoneProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -203,7 +204,8 @@ class TestAvailabilityZoneProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -287,7 +289,8 @@ class TestAvailabilityZoneProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -405,7 +408,8 @@ class TestAvailabilityZoneProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -532,7 +536,8 @@ class TestAvailabilityZoneProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, diff --git a/octavia/tests/functional/api/v2/test_availability_zones.py b/octavia/tests/functional/api/v2/test_availability_zones.py index 14a81f0962..08e7a91225 100644 --- a/octavia/tests/functional/api/v2/test_availability_zones.py +++ b/octavia/tests/functional/api/v2/test_availability_zones.py @@ -118,7 +118,8 @@ class TestAvailabilityZones(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -204,7 +205,8 @@ class TestAvailabilityZones(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -288,7 +290,8 @@ class TestAvailabilityZones(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -412,7 +415,8 @@ class TestAvailabilityZones(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -511,7 +515,8 @@ class TestAvailabilityZones(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, diff --git a/octavia/tests/functional/api/v2/test_flavor_profiles.py b/octavia/tests/functional/api/v2/test_flavor_profiles.py index 1d59312fac..14f6331cc3 100644 --- a/octavia/tests/functional/api/v2/test_flavor_profiles.py +++ b/octavia/tests/functional/api/v2/test_flavor_profiles.py @@ -109,7 +109,8 @@ class TestFlavorProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -201,7 +202,8 @@ class TestFlavorProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -285,7 +287,8 @@ class TestFlavorProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -402,7 +405,8 @@ class TestFlavorProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -525,7 +529,8 @@ class TestFlavorProfiles(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, diff --git a/octavia/tests/functional/api/v2/test_flavors.py b/octavia/tests/functional/api/v2/test_flavors.py index 60f83d0771..10a5047b42 100644 --- a/octavia/tests/functional/api/v2/test_flavors.py +++ b/octavia/tests/functional/api/v2/test_flavors.py @@ -117,7 +117,8 @@ class TestFlavors(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -204,7 +205,8 @@ class TestFlavors(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -297,7 +299,8 @@ class TestFlavors(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -426,7 +429,8 @@ class TestFlavors(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -529,7 +533,8 @@ class TestFlavors(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, diff --git a/octavia/tests/functional/api/v2/test_health_monitor.py b/octavia/tests/functional/api/v2/test_health_monitor.py index 73cf7fe9d2..62633dfba6 100644 --- a/octavia/tests/functional/api/v2/test_health_monitor.py +++ b/octavia/tests/functional/api/v2/test_health_monitor.py @@ -128,7 +128,8 @@ class TestHealthMonitor(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -167,7 +168,8 @@ class TestHealthMonitor(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.HM_PATH.format( healthmonitor_id=api_hm.get('id')), status=403) @@ -207,7 +209,8 @@ class TestHealthMonitor(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): hms = self.get(self.HMS_PATH, status=403).json @@ -281,7 +284,8 @@ class TestHealthMonitor(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', hm3['project_id']): override_credentials = { 'service_user_id': None, @@ -336,7 +340,8 @@ class TestHealthMonitor(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', None): override_credentials = { 'service_user_id': None, @@ -392,7 +397,8 @@ class TestHealthMonitor(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', hm3['project_id']): override_credentials = { 'service_user_id': None, @@ -1243,7 +1249,8 @@ class TestHealthMonitor(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1291,7 +1298,8 @@ class TestHealthMonitor(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): api_hm = self.create_health_monitor( self.pool_id, constants.HEALTH_MONITOR_HTTP, @@ -1697,7 +1705,8 @@ class TestHealthMonitor(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1738,7 +1747,8 @@ class TestHealthMonitor(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.put( self.HM_PATH.format(healthmonitor_id=api_hm.get('id')), @@ -2028,7 +2038,8 @@ class TestHealthMonitor(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -2073,7 +2084,8 @@ class TestHealthMonitor(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): self.delete( self.HM_PATH.format(healthmonitor_id=api_hm.get('id')), diff --git a/octavia/tests/functional/api/v2/test_l7policy.py b/octavia/tests/functional/api/v2/test_l7policy.py index c8d04be2e8..f9b1725e93 100644 --- a/octavia/tests/functional/api/v2/test_l7policy.py +++ b/octavia/tests/functional/api/v2/test_l7policy.py @@ -67,7 +67,8 @@ class TestL7Policy(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -99,7 +100,8 @@ class TestL7Policy(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.L7POLICY_PATH.format( l7policy_id=api_l7policy.get('id')), status=403) @@ -198,7 +200,8 @@ class TestL7Policy(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', api_l7p_c.get('project_id')): override_credentials = { 'service_user_id': None, @@ -255,7 +258,8 @@ class TestL7Policy(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', None): override_credentials = { 'service_user_id': None, @@ -307,7 +311,8 @@ class TestL7Policy(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', api_l7p_c.get('project_id')): override_credentials = { 'service_user_id': None, @@ -346,7 +351,8 @@ class TestL7Policy(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): policies = self.get(self.L7POLICIES_PATH, status=403).json @@ -670,7 +676,8 @@ class TestL7Policy(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -712,7 +719,8 @@ class TestL7Policy(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): api_l7policy = self.create_l7policy( self.listener_id, @@ -902,7 +910,8 @@ class TestL7Policy(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -946,7 +955,8 @@ class TestL7Policy(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): response = self.put(self.L7POLICY_PATH.format( l7policy_id=api_l7policy.get('id')), @@ -1146,7 +1156,8 @@ class TestL7Policy(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1194,7 +1205,8 @@ class TestL7Policy(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): self.delete(self.L7POLICY_PATH.format( l7policy_id=api_l7policy.get('id')), status=403) diff --git a/octavia/tests/functional/api/v2/test_l7rule.py b/octavia/tests/functional/api/v2/test_l7rule.py index 89ab976987..310b3f9148 100644 --- a/octavia/tests/functional/api/v2/test_l7rule.py +++ b/octavia/tests/functional/api/v2/test_l7rule.py @@ -67,7 +67,8 @@ class TestL7Rule(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -98,7 +99,8 @@ class TestL7Rule(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): response = self.get(self.l7rule_path.format( l7rule_id=l7rule.get('id')), status=403).json @@ -164,7 +166,8 @@ class TestL7Rule(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -208,7 +211,8 @@ class TestL7Rule(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', None): override_credentials = { 'service_user_id': None, @@ -244,7 +248,8 @@ class TestL7Rule(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): rules = self.get(self.l7rules_path, status=403) @@ -528,7 +533,8 @@ class TestL7Rule(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -572,7 +578,8 @@ class TestL7Rule(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): api_l7rule = self.create_l7rule( self.l7policy_id, constants.L7RULE_TYPE_HOST_NAME, @@ -906,7 +913,8 @@ class TestL7Rule(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -948,7 +956,8 @@ class TestL7Rule(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): response = self.put(self.l7rule_path.format( l7rule_id=api_l7rule.get('id')), @@ -1108,7 +1117,8 @@ class TestL7Rule(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1158,7 +1168,8 @@ class TestL7Rule(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): self.delete( self.l7rule_path.format(l7rule_id=api_l7rule.get('id')), diff --git a/octavia/tests/functional/api/v2/test_listener.py b/octavia/tests/functional/api/v2/test_listener.py index 6b5db1a777..5fb24d4e9e 100644 --- a/octavia/tests/functional/api/v2/test_listener.py +++ b/octavia/tests/functional/api/v2/test_listener.py @@ -103,7 +103,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', listener3['project_id']): override_credentials = { 'service_user_id': None, @@ -150,7 +151,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', None): override_credentials = { 'service_user_id': None, @@ -191,7 +193,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -242,7 +245,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): listeners = self.get(self.LISTENERS_PATH, status=403).json self.conf.config(group='api_settings', auth_strategy=auth_strategy) @@ -545,7 +549,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -578,7 +583,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.listener_path.format( listener_id=listener['id']), status=403) @@ -962,7 +968,8 @@ class TestListener(base.BaseAPITest): self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1017,7 +1024,8 @@ class TestListener(base.BaseAPITest): self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.post(self.LISTENERS_PATH, body, status=403) self.conf.config(group='api_settings', auth_strategy=auth_strategy) @@ -2016,7 +2024,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -2068,7 +2077,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): api_listener = self.put(listener_path, body, status=403) self.conf.config(group='api_settings', auth_strategy=auth_strategy) @@ -2175,7 +2185,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -2224,7 +2235,8 @@ class TestListener(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): self.delete(listener_path, status=403) self.conf.config(group='api_settings', auth_strategy=auth_strategy) @@ -2830,7 +2842,8 @@ class TestListener(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -2877,7 +2890,8 @@ class TestListener(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): res = self.get(self.LISTENER_PATH.format( listener_id=li['id'] + "/stats"), status=403) diff --git a/octavia/tests/functional/api/v2/test_load_balancer.py b/octavia/tests/functional/api/v2/test_load_balancer.py index 696014031c..0342efeeed 100644 --- a/octavia/tests/functional/api/v2/test_load_balancer.py +++ b/octavia/tests/functional/api/v2/test_load_balancer.py @@ -969,7 +969,8 @@ class TestLoadBalancer(base.BaseAPITest): } lb_json.update(optionals) body = self._build_body(lb_json) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): response = self.post(self.LBS_PATH, body) api_lb = response.json.get(self.root_tag) @@ -985,7 +986,8 @@ class TestLoadBalancer(base.BaseAPITest): } lb_json.update(optionals) body = self._build_body(lb_json) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -1017,7 +1019,8 @@ class TestLoadBalancer(base.BaseAPITest): } lb_json.update(optionals) body = self._build_body(lb_json) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.post(self.LBS_PATH, body, status=403) api_lb = response.json @@ -1294,7 +1297,8 @@ class TestLoadBalancer(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1333,7 +1337,8 @@ class TestLoadBalancer(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', None): override_credentials = { 'service_user_id': None, @@ -1370,7 +1375,8 @@ class TestLoadBalancer(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1409,7 +1415,8 @@ class TestLoadBalancer(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) LB_PROJECT_PATH = '{}?project_id={}'.format(self.LBS_PATH, project_id) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): response = self.get(LB_PROJECT_PATH, status=403) api_lb = response.json @@ -1876,7 +1883,8 @@ class TestLoadBalancer(base.BaseAPITest): lb_dict = lb.get(self.root_tag) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -1936,7 +1944,8 @@ class TestLoadBalancer(base.BaseAPITest): lb_dict = lb.get(self.root_tag) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.LB_PATH.format(lb_id=lb_dict.get('id')), status=403) @@ -2074,7 +2083,8 @@ class TestLoadBalancer(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -2119,7 +2129,8 @@ class TestLoadBalancer(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.put(self.LB_PATH.format(lb_id=lb_dict.get('id')), lb_json, status=403) @@ -2256,7 +2267,8 @@ class TestLoadBalancer(base.BaseAPITest): lb = self.set_lb_status(lb_dict.get('id')) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -2298,7 +2310,8 @@ class TestLoadBalancer(base.BaseAPITest): self.set_lb_status(lb_dict.get('id')) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): self.delete(self.LB_PATH.format(lb_id=lb_dict.get('id')), status=403) @@ -2422,7 +2435,8 @@ class TestLoadBalancer(base.BaseAPITest): lb_id=lb_dict.get('id')) + "/failover") auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.app.put(path, status=403) self.conf.config(group='api_settings', auth_strategy=auth_strategy) @@ -2442,7 +2456,8 @@ class TestLoadBalancer(base.BaseAPITest): lb_id=lb_dict.get('id')) + "/failover") auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): override_credentials = { 'service_user_id': None, @@ -2479,7 +2494,8 @@ class TestLoadBalancer(base.BaseAPITest): lb_id=lb_dict.get('id')) + "/failover") auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id_2): override_credentials = { 'service_user_id': None, @@ -2515,7 +2531,8 @@ class TestLoadBalancer(base.BaseAPITest): lb_id=lb_dict.get('id')) + "/failover") auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.NOAUTH) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id_2): override_credentials = { 'service_user_id': None, @@ -3958,7 +3975,8 @@ class TestLoadBalancerGraph(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -3991,7 +4009,8 @@ class TestLoadBalancerGraph(base.BaseAPITest): uuidutils.generate_uuid()).get('loadbalancer') auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): res = self.get(self.LB_PATH.format(lb_id=lb['id'] + "/status"), @@ -4057,7 +4076,8 @@ class TestLoadBalancerGraph(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -4102,7 +4122,8 @@ class TestLoadBalancerGraph(base.BaseAPITest): total_connections=random.randint(1, 9)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): res = self.get(self.LB_PATH.format(lb_id=lb['id'] + "/stats"), status=403) diff --git a/octavia/tests/functional/api/v2/test_member.py b/octavia/tests/functional/api/v2/test_member.py index fcf058895a..2442c4d8f3 100644 --- a/octavia/tests/functional/api/v2/test_member.py +++ b/octavia/tests/functional/api/v2/test_member.py @@ -80,7 +80,8 @@ class TestMember(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -110,7 +111,8 @@ class TestMember(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.member_path.format( member_id=api_member.get('id')), status=403).json @@ -183,7 +185,8 @@ class TestMember(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -229,7 +232,8 @@ class TestMember(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', None): override_credentials = { 'service_user_id': None, @@ -268,7 +272,8 @@ class TestMember(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.members_path, status=403) self.conf.config(group='api_settings', auth_strategy=auth_strategy) @@ -515,7 +520,8 @@ class TestMember(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -563,7 +569,8 @@ class TestMember(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): api_member = self.create_member( self.pool_id, '192.0.2.1', 80, status=403) @@ -1130,7 +1137,8 @@ class TestMember(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1183,7 +1191,8 @@ class TestMember(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): member_path = self.member_path_listener.format( member_id=api_member.get('id')) @@ -1310,7 +1319,8 @@ class TestMember(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1359,7 +1369,8 @@ class TestMember(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): self.delete(self.member_path_listener.format( member_id=api_member.get('id')), status=403) diff --git a/octavia/tests/functional/api/v2/test_pool.py b/octavia/tests/functional/api/v2/test_pool.py index 45327f1405..7910abda6f 100644 --- a/octavia/tests/functional/api/v2/test_pool.py +++ b/octavia/tests/functional/api/v2/test_pool.py @@ -96,7 +96,8 @@ class TestPool(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -135,7 +136,8 @@ class TestPool(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.POOL_PATH.format( pool_id=api_pool.get('id')), status=403) @@ -236,7 +238,8 @@ class TestPool(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', pool3['project_id']): override_credentials = { 'service_user_id': None, @@ -284,7 +287,8 @@ class TestPool(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', None): override_credentials = { 'service_user_id': None, @@ -327,7 +331,8 @@ class TestPool(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -378,7 +383,8 @@ class TestPool(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): pools = self.get(self.POOLS_PATH, status=403).json @@ -727,7 +733,8 @@ class TestPool(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -776,7 +783,8 @@ class TestPool(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): api_pool = self.create_pool( self.lb_id, @@ -1257,7 +1265,8 @@ class TestPool(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -1309,7 +1318,8 @@ class TestPool(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): api_pool = self.put( self.POOL_PATH.format(pool_id=api_pool.get('id')), @@ -2083,7 +2093,8 @@ class TestPool(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -2131,7 +2142,8 @@ class TestPool(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): self.delete(self.POOL_PATH.format(pool_id=api_pool.get('id')), status=403) diff --git a/octavia/tests/functional/api/v2/test_provider.py b/octavia/tests/functional/api/v2/test_provider.py index a4e97578fc..690b53022e 100644 --- a/octavia/tests/functional/api/v2/test_provider.py +++ b/octavia/tests/functional/api/v2/test_provider.py @@ -102,7 +102,8 @@ class TestFlavorCapabilities(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, @@ -226,7 +227,8 @@ class TestAvailabilityZoneCapabilities(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) project_id = uuidutils.generate_uuid() - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id): override_credentials = { 'service_user_id': None, diff --git a/octavia/tests/functional/api/v2/test_quotas.py b/octavia/tests/functional/api/v2/test_quotas.py index 0835f3c72d..7e7415ca68 100644 --- a/octavia/tests/functional/api/v2/test_quotas.py +++ b/octavia/tests/functional/api/v2/test_quotas.py @@ -168,7 +168,8 @@ class TestQuotas(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.QUOTAS_PATH, status=403) self.conf.config(group='api_settings', auth_strategy=auth_strategy) @@ -185,7 +186,8 @@ class TestQuotas(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project_id1): override_credentials = { 'service_user_id': None, @@ -225,7 +227,8 @@ class TestQuotas(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): override_credentials = { 'service_user_id': None, @@ -286,7 +289,8 @@ class TestQuotas(base.BaseAPITest): ).get(self.root_tag) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -332,7 +336,8 @@ class TestQuotas(base.BaseAPITest): ).get(self.root_tag) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -380,7 +385,8 @@ class TestQuotas(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project3_id): override_credentials = { 'service_user_id': None, @@ -425,7 +431,8 @@ class TestQuotas(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.KEYSTONE) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project3_id): override_credentials = { 'service_user_id': None, @@ -493,7 +500,8 @@ class TestQuotas(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project1_id): override_credentials = { 'service_user_id': None, @@ -526,7 +534,8 @@ class TestQuotas(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): quotas = self.get(self.QUOTA_PATH.format(project_id=project1_id), status=403) @@ -542,7 +551,8 @@ class TestQuotas(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project1_id): override_credentials = { 'service_user_id': None, @@ -575,7 +585,8 @@ class TestQuotas(base.BaseAPITest): auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', project1_id): override_credentials = { 'service_user_id': None, @@ -684,7 +695,8 @@ class TestQuotas(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -712,7 +724,8 @@ class TestQuotas(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', uuidutils.generate_uuid()): response = self.get(self.QUOTA_DEFAULT_PATH.format( project_id=self.project_id), status=403) @@ -737,7 +750,8 @@ class TestQuotas(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -769,7 +783,8 @@ class TestQuotas(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -847,7 +862,8 @@ class TestQuotas(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, @@ -883,7 +899,8 @@ class TestQuotas(base.BaseAPITest): self.conf = self.useFixture(oslo_fixture.Config(cfg.CONF)) auth_strategy = self.conf.conf.api_settings.get('auth_strategy') self.conf.config(group='api_settings', auth_strategy=constants.TESTING) - with mock.patch.object(octavia.common.context.Context, 'project_id', + with mock.patch.object(octavia.common.context.RequestContext, + 'project_id', self.project_id): override_credentials = { 'service_user_id': None, diff --git a/octavia/tests/unit/common/test_policy.py b/octavia/tests/unit/common/test_policy.py index 5fa154294c..edad63459b 100644 --- a/octavia/tests/unit/common/test_policy.py +++ b/octavia/tests/unit/common/test_policy.py @@ -46,7 +46,7 @@ class PolicyFileTestCase(base.TestCase): tmp.write('{"example:test": ""}') tmp.flush() - self.context = context.Context('fake', project_id='fake') + self.context = context.RequestContext('fake', project_id='fake') rule = oslo_policy.RuleDefault('example:test', "") policy.get_enforcer().register_defaults([rule]) @@ -73,8 +73,8 @@ class PolicyTestCase(base.TestCase): # https://bugs.launchpad.net/oslo.config/+bug/1645868 self.conf.conf.__call__(args=[]) policy.reset() - self.context = context.Context('fake', project_id='fake', - roles=['member']) + self.context = context.RequestContext('fake', project_id='fake', + roles=['member']) self.rules = [ oslo_policy.RuleDefault("true", "@"), @@ -153,8 +153,8 @@ class PolicyTestCase(base.TestCase): # NOTE(dprince) we mix case in the Admin role here to ensure # case is ignored - self.context = context.Context('admin', project_id='fake', - roles=['AdMiN']) + self.context = context.RequestContext('admin', project_id='fake', + roles=['AdMiN']) policy.get_enforcer().authorize(lowercase_action, self.target, self.context) @@ -169,16 +169,16 @@ class PolicyTestCase(base.TestCase): # This test and the conditional in common/policy.py can then # be removed in favor of test_check_is_admin_new_defaults(). def test_check_is_admin(self): - self.context = context.Context('admin', project_id='fake', - roles=['AdMiN']) + self.context = context.RequestContext('admin', project_id='fake', + roles=['AdMiN']) self.assertTrue(policy.get_enforcer().check_is_admin(self.context)) def test_check_is_admin_new_defaults(self): conf = oslo_fixture.Config(config.cfg.CONF) conf.config(group="oslo_policy", enforce_new_defaults=True) - self.context = context.Context('admin', roles=['AdMiN'], - system_scope='all') + self.context = context.RequestContext('admin', roles=['AdMiN'], + system_scope='all') self.assertTrue(policy.get_enforcer().check_is_admin(self.context)) @@ -197,7 +197,7 @@ class IsAdminCheckTestCase(base.TestCase): # https://bugs.launchpad.net/oslo.config/+bug/1645868 self.conf.conf.__call__(args=[]) - self.context = context.Context('fake', project_id='fake') + self.context = context.RequestContext('fake', project_id='fake') def test_init_true(self): check = policy.IsAdminCheck('is_admin', 'True') @@ -240,8 +240,8 @@ class AdminRolePolicyTestCase(base.TestCase): # https://bugs.launchpad.net/oslo.config/+bug/1645868 self.conf.conf.__call__(args=[]) - self.context = context.Context('fake', project_id='fake', - roles=['member']) + self.context = context.RequestContext('fake', project_id='fake', + roles=['member']) self.actions = policy.get_enforcer().get_rules().keys() self.target = {} diff --git a/octavia/tests/unit/controller/worker/v2/tasks/test_notification_tasks.py b/octavia/tests/unit/controller/worker/v2/tasks/test_notification_tasks.py index e336ced359..f74f6678fb 100644 --- a/octavia/tests/unit/controller/worker/v2/tasks/test_notification_tasks.py +++ b/octavia/tests/unit/controller/worker/v2/tasks/test_notification_tasks.py @@ -24,7 +24,8 @@ class MockNOTIFIER(mock.MagicMock): @mock.patch('octavia.common.rpc.NOTIFIER', new_callable=MockNOTIFIER) -@mock.patch('octavia.common.context.Context', new_callable=mock.MagicMock) +@mock.patch('octavia.common.context.RequestContext', + new_callable=mock.MagicMock) @mock.patch('octavia.api.v2.types.load_balancer.LoadBalancerFullResponse.' 'from_data_model', new_callable=mock.MagicMock) @@ -35,7 +36,7 @@ class TestNotificationTasks(base.TestCase): lb = {constants.PROJECT_ID: id, constants.LOADBALANCER_ID: id} noti.execute(lb) - octavia.common.context.Context.assert_called_with(project_id=id) + octavia.common.context.RequestContext.assert_called_with(project_id=id) call_args, call_kwargs = octavia.common.rpc.NOTIFIER.info.call_args self.assertEqual('octavia.loadbalancer.update.end', call_args[1]) @@ -45,7 +46,7 @@ class TestNotificationTasks(base.TestCase): lb = {constants.PROJECT_ID: id, constants.LOADBALANCER_ID: id} noti.execute(lb) - octavia.common.context.Context.assert_called_with(project_id=id) + octavia.common.context.RequestContext.assert_called_with(project_id=id) call_args, call_kwargs = octavia.common.rpc.NOTIFIER.info.call_args self.assertEqual('octavia.loadbalancer.create.end', call_args[1]) @@ -55,6 +56,6 @@ class TestNotificationTasks(base.TestCase): lb = {constants.PROJECT_ID: id, constants.LOADBALANCER_ID: id} noti.execute(lb) - octavia.common.context.Context.assert_called_with(project_id=id) + octavia.common.context.RequestContext.assert_called_with(project_id=id) call_args, call_kwargs = octavia.common.rpc.NOTIFIER.info.call_args self.assertEqual('octavia.loadbalancer.delete.end', call_args[1])