conf: Covert StrOpt -> PortOpt

...resolving the TODO in the process.

Change-Id: I076483c4a3aff369c0ba2e87abd91acafcd9f677

diff --git a/nova/conf/xenserver.py b/nova/conf/xenserver.py
index 976759a35b66c31706513fb269f182abe32debc2..8722cc37d0447d2753104d4cf44ea78ae3cb90e3 100644 (file)
--- 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 ca72edf1ea3ac85d8610022666f687ffa13a5c5a..69e80959cece65455037dddd15e86ad5af90702d 100644 (file)
--- 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):