x/stacktach
Code Issues Proposed changes

Merge pull request #309 from manalilatkar/os_distro_optional

Browse Source 
Making the type and null check for os_version optional according to import image_type
This commit is contained in:
anujm
2014-03-19 21:17:30 +05:30
parent da5cd479cb e2f99d8ae4
commit b646d6150e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/test_nova_verifier.py
View File

@@ -1412,12 +1412,13 @@ class NovaVerifierValidityTestCase(StacktachBaseTestCase):
nova_verifier._verify_validity(exist, 'all') nova_verifier._verify_validity(exist, 'all')
self.mox.VerifyAll() self.mox.VerifyAll()
def test_should_verify_null_os_distro_if_image_type_is_import(self): def test_should_verify_in_spite_of_null_os_distro_and_os_version_if_image_type_is_import(self):
self.mox.StubOutWithMock(config, 'flavor_field_name') self.mox.StubOutWithMock(config, 'flavor_field_name')
config.flavor_field_name().AndReturn('dummy_flavor_field_name') config.flavor_field_name().AndReturn('dummy_flavor_field_name')
exist = self._create_mock_exist() exist = self._create_mock_exist()
exist.os_distro = "" exist.os_distro = ""
exist.os_version = ""
exist.is_image_type_import().AndReturn(True) exist.is_image_type_import().AndReturn(True)
self.mox.ReplayAll() self.mox.ReplayAll()

7
verifier/nova_verifier.py
View File

@@ -178,10 +178,11 @@ def _verify_basic_validity(exist):
def _verify_optional_validity(exist): def _verify_optional_validity(exist):
is_image_type_import = exist.is_image_type_import() is_image_type_import = exist.is_image_type_import()
fields = {exist.rax_options: 'rax_options', fields = {exist.rax_options: 'rax_options',
exist.os_architecture: 'os_architecture', exist.os_architecture: 'os_architecture'
exist.os_version: 'os_version'} }
if not is_image_type_import: if not is_image_type_import:
fields.update({exist.os_distro: 'os_distro'}) fields.update({exist.os_distro: 'os_distro',
exist.os_version: 'os_version'})
for (field_value, field_name) in fields.items(): for (field_value, field_name) in fields.items():
if field_value == '': if field_value == '':
raise NullFieldException(field_name, exist.id, exist.instance) raise NullFieldException(field_name, exist.id, exist.instance)