From ecd96996dda1dd70b2e72a8c8656a7a4b30886b4 Mon Sep 17 00:00:00 2001 From: Sean Mooney Date: Wed, 17 Sep 2025 07:43:48 +0100 Subject: [PATCH] apply pyupgrade to 3.10+ This commit was generated with pyupgrade --py310-plus $(git ls-files | grep .py) and formated with autopep8 Change-Id: I5f04fbad52edbcdd1ed6872b3447849128b95d08 Signed-off-by: Sean Mooney --- watcher/api/controllers/base.py | 2 +- watcher/api/controllers/v1/audit.py | 12 +++--- watcher/api/controllers/v1/audit_template.py | 2 +- watcher/api/controllers/v1/collection.py | 2 +- watcher/common/nova_helper.py | 2 +- .../decision_engine/datasources/gnocchi.py | 4 +- .../decision_engine/datasources/prometheus.py | 2 +- .../strategy/strategies/base.py | 4 +- .../strategies/basic_consolidation.py | 2 +- watcher/hacking/checks.py | 8 ++-- watcher/notifications/base.py | 6 +-- watcher/tests/api/v1/test_actions.py | 4 +- watcher/tests/api/v1/test_actions_plans.py | 18 ++++---- watcher/tests/api/v1/test_audit_templates.py | 22 +++++----- watcher/tests/api/v1/test_audits.py | 26 ++++++------ watcher/tests/api/v1/test_goals.py | 12 +++--- watcher/tests/api/v1/test_scoring_engines.py | 12 +++--- watcher/tests/api/v1/test_services.py | 14 +++---- watcher/tests/api/v1/test_strategies.py | 12 +++--- watcher/tests/common/loader/test_loader.py | 8 ++-- watcher/tests/conf/test_list_opts.py | 6 +-- watcher/tests/db/test_action_description.py | 2 +- watcher/tests/db/test_audit.py | 10 ++--- watcher/tests/db/test_audit_template.py | 4 +- watcher/tests/db/test_purge.py | 2 +- watcher/tests/db/test_scoring_engine.py | 2 +- watcher/tests/db/test_service.py | 2 +- watcher/tests/db/test_strategy.py | 4 +- .../audit/test_audit_handlers.py | 2 +- .../loading/test_collector_loader.py | 2 +- .../loading/test_default_strategy_loader.py | 2 +- .../loading/test_goal_loader.py | 2 +- .../model/faker_cluster_state.py | 12 +++--- .../decision_engine/model/gnocchi_metrics.py | 2 +- .../tests/decision_engine/model/test_model.py | 42 +++++++++---------- .../decision_engine/scope/test_compute.py | 36 ++++++++-------- .../decision_engine/scope/test_storage.py | 16 +++---- .../strategy/context/test_strategy_context.py | 4 +- 38 files changed, 163 insertions(+), 163 deletions(-) diff --git a/watcher/api/controllers/base.py b/watcher/api/controllers/base.py index 0b0e68141..d40d65e55 100644 --- a/watcher/api/controllers/base.py +++ b/watcher/api/controllers/base.py @@ -79,7 +79,7 @@ class Version: headers, default_version, latest_version) def __repr__(self): - return '%s.%s' % (self.major, self.minor) + return '{}.{}'.format(self.major, self.minor) @staticmethod def parse_headers(headers, default_version, latest_version): diff --git a/watcher/api/controllers/v1/audit.py b/watcher/api/controllers/v1/audit.py index 66b9df30d..f61fa0fc0 100644 --- a/watcher/api/controllers/v1/audit.py +++ b/watcher/api/controllers/v1/audit.py @@ -177,17 +177,17 @@ class AuditPostType(wtypes.Base): if self.strategy: strategy = _get_object_by_value(context, objects.Strategy, self.strategy) - self.name = "%s-%s" % (strategy.name, - timeutils.utcnow().isoformat()) + self.name = "{}-{}".format(strategy.name, + timeutils.utcnow().isoformat()) elif self.audit_template_uuid: audit_template = objects.AuditTemplate.get( context, self.audit_template_uuid) - self.name = "%s-%s" % (audit_template.name, - timeutils.utcnow().isoformat()) + self.name = "{}-{}".format(audit_template.name, + timeutils.utcnow().isoformat()) else: goal = _get_object_by_value(context, objects.Goal, self.goal) - self.name = "%s-%s" % (goal.name, - timeutils.utcnow().isoformat()) + self.name = "{}-{}".format(goal.name, + timeutils.utcnow().isoformat()) # No more than 63 characters if len(self.name) > 63: LOG.warning("Audit: %s length exceeds 63 characters", diff --git a/watcher/api/controllers/v1/audit_template.py b/watcher/api/controllers/v1/audit_template.py index 49527f3a4..35e0bb615 100644 --- a/watcher/api/controllers/v1/audit_template.py +++ b/watcher/api/controllers/v1/audit_template.py @@ -177,7 +177,7 @@ class AuditTemplatePostType(wtypes.Base): if strategy.goal_id != goal.id: available_strategies = objects.Strategy.list( AuditTemplatePostType._ctx) - choices = ["'%s' (%s)" % (s.uuid, s.name) + choices = ["'{}' ({})".format(s.uuid, s.name) for s in available_strategies] raise exception.InvalidStrategy( message=_( diff --git a/watcher/api/controllers/v1/collection.py b/watcher/api/controllers/v1/collection.py index 7fca387dd..45a7aa3ff 100644 --- a/watcher/api/controllers/v1/collection.py +++ b/watcher/api/controllers/v1/collection.py @@ -40,7 +40,7 @@ class Collection(base.APIBase): return wtypes.Unset resource_url = url or self._type - q_args = ''.join(['%s=%s&' % (key, kwargs[key]) for key in kwargs]) + q_args = ''.join(['{}={}&'.format(key, kwargs[key]) for key in kwargs]) next_args = '?%(args)slimit=%(limit)d&marker=%(marker)s' % { 'args': q_args, 'limit': limit, 'marker': getattr(self.collection[-1], marker_field)} diff --git a/watcher/common/nova_helper.py b/watcher/common/nova_helper.py index 7e6766d43..22827cdef 100644 --- a/watcher/common/nova_helper.py +++ b/watcher/common/nova_helper.py @@ -701,7 +701,7 @@ class NovaHelper: security_groups=sec_group_list, nics=net_list, block_device_mapping_v2=block_device_mapping_v2, - availability_zone="%s:%s" % (azone, node_id)) + availability_zone="{}:{}".format(azone, node_id)) # Poll at 5 second intervals, until the status is no longer 'BUILD' if instance: diff --git a/watcher/decision_engine/datasources/gnocchi.py b/watcher/decision_engine/datasources/gnocchi.py index a7ff11d90..c1d5b48d4 100644 --- a/watcher/decision_engine/datasources/gnocchi.py +++ b/watcher/decision_engine/datasources/gnocchi.py @@ -80,7 +80,7 @@ class GnocchiHelper(base.DataSourceBase): resource_id = resource.uuid if resource_type == 'compute_node': - resource_id = "%s_%s" % (resource.hostname, resource.hostname) + resource_id = "{}_{}".format(resource.hostname, resource.hostname) kwargs = dict(query={"=": {"original_resource_id": resource_id}}, limit=1) resources = self.query_retry( @@ -162,7 +162,7 @@ class GnocchiHelper(base.DataSourceBase): resource_id = resource.uuid if resource_type == 'compute_node': - resource_id = "%s_%s" % (resource.hostname, resource.hostname) + resource_id = "{}_{}".format(resource.hostname, resource.hostname) kwargs = dict(query={"=": {"original_resource_id": resource_id}}, limit=1) resources = self.query_retry( diff --git a/watcher/decision_engine/datasources/prometheus.py b/watcher/decision_engine/datasources/prometheus.py index 23ffa838f..8752629b7 100644 --- a/watcher/decision_engine/datasources/prometheus.py +++ b/watcher/decision_engine/datasources/prometheus.py @@ -91,7 +91,7 @@ class PrometheusHelper(prometheus_base.PrometheusBase): % {'host': _host, 'port': _port, 'reason': reason}) ) the_client = prometheus_client.PrometheusAPIClient( - "%s:%s" % (_host, _port)) + "{}:{}".format(_host, _port)) # check if tls options or basic_auth options are set and use them prometheus_user = CONF.prometheus_client.username diff --git a/watcher/decision_engine/strategy/strategies/base.py b/watcher/decision_engine/strategy/strategies/base.py index de4583769..cf4a72297 100644 --- a/watcher/decision_engine/strategy/strategies/base.py +++ b/watcher/decision_engine/strategy/strategies/base.py @@ -84,8 +84,8 @@ class StrategyEndpoint: if not datasource: state = "Datasource is not presented for this strategy" else: - state = "%s: %s" % (datasource.NAME, - datasource.check_availability()) + state = "{}: {}".format(datasource.NAME, + datasource.check_availability()) return {'type': 'Datasource', 'state': state, 'mandatory': True, 'comment': ''} diff --git a/watcher/decision_engine/strategy/strategies/basic_consolidation.py b/watcher/decision_engine/strategy/strategies/basic_consolidation.py index 8cc07a2b1..aabd227bb 100644 --- a/watcher/decision_engine/strategy/strategies/basic_consolidation.py +++ b/watcher/decision_engine/strategy/strategies/basic_consolidation.py @@ -283,7 +283,7 @@ class BasicConsolidation(base.ServerConsolidationBaseStrategy): host_avg_cpu_util = self.get_compute_node_cpu_usage(node) if host_avg_cpu_util is None: - resource_id = "%s_%s" % (node.uuid, node.hostname) + resource_id = "{}_{}".format(node.uuid, node.hostname) LOG.error( "No values returned by %(resource_id)s " "for %(metric_name)s", dict( diff --git a/watcher/hacking/checks.py b/watcher/hacking/checks.py index 4332937f3..df7bf0818 100644 --- a/watcher/hacking/checks.py +++ b/watcher/hacking/checks.py @@ -52,10 +52,10 @@ _all_hints = set(_all_log_levels.values()) def _regex_for_level(level, hint): - return r".*LOG\.%(level)s\(\s*((%(wrong_hints)s)\(|'|\")" % { - 'level': level, - 'wrong_hints': '|'.join(_all_hints - {hint}), - } + return r".*LOG\.{level}\(\s*(({wrong_hints})\(|'|\")".format( + level=level, + wrong_hints='|'.join(_all_hints - {hint}), + ) log_warn = re.compile( diff --git a/watcher/notifications/base.py b/watcher/notifications/base.py index cfc69e3db..fe428468f 100644 --- a/watcher/notifications/base.py +++ b/watcher/notifications/base.py @@ -72,7 +72,7 @@ class EventType(NotificationObject): def to_notification_event_type_field(self): """Serialize the object to the wire format.""" - s = '%s.%s' % (self.object, self.action) + s = '{}.{}'.format(self.object, self.action) if self.obj_attr_is_set('phase'): s += '.%s' % self.phase return s @@ -192,8 +192,8 @@ class NotificationBase(NotificationObject): self._emit( context, event_type=self.event_type.to_notification_event_type_field(), - publisher_id='%s:%s' % (self.publisher.binary, - self.publisher.host), + publisher_id='{}:{}'.format(self.publisher.binary, + self.publisher.host), payload=self.payload.obj_to_primitive()) diff --git a/watcher/tests/api/v1/test_actions.py b/watcher/tests/api/v1/test_actions.py index b9275b9d5..2baae670c 100644 --- a/watcher/tests/api/v1/test_actions.py +++ b/watcher/tests/api/v1/test_actions.py @@ -237,7 +237,7 @@ class TestListAction(api_base.FunctionalTest): audit2 = obj_utils.create_test_audit( self.context, id=2, uuid=utils.generate_uuid(), - name='My Audit {}'.format(2)) + name=f'My Audit {2}') action_plan_2 = obj_utils.create_test_action_plan( self.context, uuid=utils.generate_uuid(), @@ -329,7 +329,7 @@ class TestListAction(api_base.FunctionalTest): self.context, uuid=utils.generate_uuid(), audit_id=self.audit.id) - url = '/actions?action_plan_uuid=%s&audit_uuid=%s' % ( + url = '/actions?action_plan_uuid={}&audit_uuid={}'.format( action_plan.uuid, self.audit.uuid) response = self.get_json(url, expect_errors=True) self.assertEqual(HTTPStatus.BAD_REQUEST, response.status_int) diff --git a/watcher/tests/api/v1/test_actions_plans.py b/watcher/tests/api/v1/test_actions_plans.py index ca3e559cf..8b321e267 100644 --- a/watcher/tests/api/v1/test_actions_plans.py +++ b/watcher/tests/api/v1/test_actions_plans.py @@ -189,10 +189,10 @@ class TestListActionPlan(api_base.FunctionalTest): action_plan_list = [] audit1 = obj_utils.create_test_audit( self.context, id=2, - uuid=utils.generate_uuid(), name='My Audit {}'.format(2)) + uuid=utils.generate_uuid(), name=f'My Audit {2}') audit2 = obj_utils.create_test_audit( self.context, id=3, - uuid=utils.generate_uuid(), name='My Audit {}'.format(3)) + uuid=utils.generate_uuid(), name=f'My Audit {3}') for id_ in range(0, 2): action_plan = obj_utils.create_test_action_plan( @@ -229,7 +229,7 @@ class TestListActionPlan(api_base.FunctionalTest): action_plan_list = [] audit = obj_utils.create_test_audit( self.context, id=2, - uuid=utils.generate_uuid(), name='My Audit {}'.format(2)) + uuid=utils.generate_uuid(), name=f'My Audit {2}') for id_ in range(2, 5): action_plan = obj_utils.create_test_action_plan( self.context, id=id_, uuid=utils.generate_uuid(), @@ -244,7 +244,7 @@ class TestListActionPlan(api_base.FunctionalTest): action_plan_list1 = [] audit1 = obj_utils.create_test_audit( self.context, id=2, - uuid=utils.generate_uuid(), name='My Audit {}'.format(2)) + uuid=utils.generate_uuid(), name=f'My Audit {2}') for id_ in range(2, 5): action_plan = obj_utils.create_test_action_plan( self.context, id=id_, uuid=utils.generate_uuid(), @@ -253,7 +253,7 @@ class TestListActionPlan(api_base.FunctionalTest): audit2 = obj_utils.create_test_audit( self.context, id=3, - uuid=utils.generate_uuid(), name='My Audit {}'.format(3)) + uuid=utils.generate_uuid(), name=f'My Audit {3}') action_plan_list2 = [] for id_ in [5, 6, 7]: action_plan = obj_utils.create_test_action_plan( @@ -303,7 +303,7 @@ class TestListActionPlan(api_base.FunctionalTest): for id_ in range(2, 5): audit = obj_utils.create_test_audit( self.context, id=id_, - uuid=utils.generate_uuid(), name='My Audit {}'.format(id_)) + uuid=utils.generate_uuid(), name=f'My Audit {id_}') obj_utils.create_test_action_plan( self.context, id=id_, uuid=utils.generate_uuid(), audit_id=audit.id) @@ -616,7 +616,7 @@ class TestPatchStateTransitionDenied(api_base.FunctionalTest): scenarios = [ ( - "%s -> %s" % (original_state, new_state), + "{} -> {}".format(original_state, new_state), {"original_state": original_state, "new_state": new_state}, ) @@ -666,8 +666,8 @@ class TestPatchStateTransitionOk(api_base.FunctionalTest): scenarios = [ ( - "%s -> %s" % (transition["original_state"], - transition["new_state"]), + "{} -> {}".format(transition["original_state"], + transition["new_state"]), transition ) for transition in ALLOWED_TRANSITIONS diff --git a/watcher/tests/api/v1/test_audit_templates.py b/watcher/tests/api/v1/test_audit_templates.py index afca25c02..157ddc49a 100644 --- a/watcher/tests/api/v1/test_audit_templates.py +++ b/watcher/tests/api/v1/test_audit_templates.py @@ -161,7 +161,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): audit_template = obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_)) + name=f'My Audit Template {id_}') audit_template_list.append(audit_template) response = self.get_json('/audit_templates') @@ -177,7 +177,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): for id_ in range(1, 6): audit_template = obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_)) + name=f'My Audit Template {id_}') audit_template_list.append(audit_template) # We soft delete the ones with ID 4 and 5 @@ -195,7 +195,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): for id_ in range(1, 6): audit_template = obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_)) + name=f'My Audit Template {id_}') audit_template_list.append(audit_template) # We soft delete the ones with ID 4 and 5 @@ -225,7 +225,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): for id_ in range(5): obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_)) + name=f'My Audit Template {id_}') response = self.get_json('/audit_templates/?limit=3') self.assertEqual(3, len(response['audit_templates'])) @@ -237,7 +237,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): for id_ in range(5): obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_)) + name=f'My Audit Template {id_}') response = self.get_json('/audit_templates') self.assertEqual(3, len(response['audit_templates'])) @@ -250,7 +250,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): itertools.repeat(self.fake_goal2.id, 2)]), 1): obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_), + name=f'My Audit Template {id_}', goal_id=goal_id) response = self.get_json( @@ -263,7 +263,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): itertools.repeat(self.fake_goal2.id, 2)]), 1): obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_), + name=f'My Audit Template {id_}', goal_id=goal_id) response = self.get_json( @@ -276,7 +276,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): itertools.repeat(self.fake_strategy2.id, 2)]), 1): obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_), + name=f'My Audit Template {id_}', strategy_id=strategy_id) response = self.get_json( @@ -289,7 +289,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): itertools.repeat(self.fake_strategy2.id, 2)]), 1): obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_), + name=f'My Audit Template {id_}', strategy_id=strategy_id) response = self.get_json( @@ -301,7 +301,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): for id_ in range(1, 6): audit_template = obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_)) + name=f'My Audit Template {id_}') audit_template_list.append(audit_template) response = self.get_json('/audit_templates?sort_key=%s' % 'name') @@ -319,7 +319,7 @@ class TestListAuditTemplate(FunctionalTestWithSetup): itertools.repeat(self.fake_goal2.id, 2)]), 1): audit_template = obj_utils.create_test_audit_template( self.context, id=id_, uuid=utils.generate_uuid(), - name='My Audit Template {}'.format(id_), + name=f'My Audit Template {id_}', goal_id=goal_id) goal_names_list.append(audit_template.goal.name) diff --git a/watcher/tests/api/v1/test_audits.py b/watcher/tests/api/v1/test_audits.py index f83b1ccb2..d5c1ae700 100644 --- a/watcher/tests/api/v1/test_audits.py +++ b/watcher/tests/api/v1/test_audits.py @@ -214,7 +214,7 @@ class TestListAudit(api_base.FunctionalTest): for id_ in range(5): audit = obj_utils.create_test_audit( self.context, id=id_, - uuid=utils.generate_uuid(), name='My Audit {}'.format(id_)) + uuid=utils.generate_uuid(), name=f'My Audit {id_}') audit_list.append(audit.uuid) response = self.get_json('/audits') self.assertEqual(len(audit_list), len(response['audits'])) @@ -226,12 +226,12 @@ class TestListAudit(api_base.FunctionalTest): for id_ in [1, 2, 3]: audit = obj_utils.create_test_audit( self.context, id=id_, - uuid=utils.generate_uuid(), name='My Audit {}'.format(id_)) + uuid=utils.generate_uuid(), name=f'My Audit {id_}') audit_list.append(audit.uuid) for id_ in [4, 5]: audit = obj_utils.create_test_audit( self.context, id=id_, - uuid=utils.generate_uuid(), name='My Audit {}'.format(id_)) + uuid=utils.generate_uuid(), name=f'My Audit {id_}') audit.soft_delete() response = self.get_json('/audits') self.assertEqual(3, len(response['audits'])) @@ -243,12 +243,12 @@ class TestListAudit(api_base.FunctionalTest): for id_ in [1, 2, 3]: audit = obj_utils.create_test_audit( self.context, id=id_, - uuid=utils.generate_uuid(), name='My Audit {}'.format(id_)) + uuid=utils.generate_uuid(), name=f'My Audit {id_}') audit_list.append(audit.uuid) for id_ in [4, 5]: audit = obj_utils.create_test_audit( self.context, id=id_, - uuid=utils.generate_uuid(), name='My Audit {}'.format(id_)) + uuid=utils.generate_uuid(), name=f'My Audit {id_}') audit.soft_delete() audit_list.append(audit.uuid) response = self.get_json('/audits', @@ -262,11 +262,11 @@ class TestListAudit(api_base.FunctionalTest): for id_ in range(5): goal = obj_utils.create_test_goal( self.context, - name='gl{}'.format(id_), + name=f'gl{id_}', uuid=utils.generate_uuid()) obj_utils.create_test_audit( self.context, id=id_, uuid=utils.generate_uuid(), - goal_id=goal.id, name='My Audit {}'.format(id_)) + goal_id=goal.id, name=f'My Audit {id_}') goal_list.append(goal.uuid) response = self.get_json('/audits/?sort_key=goal_uuid') @@ -285,7 +285,7 @@ class TestListAudit(api_base.FunctionalTest): uuid = utils.generate_uuid() obj_utils.create_test_audit( self.context, id=1, uuid=uuid, - name='My Audit {}'.format(1)) + name=f'My Audit {1}') response = self.get_json('/audits/%s' % uuid) self.assertIn('links', response.keys()) self.assertEqual(2, len(response['links'])) @@ -299,7 +299,7 @@ class TestListAudit(api_base.FunctionalTest): for id_ in range(5): obj_utils.create_test_audit( self.context, id=id_, - uuid=utils.generate_uuid(), name='My Audit {}'.format(id_)) + uuid=utils.generate_uuid(), name=f'My Audit {id_}') response = self.get_json('/audits/?limit=3') self.assertEqual(3, len(response['audits'])) @@ -311,7 +311,7 @@ class TestListAudit(api_base.FunctionalTest): for id_ in range(5): obj_utils.create_test_audit( self.context, id=id_, - uuid=utils.generate_uuid(), name='My Audit {}'.format(id_)) + uuid=utils.generate_uuid(), name=f'My Audit {id_}') response = self.get_json('/audits') self.assertEqual(3, len(response['audits'])) @@ -442,7 +442,7 @@ class TestPatchStateTransitionDenied(api_base.FunctionalTest): scenarios = [ ( - "%s -> %s" % (original_state, new_state), + "{} -> {}".format(original_state, new_state), {"original_state": original_state, "new_state": new_state}, ) @@ -490,8 +490,8 @@ class TestPatchStateTransitionOk(api_base.FunctionalTest): scenarios = [ ( - "%s -> %s" % (transition["original_state"], - transition["new_state"]), + "{} -> {}".format(transition["original_state"], + transition["new_state"]), transition ) for transition in ALLOWED_TRANSITIONS diff --git a/watcher/tests/api/v1/test_goals.py b/watcher/tests/api/v1/test_goals.py index ff5dd6c6a..505429f8e 100644 --- a/watcher/tests/api/v1/test_goals.py +++ b/watcher/tests/api/v1/test_goals.py @@ -80,7 +80,7 @@ class TestListGoal(api_base.FunctionalTest): goal = obj_utils.create_test_goal( self.context, id=idx, uuid=utils.generate_uuid(), - name='GOAL_{}'.format(idx)) + name=f'GOAL_{idx}') goal_list.append(goal.uuid) response = self.get_json('/goals') self.assertGreater(len(response['goals']), 2) @@ -90,12 +90,12 @@ class TestListGoal(api_base.FunctionalTest): for id_ in [1, 2, 3]: goal = obj_utils.create_test_goal( self.context, id=id_, uuid=utils.generate_uuid(), - name='GOAL_{}'.format(id_)) + name=f'GOAL_{id_}') goal_list.append(goal.uuid) for id_ in [4, 5]: goal = obj_utils.create_test_goal( self.context, id=id_, uuid=utils.generate_uuid(), - name='GOAL_{}'.format(id_)) + name=f'GOAL_{id_}') goal.soft_delete() response = self.get_json('/goals') self.assertEqual(3, len(response['goals'])) @@ -107,7 +107,7 @@ class TestListGoal(api_base.FunctionalTest): obj_utils.create_test_goal( self.context, id=idx, uuid=utils.generate_uuid(), - name='GOAL_{}'.format(idx)) + name=f'GOAL_{idx}') response = self.get_json('/goals/?limit=2') self.assertEqual(2, len(response['goals'])) @@ -116,7 +116,7 @@ class TestListGoal(api_base.FunctionalTest): obj_utils.create_test_goal( self.context, id=idx, uuid=utils.generate_uuid(), - name='GOAL_{}'.format(idx)) + name=f'GOAL_{idx}') cfg.CONF.set_override('max_limit', 3, 'api') response = self.get_json('/goals') self.assertEqual(3, len(response['goals'])) @@ -127,7 +127,7 @@ class TestListGoal(api_base.FunctionalTest): goal = obj_utils.create_test_goal( self.context, id=idx, uuid=utils.generate_uuid(), - name='GOAL_{}'.format(idx)) + name=f'GOAL_{idx}') goal_list.append(goal.uuid) response = self.get_json('/goals/?sort_key=uuid') diff --git a/watcher/tests/api/v1/test_scoring_engines.py b/watcher/tests/api/v1/test_scoring_engines.py index 048ae9283..7c947218b 100644 --- a/watcher/tests/api/v1/test_scoring_engines.py +++ b/watcher/tests/api/v1/test_scoring_engines.py @@ -71,7 +71,7 @@ class TestListScoringEngine(api_base.FunctionalTest): for idx in range(1, 6): scoring_engine = obj_utils.create_test_scoring_engine( self.context, id=idx, uuid=utils.generate_uuid(), - name=str(idx), description='SE_{}'.format(idx)) + name=str(idx), description=f'SE_{idx}') scoring_engine_list.append(scoring_engine.name) response = self.get_json('/scoring_engines') self.assertEqual(5, len(response['scoring_engines'])) @@ -85,12 +85,12 @@ class TestListScoringEngine(api_base.FunctionalTest): for id_ in [1, 2, 3]: scoring_engine = obj_utils.create_test_scoring_engine( self.context, id=id_, uuid=utils.generate_uuid(), - name=str(id_), description='SE_{}'.format(id_)) + name=str(id_), description=f'SE_{id_}') scoring_engine_list.append(scoring_engine.name) for id_ in [4, 5]: scoring_engine = obj_utils.create_test_scoring_engine( self.context, id=id_, uuid=utils.generate_uuid(), - name=str(id_), description='SE_{}'.format(id_)) + name=str(id_), description=f'SE_{id_}') scoring_engine.soft_delete() response = self.get_json('/scoring_engines') self.assertEqual(3, len(response['scoring_engines'])) @@ -101,7 +101,7 @@ class TestListScoringEngine(api_base.FunctionalTest): for idx in range(1, 6): obj_utils.create_test_scoring_engine( self.context, id=idx, uuid=utils.generate_uuid(), - name=str(idx), description='SE_{}'.format(idx)) + name=str(idx), description=f'SE_{idx}') response = self.get_json('/scoring_engines/?limit=2') self.assertEqual(2, len(response['scoring_engines'])) @@ -109,7 +109,7 @@ class TestListScoringEngine(api_base.FunctionalTest): for idx in range(1, 6): obj_utils.create_test_scoring_engine( self.context, id=idx, uuid=utils.generate_uuid(), - name=str(idx), description='SE_{}'.format(idx)) + name=str(idx), description=f'SE_{idx}') cfg.CONF.set_override('max_limit', 3, 'api') response = self.get_json('/scoring_engines') self.assertEqual(3, len(response['scoring_engines'])) @@ -119,7 +119,7 @@ class TestListScoringEngine(api_base.FunctionalTest): for idx in range(1, 6): scoring_engine = obj_utils.create_test_scoring_engine( self.context, id=idx, uuid=utils.generate_uuid(), - name=str(idx), description='SE_{}'.format(idx)) + name=str(idx), description=f'SE_{idx}') scoring_engine_list.append(scoring_engine.uuid) response = self.get_json('/scoring_engines/?sort_key=uuid') diff --git a/watcher/tests/api/v1/test_services.py b/watcher/tests/api/v1/test_services.py index 3726111a2..5b5cd92b2 100644 --- a/watcher/tests/api/v1/test_services.py +++ b/watcher/tests/api/v1/test_services.py @@ -82,12 +82,12 @@ class TestListService(api_base.FunctionalTest): for idx in range(1, 4): service = obj_utils.create_test_service( self.context, id=idx, host='CONTROLLER1', - name='SERVICE_{}'.format(idx)) + name=f'SERVICE_{idx}') service_list.append(service.id) for idx in range(1, 4): service = obj_utils.create_test_service( self.context, id=3+idx, host='CONTROLLER2', - name='SERVICE_{}'.format(idx)) + name=f'SERVICE_{idx}') service_list.append(service.id) response = self.get_json('/services') self.assertEqual(6, len(response['services'])) @@ -101,12 +101,12 @@ class TestListService(api_base.FunctionalTest): for id_ in [1, 2, 3]: service = obj_utils.create_test_service( self.context, id=id_, host='CONTROLLER', - name='SERVICE_{}'.format(id_)) + name=f'SERVICE_{id_}') service_list.append(service.id) for id_ in [4, 5]: service = obj_utils.create_test_service( self.context, id=id_, host='CONTROLLER', - name='SERVICE_{}'.format(id_)) + name=f'SERVICE_{id_}') service.soft_delete() response = self.get_json('/services') self.assertEqual(3, len(response['services'])) @@ -118,7 +118,7 @@ class TestListService(api_base.FunctionalTest): obj_utils.create_test_service( self.context, id=idx, host='CONTROLLER', - name='SERVICE_{}'.format(idx)) + name=f'SERVICE_{idx}') response = self.get_json('/services/?limit=2') self.assertEqual(2, len(response['services'])) @@ -127,7 +127,7 @@ class TestListService(api_base.FunctionalTest): obj_utils.create_test_service( self.context, id=idx, host='CONTROLLER', - name='SERVICE_{}'.format(idx)) + name=f'SERVICE_{idx}') cfg.CONF.set_override('max_limit', 3, 'api') response = self.get_json('/services') self.assertEqual(3, len(response['services'])) @@ -137,7 +137,7 @@ class TestListService(api_base.FunctionalTest): for id_ in range(1, 4): service = obj_utils.create_test_service( self.context, id=id_, host='CONTROLLER', - name='SERVICE_{}'.format(id_)) + name=f'SERVICE_{id_}') service_list.append(service.name) response = self.get_json('/services/?sort_key=name') diff --git a/watcher/tests/api/v1/test_strategies.py b/watcher/tests/api/v1/test_strategies.py index 3357905a5..b5d4701c5 100644 --- a/watcher/tests/api/v1/test_strategies.py +++ b/watcher/tests/api/v1/test_strategies.py @@ -113,7 +113,7 @@ class TestListStrategy(api_base.FunctionalTest): strategy = obj_utils.create_test_strategy( self.context, id=idx, uuid=utils.generate_uuid(), - name='STRATEGY_{}'.format(idx)) + name=f'STRATEGY_{idx}') strategy_list.append(strategy.uuid) response = self.get_json('/strategies') self.assertEqual(5, len(response['strategies'])) @@ -127,12 +127,12 @@ class TestListStrategy(api_base.FunctionalTest): for id_ in [1, 2, 3]: strategy = obj_utils.create_test_strategy( self.context, id=id_, uuid=utils.generate_uuid(), - name='STRATEGY_{}'.format(id_)) + name=f'STRATEGY_{id_}') strategy_list.append(strategy.uuid) for id_ in [4, 5]: strategy = obj_utils.create_test_strategy( self.context, id=id_, uuid=utils.generate_uuid(), - name='STRATEGY_{}'.format(id_)) + name=f'STRATEGY_{id_}') strategy.soft_delete() response = self.get_json('/strategies') self.assertEqual(3, len(response['strategies'])) @@ -144,7 +144,7 @@ class TestListStrategy(api_base.FunctionalTest): obj_utils.create_test_strategy( self.context, id=idx, uuid=utils.generate_uuid(), - name='STRATEGY_{}'.format(idx)) + name=f'STRATEGY_{idx}') response = self.get_json('/strategies/?limit=2') self.assertEqual(2, len(response['strategies'])) @@ -153,7 +153,7 @@ class TestListStrategy(api_base.FunctionalTest): obj_utils.create_test_strategy( self.context, id=idx, uuid=utils.generate_uuid(), - name='STRATEGY_{}'.format(idx)) + name=f'STRATEGY_{idx}') cfg.CONF.set_override('max_limit', 3, 'api') response = self.get_json('/strategies') self.assertEqual(3, len(response['strategies'])) @@ -228,7 +228,7 @@ class TestListStrategy(api_base.FunctionalTest): strategy = obj_utils.create_test_strategy( self.context, id=idx, uuid=utils.generate_uuid(), - name='STRATEGY_{}'.format(idx)) + name=f'STRATEGY_{idx}') goals_uuid_list.append(strategy.goal.uuid) response = self.get_json('/strategies/?sort_key=goal_uuid') diff --git a/watcher/tests/common/loader/test_loader.py b/watcher/tests/common/loader/test_loader.py index da30a9669..3afadd997 100644 --- a/watcher/tests/common/loader/test_loader.py +++ b/watcher/tests/common/loader/test_loader.py @@ -55,8 +55,8 @@ class TestLoader(base.TestCase): fake_driver = drivermanager.DriverManager.make_test_instance( extension=stevedore_extension.Extension( name="fake", - entry_point="%s:%s" % (FakeLoadable.__module__, - FakeLoadable.__name__), + entry_point="{}:{}".format(FakeLoadable.__module__, + FakeLoadable.__name__), plugin=FakeLoadable, obj=None), namespace="TESTING") @@ -81,8 +81,8 @@ class TestLoader(base.TestCase): fake_driver = drivermanager.DriverManager.make_test_instance( extension=stevedore_extension.Extension( name="fake", - entry_point="%s:%s" % (FakeLoadableWithOpts.__module__, - FakeLoadableWithOpts.__name__), + entry_point="{}:{}".format(FakeLoadableWithOpts.__module__, + FakeLoadableWithOpts.__name__), plugin=FakeLoadableWithOpts, obj=None), namespace="TESTING") diff --git a/watcher/tests/conf/test_list_opts.py b/watcher/tests/conf/test_list_opts.py index 216c858b5..7b4f6be8e 100644 --- a/watcher/tests/conf/test_list_opts.py +++ b/watcher/tests/conf/test_list_opts.py @@ -77,7 +77,7 @@ class TestListOpts(base.TestCase): fake_extmanager_call = extension.ExtensionManager.make_test_instance( extensions=[extension.Extension( name=fake_strategies.FakeDummy1Strategy2.get_name(), - entry_point="%s:%s" % ( + entry_point="{}:{}".format( fake_strategies.FakeDummy1Strategy2.__module__, fake_strategies.FakeDummy1Strategy2.__name__), plugin=fake_strategies.FakeDummy1Strategy2, @@ -107,7 +107,7 @@ class TestListOpts(base.TestCase): fake_extmanager_call = extension.ExtensionManager.make_test_instance( extensions=[extension.Extension( name=fake_strategies.FakeDummy1Strategy1.get_name(), - entry_point="%s:%s" % ( + entry_point="{}:{}".format( fake_strategies.FakeDummy1Strategy1.__module__, fake_strategies.FakeDummy1Strategy1.__name__), plugin=fake_strategies.FakeDummy1Strategy1, @@ -142,7 +142,7 @@ class TestPlugins(base.TestCase): fake_extmanager_call = extension.ExtensionManager.make_test_instance( extensions=[extension.Extension( name=fake_strategies.FakeDummy1Strategy1.get_name(), - entry_point="%s:%s" % ( + entry_point="{}:{}".format( fake_strategies.FakeDummy1Strategy1.__module__, fake_strategies.FakeDummy1Strategy1.__name__), plugin=fake_strategies.FakeDummy1Strategy1, diff --git a/watcher/tests/db/test_action_description.py b/watcher/tests/db/test_action_description.py index 56f412e93..9c5f3e4c5 100644 --- a/watcher/tests/db/test_action_description.py +++ b/watcher/tests/db/test_action_description.py @@ -237,7 +237,7 @@ class DbActionDescriptionTestCase(base.DbTestCase): action_desc = utils.create_test_action_desc( id=i, action_type="action_%s" % i, - description="description_{}".format(i)) + description=f"description_{i}") ids.append(action_desc['id']) action_descs = self.dbapi.get_action_description_list(self.context) action_desc_ids = [s.id for s in action_descs] diff --git a/watcher/tests/db/test_audit.py b/watcher/tests/db/test_audit.py index 7417a0874..8df3a5906 100644 --- a/watcher/tests/db/test_audit.py +++ b/watcher/tests/db/test_audit.py @@ -271,7 +271,7 @@ class DbAuditTestCase(base.DbTestCase): uuids = [] for id_ in range(1, 4): audit = utils.create_test_audit(uuid=w_utils.generate_uuid(), - name='My Audit {}'.format(id_)) + name=f'My Audit {id_}') uuids.append(str(audit['uuid'])) audits = self.dbapi.get_audit_list(self.context) audit_uuids = [a.uuid for a in audits] @@ -290,7 +290,7 @@ class DbAuditTestCase(base.DbTestCase): for i in range(1, 4): audit = utils.create_test_audit( id=i, uuid=w_utils.generate_uuid(), - name='My Audit {}'.format(i), + name=f'My Audit {i}', goal_id=goal.id, strategy_id=strategy.id) uuids.append(str(audit['uuid'])) audits = self.dbapi.get_audit_list(self.context, eager=True) @@ -307,21 +307,21 @@ class DbAuditTestCase(base.DbTestCase): id=1, audit_type=objects.audit.AuditType.ONESHOT.value, uuid=w_utils.generate_uuid(), - name='My Audit {}'.format(1), + name=f'My Audit {1}', state=objects.audit.State.ONGOING, goal_id=goal['id']) audit2 = utils.create_test_audit( id=2, audit_type=objects.audit.AuditType.CONTINUOUS.value, uuid=w_utils.generate_uuid(), - name='My Audit {}'.format(2), + name=f'My Audit {2}', state=objects.audit.State.PENDING, goal_id=goal['id']) audit3 = utils.create_test_audit( id=3, audit_type=objects.audit.AuditType.CONTINUOUS.value, uuid=w_utils.generate_uuid(), - name='My Audit {}'.format(3), + name=f'My Audit {3}', state=objects.audit.State.ONGOING, goal_id=goal['id']) diff --git a/watcher/tests/db/test_audit_template.py b/watcher/tests/db/test_audit_template.py index d88843c46..b59b56be6 100644 --- a/watcher/tests/db/test_audit_template.py +++ b/watcher/tests/db/test_audit_template.py @@ -233,7 +233,7 @@ class DbAuditTemplateTestCase(base.DbTestCase): audit_template = utils.create_test_audit_template( id=i, uuid=w_utils.generate_uuid(), - name='My Audit Template {}'.format(i)) + name=f'My Audit Template {i}') uuids.append(str(audit_template['uuid'])) audit_templates = self.dbapi.get_audit_template_list(self.context) audit_template_uuids = [at.uuid for at in audit_templates] @@ -252,7 +252,7 @@ class DbAuditTemplateTestCase(base.DbTestCase): for i in range(1, 4): audit_template = utils.create_test_audit_template( id=i, uuid=w_utils.generate_uuid(), - name='My Audit Template {}'.format(i), + name=f'My Audit Template {i}', goal_id=goal.id, strategy_id=strategy.id) uuids.append(str(audit_template['uuid'])) audit_templates = self.dbapi.get_audit_template_list( diff --git a/watcher/tests/db/test_purge.py b/watcher/tests/db/test_purge.py index f9a75fdbc..bb132b168 100644 --- a/watcher/tests/db/test_purge.py +++ b/watcher/tests/db/test_purge.py @@ -73,7 +73,7 @@ class TestPurgeCommand(base.DbTestCase): seed += 1 def generate_unique_name(self, prefix): - return "%s%s" % (prefix, uuidutils.generate_uuid()) + return "{}{}".format(prefix, uuidutils.generate_uuid()) def _data_setup(self): # All the 1's are soft_deleted and are expired diff --git a/watcher/tests/db/test_scoring_engine.py b/watcher/tests/db/test_scoring_engine.py index ad759119e..b92b06c15 100644 --- a/watcher/tests/db/test_scoring_engine.py +++ b/watcher/tests/db/test_scoring_engine.py @@ -233,7 +233,7 @@ class DbScoringEngineTestCase(base.DbTestCase): id=i, uuid=w_utils.generate_uuid(), name="SE_ID_%s" % i, - description='My ScoringEngine {}'.format(i), + description=f'My ScoringEngine {i}', metainfo='a{0}=b{0}'.format(i)) names.append(str(scoring_engine['name'])) scoring_engines = self.dbapi.get_scoring_engine_list(self.context) diff --git a/watcher/tests/db/test_service.py b/watcher/tests/db/test_service.py index 68a2e5f03..a441bbe6e 100644 --- a/watcher/tests/db/test_service.py +++ b/watcher/tests/db/test_service.py @@ -234,7 +234,7 @@ class DbServiceTestCase(base.DbTestCase): service = utils.create_test_service( id=i, name="SERVICE_ID_%s" % i, - host="controller_{}".format(i)) + host=f"controller_{i}") ids.append(service['id']) services = self.dbapi.get_service_list(self.context) service_ids = [s.id for s in services] diff --git a/watcher/tests/db/test_strategy.py b/watcher/tests/db/test_strategy.py index 90329e7cf..4bf390c3c 100644 --- a/watcher/tests/db/test_strategy.py +++ b/watcher/tests/db/test_strategy.py @@ -244,7 +244,7 @@ class DbStrategyTestCase(base.DbTestCase): id=i, uuid=w_utils.generate_uuid(), name="STRATEGY_ID_%s" % i, - display_name='My Strategy {}'.format(i)) + display_name=f'My Strategy {i}') uuids.append(str(strategy['uuid'])) strategies = self.dbapi.get_strategy_list(self.context) strategy_uuids = [s.uuid for s in strategies] @@ -261,7 +261,7 @@ class DbStrategyTestCase(base.DbTestCase): id=i, uuid=w_utils.generate_uuid(), name="STRATEGY_ID_%s" % i, - display_name='My Strategy {}'.format(i), + display_name=f'My Strategy {i}', goal_id=goal.id) uuids.append(str(strategy['uuid'])) strategys = self.dbapi.get_strategy_list(self.context, eager=True) diff --git a/watcher/tests/decision_engine/audit/test_audit_handlers.py b/watcher/tests/decision_engine/audit/test_audit_handlers.py index 4a409937a..f17fc310a 100644 --- a/watcher/tests/decision_engine/audit/test_audit_handlers.py +++ b/watcher/tests/decision_engine/audit/test_audit_handlers.py @@ -252,7 +252,7 @@ class TestContinuousAuditHandler(base.DbTestCase): obj_utils.create_test_audit( self.context, id=id_, - name='My Audit {}'.format(id_), + name=f'My Audit {id_}', uuid=uuidutils.generate_uuid(), audit_template_id=audit_template.id, goal_id=self.goal.id, diff --git a/watcher/tests/decision_engine/loading/test_collector_loader.py b/watcher/tests/decision_engine/loading/test_collector_loader.py index 423294afe..88adbdb84 100644 --- a/watcher/tests/decision_engine/loading/test_collector_loader.py +++ b/watcher/tests/decision_engine/loading/test_collector_loader.py @@ -43,7 +43,7 @@ class TestClusterDataModelCollectorLoader(base.TestCase): fake_driver_call = drivermanager.DriverManager.make_test_instance( extension=stevedore_extension.Extension( name=fake_driver, - entry_point="%s:%s" % ( + entry_point="{}:{}".format( faker_cluster_state.FakerModelCollector.__module__, faker_cluster_state.FakerModelCollector.__name__), plugin=faker_cluster_state.FakerModelCollector, diff --git a/watcher/tests/decision_engine/loading/test_default_strategy_loader.py b/watcher/tests/decision_engine/loading/test_default_strategy_loader.py index 4cd3675fc..0ab756b8f 100644 --- a/watcher/tests/decision_engine/loading/test_default_strategy_loader.py +++ b/watcher/tests/decision_engine/loading/test_default_strategy_loader.py @@ -38,7 +38,7 @@ class TestDefaultStrategyLoader(base.TestCase): fake_extmanager_call = extension.ExtensionManager.make_test_instance( extensions=[extension.Extension( name=dummy_strategy_name, - entry_point="%s:%s" % ( + entry_point="{}:{}".format( dummy_strategy.DummyStrategy.__module__, dummy_strategy.DummyStrategy.__name__), plugin=dummy_strategy.DummyStrategy, diff --git a/watcher/tests/decision_engine/loading/test_goal_loader.py b/watcher/tests/decision_engine/loading/test_goal_loader.py index 16eb0cfcf..3a2725dd5 100644 --- a/watcher/tests/decision_engine/loading/test_goal_loader.py +++ b/watcher/tests/decision_engine/loading/test_goal_loader.py @@ -38,7 +38,7 @@ class TestDefaultGoalLoader(base.TestCase): fake_extmanager_call = extension.ExtensionManager.make_test_instance( extensions=[extension.Extension( name=dummy_goal_name, - entry_point="%s:%s" % ( + entry_point="{}:{}".format( goals.Dummy.__module__, goals.Dummy.__name__), plugin=goals.Dummy, diff --git a/watcher/tests/decision_engine/model/faker_cluster_state.py b/watcher/tests/decision_engine/model/faker_cluster_state.py index 4f9703aa4..955666488 100644 --- a/watcher/tests/decision_engine/model/faker_cluster_state.py +++ b/watcher/tests/decision_engine/model/faker_cluster_state.py @@ -74,8 +74,8 @@ class FakerModelCollector(base.BaseClusterDataModelCollector): instance_count = (node_count * node_instance_count) for id_ in range(0, node_count): - node_uuid = "Node_{}".format(id_) - hostname = "hostname_{}".format(id_) + node_uuid = f"Node_{id_}" + hostname = f"hostname_{id_}" node_attributes = { "id": id_, "uuid": node_uuid, @@ -95,7 +95,7 @@ class FakerModelCollector(base.BaseClusterDataModelCollector): model.add_node(node) for i in range(0, instance_count): - instance_uuid = "INSTANCE_{}".format(i) + instance_uuid = f"INSTANCE_{i}" if instance_uuid == "INSTANCE_1": project_id = "26F03131-32CB-4697-9D61-9123F87A8147" elif instance_uuid == "INSTANCE_2": @@ -221,8 +221,8 @@ class FakerStorageModelCollector(base.BaseClusterDataModelCollector): for i in range(0, node_count): host = "host_{0}@backend_{0}".format(i) - zone = "zone_{}".format(i) - volume_type = ["type_{}".format(i)] + zone = f"zone_{i}" + volume_type = [f"type_{i}"] node_attributes = { "host": host, "zone": zone, @@ -274,7 +274,7 @@ class FakerStorageModelCollector(base.BaseClusterDataModelCollector): for k in range(volume_count): uuid = volume_uuid_mapping[k] - name = "name_{}".format(k) + name = f"name_{k}" volume_attributes = { "size": 40, "status": "in-use", diff --git a/watcher/tests/decision_engine/model/gnocchi_metrics.py b/watcher/tests/decision_engine/model/gnocchi_metrics.py index 9e3d580f4..013ed9145 100644 --- a/watcher/tests/decision_engine/model/gnocchi_metrics.py +++ b/watcher/tests/decision_engine/model/gnocchi_metrics.py @@ -175,7 +175,7 @@ class FakeGnocchiMetrics: """ resource = args[0] - uuid = "%s_%s" % (resource.uuid, resource.hostname) + uuid = "{}_{}".format(resource.uuid, resource.hostname) # Normalize measurements = {} diff --git a/watcher/tests/decision_engine/model/test_model.py b/watcher/tests/decision_engine/model/test_model.py index 501a5e97d..a6e6a9687 100644 --- a/watcher/tests/decision_engine/model/test_model.py +++ b/watcher/tests/decision_engine/model/test_model.py @@ -97,12 +97,12 @@ class TestModel(base.TestCase): def test_get_node_by_instance_uuid(self): model = model_root.ModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" node = element.ComputeNode(id=1) node.uuid = uuid_ model.add_node(node) self.assertEqual(node, model.get_node_by_uuid(uuid_)) - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" instance = element.Instance(id=1) instance.uuid = uuid_ model.add_instance(instance) @@ -112,7 +112,7 @@ class TestModel(base.TestCase): def test_add_node(self): model = model_root.ModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" node = element.ComputeNode(id=1) node.uuid = uuid_ model.add_node(node) @@ -120,7 +120,7 @@ class TestModel(base.TestCase): def test_delete_node(self): model = model_root.ModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" node = element.ComputeNode(id=1) node.uuid = uuid_ model.add_node(node) @@ -132,7 +132,7 @@ class TestModel(base.TestCase): def test_get_all_compute_nodes(self): model = model_root.ModelRoot() for id_ in range(10): - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" node = element.ComputeNode(id_) node.uuid = uuid_ model.add_node(node) @@ -143,7 +143,7 @@ class TestModel(base.TestCase): def test_set_get_state_nodes(self): model = model_root.ModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" node = element.ComputeNode(id=1) node.uuid = uuid_ model.add_node(node) @@ -156,7 +156,7 @@ class TestModel(base.TestCase): def test_get_node_by_name(self): model = model_root.ModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" name = 'test_node' node = element.ComputeNode() node.uuid = uuid_ @@ -169,7 +169,7 @@ class TestModel(base.TestCase): def test_node_from_name_raise(self): model = model_root.ModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" name = 'test_node' node = element.ComputeNode() node.uuid = uuid_ @@ -182,23 +182,23 @@ class TestModel(base.TestCase): def test_node_from_uuid_raise(self): model = model_root.ModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" node = element.ComputeNode(id=1) node.uuid = uuid_ model.add_node(node) - uuid2 = "{}".format(uuidutils.generate_uuid()) + uuid2 = f"{uuidutils.generate_uuid()}" self.assertRaises(exception.ComputeNodeNotFound, model.get_node_by_uuid, uuid2) def test_remove_node_raise(self): model = model_root.ModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" node = element.ComputeNode(id=1) node.uuid = uuid_ model.add_node(node) - uuid2 = "{}".format(uuidutils.generate_uuid()) + uuid2 = f"{uuidutils.generate_uuid()}" node2 = element.ComputeNode(id=2) node2.uuid = uuid2 @@ -207,7 +207,7 @@ class TestModel(base.TestCase): def test_assert_node_raise(self): model = model_root.ModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" node = element.ComputeNode(id=1) node.uuid = uuid_ model.add_node(node) @@ -310,7 +310,7 @@ class TestStorageModel(base.TestCase): def test_assert_volume_raise(self): model = model_root.StorageModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" volume = element.Volume(uuid=uuid_) model.add_volume(volume) self.assertRaises(exception.IllegalArgumentException, @@ -367,14 +367,14 @@ class TestStorageModel(base.TestCase): def test_add_volume(self): model = model_root.StorageModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" volume = element.Volume(uuid=uuid_) model.add_volume(volume) self.assertEqual(volume, model.get_volume_by_uuid(uuid_)) def test_remove_volume(self): model = model_root.StorageModelRoot() - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" volume = element.Volume(uuid=uuid_) model.add_volume(volume) self.assertEqual(volume, model.get_volume_by_uuid(uuid_)) @@ -388,7 +388,7 @@ class TestStorageModel(base.TestCase): pool = element.Pool(name=pool_name) model.add_pool(pool) self.assertEqual(pool, model.get_pool_by_pool_name(pool_name)) - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" volume = element.Volume(uuid=uuid_) model.add_volume(volume) self.assertEqual(volume, model.get_volume_by_uuid(uuid_)) @@ -400,7 +400,7 @@ class TestStorageModel(base.TestCase): def test_get_all_storage_nodes(self): model = model_root.StorageModelRoot() for i in range(10): - hostname = "host_{}".format(i) + hostname = f"host_{i}" node = element.StorageNode(host=hostname) model.add_node(node) all_nodes = model.get_all_storage_nodes() @@ -411,7 +411,7 @@ class TestStorageModel(base.TestCase): def test_get_all_volumes(self): model = model_root.StorageModelRoot() for id_ in range(10): - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" volume = element.Volume(uuid=uuid_) model.add_volume(volume) all_volumes = model.get_all_volumes() @@ -438,7 +438,7 @@ class TestStorageModel(base.TestCase): pool = element.Pool(name=pool_name) model.add_pool(pool) self.assertEqual(pool, model.get_pool_by_pool_name(pool_name)) - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" volume = element.Volume(uuid=uuid_) model.add_volume(volume) self.assertEqual(volume, model.get_volume_by_uuid(uuid_)) @@ -451,7 +451,7 @@ class TestStorageModel(base.TestCase): pool = element.Pool(name=pool_name) model.add_pool(pool) self.assertEqual(pool, model.get_pool_by_pool_name(pool_name)) - uuid_ = "{}".format(uuidutils.generate_uuid()) + uuid_ = f"{uuidutils.generate_uuid()}" volume = element.Volume(uuid=uuid_) model.add_volume(volume) self.assertEqual(volume, model.get_volume_by_uuid(uuid_)) diff --git a/watcher/tests/decision_engine/scope/test_compute.py b/watcher/tests/decision_engine/scope/test_compute.py index 285e4c7f0..bc75537ba 100644 --- a/watcher/tests/decision_engine/scope/test_compute.py +++ b/watcher/tests/decision_engine/scope/test_compute.py @@ -37,8 +37,8 @@ class TestComputeScope(base.TestCase): cluster = self.fake_cluster.generate_scenario_1() audit_scope = fake_scopes.fake_scope_1 mock_zone_list.return_value = [ - mock.Mock(zone='AZ{}'.format(i), - host={'hostname_{}'.format(i): {}}) + mock.Mock(zone=f'AZ{i}', + host={f'hostname_{i}': {}}) for i in range(4)] model = compute.ComputeScope(audit_scope, mock.Mock(), osc=mock.Mock()).get_scoped_model(cluster) @@ -74,7 +74,7 @@ class TestComputeScope(base.TestCase): def test_collect_aggregates(self, mock_aggregate): allowed_nodes = [] mock_aggregate.return_value = [ - mock.Mock(id=i, hosts=['Node_{}'.format(i)]) for i in range(2)] + mock.Mock(id=i, hosts=[f'Node_{i}']) for i in range(2)] compute.ComputeScope([{'host_aggregates': [{'id': 1}, {'id': 2}]}], mock.Mock(), osc=mock.Mock())._collect_aggregates( [{'id': 1}, {'id': 2}], allowed_nodes) @@ -84,7 +84,7 @@ class TestComputeScope(base.TestCase): def test_aggregates_wildcard_is_used(self, mock_aggregate): allowed_nodes = [] mock_aggregate.return_value = [ - mock.Mock(id=i, hosts=['Node_{}'.format(i)]) for i in range(2)] + mock.Mock(id=i, hosts=[f'Node_{i}']) for i in range(2)] compute.ComputeScope([{'host_aggregates': [{'id': '*'}]}], mock.Mock(), osc=mock.Mock())._collect_aggregates( [{'id': '*'}], allowed_nodes) @@ -105,7 +105,7 @@ class TestComputeScope(base.TestCase): @mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_list') def test_aggregates_with_names_and_ids(self, mock_aggregate): allowed_nodes = [] - mock_collection = [mock.Mock(id=i, hosts=['Node_{}'.format(i)]) + mock_collection = [mock.Mock(id=i, hosts=[f'Node_{i}']) for i in range(2)] mock_collection[0].name = 'HA_0' mock_collection[1].name = 'HA_1' @@ -122,9 +122,9 @@ class TestComputeScope(base.TestCase): def test_collect_zones(self, mock_zone_list): allowed_nodes = [] mock_zone_list.return_value = [ - mock.Mock(zone="AZ{}".format(i + 1), - host={'Node_{}'.format(2 * i): 1, - 'Node_{}'.format(2 * i + 1): 2}) + mock.Mock(zone=f"AZ{i + 1}", + host={f'Node_{2 * i}': 1, + f'Node_{2 * i + 1}': 2}) for i in range(2)] compute.ComputeScope([{'availability_zones': [{'name': "AZ1"}]}], mock.Mock(), osc=mock.Mock())._collect_zones( @@ -135,9 +135,9 @@ class TestComputeScope(base.TestCase): def test_zones_wildcard_is_used(self, mock_zone_list): allowed_nodes = [] mock_zone_list.return_value = [ - mock.Mock(zone="AZ{}".format(i + 1), - host={'Node_{}'.format(2 * i): 1, - 'Node_{}'.format(2 * i + 1): 2}) + mock.Mock(zone=f"AZ{i + 1}", + host={f'Node_{2 * i}': 1, + f'Node_{2 * i + 1}': 2}) for i in range(2)] compute.ComputeScope([{'availability_zones': [{'name': "*"}]}], mock.Mock(), osc=mock.Mock())._collect_zones( @@ -149,9 +149,9 @@ class TestComputeScope(base.TestCase): def test_zones_wildcard_with_other_ids(self, mock_zone_list): allowed_nodes = [] mock_zone_list.return_value = [ - mock.Mock(zone="AZ{}".format(i + 1), - host={'Node_{}'.format(2 * i): 1, - 'Node_{}'.format(2 * i + 1): 2}) + mock.Mock(zone=f"AZ{i + 1}", + host={f'Node_{2 * i}': 1, + f'Node_{2 * i + 1}': 2}) for i in range(2)] scope_handler = compute.ComputeScope( [{'availability_zones': [{'name': "*"}, {'name': 'AZ1'}]}], @@ -169,7 +169,7 @@ class TestComputeScope(base.TestCase): @mock.patch.object(nova_helper.NovaHelper, 'get_aggregate_list') def test_exclude_resource(self, mock_aggregate): - mock_collection = [mock.Mock(id=i, hosts=['Node_{}'.format(i)]) + mock_collection = [mock.Mock(id=i, hosts=[f'Node_{i}']) for i in range(2)] mock_collection[0].name = 'HA_0' mock_collection[1].name = 'HA_1' @@ -274,7 +274,7 @@ class TestComputeScope(base.TestCase): cluster = self.fake_cluster.generate_scenario_1() audit_scope = fake_scopes.fake_scope_3 mock_list.return_value = [mock.Mock(id=i, - name="HA_{}".format(i)) + name=f"HA_{i}") for i in range(2)] model = compute.ComputeScope(audit_scope, mock.Mock(), osc=mock.Mock()).get_scoped_model(cluster) @@ -288,8 +288,8 @@ class TestComputeScope(base.TestCase): audit_scope.extend(fake_scopes.fake_scope_1) audit_scope.extend(fake_scopes.fake_scope_2) mock_zone_list.return_value = [ - mock.Mock(zone='AZ{}'.format(i), - host={'hostname_{}'.format(i): {}}) + mock.Mock(zone=f'AZ{i}', + host={f'hostname_{i}': {}}) for i in range(4)] model = compute.ComputeScope(audit_scope, mock.Mock(), osc=mock.Mock()).get_scoped_model(cluster) diff --git a/watcher/tests/decision_engine/scope/test_storage.py b/watcher/tests/decision_engine/scope/test_storage.py index 22ea0d654..1b7e19d52 100644 --- a/watcher/tests/decision_engine/scope/test_storage.py +++ b/watcher/tests/decision_engine/scope/test_storage.py @@ -35,8 +35,8 @@ class TestStorageScope(base.TestCase): cluster = self.fake_cluster.generate_scenario_1() audit_scope = fake_scopes.fake_scope_2 mock_zone_list.return_value = [ - mock.Mock(zone='zone_{}'.format(i), - host='host_{}@backend_{}'.format(i, i)) + mock.Mock(zone=f'zone_{i}', + host=f'host_{i}@backend_{i}') for i in range(2)] model = storage.StorageScope(audit_scope, mock.Mock(), osc=mock.Mock()).get_scoped_model(cluster) @@ -57,8 +57,8 @@ class TestStorageScope(base.TestCase): allowed_nodes = [] az_scope = [{'name': 'zone_1'}] mock_zone_list.return_value = [ - mock.Mock(zone='zone_{}'.format(i), - host='host_{}@backend_{}'.format(i, i)) + mock.Mock(zone=f'zone_{i}', + host=f'host_{i}@backend_{i}') for i in range(2)] storage.StorageScope([{'availability _zones': az_scope}], mock.Mock(), osc=mock.Mock())._collect_zones( @@ -89,8 +89,8 @@ class TestStorageScope(base.TestCase): def test_collect_vtype(self, mock_vt_list, mock_zone_list): allowed_nodes = [] mock_zone_list.return_value = [ - mock.Mock(zone='zone_{}'.format(i), - host='host_{}@backend_{}'.format(i, i)) + mock.Mock(zone=f'zone_{i}', + host=f'host_{i}@backend_{i}') for i in range(2)] def side_effect(arg): @@ -203,8 +203,8 @@ class TestStorageScope(base.TestCase): audit_scope.extend(fake_scopes.fake_scope_2) audit_scope.extend(fake_scopes.fake_scope_1) mock_zone_list.return_value = [ - mock.Mock(zone='zone_{}'.format(i), - host='host_{}@backend_{}'.format(i, i)) + mock.Mock(zone=f'zone_{i}', + host=f'host_{i}@backend_{i}') for i in range(2)] model = storage.StorageScope(audit_scope, mock.Mock(), osc=mock.Mock()).get_scoped_model(cluster) diff --git a/watcher/tests/decision_engine/strategy/context/test_strategy_context.py b/watcher/tests/decision_engine/strategy/context/test_strategy_context.py index 374976590..0d02166a3 100644 --- a/watcher/tests/decision_engine/strategy/context/test_strategy_context.py +++ b/watcher/tests/decision_engine/strategy/context/test_strategy_context.py @@ -67,7 +67,7 @@ class TestStrategyContext(base.DbTestCase): audit = obj_utils.create_test_audit( self.context, - id=2, name='My Audit {}'.format(2), + id=2, name=f'My Audit {2}', goal_id=goal.id, strategy_id=strategy.id, uuid=utils.generate_uuid(), @@ -95,7 +95,7 @@ class TestStrategyContext(base.DbTestCase): audit = obj_utils.create_test_audit( self.context, - id=2, name='My Audit {}'.format(2), + id=2, name=f'My Audit {2}', strategy_id=strategy.id, uuid=utils.generate_uuid(), )