From bc5cc972df4a2c6622d97267d5fa7975cd33d556 Mon Sep 17 00:00:00 2001 From: kskachkov Date: Mon, 4 Oct 2021 19:08:54 +0300 Subject: [PATCH] Move files to common agrirouter directory --- {auth => agrirouter/auth}/__init__.py | 0 {auth => agrirouter/auth}/auth.py | 6 +++--- {auth => agrirouter/auth}/enums.py | 0 {auth => agrirouter/auth}/exceptions.py | 0 {auth => agrirouter/auth}/parameters.py | 2 +- {auth => agrirouter/auth}/response.py | 2 +- {clients => agrirouter/clients}/__init__.py | 0 {clients => agrirouter/clients}/clients.py | 2 +- {constants => agrirouter/constants}/__init__.py | 0 {constants => agrirouter/constants}/keys.py | 0 {constants => agrirouter/constants}/media_types.py | 2 +- .../environments}/__init__.py | 0 {environments => agrirouter/environments}/enums.py | 0 .../environments}/environmental_services.py | 4 ++-- .../environments}/environments.py | 0 .../environments}/exceptions.py | 0 {onboarding => agrirouter/onboarding}/__init__.py | 0 {onboarding => agrirouter/onboarding}/enums.py | 2 +- .../onboarding}/exceptions.py | 0 {onboarding => agrirouter/onboarding}/headers.py | 2 +- .../onboarding}/onboarding.py | 14 +++++++------- .../onboarding}/parameters.py | 4 ++-- {onboarding => agrirouter/onboarding}/request.py | 6 +++--- .../onboarding}/request_body.py | 4 ++-- {onboarding => agrirouter/onboarding}/response.py | 0 {onboarding => agrirouter/onboarding}/signature.py | 0 {revoking => agrirouter/revoking}/__init__.py | 0 {revoking => agrirouter/revoking}/headers.py | 2 +- {revoking => agrirouter/revoking}/parameters.py | 2 +- {revoking => agrirouter/revoking}/request.py | 6 +++--- {revoking => agrirouter/revoking}/request_body.py | 0 {revoking => agrirouter/revoking}/response.py | 0 {revoking => agrirouter/revoking}/revoking.py | 14 +++++++------- 33 files changed, 37 insertions(+), 37 deletions(-) rename {auth => agrirouter/auth}/__init__.py (100%) rename {auth => agrirouter/auth}/auth.py (85%) rename {auth => agrirouter/auth}/enums.py (100%) rename {auth => agrirouter/auth}/exceptions.py (100%) rename {auth => agrirouter/auth}/parameters.py (96%) rename {auth => agrirouter/auth}/response.py (97%) rename {clients => agrirouter/clients}/__init__.py (100%) rename {clients => agrirouter/clients}/clients.py (89%) rename {constants => agrirouter/constants}/__init__.py (100%) rename {constants => agrirouter/constants}/keys.py (100%) rename {constants => agrirouter/constants}/media_types.py (63%) rename {environments => agrirouter/environments}/__init__.py (100%) rename {environments => agrirouter/environments}/enums.py (100%) rename {environments => agrirouter/environments}/environmental_services.py (69%) rename {environments => agrirouter/environments}/environments.py (100%) rename {environments => agrirouter/environments}/exceptions.py (100%) rename {onboarding => agrirouter/onboarding}/__init__.py (100%) rename {onboarding => agrirouter/onboarding}/enums.py (74%) rename {onboarding => agrirouter/onboarding}/exceptions.py (100%) rename {onboarding => agrirouter/onboarding}/headers.py (95%) rename {onboarding => agrirouter/onboarding}/onboarding.py (81%) rename {onboarding => agrirouter/onboarding}/parameters.py (96%) rename {onboarding => agrirouter/onboarding}/request.py (80%) rename {onboarding => agrirouter/onboarding}/request_body.py (94%) rename {onboarding => agrirouter/onboarding}/response.py (100%) rename {onboarding => agrirouter/onboarding}/signature.py (100%) rename {revoking => agrirouter/revoking}/__init__.py (100%) rename {revoking => agrirouter/revoking}/headers.py (92%) rename {revoking => agrirouter/revoking}/parameters.py (94%) rename {revoking => agrirouter/revoking}/request.py (84%) rename {revoking => agrirouter/revoking}/request_body.py (100%) rename {revoking => agrirouter/revoking}/response.py (100%) rename {revoking => agrirouter/revoking}/revoking.py (75%) diff --git a/auth/__init__.py b/agrirouter/auth/__init__.py similarity index 100% rename from auth/__init__.py rename to agrirouter/auth/__init__.py diff --git a/auth/auth.py b/agrirouter/auth/auth.py similarity index 85% rename from auth/auth.py rename to agrirouter/auth/auth.py index d0525e82..fa9e2e9a 100644 --- a/auth/auth.py +++ b/agrirouter/auth/auth.py @@ -1,8 +1,8 @@ from urllib.parse import urlparse, parse_qs -from auth.parameters import AuthUrlParameter -from auth.response import AuthResponse -from environments.environmental_services import EnvironmentalService +from agrirouter.auth.parameters import AuthUrlParameter +from agrirouter.auth.response import AuthResponse +from agrirouter.environments.environmental_services import EnvironmentalService class Authorization(EnvironmentalService): diff --git a/auth/enums.py b/agrirouter/auth/enums.py similarity index 100% rename from auth/enums.py rename to agrirouter/auth/enums.py diff --git a/auth/exceptions.py b/agrirouter/auth/exceptions.py similarity index 100% rename from auth/exceptions.py rename to agrirouter/auth/exceptions.py diff --git a/auth/parameters.py b/agrirouter/auth/parameters.py similarity index 96% rename from auth/parameters.py rename to agrirouter/auth/parameters.py index 48ee6e7b..a7d9902d 100644 --- a/auth/parameters.py +++ b/agrirouter/auth/parameters.py @@ -1,6 +1,6 @@ from uuid import uuid4 -from auth.enums import ResponseType +from agrirouter.auth.enums import ResponseType class AuthUrlParameter: diff --git a/auth/response.py b/agrirouter/auth/response.py similarity index 97% rename from auth/response.py rename to agrirouter/auth/response.py index 40a6b9c3..3e4f1067 100644 --- a/auth/response.py +++ b/agrirouter/auth/response.py @@ -5,7 +5,7 @@ from cryptography.exceptions import InvalidSignature -from onboarding.signature import verify_signature +from agrirouter.onboarding.signature import verify_signature class AuthResponse: diff --git a/clients/__init__.py b/agrirouter/clients/__init__.py similarity index 100% rename from clients/__init__.py rename to agrirouter/clients/__init__.py diff --git a/clients/clients.py b/agrirouter/clients/clients.py similarity index 89% rename from clients/clients.py rename to agrirouter/clients/clients.py index f3102e35..f42483ae 100644 --- a/clients/clients.py +++ b/agrirouter/clients/clients.py @@ -1,4 +1,4 @@ -from environments.environments import ProductionEnvironment, QAEnvironment +from agrirouter.environments.environments import ProductionEnvironment, QAEnvironment class InvalidEnvironmentSetup(Exception): diff --git a/constants/__init__.py b/agrirouter/constants/__init__.py similarity index 100% rename from constants/__init__.py rename to agrirouter/constants/__init__.py diff --git a/constants/keys.py b/agrirouter/constants/keys.py similarity index 100% rename from constants/keys.py rename to agrirouter/constants/keys.py diff --git a/constants/media_types.py b/agrirouter/constants/media_types.py similarity index 63% rename from constants/media_types.py rename to agrirouter/constants/media_types.py index a77638f6..56d454f0 100644 --- a/constants/media_types.py +++ b/agrirouter/constants/media_types.py @@ -1,4 +1,4 @@ -from auth.enums import BaseEnum +from agrirouter.auth.enums import BaseEnum class ContentTypes(BaseEnum): diff --git a/environments/__init__.py b/agrirouter/environments/__init__.py similarity index 100% rename from environments/__init__.py rename to agrirouter/environments/__init__.py diff --git a/environments/enums.py b/agrirouter/environments/enums.py similarity index 100% rename from environments/enums.py rename to agrirouter/environments/enums.py diff --git a/environments/environmental_services.py b/agrirouter/environments/environmental_services.py similarity index 69% rename from environments/environmental_services.py rename to agrirouter/environments/environmental_services.py index f980cd2f..c502becd 100644 --- a/environments/environmental_services.py +++ b/agrirouter/environments/environmental_services.py @@ -1,5 +1,5 @@ -from environments.exceptions import InvalidEnvironmentSetup -from environments.environments import ProductionEnvironment, QAEnvironment +from agrirouter.environments.exceptions import InvalidEnvironmentSetup +from agrirouter.environments.environments import ProductionEnvironment, QAEnvironment class EnvironmentalService: diff --git a/environments/environments.py b/agrirouter/environments/environments.py similarity index 100% rename from environments/environments.py rename to agrirouter/environments/environments.py diff --git a/environments/exceptions.py b/agrirouter/environments/exceptions.py similarity index 100% rename from environments/exceptions.py rename to agrirouter/environments/exceptions.py diff --git a/onboarding/__init__.py b/agrirouter/onboarding/__init__.py similarity index 100% rename from onboarding/__init__.py rename to agrirouter/onboarding/__init__.py diff --git a/onboarding/enums.py b/agrirouter/onboarding/enums.py similarity index 74% rename from onboarding/enums.py rename to agrirouter/onboarding/enums.py index cc7dbd31..f25a34e9 100644 --- a/onboarding/enums.py +++ b/agrirouter/onboarding/enums.py @@ -1,4 +1,4 @@ -from auth.enums import BaseEnum +from agrirouter.auth.enums import BaseEnum class CertificateTypes(BaseEnum): diff --git a/onboarding/exceptions.py b/agrirouter/onboarding/exceptions.py similarity index 100% rename from onboarding/exceptions.py rename to agrirouter/onboarding/exceptions.py diff --git a/onboarding/headers.py b/agrirouter/onboarding/headers.py similarity index 95% rename from onboarding/headers.py rename to agrirouter/onboarding/headers.py index 8ebf313e..20fcf6fa 100644 --- a/onboarding/headers.py +++ b/agrirouter/onboarding/headers.py @@ -1,6 +1,6 @@ from abc import ABC, abstractmethod -from constants.media_types import ContentTypes +from agrirouter.constants.media_types import ContentTypes class BaseOnboardingHeader(ABC): diff --git a/onboarding/onboarding.py b/agrirouter/onboarding/onboarding.py similarity index 81% rename from onboarding/onboarding.py rename to agrirouter/onboarding/onboarding.py index ee0d3dfe..0d0094e6 100644 --- a/onboarding/onboarding.py +++ b/agrirouter/onboarding/onboarding.py @@ -1,12 +1,12 @@ import requests -from environments.environmental_services import EnvironmentalService -from onboarding.exceptions import RequestNotSigned -from onboarding.headers import SoftwareOnboardingHeader, CUOnboardingHeader -from onboarding.parameters import SoftwareOnboardingParameter, BaseOnboardingParameter, CUOnboardingParameter -from onboarding.request import SoftwareOnboardingRequest, BaseOnboardingRequest, CUOnboardingRequest -from onboarding.request_body import SoftwareOnboardingBody, CUOnboardingBody -from onboarding.response import SoftwareVerifyOnboardingResponse, SoftwareOnboardingResponse, CUOnboardingResponse +from agrirouter.environments.environmental_services import EnvironmentalService +from agrirouter.onboarding.exceptions import RequestNotSigned +from agrirouter.onboarding.headers import SoftwareOnboardingHeader, CUOnboardingHeader +from agrirouter.onboarding.parameters import SoftwareOnboardingParameter, BaseOnboardingParameter, CUOnboardingParameter +from agrirouter.onboarding.request import SoftwareOnboardingRequest, BaseOnboardingRequest, CUOnboardingRequest +from agrirouter.onboarding.request_body import SoftwareOnboardingBody, CUOnboardingBody +from agrirouter.onboarding.response import SoftwareVerifyOnboardingResponse, SoftwareOnboardingResponse, CUOnboardingResponse class SoftwareOnboarding(EnvironmentalService): diff --git a/onboarding/parameters.py b/agrirouter/onboarding/parameters.py similarity index 96% rename from onboarding/parameters.py rename to agrirouter/onboarding/parameters.py index 12f3373a..f88be38c 100644 --- a/onboarding/parameters.py +++ b/agrirouter/onboarding/parameters.py @@ -1,7 +1,7 @@ from abc import ABC, abstractmethod -from constants.media_types import ContentTypes -from onboarding.enums import CertificateTypes +from agrirouter.constants.media_types import ContentTypes +from agrirouter.onboarding.enums import CertificateTypes class BaseOnboardingParameter(ABC): diff --git a/onboarding/request.py b/agrirouter/onboarding/request.py similarity index 80% rename from onboarding/request.py rename to agrirouter/onboarding/request.py index 8ec4258f..aae1e653 100644 --- a/onboarding/request.py +++ b/agrirouter/onboarding/request.py @@ -1,6 +1,6 @@ -from onboarding.headers import SoftwareOnboardingHeader, BaseOnboardingHeader -from onboarding.request_body import SoftwareOnboardingBody, BaseOnboardingBody -from onboarding.signature import create_signature +from agrirouter.onboarding.headers import SoftwareOnboardingHeader, BaseOnboardingHeader +from agrirouter.onboarding.request_body import SoftwareOnboardingBody, BaseOnboardingBody +from agrirouter.onboarding.signature import create_signature class BaseOnboardingRequest: diff --git a/onboarding/request_body.py b/agrirouter/onboarding/request_body.py similarity index 94% rename from onboarding/request_body.py rename to agrirouter/onboarding/request_body.py index 1d6c2ff2..d1c108eb 100644 --- a/onboarding/request_body.py +++ b/agrirouter/onboarding/request_body.py @@ -1,8 +1,8 @@ import json from abc import ABC, abstractmethod -from onboarding.enums import CertificateTypes, GateWays -from onboarding.exceptions import WrongCertificationType, WrongGateWay +from agrirouter.onboarding.enums import CertificateTypes, GateWays +from agrirouter.onboarding.exceptions import WrongCertificationType, WrongGateWay class BaseOnboardingBody(ABC): diff --git a/onboarding/response.py b/agrirouter/onboarding/response.py similarity index 100% rename from onboarding/response.py rename to agrirouter/onboarding/response.py diff --git a/onboarding/signature.py b/agrirouter/onboarding/signature.py similarity index 100% rename from onboarding/signature.py rename to agrirouter/onboarding/signature.py diff --git a/revoking/__init__.py b/agrirouter/revoking/__init__.py similarity index 100% rename from revoking/__init__.py rename to agrirouter/revoking/__init__.py diff --git a/revoking/headers.py b/agrirouter/revoking/headers.py similarity index 92% rename from revoking/headers.py rename to agrirouter/revoking/headers.py index 08dc878e..0c1770f2 100644 --- a/revoking/headers.py +++ b/agrirouter/revoking/headers.py @@ -1,4 +1,4 @@ -from constants.media_types import ContentTypes +from agrirouter.constants.media_types import ContentTypes class RevokingHeader: diff --git a/revoking/parameters.py b/agrirouter/revoking/parameters.py similarity index 94% rename from revoking/parameters.py rename to agrirouter/revoking/parameters.py index ef65d556..95a73332 100644 --- a/revoking/parameters.py +++ b/agrirouter/revoking/parameters.py @@ -1,4 +1,4 @@ -from constants.media_types import ContentTypes +from agrirouter.constants.media_types import ContentTypes class RevokingParameter: diff --git a/revoking/request.py b/agrirouter/revoking/request.py similarity index 84% rename from revoking/request.py rename to agrirouter/revoking/request.py index df80233e..d45b7787 100644 --- a/revoking/request.py +++ b/agrirouter/revoking/request.py @@ -1,6 +1,6 @@ -from onboarding.signature import create_signature -from revoking.headers import RevokingHeader -from revoking.request_body import RevokingBody +from agrirouter.onboarding.signature import create_signature +from agrirouter.revoking.headers import RevokingHeader +from agrirouter.revoking.request_body import RevokingBody class RevokingRequest: diff --git a/revoking/request_body.py b/agrirouter/revoking/request_body.py similarity index 100% rename from revoking/request_body.py rename to agrirouter/revoking/request_body.py diff --git a/revoking/response.py b/agrirouter/revoking/response.py similarity index 100% rename from revoking/response.py rename to agrirouter/revoking/response.py diff --git a/revoking/revoking.py b/agrirouter/revoking/revoking.py similarity index 75% rename from revoking/revoking.py rename to agrirouter/revoking/revoking.py index a1adb219..aaa8f871 100644 --- a/revoking/revoking.py +++ b/agrirouter/revoking/revoking.py @@ -1,12 +1,12 @@ import requests -from environments.environmental_services import EnvironmentalService -from onboarding.exceptions import RequestNotSigned -from revoking.headers import RevokingHeader -from revoking.parameters import RevokingParameter -from revoking.request import RevokingRequest -from revoking.request_body import RevokingBody -from revoking.response import RevokingResponse +from agrirouter.environments.environmental_services import EnvironmentalService +from agrirouter.onboarding.exceptions import RequestNotSigned +from agrirouter.revoking.headers import RevokingHeader +from agrirouter.revoking.parameters import RevokingParameter +from agrirouter.revoking.request import RevokingRequest +from agrirouter.revoking.request_body import RevokingBody +from agrirouter.revoking.response import RevokingResponse class Revoking(EnvironmentalService):