openstack
/
fuel-plugins
Code Issues Proposed changes

Rename existing BaseValidator to LegacyBaseValidator 

This change is required to introduce refactored validator instead current.

Change-Id: I2972ed8ce23b74b740fe3b6aa49002940677cbcc
Related-Bug: #1534126
Implements: blueprint release-as-a-plugin
This commit is contained in:
Ilya Kutukov 2016-02-19 01:43:50 +03:00
parent ee875c63bb
commit 5ec8f1ee88
9 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuel_plugin_builder/tests/base.py
View File

@ -85,7 +85,7 @@ class BaseTestCase(TestCase):
@mock.patch('fuel_plugin_builder.validators.base.utils') @mock.patch('fuel_plugin_builder.validators.base.utils')
class BaseValidator(BaseTestCase): class LegacyBaseValidatorTestCase(BaseTestCase):
__test__ = False __test__ = False
validator_class = None validator_class = None

18
fuel_plugin_builder/tests/test_base_validator.py
View File

@ -18,13 +18,13 @@ import mock
from fuel_plugin_builder import errors from fuel_plugin_builder import errors
from fuel_plugin_builder.tests.base import BaseTestCase from fuel_plugin_builder.tests.base import BaseTestCase
from fuel_plugin_builder.validators import BaseValidator from fuel_plugin_builder.validators import LegacyBaseValidator
class TestBaseValidator(BaseTestCase): class LegacyBaseValidatorTestCase(BaseTestCase):
def setUp(self): def setUp(self):
class NewValidator(BaseValidator): class NewValidator(LegacyBaseValidator):
@property @property
def basic_version(self): def basic_version(self):
@ -91,7 +91,8 @@ class TestBaseValidator(BaseTestCase):
data, schema, 'file_path', value_path=[0, 'path2']) data, schema, 'file_path', value_path=[0, 'path2'])
@mock.patch( @mock.patch(
'fuel_plugin_builder.validators.base.BaseValidator.validate_schema') 'fuel_plugin_builder.validators.base'
'.LegacyBaseValidator.validate_schema')
def test_validate_file_by_schema_failed(self, utils_mock): def test_validate_file_by_schema_failed(self, utils_mock):
utils_mock.parse_yaml.return_value = self.data utils_mock.parse_yaml.return_value = self.data
with self.assertRaisesRegexp( with self.assertRaisesRegexp(
@ -102,7 +103,8 @@ class TestBaseValidator(BaseTestCase):
@mock.patch('fuel_plugin_builder.validators.base.utils') @mock.patch('fuel_plugin_builder.validators.base.utils')
@mock.patch( @mock.patch(
'fuel_plugin_builder.validators.base.BaseValidator.validate_schema') 'fuel_plugin_builder.validators.base'
'.LegacyBaseValidator.validate_schema')
def test_validate_file_by_schema(self, validate_mock, utils_mock): def test_validate_file_by_schema(self, validate_mock, utils_mock):
utils_mock.parse_yaml.return_value = self.data utils_mock.parse_yaml.return_value = self.data
self.validator.validate_file_by_schema(self.schema, self.plugin_path) self.validator.validate_file_by_schema(self.schema, self.plugin_path)
@ -111,7 +113,8 @@ class TestBaseValidator(BaseTestCase):
@mock.patch('fuel_plugin_builder.validators.base.utils') @mock.patch('fuel_plugin_builder.validators.base.utils')
@mock.patch( @mock.patch(
'fuel_plugin_builder.validators.base.BaseValidator.validate_schema') 'fuel_plugin_builder.validators.base'
'.LegacyBaseValidator.validate_schema')
def test_validate_file_by_schema_empty_file_passes( def test_validate_file_by_schema_empty_file_passes(
self, validate_mock, utils_mock): self, validate_mock, utils_mock):
utils_mock.parse_yaml.return_value = None utils_mock.parse_yaml.return_value = None
@ -123,7 +126,8 @@ class TestBaseValidator(BaseTestCase):
@mock.patch('fuel_plugin_builder.validators.base.utils') @mock.patch('fuel_plugin_builder.validators.base.utils')
@mock.patch( @mock.patch(
'fuel_plugin_builder.validators.base.BaseValidator.validate_schema') 'fuel_plugin_builder.validators.base'
'.LegacyBaseValidator.validate_schema')
def test_validate_file_by_schema_empty_file_fails( def test_validate_file_by_schema_empty_file_fails(
self, validate_mock, utils_mock): self, validate_mock, utils_mock):
utils_mock.parse_yaml.return_value = None utils_mock.parse_yaml.return_value = None

4
fuel_plugin_builder/tests/test_validator_v1.py
View File

@ -17,12 +17,12 @@
import mock import mock
from fuel_plugin_builder import errors from fuel_plugin_builder import errors
from fuel_plugin_builder.tests.base import BaseValidator from fuel_plugin_builder.tests.base import LegacyBaseValidatorTestCase
from fuel_plugin_builder.validators.schemas.v1 import SchemaV1 from fuel_plugin_builder.validators.schemas.v1 import SchemaV1
from fuel_plugin_builder.validators.validator_v1 import ValidatorV1 from fuel_plugin_builder.validators.validator_v1 import ValidatorV1
class TestValidatorV1(BaseValidator): class TestValidatorV1(LegacyBaseValidatorTestCase):
__test__ = True __test__ = True
validator_class = ValidatorV1 validator_class = ValidatorV1

4
fuel_plugin_builder/tests/test_validator_v2.py
View File

@ -17,12 +17,12 @@
import mock import mock
from fuel_plugin_builder import errors from fuel_plugin_builder import errors
from fuel_plugin_builder.tests.base import BaseValidator from fuel_plugin_builder.tests.base import LegacyBaseValidatorTestCase
from fuel_plugin_builder.validators.schemas.v2 import SchemaV2 from fuel_plugin_builder.validators.schemas.v2 import SchemaV2
from fuel_plugin_builder.validators.validator_v2 import ValidatorV2 from fuel_plugin_builder.validators.validator_v2 import ValidatorV2
class TestValidatorV2(BaseValidator): class TestValidatorV2(LegacyBaseValidatorTestCase):
__test__ = True __test__ = True
validator_class = ValidatorV2 validator_class = ValidatorV2

4
fuel_plugin_builder/tests/test_validator_v3.py
View File

@ -17,12 +17,12 @@
import mock import mock
from fuel_plugin_builder import errors from fuel_plugin_builder import errors
from fuel_plugin_builder.tests.base import BaseValidator from fuel_plugin_builder.tests.base import LegacyBaseValidatorTestCase
from fuel_plugin_builder.validators.schemas import SchemaV3 from fuel_plugin_builder.validators.schemas import SchemaV3
from fuel_plugin_builder.validators.validator_v3 import ValidatorV3 from fuel_plugin_builder.validators.validator_v3 import ValidatorV3
class TestValidatorV3(BaseValidator): class TestValidatorV3(LegacyBaseValidatorTestCase):
__test__ = True __test__ = True
validator_class = ValidatorV3 validator_class = ValidatorV3

2
fuel_plugin_builder/validators/__init__.py
View File

@ -19,4 +19,4 @@ from fuel_plugin_builder.validators.validator_v1 import ValidatorV1
from fuel_plugin_builder.validators.validator_v2 import ValidatorV2 from fuel_plugin_builder.validators.validator_v2 import ValidatorV2
from fuel_plugin_builder.validators.validator_v3 import ValidatorV3 from fuel_plugin_builder.validators.validator_v3 import ValidatorV3
from fuel_plugin_builder.validators.validator_v4 import ValidatorV4 from fuel_plugin_builder.validators.validator_v4 import ValidatorV4
from fuel_plugin_builder.validators.base import BaseValidator from fuel_plugin_builder.validators.base import LegacyBaseValidator

2
fuel_plugin_builder/validators/base.py
View File

@ -29,7 +29,7 @@ logger = logging.getLogger(__name__)
@six.add_metaclass(abc.ABCMeta) @six.add_metaclass(abc.ABCMeta)
class BaseValidator(object): class LegacyBaseValidator(object):
@abc.abstractproperty @abc.abstractproperty
def basic_version(self): def basic_version(self):

4
fuel_plugin_builder/validators/validator_v1.py
View File

@ -18,14 +18,14 @@ import logging
from os.path import join as join_path from os.path import join as join_path
from fuel_plugin_builder import utils from fuel_plugin_builder import utils
from fuel_plugin_builder.validators.base import BaseValidator from fuel_plugin_builder.validators.base import LegacyBaseValidator
from fuel_plugin_builder.validators.schemas import SchemaV1 from fuel_plugin_builder.validators.schemas import SchemaV1
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class ValidatorV1(BaseValidator): class ValidatorV1(LegacyBaseValidator):
schema = SchemaV1() schema = SchemaV1()

4
fuel_plugin_builder/validators/validator_v2.py
View File

@ -18,14 +18,14 @@ import logging
from os.path import join as join_path from os.path import join as join_path
from fuel_plugin_builder import utils from fuel_plugin_builder import utils
from fuel_plugin_builder.validators.base import BaseValidator from fuel_plugin_builder.validators.base import LegacyBaseValidator
from fuel_plugin_builder.validators.schemas import SchemaV2 from fuel_plugin_builder.validators.schemas import SchemaV2
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
class ValidatorV2(BaseValidator): class ValidatorV2(LegacyBaseValidator):
schema = SchemaV2() schema = SchemaV2()