From a9d1a18af94f3e0f0ac669c51f3acfb1c03058f0 Mon Sep 17 00:00:00 2001 From: hochikong <1097225749@qq.com> Date: Wed, 24 Aug 2016 14:56:00 +0800 Subject: Fix some mistakes in README and check all codes by 2to3 --- README.md | 14 ++++++++------ vymgmt/base_exception/__init__.py | 0 vymgmt/base_exception/base.py | 15 --------------- vymgmt/base_exception/exception_for_commit.py | 21 --------------------- .../exceptions_for_set_and_delete.py | 22 ---------------------- vymgmt/base_exceptions/__init__.py | 0 vymgmt/base_exceptions/base.py | 15 +++++++++++++++ vymgmt/base_exceptions/exceptions_for_commit.py | 21 +++++++++++++++++++++ .../exceptions_for_set_and_delete.py | 22 ++++++++++++++++++++++ vymgmt/router.py | 8 ++++---- 10 files changed, 70 insertions(+), 68 deletions(-) delete mode 100644 vymgmt/base_exception/__init__.py delete mode 100644 vymgmt/base_exception/base.py delete mode 100644 vymgmt/base_exception/exception_for_commit.py delete mode 100644 vymgmt/base_exception/exceptions_for_set_and_delete.py create mode 100644 vymgmt/base_exceptions/__init__.py create mode 100644 vymgmt/base_exceptions/base.py create mode 100644 vymgmt/base_exceptions/exceptions_for_commit.py create mode 100644 vymgmt/base_exceptions/exceptions_for_set_and_delete.py diff --git a/README.md b/README.md index e769a20..137bc40 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ #VyMGMT A python library for VyOS configurations -This python library is used for VyOS configurations.Use this library to send the configuration to VyOS. +This python library is used for VyOS configurations. + +Use this library to send the configuration commands to VyOS. ##Note ###Version:0.1 @@ -107,19 +109,19 @@ config: "interfaces ethernet eth0 description 'eth0'" The minimal configuration method. #Exceptions -##vymgmt.base\_exception.exception\_for\_commit.CommitFailed() +##vymgmt.base\_exceptions.exceptions\_for\_commit.CommitFailed() This exception class is for commit() failures due to some mistakes in your configurations. When this exception raise,the error message from VyOS will displayed. -##vymgmt.base\_exception.exception\_for\_commit.CommitConflict() +##vymgmt.base\_exceptions.exceptions\_for\_commit.CommitConflict() This exception class is for commit() failures due to the commit conflicts when more than one users committing their configurations at the same time. When this exception raise,the error message from VyOS will displayed. -##vymgmt.base\_exception.exceptions\_for\_set\_and\_delete.ConfigPathError() +##vymgmt.base\_exceptions.exceptions\_for\_set\_and\_delete.ConfigPathError() This exception class is for set() and delete() failures due to configuration path error. @@ -140,7 +142,7 @@ The wrong one will raise this exception and display the error message: When this exception raise,the error message from VyOS will displayed. -##vymgmt.base\_exception.exceptions\_for\_set\_and\_delete.ConfigValueError() +##vymgmt.base\_exceptions.exceptions\_for\_set\_and\_delete.ConfigValueError() This exception class is for set() and delete() failures due to value error. @@ -150,7 +152,7 @@ This exception will raise when your configuration has wrong value,such as: When this exception raise,the error message from VyOS will displayed. -##vymgmt.base_exception.CommonError() +##vymgmt.base_exceptions.CommonError() This exception class is for all failures which do not covered by exceptions above. diff --git a/vymgmt/base_exception/__init__.py b/vymgmt/base_exception/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/vymgmt/base_exception/base.py b/vymgmt/base_exception/base.py deleted file mode 100644 index dc80840..0000000 --- a/vymgmt/base_exception/base.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2016 Hochikong - -prefix = "\r\n" - - -class Error(Exception): - pass - - -class CommonError(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message diff --git a/vymgmt/base_exception/exception_for_commit.py b/vymgmt/base_exception/exception_for_commit.py deleted file mode 100644 index 26c14c4..0000000 --- a/vymgmt/base_exception/exception_for_commit.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2016 Hochikong - -from .base import Error - -prefix = "\r\n" - - -class CommitFailed(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message - - -class CommitConflict(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message diff --git a/vymgmt/base_exception/exceptions_for_set_and_delete.py b/vymgmt/base_exception/exceptions_for_set_and_delete.py deleted file mode 100644 index 0f65c88..0000000 --- a/vymgmt/base_exception/exceptions_for_set_and_delete.py +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2016 Hochikong - - -from .base import Error - -prefix = "\r\n" - - -class ConfigPathError(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message - - -class ConfigValueError(Error): - def __init__(self, message): - self.error_message = message - - def __str__(self): - return prefix + self.error_message diff --git a/vymgmt/base_exceptions/__init__.py b/vymgmt/base_exceptions/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/vymgmt/base_exceptions/base.py b/vymgmt/base_exceptions/base.py new file mode 100644 index 0000000..dc80840 --- /dev/null +++ b/vymgmt/base_exceptions/base.py @@ -0,0 +1,15 @@ +# Copyright (c) 2016 Hochikong + +prefix = "\r\n" + + +class Error(Exception): + pass + + +class CommonError(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message diff --git a/vymgmt/base_exceptions/exceptions_for_commit.py b/vymgmt/base_exceptions/exceptions_for_commit.py new file mode 100644 index 0000000..26c14c4 --- /dev/null +++ b/vymgmt/base_exceptions/exceptions_for_commit.py @@ -0,0 +1,21 @@ +# Copyright (c) 2016 Hochikong + +from .base import Error + +prefix = "\r\n" + + +class CommitFailed(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message + + +class CommitConflict(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message diff --git a/vymgmt/base_exceptions/exceptions_for_set_and_delete.py b/vymgmt/base_exceptions/exceptions_for_set_and_delete.py new file mode 100644 index 0000000..0f65c88 --- /dev/null +++ b/vymgmt/base_exceptions/exceptions_for_set_and_delete.py @@ -0,0 +1,22 @@ +# Copyright (c) 2016 Hochikong + + +from .base import Error + +prefix = "\r\n" + + +class ConfigPathError(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message + + +class ConfigValueError(Error): + def __init__(self, message): + self.error_message = message + + def __str__(self): + return prefix + self.error_message diff --git a/vymgmt/router.py b/vymgmt/router.py index 955a9ba..f46955d 100644 --- a/vymgmt/router.py +++ b/vymgmt/router.py @@ -2,10 +2,10 @@ from pxssh import pxssh -from mgmt_common import messenger, committer -from .base_exception.exceptions_for_set_and_delete import ConfigPathError, ConfigValueError -from .base_exception.exception_for_commit import CommitFailed, CommitConflict -from .base_exception.base import CommonError +from .mgmt_common import messenger, committer +from .base_exceptions.exceptions_for_set_and_delete import ConfigPathError, ConfigValueError +from .base_exceptions.exceptions_for_commit import CommitFailed, CommitConflict +from .base_exceptions.base import CommonError from .error_distinguish import distinguish_for_set, distinguish_for_delete, distinguish_for_commit -- cgit v1.2.3