diff --git a/wazo_confd/_bus.py b/wazo_confd/_bus.py index ef31927ee..dc89cec9b 100644 --- a/wazo_confd/_bus.py +++ b/wazo_confd/_bus.py @@ -6,7 +6,7 @@ from wazo_bus.consumer import BusConsumer as Consumer from wazo_bus.mixins import PublisherMixin, WazoEventMixin from wazo_bus.base import Base -from xivo.status import Status +from wazo.status import Status class FlushMixin: diff --git a/wazo_confd/auth.py b/wazo_confd/auth.py index 88157d537..db7864d69 100644 --- a/wazo_confd/auth.py +++ b/wazo_confd/auth.py @@ -1,9 +1,9 @@ -# Copyright 2014-2022 The Wazo Authors (see the AUTHORS file) +# Copyright 2014-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later -from xivo.auth_verifier import required_acl, required_tenant, no_auth -from xivo.rest_api_helpers import APIException -from xivo.status import Status +from wazo.auth_verifier import required_acl, required_tenant, no_auth +from wazo.rest_api_helpers import APIException +from wazo.status import Status from werkzeug.local import LocalProxy as Proxy diff --git a/wazo_confd/config.py b/wazo_confd/config.py index f9f9c0311..68771e209 100644 --- a/wazo_confd/config.py +++ b/wazo_confd/config.py @@ -4,9 +4,9 @@ import argparse import yaml -from xivo.chain_map import ChainMap -from xivo.config_helper import parse_config_file, read_config_file_hierarchy -from xivo.xivo_logging import get_log_level_by_name +from wazo.chain_map import ChainMap +from wazo.config_helper import parse_config_file, read_config_file_hierarchy +from wazo.xivo_logging import get_log_level_by_name API_VERSION = '1.1' WIZARD_KEY_FILE = '/var/lib/wazo-auth-keys/wazo-wizard-key.yml' diff --git a/wazo_confd/controller.py b/wazo_confd/controller.py index d8c4e910d..bc6551095 100644 --- a/wazo_confd/controller.py +++ b/wazo_confd/controller.py @@ -1,4 +1,4 @@ -# Copyright 2015-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2015-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later import logging @@ -10,10 +10,10 @@ import xivo_dao from wazo_auth_client import Client as AuthClient -from xivo import plugin_helpers -from xivo.consul_helpers import ServiceCatalogRegistration -from xivo.status import StatusAggregator, TokenStatus -from xivo.token_renewer import TokenRenewer +from wazo import plugin_helpers +from wazo.consul_helpers import ServiceCatalogRegistration +from wazo.status import StatusAggregator, TokenStatus +from wazo.token_renewer import TokenRenewer from wazo_confd.helpers.asterisk import PJSIPDoc from wazo_confd.helpers.middleware import MiddleWareHandle diff --git a/wazo_confd/helpers/asterisk.py b/wazo_confd/helpers/asterisk.py index cd3a4ce58..332aad8b6 100644 --- a/wazo_confd/helpers/asterisk.py +++ b/wazo_confd/helpers/asterisk.py @@ -1,4 +1,4 @@ -# Copyright 2018-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2018-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later import logging @@ -10,7 +10,7 @@ from marshmallow import fields, pre_dump, post_load, pre_load, post_dump from marshmallow.validate import Length -from xivo.rest_api_helpers import APIException +from wazo.rest_api_helpers import APIException from xivo_dao.alchemy.asterisk_file_variable import AsteriskFileVariable from xivo_dao.helpers import errors diff --git a/wazo_confd/helpers/common.py b/wazo_confd/helpers/common.py index 2e7601ac2..59ff36499 100644 --- a/wazo_confd/helpers/common.py +++ b/wazo_confd/helpers/common.py @@ -1,4 +1,4 @@ -# Copyright 2013-2019 The Wazo Authors (see the AUTHORS file) +# Copyright 2013-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later import logging @@ -9,7 +9,7 @@ from flask_restful.utils import http_status_message from werkzeug.exceptions import HTTPException -from xivo import rest_api_helpers +from wazo import rest_api_helpers from xivo_dao.helpers.db_manager import Session from xivo_dao.helpers.exception import ServiceError, NotFoundError from wazo_provd_client.exceptions import ProvdError diff --git a/wazo_confd/helpers/restful.py b/wazo_confd/helpers/restful.py index e9622dbfc..1cd98bae6 100644 --- a/wazo_confd/helpers/restful.py +++ b/wazo_confd/helpers/restful.py @@ -6,9 +6,9 @@ import marshmallow -from xivo.flask.auth_verifier import AuthVerifierFlask -from xivo.mallow import fields, validate -from xivo.tenant_flask_helpers import Tenant, token +from wazo.flask.auth_verifier import AuthVerifierFlask +from wazo.mallow import fields, validate +from wazo.tenant_flask_helpers import Tenant, token from xivo_dao import tenant_dao from wazo_confd.helpers.common import handle_api_exception diff --git a/wazo_confd/http_server.py b/wazo_confd/http_server.py index 8ead68e79..cb2a8a81e 100644 --- a/wazo_confd/http_server.py +++ b/wazo_confd/http_server.py @@ -12,8 +12,8 @@ from werkzeug.middleware.profiler import ProfilerMiddleware from werkzeug.middleware.proxy_fix import ProxyFix -from xivo import http_helpers -from xivo.http_helpers import ReverseProxied +from wazo import http_helpers +from wazo.http_helpers import ReverseProxied from xivo_dao.helpers.db_manager import Session from xivo_dao.helpers.db_utils import session_scope from xivo_dao.resources.infos import dao as info_dao diff --git a/wazo_confd/main.py b/wazo_confd/main.py index 1eb521d9e..78aa6feee 100644 --- a/wazo_confd/main.py +++ b/wazo_confd/main.py @@ -1,12 +1,12 @@ -# Copyright 2013-2020 The Wazo Authors (see the AUTHORS file) +# Copyright 2013-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later import logging import sys -from xivo import xivo_logging -from xivo.config_helper import set_xivo_uuid, UUIDNotFound -from xivo.user_rights import change_user +from wazo import xivo_logging +from wazo.config_helper import set_xivo_uuid, UUIDNotFound +from wazo.user_rights import change_user from wazo_confd.config import load as load_config from wazo_confd.controller import Controller diff --git a/wazo_confd/plugins/api/resource.py b/wazo_confd/plugins/api/resource.py index 95f040a33..e4a2db383 100644 --- a/wazo_confd/plugins/api/resource.py +++ b/wazo_confd/plugins/api/resource.py @@ -1,4 +1,4 @@ -# Copyright 2016-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2016-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later import logging @@ -6,9 +6,9 @@ from flask import make_response from flask_restful import Resource -from xivo.chain_map import ChainMap -from xivo.rest_api_helpers import load_all_api_specs -from xivo.http_helpers import reverse_proxy_fix_api_spec +from wazo.chain_map import ChainMap +from wazo.rest_api_helpers import load_all_api_specs +from wazo.http_helpers import reverse_proxy_fix_api_spec logger = logging.getLogger(__name__) diff --git a/wazo_confd/plugins/call_filter/schema.py b/wazo_confd/plugins/call_filter/schema.py index 88e9d01a1..352b331eb 100644 --- a/wazo_confd/plugins/call_filter/schema.py +++ b/wazo_confd/plugins/call_filter/schema.py @@ -1,9 +1,9 @@ -# Copyright 2018-2022 The Wazo Authors (see the AUTHORS file) +# Copyright 2018-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later from marshmallow import fields, post_dump from marshmallow.validate import OneOf, Length, Range -from xivo.xivo_helpers import clean_extension +from wazo.xivo_helpers import clean_extension from wazo_confd.helpers.mallow import BaseSchema, StrictBoolean, Link, ListLink, Nested diff --git a/wazo_confd/plugins/device/funckey.py b/wazo_confd/plugins/device/funckey.py index 11ec27ea5..d50b00dd4 100644 --- a/wazo_confd/plugins/device/funckey.py +++ b/wazo_confd/plugins/device/funckey.py @@ -3,7 +3,7 @@ import abc -from xivo.xivo_helpers import fkey_extension +from wazo.xivo_helpers import fkey_extension from xivo_dao.resources.extension import dao as extension_dao_module from xivo_dao.resources.feature_extension import dao as feature_extension_dao_module from xivo_dao.resources.features import dao as features_dao_module diff --git a/wazo_confd/plugins/device/resource.py b/wazo_confd/plugins/device/resource.py index e9f739949..c66067698 100644 --- a/wazo_confd/plugins/device/resource.py +++ b/wazo_confd/plugins/device/resource.py @@ -1,8 +1,8 @@ -# Copyright 2016-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2016-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later from flask import request, url_for -from xivo.tenant_flask_helpers import Tenant +from wazo.tenant_flask_helpers import Tenant from wazo_confd.auth import required_acl from wazo_confd.helpers.restful import ( diff --git a/wazo_confd/plugins/func_key/validator.py b/wazo_confd/plugins/func_key/validator.py index 6cd7ab117..468848526 100644 --- a/wazo_confd/plugins/func_key/validator.py +++ b/wazo_confd/plugins/func_key/validator.py @@ -14,7 +14,7 @@ from xivo_dao.resources.queue import dao as queue_dao from xivo_dao.resources.user import dao as user_dao from marshmallow.exceptions import ValidationError -from xivo.mallow import validate as mallow_validate +from wazo.mallow import validate as mallow_validate from wazo_confd.helpers.validator import ( Validator, diff --git a/wazo_confd/plugins/ha/schema.py b/wazo_confd/plugins/ha/schema.py index 52bc3bc1b..3740abb2e 100644 --- a/wazo_confd/plugins/ha/schema.py +++ b/wazo_confd/plugins/ha/schema.py @@ -1,10 +1,10 @@ -# Copyright 2019-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2019-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later from marshmallow import validates_schema from marshmallow.exceptions import ValidationError from marshmallow.validate import OneOf -from xivo.mallow import fields +from wazo.mallow import fields from wazo_confd.helpers.mallow import BaseSchema diff --git a/wazo_confd/plugins/line_device/resource.py b/wazo_confd/plugins/line_device/resource.py index 65ce95aa3..b5001f013 100644 --- a/wazo_confd/plugins/line_device/resource.py +++ b/wazo_confd/plugins/line_device/resource.py @@ -1,9 +1,9 @@ -# Copyright 2016-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2016-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later from marshmallow import fields -from xivo.tenant_flask_helpers import Tenant +from wazo.tenant_flask_helpers import Tenant from wazo_confd.auth import required_acl from wazo_confd.helpers.mallow import BaseSchema, Link, ListLink from wazo_confd.helpers.restful import ConfdResource, build_tenant diff --git a/wazo_confd/plugins/localization/resource.py b/wazo_confd/plugins/localization/resource.py index fcdc95903..d37949255 100644 --- a/wazo_confd/plugins/localization/resource.py +++ b/wazo_confd/plugins/localization/resource.py @@ -5,7 +5,7 @@ from wazo_confd.auth import required_acl from wazo_confd.helpers.restful import ConfdResource, build_tenant -from xivo.tenant_flask_helpers import Tenant +from wazo.tenant_flask_helpers import Tenant from .schema import LocalizationSchema diff --git a/wazo_confd/plugins/localization/schema.py b/wazo_confd/plugins/localization/schema.py index f317683e3..ba71382fe 100644 --- a/wazo_confd/plugins/localization/schema.py +++ b/wazo_confd/plugins/localization/schema.py @@ -6,7 +6,7 @@ from marshmallow import validates from marshmallow.validate import Length from marshmallow.exceptions import ValidationError -from xivo.mallow import fields +from wazo.mallow import fields from wazo_confd.helpers.mallow import BaseSchema diff --git a/wazo_confd/plugins/meeting/exceptions.py b/wazo_confd/plugins/meeting/exceptions.py index 4e7456a34..6d8ca34d6 100644 --- a/wazo_confd/plugins/meeting/exceptions.py +++ b/wazo_confd/plugins/meeting/exceptions.py @@ -1,7 +1,7 @@ -# Copyright 2022 The Wazo Authors (see the AUTHORS file) +# Copyright 2022-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later -from xivo.rest_api_helpers import APIException +from wazo.rest_api_helpers import APIException class MeetingGuestSIPTemplateNotFound(APIException): diff --git a/wazo_confd/plugins/meeting/notifier.py b/wazo_confd/plugins/meeting/notifier.py index c3a66526b..6f2d7a839 100644 --- a/wazo_confd/plugins/meeting/notifier.py +++ b/wazo_confd/plugins/meeting/notifier.py @@ -1,7 +1,7 @@ # Copyright 2021-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later -from xivo.xivo_helpers import clean_extension +from wazo.xivo_helpers import clean_extension from wazo_bus.resources.meeting.event import ( MeetingCreatedEvent, MeetingDeletedEvent, diff --git a/wazo_confd/plugins/meeting/resource.py b/wazo_confd/plugins/meeting/resource.py index 434cd6ff9..ce523f35c 100644 --- a/wazo_confd/plugins/meeting/resource.py +++ b/wazo_confd/plugins/meeting/resource.py @@ -9,8 +9,8 @@ from flask import url_for, request -from xivo.xivo_helpers import clean_extension -from xivo.tenant_flask_helpers import user +from wazo.xivo_helpers import clean_extension +from wazo.tenant_flask_helpers import user from xivo_dao.alchemy.meeting import Meeting from xivo_dao.alchemy.endpoint_sip import EndpointSIP diff --git a/wazo_confd/plugins/meeting/schema.py b/wazo_confd/plugins/meeting/schema.py index afcf56c0e..5f93e0b29 100644 --- a/wazo_confd/plugins/meeting/schema.py +++ b/wazo_confd/plugins/meeting/schema.py @@ -1,4 +1,4 @@ -# Copyright 2021-2022 The Wazo Authors (see the AUTHORS file) +# Copyright 2021-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later import logging @@ -7,7 +7,7 @@ from marshmallow import fields from marshmallow.validate import Length -from xivo.rest_api_helpers import APIException +from wazo.rest_api_helpers import APIException from wazo_confd.helpers.mallow import BaseSchema, Link, ListLink diff --git a/wazo_confd/plugins/meeting_authorization/resource.py b/wazo_confd/plugins/meeting_authorization/resource.py index e6a9a212b..2fb7d0e4f 100644 --- a/wazo_confd/plugins/meeting_authorization/resource.py +++ b/wazo_confd/plugins/meeting_authorization/resource.py @@ -7,7 +7,7 @@ from xivo_dao.alchemy.meeting_authorization import MeetingAuthorization from xivo_dao.helpers import errors from xivo_dao.helpers.exception import NotFoundError -from xivo.tenant_flask_helpers import user +from wazo.tenant_flask_helpers import user from .schema import ( MeetingAuthorizationSchema, diff --git a/wazo_confd/plugins/sound/resource.py b/wazo_confd/plugins/sound/resource.py index dd9b954d6..bdd4eb70d 100644 --- a/wazo_confd/plugins/sound/resource.py +++ b/wazo_confd/plugins/sound/resource.py @@ -1,8 +1,8 @@ -# Copyright 2017-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2017-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later from flask import request, url_for -from xivo.tenant_flask_helpers import Tenant +from wazo.tenant_flask_helpers import Tenant from wazo_confd.auth import required_acl from wazo_confd.helpers.restful import ConfdResource, ItemResource, ListResource diff --git a/wazo_confd/plugins/status/plugin.py b/wazo_confd/plugins/status/plugin.py index 9975e3630..9e8f1f036 100644 --- a/wazo_confd/plugins/status/plugin.py +++ b/wazo_confd/plugins/status/plugin.py @@ -1,7 +1,7 @@ -# Copyright 2022 The Wazo Authors (see the AUTHORS file) +# Copyright 2022-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later -from xivo.status import Status +from wazo.status import Status from .resource import StatusChecker diff --git a/wazo_confd/plugins/status/resource.py b/wazo_confd/plugins/status/resource.py index a5ec27d7a..e450a8581 100644 --- a/wazo_confd/plugins/status/resource.py +++ b/wazo_confd/plugins/status/resource.py @@ -1,7 +1,7 @@ -# Copyright 2022 The Wazo Authors (see the AUTHORS file) +# Copyright 2022-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later -from xivo.auth_verifier import required_acl +from wazo.auth_verifier import required_acl from wazo_confd.helpers.restful import ConfdResource diff --git a/wazo_confd/plugins/user_external_app/resource.py b/wazo_confd/plugins/user_external_app/resource.py index 2deca2a80..4da33f7f7 100644 --- a/wazo_confd/plugins/user_external_app/resource.py +++ b/wazo_confd/plugins/user_external_app/resource.py @@ -1,9 +1,9 @@ -# Copyright 2020-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2020-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later from flask import url_for, request -from xivo.tenant_flask_helpers import Tenant +from wazo.tenant_flask_helpers import Tenant from xivo_dao import tenant_dao from xivo_dao.alchemy.user_external_app import UserExternalApp diff --git a/wazo_confd/plugins/user_import/resource.py b/wazo_confd/plugins/user_import/resource.py index a40b0b91b..91ec8f274 100644 --- a/wazo_confd/plugins/user_import/resource.py +++ b/wazo_confd/plugins/user_import/resource.py @@ -1,7 +1,7 @@ -# Copyright 2015-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2015-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later -from xivo.tenant_flask_helpers import Tenant +from wazo.tenant_flask_helpers import Tenant from xivo_dao.helpers.db_manager import Session from wazo_confd import sysconfd, bus diff --git a/wazo_confd/plugins/user_subscription/resource.py b/wazo_confd/plugins/user_subscription/resource.py index 220ab29dc..b78545a7e 100644 --- a/wazo_confd/plugins/user_subscription/resource.py +++ b/wazo_confd/plugins/user_subscription/resource.py @@ -1,9 +1,9 @@ -# Copyright 2022-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2022-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later from marshmallow import fields -from xivo.tenant_flask_helpers import Tenant +from wazo.tenant_flask_helpers import Tenant from wazo_confd.auth import required_acl from wazo_confd.helpers.restful import ConfdResource diff --git a/wazo_confd/purge_meetings.py b/wazo_confd/purge_meetings.py index 86ff43099..699fcbe99 100644 --- a/wazo_confd/purge_meetings.py +++ b/wazo_confd/purge_meetings.py @@ -1,4 +1,4 @@ -# Copyright 2021-2022 The Wazo Authors (see the AUTHORS file) +# Copyright 2021-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later import argparse @@ -6,9 +6,9 @@ from datetime import datetime, timedelta, timezone -from xivo import xivo_logging -from xivo.chain_map import ChainMap -from xivo.config_helper import read_config_file_hierarchy +from wazo import xivo_logging +from wazo.chain_map import ChainMap +from wazo.config_helper import read_config_file_hierarchy from xivo_dao import init_db_from_config from xivo_dao.helpers.db_utils import session_scope from xivo_dao.resources.infos import dao as info_dao diff --git a/wazo_confd/sync_db.py b/wazo_confd/sync_db.py index fd0253a68..fd2af6827 100644 --- a/wazo_confd/sync_db.py +++ b/wazo_confd/sync_db.py @@ -1,12 +1,12 @@ -# Copyright 2020-2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2020-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later import argparse import logging -from xivo import xivo_logging -from xivo.chain_map import ChainMap -from xivo.config_helper import read_config_file_hierarchy +from wazo import xivo_logging +from wazo.chain_map import ChainMap +from wazo.config_helper import read_config_file_hierarchy from xivo_dao import init_db_from_config from xivo_dao.alchemy.tenant import Tenant from xivo_dao.helpers.db_utils import session_scope diff --git a/wazo_confd/wait.py b/wazo_confd/wait.py index e8eb3401f..a77db1d2e 100644 --- a/wazo_confd/wait.py +++ b/wazo_confd/wait.py @@ -1,4 +1,4 @@ -# Copyright 2023 The Wazo Authors (see the AUTHORS file) +# Copyright 2023-2024 The Wazo Authors (see the AUTHORS file) # SPDX-License-Identifier: GPL-3.0-or-later import socket @@ -6,8 +6,8 @@ import time from contextlib import closing -from xivo.chain_map import ChainMap -from xivo.config_helper import read_config_file_hierarchy +from wazo.chain_map import ChainMap +from wazo.config_helper import read_config_file_hierarchy from wazo_confd.config import DEFAULT_CONFIG