summaryrefslogtreecommitdiff
path: root/ironic/common
diff options
context:
space:
mode:
authorVasyl Saienko <vsaienko@mirantis.com>2016-12-05 14:23:08 +0200
committerVasyl Saienko <vsaienko@mirantis.com>2017-01-16 16:25:00 +0200
commitb83af0d65a9a06691a6e9bd716b9f17fff0856ed (patch)
tree98741ebb0e598e55e23ce7aa299dd09ddce99c9c /ironic/common
parentb71f9a9cdf350b392117ca645e68ae65f4e60ce9 (diff)
downloadironic-b83af0d65a9a06691a6e9bd716b9f17fff0856ed.tar.gz
Allow to attach/detach VIF to portgroup
With this patch port groups are activated in Ironic. When attaching a VIF to a node, it is attached to the first free port group. If there are no free port groups, the first available port (pxe_enabled has higher priority) is used instead. Related-Bug: #1618754 Related-Bug: #1582188 Co-Authored-By: Vladyslav Drok <vdrok@mirantis.com> Change-Id: I0dca2c2d98184e370c08c3e05aa3edadead869af
Diffstat (limited to 'ironic/common')
-rw-r--r--ironic/common/exception.py2
-rw-r--r--ironic/common/utils.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ironic/common/exception.py b/ironic/common/exception.py
index b9612c25e..1429fc01b 100644
--- a/ironic/common/exception.py
+++ b/ironic/common/exception.py
@@ -228,7 +228,7 @@ class VolumeTargetBootIndexAlreadyExists(Conflict):
class VifAlreadyAttached(Conflict):
_msg_fmt = _("Unable to attach VIF because VIF %(vif)s is already "
- "attached to Ironic port %(port_uuid)s")
+ "attached to Ironic %(object_type)s %(object_uuid)s")
class NoFreePhysicalPorts(Invalid):
diff --git a/ironic/common/utils.py b/ironic/common/utils.py
index 8b221cc56..30244e4e5 100644
--- a/ironic/common/utils.py
+++ b/ironic/common/utils.py
@@ -544,7 +544,7 @@ def warn_about_deprecated_extra_vif_port_id():
global warn_deprecated_extra_vif_port_id
if not warn_deprecated_extra_vif_port_id:
warn_deprecated_extra_vif_port_id = True
- LOG.warning(_LW("Attaching VIF to a port via "
+ LOG.warning(_LW("Attaching VIF to a port/portgroup via "
"extra['vif_port_id'] is deprecated and will not "
"be supported in Pike release. API endpoint "
"v1/nodes/<node>/vifs should be used instead."))