From 0d8b14a0fec8481a5476ef9145611108a3478148 Mon Sep 17 00:00:00 2001
From: ZhiQiang Fan <aji.zqfan@gmail.com>
Date: Thu, 22 Oct 2015 00:33:21 -0600
Subject: [PATCH] Use oslo_config new type PortOpt for port options

The oslo_config library provides new type PortOpt to validate the
range of port now.

Change-Id: I90f1c3bc418426c53ba8f16b4cbbfa128606c4e7
---
 ironic/api/__init__.py                | 7 +++----
 ironic/common/image_service.py        | 7 +++----
 ironic/drivers/modules/ilo/common.py  | 7 +++----
 ironic/drivers/modules/irmc/common.py | 8 ++++----
 ironic/drivers/modules/virtualbox.py  | 7 +++----
 5 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/ironic/api/__init__.py b/ironic/api/__init__.py
index 8349ed7ba8..dfade053c3 100644
--- a/ironic/api/__init__.py
+++ b/ironic/api/__init__.py
@@ -21,10 +21,9 @@ API_SERVICE_OPTS = [
     cfg.StrOpt('host_ip',
                default='0.0.0.0',
                help=_('The IP address on which ironic-api listens.')),
-    cfg.IntOpt('port',
-               default=6385,
-               min=1, max=65535,
-               help=_('The TCP port on which ironic-api listens.')),
+    cfg.PortOpt('port',
+                default=6385,
+                help=_('The TCP port on which ironic-api listens.')),
     cfg.IntOpt('max_limit',
                default=1000,
                help=_('The maximum number of items returned in a single '
diff --git a/ironic/common/image_service.py b/ironic/common/image_service.py
index fe0c93d0de..7db53a665d 100644
--- a/ironic/common/image_service.py
+++ b/ironic/common/image_service.py
@@ -48,10 +48,9 @@ glance_opts = [
     cfg.StrOpt('glance_host',
                default='$my_ip',
                help=_('Default glance hostname or IP address.')),
-    cfg.IntOpt('glance_port',
-               default=9292,
-               min=1, max=65535,
-               help=_('Default glance port.')),
+    cfg.PortOpt('glance_port',
+                default=9292,
+                help=_('Default glance port.')),
     cfg.StrOpt('glance_protocol',
                default='http',
                help=_('Default protocol to use when connecting to glance. '
diff --git a/ironic/drivers/modules/ilo/common.py b/ironic/drivers/modules/ilo/common.py
index b814315b81..362259bd6c 100644
--- a/ironic/drivers/modules/ilo/common.py
+++ b/ironic/drivers/modules/ilo/common.py
@@ -48,10 +48,9 @@ opts = [
     cfg.IntOpt('client_timeout',
                default=60,
                help=_('Timeout (in seconds) for iLO operations')),
-    cfg.IntOpt('client_port',
-               default=443,
-               min=1, max=65535,
-               help=_('Port to be used for iLO operations')),
+    cfg.PortOpt('client_port',
+                default=443,
+                help=_('Port to be used for iLO operations')),
     cfg.StrOpt('swift_ilo_container',
                default='ironic_ilo_container',
                help=_('The Swift iLO container to store data.')),
diff --git a/ironic/drivers/modules/irmc/common.py b/ironic/drivers/modules/irmc/common.py
index 9cf2ecb33d..4b95315b25 100644
--- a/ironic/drivers/modules/irmc/common.py
+++ b/ironic/drivers/modules/irmc/common.py
@@ -26,10 +26,10 @@ from ironic.common.i18n import _
 scci = importutils.try_import('scciclient.irmc.scci')
 
 opts = [
-    cfg.IntOpt('port',
-               default=443,
-               help=_('Port to be used for iRMC operations, either 80 or '
-                      '443')),
+    cfg.PortOpt('port',
+                default=443,
+                help=_('Port to be used for iRMC operations, either 80 or '
+                       '443')),
     cfg.StrOpt('auth_method',
                default='basic',
                help=_('Authentication method to be used for iRMC operations, '
diff --git a/ironic/drivers/modules/virtualbox.py b/ironic/drivers/modules/virtualbox.py
index 3752d97f7f..38980ece36 100644
--- a/ironic/drivers/modules/virtualbox.py
+++ b/ironic/drivers/modules/virtualbox.py
@@ -46,10 +46,9 @@ VIRTUALBOX_TO_IRONIC_POWER_MAPPING = {
 }
 
 opts = [
-    cfg.IntOpt('port',
-               default=18083,
-               min=1, max=65535,
-               help=_('Port on which VirtualBox web service is listening.')),
+    cfg.PortOpt('port',
+                default=18083,
+                help=_('Port on which VirtualBox web service is listening.')),
 ]
 CONF = cfg.CONF
 CONF.register_opts(opts, group='virtualbox')