From 5c9076b5b10980b61c57a1b3dcd4b966dca5b6de Mon Sep 17 00:00:00 2001
From: lei-zhang-99cloud <zhang.lei@99cloud.net>
Date: Wed, 26 Aug 2015 16:01:49 +0800
Subject: [PATCH] Add minimum and maximum on port option

oslo.config can use minimum and maximum to support the ability to
set valid range on port option values

Change-Id: Idd182617cd500a7ed91ff18933bc989764c310db
---
 ironic/api/__init__.py               | 1 +
 ironic/common/image_service.py       | 1 +
 ironic/drivers/modules/ilo/common.py | 1 +
 ironic/drivers/modules/virtualbox.py | 1 +
 4 files changed, 4 insertions(+)

diff --git a/ironic/api/__init__.py b/ironic/api/__init__.py
index f1fedc5340c..ff738fce798 100644
--- a/ironic/api/__init__.py
+++ b/ironic/api/__init__.py
@@ -23,6 +23,7 @@ API_SERVICE_OPTS = [
                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.IntOpt('max_limit',
                default=1000,
diff --git a/ironic/common/image_service.py b/ironic/common/image_service.py
index d2032fb825e..fe0c93d0de6 100644
--- a/ironic/common/image_service.py
+++ b/ironic/common/image_service.py
@@ -50,6 +50,7 @@ glance_opts = [
                help=_('Default glance hostname or IP address.')),
     cfg.IntOpt('glance_port',
                default=9292,
+               min=1, max=65535,
                help=_('Default glance port.')),
     cfg.StrOpt('glance_protocol',
                default='http',
diff --git a/ironic/drivers/modules/ilo/common.py b/ironic/drivers/modules/ilo/common.py
index a63c2af0193..05110773160 100644
--- a/ironic/drivers/modules/ilo/common.py
+++ b/ironic/drivers/modules/ilo/common.py
@@ -45,6 +45,7 @@ opts = [
                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.StrOpt('swift_ilo_container',
                default='ironic_ilo_container',
diff --git a/ironic/drivers/modules/virtualbox.py b/ironic/drivers/modules/virtualbox.py
index 9931f31a746..3752d97f7fc 100644
--- a/ironic/drivers/modules/virtualbox.py
+++ b/ironic/drivers/modules/virtualbox.py
@@ -48,6 +48,7 @@ VIRTUALBOX_TO_IRONIC_POWER_MAPPING = {
 opts = [
     cfg.IntOpt('port',
                default=18083,
+               min=1, max=65535,
                help=_('Port on which VirtualBox web service is listening.')),
 ]
 CONF = cfg.CONF