openstack/watcher
Code Issues Proposed changes

Apply pyupgrade

Browse Source 
This change was generated with the following command
pyupgrade --keep-percent-format --keep-runtime-typing --py3-only $(git ls-files | grep .py)
then formated with pre-commit and autopep8

Change-Id: Iefb974d448ab91a01b07656cc5f6590307020f3a
Signed-off-by: Sean Mooney <work@seanmooney.info>
This commit is contained in:
Sean Mooney
2025-09-17 07:26:10 +01:00
parent 03073a1b0d
commit a1fdc7a1ed
350 changed files with 766 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api-ref/source/conf.py
View File

@@ -39,8 +39,8 @@ source_suffix = '.rst'
master_doc = 'index' master_doc = 'index'
# General information about the project. # General information about the project.
project = u'Infrastructure Optimization API Reference' project = 'Infrastructure Optimization API Reference'
copyright = u'2010-present, OpenStack Foundation' copyright = '2010-present, OpenStack Foundation'
# openstackdocstheme options # openstackdocstheme options
openstackdocs_repo_name = 'openstack/watcher' openstackdocs_repo_name = 'openstack/watcher'
@@ -70,6 +70,6 @@ html_theme_options = {
# (source start file, target name, title, author, documentclass # (source start file, target name, title, author, documentclass
# [howto/manual]). # [howto/manual]).
latex_documents = [ latex_documents = [
('index', 'Watcher.tex', u'Infrastructure Optimization API Reference', ('index', 'Watcher.tex', 'Infrastructure Optimization API Reference',
u'OpenStack Foundation', 'manual'), 'OpenStack Foundation', 'manual'),
] ]

2
doc/ext/term.py
View File

@@ -27,7 +27,7 @@ class BaseWatcherDirective(rst.Directive):
def __init__(self, name, arguments, options, content, lineno, def __init__(self, name, arguments, options, content, lineno,
content_offset, block_text, state, state_machine): content_offset, block_text, state, state_machine):
super(BaseWatcherDirective, self).__init__( super().__init__(
name, arguments, options, content, lineno, name, arguments, options, content, lineno,
content_offset, block_text, state, state_machine) content_offset, block_text, state, state_machine)
self.result = statemachine.ViewList() self.result = statemachine.ViewList()

2
doc/ext/versioned_notifications.py
View File

@@ -112,7 +112,7 @@ jQuery(document).ready(function(){
col = nodes.entry() col = nodes.entry()
row.append(col) row.append(col)
with open(self.SAMPLE_ROOT + sample_file, 'r') as f: with open(self.SAMPLE_ROOT + sample_file) as f:
sample_content = f.read() sample_content = f.read()
event_type = sample_file[0: -5] event_type = sample_file[0: -5]

1
watcher/_i18n.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");

1
watcher/api/acl.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright © 2012 New Dream Network, LLC (DreamHost) # Copyright © 2012 New Dream Network, LLC (DreamHost)
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp

4
watcher/api/app.py
View File

@@ -1,5 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright © 2012 New Dream Network, LLC (DreamHost) # Copyright © 2012 New Dream Network, LLC (DreamHost)
# All Rights Reserved. # All Rights Reserved.
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
@@ -70,7 +68,7 @@ def _wrap_app(app):
return app return app
class VersionSelectorApplication(object): class VersionSelectorApplication:
def __init__(self): def __init__(self):
pc = get_pecan_config() pc = get_pecan_config()
self.v1 = setup_app(config=pc) self.v1 = setup_app(config=pc)

1
watcher/api/config.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

7
watcher/api/controllers/base.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -35,10 +34,10 @@ class APIBase(wtypes.Base):
def as_dict(self): def as_dict(self):
"""Render this object as a dict of its fields.""" """Render this object as a dict of its fields."""
return dict((k, getattr(self, k)) return {k: getattr(self, k)
for k in self.fields for k in self.fields
if hasattr(self, k) and if hasattr(self, k) and
getattr(self, k) != wsme.Unset) getattr(self, k) != wsme.Unset}
def unset_fields_except(self, except_list=None): def unset_fields_except(self, except_list=None):
"""Unset fields so they don't appear in the message body. """Unset fields so they don't appear in the message body.
@@ -55,7 +54,7 @@ class APIBase(wtypes.Base):
@functools.total_ordering @functools.total_ordering
class Version(object): class Version:
"""API Version object.""" """API Version object."""
string = 'OpenStack-API-Version' string = 'OpenStack-API-Version'

1
watcher/api/controllers/link.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright 2013 Red Hat, Inc. # Copyright 2013 Red Hat, Inc.
# All Rights Reserved. # All Rights Reserved.
# #

6
watcher/api/controllers/root.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright © 2012 New Dream Network, LLC (DreamHost) # Copyright © 2012 New Dream Network, LLC (DreamHost)
# #
@@ -26,7 +25,7 @@ from watcher.api.controllers import link
from watcher.api.controllers import v1 from watcher.api.controllers import v1
class APIStatus(object): class APIStatus:
CURRENT = "CURRENT" CURRENT = "CURRENT"
SUPPORTED = "SUPPORTED" SUPPORTED = "SUPPORTED"
DEPRECATED = "DEPRECATED" DEPRECATED = "DEPRECATED"
@@ -118,4 +117,5 @@ class RootController(rest.RestController):
if args[0] and args[0] not in self._versions: if args[0] and args[0] not in self._versions:
args = [self._default_version] + args args = [self._default_version] + args
return super(RootController, self)._route(args, request)
return super()._route(args, request)

7
watcher/api/controllers/v1/__init__.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -72,10 +71,10 @@ class APIBase(wtypes.Base):
def as_dict(self): def as_dict(self):
"""Render this object as a dict of its fields.""" """Render this object as a dict of its fields."""
return dict((k, getattr(self, k)) return {k: getattr(self, k)
for k in self.fields for k in self.fields
if hasattr(self, k) and if hasattr(self, k) and
getattr(self, k) != wsme.Unset) getattr(self, k) != wsme.Unset}
def unset_fields_except(self, except_list=None): def unset_fields_except(self, except_list=None):
"""Unset fields so they don't appear in the message body. """Unset fields so they don't appear in the message body.
@@ -282,7 +281,7 @@ class Controller(rest.RestController):
' '.join([versions.service_type_string(), str(v)])) ' '.join([versions.service_type_string(), str(v)]))
pecan.request.version = v pecan.request.version = v
return super(Controller, self)._route(args, request) return super()._route(args, request)
__all__ = ("Controller", ) __all__ = ("Controller", )

5
watcher/api/controllers/v1/action.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright 2013 Red Hat, Inc. # Copyright 2013 Red Hat, Inc.
# All Rights Reserved. # All Rights Reserved.
# #
@@ -173,7 +172,7 @@ class Action(base.APIBase):
"""Status message""" """Status message"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(Action, self).__init__() super().__init__()
self.fields = [] self.fields = []
fields = list(objects.Action.fields) fields = list(objects.Action.fields)
@@ -263,7 +262,7 @@ class ActionsController(rest.RestController):
"""REST controller for Actions.""" """REST controller for Actions."""
def __init__(self): def __init__(self):
super(ActionsController, self).__init__() super().__init__()
_custom_actions = { _custom_actions = {
'detail': ['GET'], 'detail': ['GET'],

5
watcher/api/controllers/v1/action_plan.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright 2013 Red Hat, Inc. # Copyright 2013 Red Hat, Inc.
# All Rights Reserved. # All Rights Reserved.
# #
@@ -253,7 +252,7 @@ class ActionPlan(base.APIBase):
"""Status message of the action plan""" """Status message of the action plan"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(ActionPlan, self).__init__() super().__init__()
self.fields = [] self.fields = []
fields = list(objects.ActionPlan.fields) fields = list(objects.ActionPlan.fields)
for field in fields: for field in fields:
@@ -342,7 +341,7 @@ class ActionPlansController(rest.RestController):
"""REST controller for Actions.""" """REST controller for Actions."""
def __init__(self): def __init__(self):
super(ActionPlansController, self).__init__() super().__init__()
self.applier_client = rpcapi.ApplierAPI() self.applier_client = rpcapi.ApplierAPI()
_custom_actions = { _custom_actions = {

7
watcher/api/controllers/v1/audit.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright 2013 Red Hat, Inc. # Copyright 2013 Red Hat, Inc.
# All Rights Reserved. # All Rights Reserved.
# #
@@ -162,7 +161,7 @@ class AuditPostType(wtypes.Base):
'strategy': 'strategy_id', 'strategy': 'strategy_id',
'scope': 'scope', 'scope': 'scope',
} }
to_string_fields = set(['goal', 'strategy']) to_string_fields = {'goal', 'strategy'}
for k in at2a: for k in at2a:
if not getattr(self, k): if not getattr(self, k):
try: try:
@@ -466,7 +465,7 @@ class AuditCollection(collection.Collection):
"""A list containing audits objects""" """A list containing audits objects"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(AuditCollection, self).__init__() super().__init__()
self._type = 'audits' self._type = 'audits'
@staticmethod @staticmethod
@@ -489,7 +488,7 @@ class AuditsController(rest.RestController):
"""REST controller for Audits.""" """REST controller for Audits."""
def __init__(self): def __init__(self):
super(AuditsController, self).__init__() super().__init__()
self.dc_client = rpcapi.DecisionEngineAPI() self.dc_client = rpcapi.DecisionEngineAPI()
_custom_actions = { _custom_actions = {

7
watcher/api/controllers/v1/audit_template.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright 2013 Red Hat, Inc. # Copyright 2013 Red Hat, Inc.
# All Rights Reserved. # All Rights Reserved.
# #
@@ -376,7 +375,7 @@ class AuditTemplate(base.APIBase):
"""Audit Scope""" """Audit Scope"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(AuditTemplate, self).__init__() super().__init__()
self.fields = [] self.fields = []
fields = list(objects.AuditTemplate.fields) fields = list(objects.AuditTemplate.fields)
@@ -453,7 +452,7 @@ class AuditTemplateCollection(collection.Collection):
"""A list containing audit templates objects""" """A list containing audit templates objects"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(AuditTemplateCollection, self).__init__() super().__init__()
self._type = 'audit_templates' self._type = 'audit_templates'
@staticmethod @staticmethod
@@ -477,7 +476,7 @@ class AuditTemplatesController(rest.RestController):
"""REST controller for AuditTemplates.""" """REST controller for AuditTemplates."""
def __init__(self): def __init__(self):
super(AuditTemplatesController, self).__init__() super().__init__()
_custom_actions = { _custom_actions = {
'detail': ['GET'], 'detail': ['GET'],

1
watcher/api/controllers/v1/collection.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright 2013 Red Hat, Inc. # Copyright 2013 Red Hat, Inc.
# All Rights Reserved. # All Rights Reserved.
# #

3
watcher/api/controllers/v1/data_model.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2019 ZTE Corporation # Copyright (c) 2019 ZTE Corporation
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -50,7 +49,7 @@ class DataModelController(rest.RestController):
"""REST controller for data model""" """REST controller for data model"""
def __init__(self): def __init__(self):
super(DataModelController, self).__init__() super().__init__()
@wsme_pecan.wsexpose(wtypes.text, wtypes.text, types.uuid) @wsme_pecan.wsexpose(wtypes.text, wtypes.text, types.uuid)
def get_all(self, data_model_type='compute', audit_uuid=None): def get_all(self, data_model_type='compute', audit_uuid=None):

3
watcher/api/controllers/v1/efficacy_indicator.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -60,7 +59,7 @@ class EfficacyIndicator(base.APIBase):
"""Value of this efficacy indicator""" """Value of this efficacy indicator"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(EfficacyIndicator, self).__init__() super().__init__()
self.fields = [] self.fields = []
fields = list(objects.EfficacyIndicator.fields) fields = list(objects.EfficacyIndicator.fields)

5
watcher/api/controllers/v1/goal.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright 2013 Red Hat, Inc. # Copyright 2013 Red Hat, Inc.
# All Rights Reserved. # All Rights Reserved.
# #
@@ -131,7 +130,7 @@ class GoalCollection(collection.Collection):
"""A list containing goals objects""" """A list containing goals objects"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(GoalCollection, self).__init__() super().__init__()
self._type = 'goals' self._type = 'goals'
@staticmethod @staticmethod
@@ -155,7 +154,7 @@ class GoalsController(rest.RestController):
"""REST controller for Goals.""" """REST controller for Goals."""
def __init__(self): def __init__(self):
super(GoalsController, self).__init__() super().__init__()
_custom_actions = { _custom_actions = {
'detail': ['GET'], 'detail': ['GET'],

7
watcher/api/controllers/v1/scoring_engine.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright 2016 Intel # Copyright 2016 Intel
# All Rights Reserved. # All Rights Reserved.
# #
@@ -76,7 +75,7 @@ class ScoringEngine(base.APIBase):
"""A list containing a self link and associated action links""" """A list containing a self link and associated action links"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(ScoringEngine, self).__init__() super().__init__()
self.fields = [] self.fields = []
self.fields.append('uuid') self.fields.append('uuid')
@@ -123,7 +122,7 @@ class ScoringEngineCollection(collection.Collection):
"""A list containing scoring engine objects""" """A list containing scoring engine objects"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(ScoringEngineCollection, self).__init__() super().__init__()
self._type = 'scoring_engines' self._type = 'scoring_engines'
@staticmethod @staticmethod
@@ -147,7 +146,7 @@ class ScoringEngineController(rest.RestController):
"""REST controller for Scoring Engines.""" """REST controller for Scoring Engines."""
def __init__(self): def __init__(self):
super(ScoringEngineController, self).__init__() super().__init__()
_custom_actions = { _custom_actions = {
'detail': ['GET'], 'detail': ['GET'],

7
watcher/api/controllers/v1/service.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Servionica # Copyright (c) 2016 Servionica
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -109,7 +108,7 @@ class Service(base.APIBase):
"""A list containing a self link.""" """A list containing a self link."""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(Service, self).__init__() super().__init__()
fields = list(objects.Service.fields) + ['status'] fields = list(objects.Service.fields) + ['status']
self.fields = [] self.fields = []
@@ -153,7 +152,7 @@ class ServiceCollection(collection.Collection):
"""A list containing services objects""" """A list containing services objects"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(ServiceCollection, self).__init__() super().__init__()
self._type = 'services' self._type = 'services'
@staticmethod @staticmethod
@@ -177,7 +176,7 @@ class ServicesController(rest.RestController):
"""REST controller for Services.""" """REST controller for Services."""
def __init__(self): def __init__(self):
super(ServicesController, self).__init__() super().__init__()
_custom_actions = { _custom_actions = {
'detail': ['GET'], 'detail': ['GET'],

7
watcher/api/controllers/v1/strategy.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -123,7 +122,7 @@ class Strategy(base.APIBase):
"""Parameters spec dict""" """Parameters spec dict"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(Strategy, self).__init__() super().__init__()
self.fields = [] self.fields = []
self.fields.append('uuid') self.fields.append('uuid')
@@ -174,7 +173,7 @@ class StrategyCollection(collection.Collection):
"""A list containing strategies objects""" """A list containing strategies objects"""
def __init__(self, **kwargs): def __init__(self, **kwargs):
super(StrategyCollection, self).__init__() super().__init__()
self._type = 'strategies' self._type = 'strategies'
@staticmethod @staticmethod
@@ -198,7 +197,7 @@ class StrategiesController(rest.RestController):
"""REST controller for Strategies.""" """REST controller for Strategies."""
def __init__(self): def __init__(self):
super(StrategiesController, self).__init__() super().__init__()
_custom_actions = { _custom_actions = {
'detail': ['GET'], 'detail': ['GET'],

2
watcher/api/controllers/v1/types.py
View File

@@ -218,7 +218,7 @@ class JsonPatchType(wtypes.Base):
@staticmethod @staticmethod
def validate(patch): def validate(patch):
_path = '/{0}'.format(patch.path.split('/')[1]) _path = '/{}'.format(patch.path.split('/')[1])
if len(patch.allowed_attrs()) > 0: if len(patch.allowed_attrs()) > 0:
if _path not in patch.allowed_attrs(): if _path not in patch.allowed_attrs():
msg = _("'%s' is not an allowed attribute and can not be " msg = _("'%s' is not an allowed attribute and can not be "

2
watcher/api/controllers/v1/webhooks.py
View File

@@ -34,7 +34,7 @@ class WebhookController(rest.RestController):
"""REST controller for webhooks resource.""" """REST controller for webhooks resource."""
def __init__(self): def __init__(self):
super(WebhookController, self).__init__() super().__init__()
self.dc_client = rpcapi.DecisionEngineAPI() self.dc_client = rpcapi.DecisionEngineAPI()
@wsme_pecan.wsexpose(None, wtypes.text, body=types.jsontype, @wsme_pecan.wsexpose(None, wtypes.text, body=types.jsontype,

1
watcher/api/hooks.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright © 2012 New Dream Network, LLC (DreamHost) # Copyright © 2012 New Dream Network, LLC (DreamHost)
# #

5
watcher/api/middleware/auth_token.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@@ -45,7 +44,7 @@ class AuthTokenMiddleware(auth_token.AuthProtocol):
raise exception.ConfigInvalid( raise exception.ConfigInvalid(
error_msg=_('Cannot compile public API routes')) error_msg=_('Cannot compile public API routes'))
super(AuthTokenMiddleware, self).__init__(app, conf) super().__init__(app, conf)
def __call__(self, env, start_response): def __call__(self, env, start_response):
path = utils.safe_rstrip(env.get('PATH_INFO'), '/') path = utils.safe_rstrip(env.get('PATH_INFO'), '/')
@@ -59,4 +58,4 @@ class AuthTokenMiddleware(auth_token.AuthProtocol):
if env['is_public_api']: if env['is_public_api']:
return self._app(env, start_response) return self._app(env, start_response)
return super(AuthTokenMiddleware, self).__call__(env, start_response) return super().__call__(env, start_response)

3
watcher/api/middleware/parsable_error.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright © 2012 New Dream Network, LLC (DreamHost) # Copyright © 2012 New Dream Network, LLC (DreamHost)
# #
@@ -31,7 +30,7 @@ from watcher._i18n import _
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
class ParsableErrorMiddleware(object): class ParsableErrorMiddleware:
"""Replace error body with something the client can parse.""" """Replace error body with something the client can parse."""
def __init__(self, app): def __init__(self, app):

5
watcher/api/scheduling.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2017 Servionica # Copyright (c) 2017 Servionica
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +34,7 @@ class APISchedulingService(scheduling.BackgroundSchedulerService):
def __init__(self, gconfig={}, **options): def __init__(self, gconfig={}, **options):
self.services_status = {} self.services_status = {}
super(APISchedulingService, self).__init__(gconfig, **options) super().__init__(gconfig, **options)
def get_services_status(self, context): def get_services_status(self, context):
services = objects.service.Service.list(context) services = objects.service.Service.list(context)
@@ -110,7 +109,7 @@ class APISchedulingService(scheduling.BackgroundSchedulerService):
trigger='interval', jobstore='default', args=[context], trigger='interval', jobstore='default', args=[context],
next_run_time=datetime.datetime.now(), next_run_time=datetime.datetime.now(),
seconds=CONF.periodic_interval) seconds=CONF.periodic_interval)
super(APISchedulingService, self).start() super().start()
def stop(self): def stop(self):
"""Stop service.""" """Stop service."""

3
watcher/applier/action_plan/base.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
@@ -20,7 +19,7 @@
import abc import abc
class BaseActionPlanHandler(object, metaclass=abc.ABCMeta): class BaseActionPlanHandler(metaclass=abc.ABCMeta):
@abc.abstractmethod @abc.abstractmethod
def execute(self): def execute(self):
raise NotImplementedError() raise NotImplementedError()

3
watcher/applier/action_plan/default.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
@@ -34,7 +33,7 @@ LOG = log.getLogger(__name__)
class DefaultActionPlanHandler(base.BaseActionPlanHandler): class DefaultActionPlanHandler(base.BaseActionPlanHandler):
def __init__(self, context, service, action_plan_uuid): def __init__(self, context, service, action_plan_uuid):
super(DefaultActionPlanHandler, self).__init__() super().__init__()
self.ctx = context self.ctx = context
self.service = service self.service = service
self.action_plan_uuid = action_plan_uuid self.action_plan_uuid = action_plan_uuid

3
watcher/applier/actions/base.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
@@ -42,7 +41,7 @@ class BaseAction(loadable.Loadable, metaclass=abc.ABCMeta):
:param osc: an OpenStackClients instance, defaults to None :param osc: an OpenStackClients instance, defaults to None
:type osc: :py:class:`~.OpenStackClients` instance, optional :type osc: :py:class:`~.OpenStackClients` instance, optional
""" """
super(BaseAction, self).__init__(config) super().__init__(config)
self._input_parameters = {} self._input_parameters = {}
self._osc = osc self._osc = osc

1
watcher/applier/actions/change_node_power_state.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2017 ZTE # Copyright (c) 2017 ZTE
# #
# Authors: Li Canwei # Authors: Li Canwei

1
watcher/applier/actions/change_nova_service_state.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>

3
watcher/applier/actions/factory.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,7 +21,7 @@ from watcher.applier.loading import default
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
class ActionFactory(object): class ActionFactory:
def __init__(self): def __init__(self):
self.action_loader = default.DefaultActionLoader() self.action_loader = default.DefaultActionLoader()

1
watcher/applier/actions/migration.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>

1
watcher/applier/actions/nop.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>

1
watcher/applier/actions/resize.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2017 Servionica # Copyright (c) 2017 Servionica
# #
# Authors: Alexander Chadin <a.chadin@servionica.ru> # Authors: Alexander Chadin <a.chadin@servionica.ru>

1
watcher/applier/actions/sleep.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>

1
watcher/applier/actions/stop.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.

2
watcher/applier/actions/volume_migration.py
View File

@@ -66,7 +66,7 @@ class VolumeMigrate(base.BaseAction):
DESTINATION_TYPE = "destination_type" DESTINATION_TYPE = "destination_type"
def __init__(self, config, osc=None): def __init__(self, config, osc=None):
super(VolumeMigrate, self).__init__(config) super().__init__(config)
self.cinder_util = cinder_helper.CinderHelper(osc=self.osc) self.cinder_util = cinder_helper.CinderHelper(osc=self.osc)
self.nova_util = nova_helper.NovaHelper(osc=self.osc) self.nova_util = nova_helper.NovaHelper(osc=self.osc)

3
watcher/applier/base.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
@@ -28,7 +27,7 @@ See: :doc:`../architecture` for more details on this component.
import abc import abc
class BaseApplier(object, metaclass=abc.ABCMeta): class BaseApplier(metaclass=abc.ABCMeta):
@abc.abstractmethod @abc.abstractmethod
def execute(self, action_plan_uuid): def execute(self, action_plan_uuid):
raise NotImplementedError() raise NotImplementedError()

3
watcher/applier/default.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
@@ -29,7 +28,7 @@ CONF = cfg.CONF
class DefaultApplier(base.BaseApplier): class DefaultApplier(base.BaseApplier):
def __init__(self, context, applier_manager): def __init__(self, context, applier_manager):
super(DefaultApplier, self).__init__() super().__init__()
self._applier_manager = applier_manager self._applier_manager = applier_manager
self._loader = default.DefaultWorkFlowEngineLoader() self._loader = default.DefaultWorkFlowEngineLoader()
self._engine = None self._engine = None

4
watcher/applier/loading/default.py
View File

@@ -16,11 +16,11 @@ from watcher.common.loader import default
class DefaultWorkFlowEngineLoader(default.DefaultLoader): class DefaultWorkFlowEngineLoader(default.DefaultLoader):
def __init__(self): def __init__(self):
super(DefaultWorkFlowEngineLoader, self).__init__( super().__init__(
namespace='watcher_workflow_engines') namespace='watcher_workflow_engines')
class DefaultActionLoader(default.DefaultLoader): class DefaultActionLoader(default.DefaultLoader):
def __init__(self): def __init__(self):
super(DefaultActionLoader, self).__init__( super().__init__(
namespace='watcher_actions') namespace='watcher_actions')

1
watcher/applier/manager.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #

3
watcher/applier/messaging/trigger.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
@@ -27,7 +26,7 @@ LOG = log.getLogger(__name__)
CONF = cfg.CONF CONF = cfg.CONF
class TriggerActionPlan(object): class TriggerActionPlan:
def __init__(self, applier_manager): def __init__(self, applier_manager):
self.applier_manager = applier_manager self.applier_manager = applier_manager
workers = CONF.watcher_applier.workers workers = CONF.watcher_applier.workers

3
watcher/applier/rpcapi.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
@@ -30,7 +29,7 @@ CONF = conf.CONF
class ApplierAPI(service.Service): class ApplierAPI(service.Service):
def __init__(self): def __init__(self):
super(ApplierAPI, self).__init__(ApplierAPIManager) super().__init__(ApplierAPIManager)
def launch_action_plan(self, context, action_plan_uuid=None): def launch_action_plan(self, context, action_plan_uuid=None):
if not utils.is_uuid_like(action_plan_uuid): if not utils.is_uuid_like(action_plan_uuid):

3
watcher/applier/sync.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2017 ZTE # Copyright (c) 2017 ZTE
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +27,7 @@ CONF = cfg.CONF
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
class Syncer(object): class Syncer:
"""Syncs all available actions with the Watcher DB""" """Syncs all available actions with the Watcher DB"""
def sync(self): def sync(self):

5
watcher/applier/workflow_engine/base.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# #
@@ -48,7 +47,7 @@ class BaseWorkFlowEngine(loadable.Loadable, metaclass=abc.ABCMeta):
:param osc: an OpenStackClients object, defaults to None :param osc: an OpenStackClients object, defaults to None
:type osc: :py:class:`~.OpenStackClients` instance, optional :type osc: :py:class:`~.OpenStackClients` instance, optional
""" """
super(BaseWorkFlowEngine, self).__init__(config) super().__init__(config)
self._context = context self._context = context
self._applier_manager = applier_manager self._applier_manager = applier_manager
self._action_factory = factory.ActionFactory() self._action_factory = factory.ActionFactory()
@@ -111,7 +110,7 @@ class BaseWorkFlowEngine(loadable.Loadable, metaclass=abc.ABCMeta):
class BaseTaskFlowActionContainer(flow_task.Task): class BaseTaskFlowActionContainer(flow_task.Task):
def __init__(self, name, db_action, engine, **kwargs): def __init__(self, name, db_action, engine, **kwargs):
super(BaseTaskFlowActionContainer, self).__init__(name=name) super().__init__(name=name)
self._db_action = db_action self._db_action = db_action
self._engine = engine self._engine = engine
self.loaded_action = None self.loaded_action = None

5
watcher/applier/workflow_engine/default.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -130,9 +129,9 @@ class DefaultWorkFlowEngine(base.BaseWorkFlowEngine):
class TaskFlowActionContainer(base.BaseTaskFlowActionContainer): class TaskFlowActionContainer(base.BaseTaskFlowActionContainer):
def __init__(self, db_action, engine): def __init__(self, db_action, engine):
self.name = "action_type:{0} uuid:{1}".format(db_action.action_type, self.name = "action_type:{} uuid:{}".format(db_action.action_type,
db_action.uuid) db_action.uuid)
super(TaskFlowActionContainer, self).__init__(self.name, super().__init__(self.name,
db_action, db_action,
engine) engine)

7
watcher/cmd/dbmanage.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright 2013 Hewlett-Packard Development Company, L.P. # Copyright 2013 Hewlett-Packard Development Company, L.P.
# All Rights Reserved. # All Rights Reserved.
@@ -31,7 +30,7 @@ from watcher.db import purge
CONF = conf.CONF CONF = conf.CONF
class DBCommand(object): class DBCommand:
@staticmethod @staticmethod
def upgrade(): def upgrade():
@@ -145,11 +144,11 @@ def main():
register_sub_command_opts() register_sub_command_opts()
# this is hack to work with previous usage of watcher-dbsync # this is hack to work with previous usage of watcher-dbsync
# pls change it to watcher-dbsync upgrade # pls change it to watcher-dbsync upgrade
valid_commands = set([ valid_commands = {
'upgrade', 'downgrade', 'revision', 'upgrade', 'downgrade', 'revision',
'version', 'stamp', 'create_schema', 'version', 'stamp', 'create_schema',
'purge', 'purge',
]) }
if not set(sys.argv).intersection(valid_commands): if not set(sys.argv).intersection(valid_commands):
sys.argv.append('upgrade') sys.argv.append('upgrade')

1
watcher/cmd/eventlet/api.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright 2013 Hewlett-Packard Development Company, L.P. # Copyright 2013 Hewlett-Packard Development Company, L.P.
# All Rights Reserved. # All Rights Reserved.

1
watcher/cmd/eventlet/applier.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright 2013 Hewlett-Packard Development Company, L.P. # Copyright 2013 Hewlett-Packard Development Company, L.P.
# All Rights Reserved. # All Rights Reserved.

1
watcher/cmd/eventlet/decisionengine.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright 2013 Hewlett-Packard Development Company, L.P. # Copyright 2013 Hewlett-Packard Development Company, L.P.
# All Rights Reserved. # All Rights Reserved.

1
watcher/cmd/sync.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright (c) 2016 Intel # Copyright (c) 2016 Intel
# #

2
watcher/common/cinder_helper.py
View File

@@ -27,7 +27,7 @@ CONF = conf.CONF
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
class CinderHelper(object): class CinderHelper:
def __init__(self, osc=None): def __init__(self, osc=None):
""":param osc: an OpenStackClients instance""" """:param osc: an OpenStackClients instance"""

2
watcher/common/clients.py
View File

@@ -61,7 +61,7 @@ def check_min_nova_api_version(config_version):
MIN_NOVA_API_VERSION)) MIN_NOVA_API_VERSION))
class OpenStackClients(object): class OpenStackClients:
"""Convenience class to create and cache client instances.""" """Convenience class to create and cache client instances."""
def __init__(self): def __init__(self):

3
watcher/common/exception.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -93,7 +92,7 @@ class WatcherException(Exception):
# at least get the core msg_fmt out if something happened # at least get the core msg_fmt out if something happened
message = self.msg_fmt message = self.msg_fmt
super(WatcherException, self).__init__(message) super().__init__(message)
def __str__(self): def __str__(self):
"""Encode to utf-8 then wsme api can consume it as well""" """Encode to utf-8 then wsme api can consume it as well"""

2
watcher/common/executor.py
View File

@@ -48,4 +48,4 @@ class APSchedulerThreadPoolExecutor(pool_executor.BasePoolExecutor):
def __init__(self, max_workers=10): def __init__(self, max_workers=10):
pool = get_futurist_pool_executor(max_workers) pool = get_futurist_pool_executor(max_workers)
super(APSchedulerThreadPoolExecutor, self).__init__(pool) super().__init__(pool)

3
watcher/common/ironic_helper.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2017 ZTE Corporation # Copyright (c) 2017 ZTE Corporation
# #
# Authors:Yumeng Bao <bao.yumeng@zte.com.cn> # Authors:Yumeng Bao <bao.yumeng@zte.com.cn>
@@ -26,7 +25,7 @@ from watcher.common import utils
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
class IronicHelper(object): class IronicHelper:
def __init__(self, osc=None): def __init__(self, osc=None):
""":param osc: an OpenStackClients instance""" """:param osc: an OpenStackClients instance"""

2
watcher/common/keystone_helper.py
View File

@@ -24,7 +24,7 @@ CONF = conf.CONF
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
class KeystoneHelper(object): class KeystoneHelper:
def __init__(self, osc=None): def __init__(self, osc=None):
""":param osc: an OpenStackClients instance""" """:param osc: an OpenStackClients instance"""

3
watcher/common/loader/base.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +16,7 @@
import abc import abc
class BaseLoader(object, metaclass=abc.ABCMeta): class BaseLoader(metaclass=abc.ABCMeta):
@abc.abstractmethod @abc.abstractmethod
def list_available(self): def list_available(self):

3
watcher/common/loader/default.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,7 +34,7 @@ class DefaultLoader(base.BaseLoader):
:type namespace: str :type namespace: str
:param conf: ConfigOpts instance, defaults to cfg.CONF :param conf: ConfigOpts instance, defaults to cfg.CONF
""" """
super(DefaultLoader, self).__init__() super().__init__()
self.namespace = namespace self.namespace = namespace
self.conf = conf self.conf = conf

9
watcher/common/loader/loadable.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +18,7 @@ import abc
from watcher.common import service from watcher.common import service
class Loadable(object, metaclass=abc.ABCMeta): class Loadable(metaclass=abc.ABCMeta):
"""Generic interface for dynamically loading a driver/entry point. """Generic interface for dynamically loading a driver/entry point.
This defines the contract in order to let the loader manager inject This defines the contract in order to let the loader manager inject
@@ -27,7 +26,7 @@ class Loadable(object, metaclass=abc.ABCMeta):
""" """
def __init__(self, config): def __init__(self, config):
super(Loadable, self).__init__() super().__init__()
self.config = config self.config = config
@classmethod @classmethod
@@ -45,7 +44,7 @@ LoadableSingletonMeta = type(
"LoadableSingletonMeta", (abc.ABCMeta, service.Singleton), {}) "LoadableSingletonMeta", (abc.ABCMeta, service.Singleton), {})
class LoadableSingleton(object, metaclass=LoadableSingletonMeta): class LoadableSingleton(metaclass=LoadableSingletonMeta):
"""Generic interface for dynamically loading a driver as a singleton. """Generic interface for dynamically loading a driver as a singleton.
This defines the contract in order to let the loader manager inject This defines the contract in order to let the loader manager inject
@@ -54,7 +53,7 @@ class LoadableSingleton(object, metaclass=LoadableSingletonMeta):
""" """
def __init__(self, config): def __init__(self, config):
super(LoadableSingleton, self).__init__() super().__init__()
self.config = config self.config = config
@classmethod @classmethod

3
watcher/common/nova_helper.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
@@ -34,7 +33,7 @@ LOG = log.getLogger(__name__)
CONF = conf.CONF CONF = conf.CONF
class NovaHelper(object): class NovaHelper:
def __init__(self, osc=None): def __init__(self, osc=None):
""":param osc: an OpenStackClients instance""" """:param osc: an OpenStackClients instance"""

1
watcher/common/oslo_service_helper.py
View File

@@ -1,4 +1,3 @@
# Copyright 2025 Red Hat, Inc. # Copyright 2025 Red Hat, Inc.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); you may # Licensed under the Apache License, Version 2.0 (the "License"); you may

2
watcher/common/placement_helper.py
View File

@@ -21,7 +21,7 @@ CONF = cfg.CONF
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
class PlacementHelper(object): class PlacementHelper:
def __init__(self, osc=None): def __init__(self, osc=None):
""":param osc: an OpenStackClients instance""" """:param osc: an OpenStackClients instance"""

1
watcher/common/scheduling.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Authors: Vincent FRANCOISE <vincent.francoise@b-com.com> # Authors: Vincent FRANCOISE <vincent.francoise@b-com.com>

7
watcher/common/service.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright © 2012 eNovance <licensing@enovance.com> # Copyright © 2012 eNovance <licensing@enovance.com>
## ##
@@ -109,7 +108,7 @@ class ServiceHeartbeat(scheduling.BackgroundSchedulerService):
def __init__(self, gconfig=None, service_name=None, **kwargs): def __init__(self, gconfig=None, service_name=None, **kwargs):
gconfig = None or {} gconfig = None or {}
super(ServiceHeartbeat, self).__init__(gconfig, **kwargs) super().__init__(gconfig, **kwargs)
ServiceHeartbeat.service_name = service_name ServiceHeartbeat.service_name = service_name
self.context = context.make_context() self.context = context.make_context()
self.send_beat() self.send_beat()
@@ -140,7 +139,7 @@ class ServiceHeartbeat(scheduling.BackgroundSchedulerService):
def start(self): def start(self):
"""Start service.""" """Start service."""
self.add_heartbeat_job() self.add_heartbeat_job()
super(ServiceHeartbeat, self).start() super().start()
def stop(self): def stop(self):
"""Stop service.""" """Stop service."""
@@ -161,7 +160,7 @@ class Service(service.ServiceBase):
API_VERSION = '1.0' API_VERSION = '1.0'
def __init__(self, manager_class): def __init__(self, manager_class):
super(Service, self).__init__() super().__init__()
self.manager = manager_class() self.manager = manager_class()
self.publisher_id = self.manager.publisher_id self.publisher_id = self.manager.publisher_id

3
watcher/common/service_manager.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright © 2016 Servionica # Copyright © 2016 Servionica
## ##
@@ -17,7 +16,7 @@
import abc import abc
class ServiceManager(object, metaclass=abc.ABCMeta): class ServiceManager(metaclass=abc.ABCMeta):
@property @property
@abc.abstractmethod @abc.abstractmethod

11
watcher/common/utils.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -126,10 +125,9 @@ def extend_with_default(validator_class):
if "default" in subschema and instance is not None: if "default" in subschema and instance is not None:
instance.setdefault(prop, subschema["default"]) instance.setdefault(prop, subschema["default"])
for error in validate_properties( yield from validate_properties(
validator, properties, instance, schema validator, properties, instance, schema
): )
yield error
return validators.extend(validator_class, return validators.extend(validator_class,
{"properties": set_defaults}) {"properties": set_defaults})
@@ -147,10 +145,9 @@ def extend_with_strict_schema(validator_class):
if para not in properties.keys(): if para not in properties.keys():
raise exception.AuditParameterNotAllowed(parameter=para) raise exception.AuditParameterNotAllowed(parameter=para)
for error in validate_properties( yield from validate_properties(
validator, properties, instance, schema validator, properties, instance, schema
): )
yield error
return validators.extend(validator_class, {"properties": strict_schema}) return validators.extend(validator_class, {"properties": strict_schema})

1
watcher/conf/__init__.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #

1
watcher/conf/api.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/applier.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/cinder_client.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/clients_auth.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/datasources.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2019 European Organization for Nuclear Research (CERN) # Copyright (c) 2019 European Organization for Nuclear Research (CERN)
# #
# Authors: Corne Lukken <info@dantalion.nl> # Authors: Corne Lukken <info@dantalion.nl>

3
watcher/conf/db.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>
@@ -21,7 +20,7 @@ from oslo_db import options as oslo_db_options
from watcher.conf import paths from watcher.conf import paths
_DEFAULT_SQL_CONNECTION = 'sqlite:///{0}'.format( _DEFAULT_SQL_CONNECTION = 'sqlite:///{}'.format(
paths.state_path_def('watcher.sqlite')) paths.state_path_def('watcher.sqlite'))
database = cfg.OptGroup(name='database', database = cfg.OptGroup(name='database',

1
watcher/conf/decision_engine.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 Intel Corp # Copyright (c) 2015 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/exception.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/glance_client.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/gnocchi_client.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2017 Servionica # Copyright (c) 2017 Servionica
# #
# Authors: Alexander Chadin <a.chadin@servionica.ru> # Authors: Alexander Chadin <a.chadin@servionica.ru>

1
watcher/conf/grafana_client.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2019 European Organization for Nuclear Research (CERN) # Copyright (c) 2019 European Organization for Nuclear Research (CERN)
# #
# Authors: Corne Lukken <info@dantalion.nl> # Authors: Corne Lukken <info@dantalion.nl>

1
watcher/conf/grafana_translators.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2019 European Organization for Nuclear Research (CERN) # Copyright (c) 2019 European Organization for Nuclear Research (CERN)
# #
# Authors: Corne Lukken <info@dantalion.nl> # Authors: Corne Lukken <info@dantalion.nl>

1
watcher/conf/ironic_client.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2017 ZTE Corp # Copyright (c) 2017 ZTE Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/keystone_client.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2019 ZTE Corporation # Copyright (c) 2019 ZTE Corporation
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");

1
watcher/conf/monasca_client.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/neutron_client.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/nova_client.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/paths.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/planner.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
# Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com> # Authors: Prudhvi Rao Shedimbi <prudhvi.rao.shedimbi@intel.com>

1
watcher/conf/plugins.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Authors: Vincent FRANCOISE <vincent.francoise@b-com.com> # Authors: Vincent FRANCOISE <vincent.francoise@b-com.com>

1
watcher/conf/service.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Authors: Vincent FRANCOISE <vincent.francoise@b-com.com> # Authors: Vincent FRANCOISE <vincent.francoise@b-com.com>

2
watcher/db/api.py
View File

@@ -29,7 +29,7 @@ def get_instance():
return IMPL return IMPL
class BaseConnection(object, metaclass=abc.ABCMeta): class BaseConnection(metaclass=abc.ABCMeta):
"""Base class for storage system connections.""" """Base class for storage system connections."""
@abc.abstractmethod @abc.abstractmethod

7
watcher/db/purge.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 b<>com # Copyright (c) 2016 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -34,7 +33,7 @@ from watcher import objects
LOG = log.getLogger(__name__) LOG = log.getLogger(__name__)
class WatcherObjectsMap(object): class WatcherObjectsMap:
"""Wrapper to deal with watcher objects per type """Wrapper to deal with watcher objects per type
This wrapper object contains a list of watcher objects per type. This wrapper object contains a list of watcher objects per type.
@@ -109,7 +108,7 @@ class WatcherObjectsMap(object):
return table.get_string() return table.get_string()
class PurgeCommand(object): class PurgeCommand:
"""Purges the DB by removing soft deleted entries """Purges the DB by removing soft deleted entries
The workflow for this purge is the following: The workflow for this purge is the following:
@@ -193,7 +192,7 @@ class PurgeCommand(object):
action_plans = objects.ActionPlan.list(self.ctx, filters=filters) action_plans = objects.ActionPlan.list(self.ctx, filters=filters)
actions = objects.Action.list(self.ctx, filters=filters) actions = objects.Action.list(self.ctx, filters=filters)
goal_ids = set(g.id for g in goals) goal_ids = {g.id for g in goals}
orphans.strategies = [ orphans.strategies = [
strategy for strategy in strategies strategy for strategy in strategies
if strategy.goal_id not in goal_ids] if strategy.goal_id not in goal_ids]

3
watcher/db/sqlalchemy/api.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# #
# Copyright 2013 Hewlett-Packard Development Company, L.P. # Copyright 2013 Hewlett-Packard Development Company, L.P.
# #
@@ -111,7 +110,7 @@ class Connection(api.BaseConnection):
} }
def __init__(self): def __init__(self):
super(Connection, self).__init__() super().__init__()
def __add_simple_filter(self, query, model, fieldname, value, operator_): def __add_simple_filter(self, query, model, fieldname, value, operator_):
field = getattr(model, fieldname) field = getattr(model, fieldname)

3
watcher/db/sqlalchemy/job_store.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2017 Servionica LTD # Copyright (c) 2017 Servionica LTD
# #
# Authors: Alexander Chadin <a.chadin@servionica.ru> # Authors: Alexander Chadin <a.chadin@servionica.ru>
@@ -52,7 +51,7 @@ class WatcherJobStore(sqlalchemy.SQLAlchemyJobStore):
def __init__(self, url=None, engine=None, tablename='apscheduler_jobs', def __init__(self, url=None, engine=None, tablename='apscheduler_jobs',
metadata=None, pickle_protocol=pickle.HIGHEST_PROTOCOL, metadata=None, pickle_protocol=pickle.HIGHEST_PROTOCOL,
tag=None): tag=None):
super(WatcherJobStore, self).__init__(url, engine, tablename, super().__init__(url, engine, tablename,
metadata, pickle_protocol) metadata, pickle_protocol)
metadata = maybe_ref(metadata) or MetaData() metadata = maybe_ref(metadata) or MetaData()
self.jobs_t = Table(tablename, metadata, autoload_with=engine) self.jobs_t = Table(tablename, metadata, autoload_with=engine)

5
watcher/decision_engine/audit/base.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com> # Authors: Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
@@ -39,7 +38,7 @@ class BaseMetaClass(service.Singleton, abc.ABCMeta):
pass pass
class BaseAuditHandler(object, metaclass=BaseMetaClass): class BaseAuditHandler(metaclass=BaseMetaClass):
@abc.abstractmethod @abc.abstractmethod
def execute(self, audit, request_context): def execute(self, audit, request_context):
@@ -61,7 +60,7 @@ class BaseAuditHandler(object, metaclass=BaseMetaClass):
class AuditHandler(BaseAuditHandler, metaclass=abc.ABCMeta): class AuditHandler(BaseAuditHandler, metaclass=abc.ABCMeta):
def __init__(self): def __init__(self):
super(AuditHandler, self).__init__() super().__init__()
self._strategy_context = default_context.DefaultStrategyContext() self._strategy_context = default_context.DefaultStrategyContext()
self._planner_loader = loader.DefaultPlannerLoader() self._planner_loader = loader.DefaultPlannerLoader()
self.applier_client = rpcapi.ApplierAPI() self.applier_client = rpcapi.ApplierAPI()

5
watcher/decision_engine/audit/continuous.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2016 Servionica LTD # Copyright (c) 2016 Servionica LTD
# Copyright (c) 2016 Intel Corp # Copyright (c) 2016 Intel Corp
# #
@@ -39,7 +38,7 @@ CONF = conf.CONF
class ContinuousAuditHandler(base.AuditHandler): class ContinuousAuditHandler(base.AuditHandler):
def __init__(self): def __init__(self):
super(ContinuousAuditHandler, self).__init__() super().__init__()
# scheduler for executing audits # scheduler for executing audits
self._audit_scheduler = None self._audit_scheduler = None
# scheduler for a periodic task to launch audit # scheduler for a periodic task to launch audit
@@ -82,7 +81,7 @@ class ContinuousAuditHandler(base.AuditHandler):
return False return False
def do_execute(self, audit, request_context): def do_execute(self, audit, request_context):
solution = super(ContinuousAuditHandler, self)\ solution = super()\
.do_execute(audit, request_context) .do_execute(audit, request_context)
if audit.audit_type == objects.audit.AuditType.CONTINUOUS.value: if audit.audit_type == objects.audit.AuditType.CONTINUOUS.value:

3
watcher/decision_engine/audit/event.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2019 ZTE Corporation # Copyright (c) 2019 ZTE Corporation
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +20,7 @@ from watcher import objects
class EventAuditHandler(base.AuditHandler): class EventAuditHandler(base.AuditHandler):
def post_execute(self, audit, solution, request_context): def post_execute(self, audit, solution, request_context):
super(EventAuditHandler, self).post_execute(audit, solution, super().post_execute(audit, solution,
request_context) request_context)
# change state of the audit to SUCCEEDED # change state of the audit to SUCCEEDED
self.update_audit_state(audit, objects.audit.State.SUCCEEDED) self.update_audit_state(audit, objects.audit.State.SUCCEEDED)

3
watcher/decision_engine/audit/oneshot.py
View File

@@ -1,4 +1,3 @@
# -*- encoding: utf-8 -*-
# Copyright (c) 2015 b<>com # Copyright (c) 2015 b<>com
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +20,7 @@ from watcher import objects
class OneShotAuditHandler(base.AuditHandler): class OneShotAuditHandler(base.AuditHandler):
def post_execute(self, audit, solution, request_context): def post_execute(self, audit, solution, request_context):
super(OneShotAuditHandler, self).post_execute(audit, solution, super().post_execute(audit, solution,
request_context) request_context)
# change state of the audit to SUCCEEDED # change state of the audit to SUCCEEDED
self.update_audit_state(audit, objects.audit.State.SUCCEEDED) self.update_audit_state(audit, objects.audit.State.SUCCEEDED)

Some files were not shown because too many files have changed in this diff Show More