From c5a76f97e614673ad61322b82110830acfa13612 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 7 Nov 2016 12:03:36 +0000 Subject: [PATCH] conf: Covert StrOpt -> PortOpt ...resolving the TODO in the process. Change-Id: I076483c4a3aff369c0ba2e87abd91acafcd9f677 --- nova/conf/xenserver.py | 5 ++--- nova/tests/unit/virt/xenapi/test_volume_utils.py | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/nova/conf/xenserver.py b/nova/conf/xenserver.py index 976759a35b66..8722cc37d044 100644 --- a/nova/conf/xenserver.py +++ b/nova/conf/xenserver.py @@ -425,9 +425,8 @@ Possible values: * Any string that represents hostname/ip of Target. """), - # TODO(aunnam): This should be PortOpt - cfg.StrOpt('target_port', - default='3260', + cfg.PortOpt('target_port', + default=3260, help=""" The iSCSI Target Port. diff --git a/nova/tests/unit/virt/xenapi/test_volume_utils.py b/nova/tests/unit/virt/xenapi/test_volume_utils.py index ca72edf1ea3a..69e80959cece 100644 --- a/nova/tests/unit/virt/xenapi/test_volume_utils.py +++ b/nova/tests/unit/virt/xenapi/test_volume_utils.py @@ -81,11 +81,8 @@ class ISCSIParametersTestCase(stubs.XenAPITestBaseNoDB): self.assertIsNone(volume_utils._get_target_host(None)) def test_target_port(self): - self.assertEqual(volume_utils._get_target_port('host:port'), - 'port') - - self.assertEqual(volume_utils._get_target_port('host'), - '3260') + self.assertEqual(volume_utils._get_target_port('host:port'), 'port') + self.assertEqual(volume_utils._get_target_port('host'), 3260) class IntroduceTestCase(stubs.XenAPITestBaseNoDB):