diff -Nru python-ironicclient-2.6.0/AUTHORS python-ironicclient-2.7.0/AUTHORS
--- python-ironicclient-2.6.0/AUTHORS	2019-01-15 01:38:03.000000000 +0000
+++ python-ironicclient-2.7.0/AUTHORS	2019-03-08 00:31:10.000000000 +0000
@@ -18,6 +18,7 @@
 Chuck Short <chucks@redhat.com>
 Clark Boylan <clark.boylan@gmail.com>
 Clif Houck <me@clifhouck.com>
+Corey Bryant <corey.bryant@canonical.com>
 Dao Cong Tien <tiendc@vn.fujitsu.com>
 Davanum Srinivas <davanum@gmail.com>
 David Hu <david.hu@hp.com>
@@ -29,11 +30,14 @@
 Dmitry Tantsur <dtantsur@redhat.com>
 Doug Hellmann <doug@doughellmann.com>
 Eric Fried <efried@us.ibm.com>
+Eric Fried <openstack@fried.cc>
 Flavio Percoco <flaper87@gmail.com>
 Florian Fuchs <flfuchs@redhat.com>
 Galyna Zholtkevych <gzholtkevych@mirantis.com>
 Ghe Rivero <ghe.rivero@hp.com>
+Guang Yee <guang.yee@suse.com>
 Gábor Antal <antal@inf.u-szeged.hu>
+Hamdy Khader <hamdyk@mellanox.com>
 Hangdong Zhang <hdzhang@fiberhome.com>
 HaoZhi, Cui <haozhi.cui@gmail.com>
 Haomeng, Wang <whaom@cn.ibm.com>
@@ -90,6 +94,7 @@
 Ramakrishnan G <rameshg87@gmail.com>
 Rodion Promyshlennikov <rpromyshlennikov@mirantis.com>
 Ruby Loo <rloo@oath.com>
+Ruby Loo <rloo@verizonmedia.com>
 Ruby Loo <rloo@yahoo-inc.com>
 Ruby Loo <ruby.loo@intel.com>
 Rui Chen <chenrui.momo@gmail.com>
@@ -105,6 +110,7 @@
 Tang Chen <chen.tang@easystack.cn>
 Tang Chen <tangchen@cn.fujitsu.com>
 Tao Li <litao3721@126.com>
+TienDC <tiendc@vn.fujitsu.com>
 Tuan Do Anh <tuanda@vn.fujitsu.com>
 Ukesh Kumar Vasudevan <ukeshkumar@gmail.com>
 Vadim Hmyrov <vhmyrov@mirantis.com>
@@ -122,6 +128,7 @@
 Zenghui Shi <zshi@redhat.com>
 Zhenguo Niu <niuzhenguo@huawei.com>
 deepakmourya <deepak.mourya@nectechnologies.in>
+dnuka <csx@tuta.io>
 ericxiett <eric_xiett@163.com>
 fpxie <fpxie@fiberhome.com>
 ghanshyam <gmann@ghanshyammann.com>
@@ -148,3 +155,4 @@
 xiexs <xiexs@cn.fujitsu.com>
 ya.wang <wang.ya@99cloud.net>
 zhengchuan hu <zhengchuan.hu@easystack.cn>
+zhulingjie <easyzlj@gmail.com>
diff -Nru python-ironicclient-2.6.0/ChangeLog python-ironicclient-2.7.0/ChangeLog
--- python-ironicclient-2.6.0/ChangeLog	2019-01-15 01:38:03.000000000 +0000
+++ python-ironicclient-2.7.0/ChangeLog	2019-03-08 00:31:10.000000000 +0000
@@ -1,6 +1,28 @@
 CHANGES
 =======
 
+2.7.0
+-----
+
+* Update release notes
+* Follow-up to the configdrive change
+* Accept 'valid\_interfaces' in client setup
+* pass endpoint interface to http client
+* Support passing a dictionary for configdrive
+* Deploy templates: client support
+* [Trivial] Allocation API: fix incorrect parameter description
+* [Follow Up] Add 'hostname' to port's local link connection
+* Replace mock.has\_calls() with assert\_has\_calls
+* Add 'hostname' to port's local link connection
+* Add is-smartnic port attribute to port command
+* Support node description
+* Allocation API: client API and CLI
+* add python 3.7 unit test job
+* Add Events support
+* Add node owner
+* Support for conductors exposed from API
+* Change openstack-dev to openstack-discuss
+
 2.6.0
 -----
 
diff -Nru python-ironicclient-2.6.0/debian/changelog python-ironicclient-2.7.0/debian/changelog
--- python-ironicclient-2.6.0/debian/changelog	2019-01-30 15:59:14.000000000 +0000
+++ python-ironicclient-2.7.0/debian/changelog	2019-03-11 18:28:35.000000000 +0000
@@ -1,11 +1,17 @@
-python-ironicclient (2.6.0-0ubuntu1~ubuntu19.04.1~ppa201901301059) disco; urgency=medium
+python-ironicclient (2.7.0-0ubuntu1~ubuntu19.04.1~ppa201903111428) disco; urgency=medium
+
+  * New upstream release for OpenStack Stein.
+  * No-change backport to disco
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Mon, 11 Mar 2019 14:28:35 -0400
+
+python-ironicclient (2.6.0-0ubuntu1) disco; urgency=medium
 
   * New upstream release for OpenStack Stein.
   * d/control: Align (Build-)Depends with upstream.
   * d/p/drop-sphinxcontrib-apidoc.patch: Dropped. No longer needed.
-  * No-change backport to disco
 
- -- Corey Bryant <corey.bryant@canonical.com>  Wed, 30 Jan 2019 10:59:14 -0500
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 30 Jan 2019 10:15:28 -0500
 
 python-ironicclient (2.5.0-0ubuntu1) cosmic; urgency=medium
 
diff -Nru python-ironicclient-2.6.0/doc/source/cli/osc/v1/index.rst python-ironicclient-2.7.0/doc/source/cli/osc/v1/index.rst
--- python-ironicclient-2.6.0/doc/source/cli/osc/v1/index.rst	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/doc/source/cli/osc/v1/index.rst	2019-03-08 00:29:10.000000000 +0000
@@ -4,6 +4,13 @@
 List of released CLI commands available in openstack client. These commands
 can be referenced by doing ``openstack help baremetal``.
 
+====================
+baremetal allocation
+====================
+
+.. autoprogram-cliff:: openstack.baremetal.v1
+    :command: baremetal allocation *
+
 =================
 baremetal chassis
 =================
diff -Nru python-ironicclient-2.6.0/doc/source/contributor/contributing.rst python-ironicclient-2.7.0/doc/source/contributor/contributing.rst
--- python-ironicclient-2.6.0/doc/source/contributor/contributing.rst	2019-01-15 01:36:21.000000000 +0000
+++ python-ironicclient-2.7.0/doc/source/contributor/contributing.rst	2019-03-08 00:29:10.000000000 +0000
@@ -37,7 +37,7 @@
     https://storyboard.openstack.org/#!/project/959
 
 Mailing list (prefix subjects with ``[ironic]`` for faster responses)
-    http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
+    http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss
 
 Code Hosting
     https://git.openstack.org/cgit/openstack/python-ironicclient
diff -Nru python-ironicclient-2.6.0/ironicclient/client.py python-ironicclient-2.7.0/ironicclient/client.py
--- python-ironicclient-2.6.0/ironicclient/client.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/client.py	2019-03-08 00:29:13.000000000 +0000
@@ -100,14 +100,24 @@
         session = session_loader.load_from_options(auth=auth_plugin,
                                                    **session_opts)
 
+    # Make sure we also pass the endpoint interface to the HTTP client.
+    # NOTE(gyee/efried): 'interface' in ksa config is deprecated in favor of
+    # 'valid_interfaces'. So, since the caller may be deriving kwargs from
+    # conf, accept 'valid_interfaces' first. But keep support for 'interface',
+    # in case the caller is deriving kwargs from, say, an existing Adapter.
+    interface = kwargs.get('valid_interfaces', kwargs.get('interface'))
+
     endpoint = kwargs.get('endpoint')
     if not endpoint:
         try:
             # endpoint will be used to get hostname
             # and port that will be used for API version caching.
+            # NOTE(gyee): KSA defaults interface to 'public' if it is
+            # empty or None so there's no need to set it to publicURL
+            # explicitly.
             endpoint = session.get_endpoint(
                 service_type=kwargs.get('service_type') or 'baremetal',
-                interface=kwargs.get('interface') or 'publicURL',
+                interface=interface,
                 region_name=kwargs.get('region_name')
             )
         except Exception as e:
@@ -120,7 +130,8 @@
         'max_retries': max_retries,
         'retry_interval': retry_interval,
         'session': session,
-        'endpoint_override': endpoint
+        'endpoint_override': endpoint,
+        'interface': interface
     }
 
     return Client(api_version, **ironicclient_kwargs)
diff -Nru python-ironicclient-2.6.0/ironicclient/common/http.py python-ironicclient-2.7.0/ironicclient/common/http.py
--- python-ironicclient-2.6.0/ironicclient/common/http.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/common/http.py	2019-03-08 00:29:13.000000000 +0000
@@ -43,7 +43,7 @@
 #             http://specs.openstack.org/openstack/ironic-specs/specs/kilo/api-microversions.html # noqa
 #             for full details.
 DEFAULT_VER = '1.9'
-LAST_KNOWN_API_VERSION = 48
+LAST_KNOWN_API_VERSION = 56
 LATEST_VERSION = '1.{}'.format(LAST_KNOWN_API_VERSION)
 
 LOG = logging.getLogger(__name__)
diff -Nru python-ironicclient-2.6.0/ironicclient/common/utils.py python-ironicclient-2.7.0/ironicclient/common/utils.py
--- python-ironicclient-2.6.0/ironicclient/common/utils.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/common/utils.py	2019-03-08 00:29:10.000000000 +0000
@@ -24,6 +24,7 @@
 import subprocess
 import sys
 import tempfile
+import time
 
 from oslo_serialization import base64
 from oslo_utils import strutils
@@ -390,3 +391,39 @@
         raise exc.InvalidAttribute(err)
 
     return json_arg
+
+
+def poll(timeout, poll_interval, poll_delay_function, timeout_message):
+    if not isinstance(timeout, (int, float)) or timeout < 0:
+        raise ValueError(_('Timeout must be a non-negative number'))
+
+    threshold = time.time() + timeout
+    poll_delay_function = (time.sleep if poll_delay_function is None
+                           else poll_delay_function)
+    if not callable(poll_delay_function):
+        raise TypeError(_('poll_delay_function must be callable'))
+
+    count = 0
+    while not timeout or time.time() < threshold:
+        yield count
+
+        poll_delay_function(poll_interval)
+        count += 1
+
+    raise exc.StateTransitionTimeout(timeout_message)
+
+
+def handle_json_arg(json_arg, info_desc):
+    """Read a JSON argument from stdin, file or string.
+
+    :param json_arg: May be a file name containing the JSON, a JSON string, or
+        '-' indicating that the argument should be read from standard input.
+    :param info_desc: A string description of the desired information
+    :returns: A list or dictionary parsed from JSON.
+    :raises: InvalidAttribute if the argument cannot be parsed.
+    """
+    if json_arg == '-':
+        json_arg = get_from_stdin(info_desc)
+    if json_arg:
+        json_arg = handle_json_or_file_arg(json_arg)
+    return json_arg
diff -Nru python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_allocation.py python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_allocation.py
--- python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_allocation.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_allocation.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,269 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+import itertools
+import logging
+
+from osc_lib.command import command
+from osc_lib import utils as oscutils
+
+from ironicclient.common.i18n import _
+from ironicclient.common import utils
+from ironicclient import exc
+from ironicclient.v1 import resource_fields as res_fields
+
+
+class CreateBaremetalAllocation(command.ShowOne):
+    """Create a new baremetal allocation."""
+
+    log = logging.getLogger(__name__ + ".CreateBaremetalAllocation")
+
+    def get_parser(self, prog_name):
+        parser = super(CreateBaremetalAllocation, self).get_parser(prog_name)
+
+        parser.add_argument(
+            '--resource-class',
+            dest='resource_class',
+            required=True,
+            help=_('Resource class to request.'))
+        parser.add_argument(
+            '--trait',
+            action='append',
+            dest='traits',
+            help=_('A trait to request. Can be specified multiple times.'))
+        parser.add_argument(
+            '--candidate-node',
+            action='append',
+            dest='candidate_nodes',
+            help=_('A candidate node for this allocation. Can be specified '
+                   'multiple times. If at least one is specified, only the '
+                   'provided candidate nodes are considered for the '
+                   'allocation.'))
+        parser.add_argument(
+            '--name',
+            dest='name',
+            help=_('Unique name of the allocation.'))
+        parser.add_argument(
+            '--uuid',
+            dest='uuid',
+            help=_('UUID of the allocation.'))
+        parser.add_argument(
+            '--extra',
+            metavar="<key=value>",
+            action='append',
+            help=_("Record arbitrary key/value metadata. "
+                   "Can be specified multiple times."))
+        parser.add_argument(
+            '--wait',
+            type=int,
+            dest='wait_timeout',
+            default=None,
+            metavar='<time-out>',
+            const=0,
+            nargs='?',
+            help=_("Wait for the new allocation to become active. An error "
+                   "is returned if allocation fails and --wait is used. "
+                   "Optionally takes a timeout value (in seconds). The "
+                   "default value is 0, meaning it will wait indefinitely."))
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+        baremetal_client = self.app.client_manager.baremetal
+
+        field_list = ['name', 'uuid', 'extra', 'resource_class', 'traits',
+                      'candidate_nodes']
+        fields = dict((k, v) for (k, v) in vars(parsed_args).items()
+                      if k in field_list and v is not None)
+
+        fields = utils.args_array_to_dict(fields, 'extra')
+        allocation = baremetal_client.allocation.create(**fields)
+        if parsed_args.wait_timeout is not None:
+            allocation = baremetal_client.allocation.wait(
+                allocation.uuid, timeout=parsed_args.wait_timeout)
+
+        data = dict([(f, getattr(allocation, f, '')) for f in
+                     res_fields.ALLOCATION_DETAILED_RESOURCE.fields])
+
+        return self.dict2columns(data)
+
+
+class ShowBaremetalAllocation(command.ShowOne):
+    """Show baremetal allocation details."""
+
+    log = logging.getLogger(__name__ + ".ShowBaremetalAllocation")
+
+    def get_parser(self, prog_name):
+        parser = super(ShowBaremetalAllocation, self).get_parser(prog_name)
+        parser.add_argument(
+            "allocation",
+            metavar="<id>",
+            help=_("UUID or name of the allocation"))
+        parser.add_argument(
+            '--fields',
+            nargs='+',
+            dest='fields',
+            metavar='<field>',
+            action='append',
+            choices=res_fields.ALLOCATION_DETAILED_RESOURCE.fields,
+            default=[],
+            help=_("One or more allocation fields. Only these fields will be "
+                   "fetched from the server."))
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        baremetal_client = self.app.client_manager.baremetal
+        fields = list(itertools.chain.from_iterable(parsed_args.fields))
+        fields = fields if fields else None
+
+        allocation = baremetal_client.allocation.get(
+            parsed_args.allocation, fields=fields)._info
+
+        allocation.pop("links", None)
+        return zip(*sorted(allocation.items()))
+
+
+class ListBaremetalAllocation(command.Lister):
+    """List baremetal allocations."""
+
+    log = logging.getLogger(__name__ + ".ListBaremetalAllocation")
+
+    def get_parser(self, prog_name):
+        parser = super(ListBaremetalAllocation, self).get_parser(prog_name)
+        parser.add_argument(
+            '--limit',
+            metavar='<limit>',
+            type=int,
+            help=_('Maximum number of allocations to return per request, '
+                   '0 for no limit. Default is the maximum number used '
+                   'by the Baremetal API Service.'))
+        parser.add_argument(
+            '--marker',
+            metavar='<allocation>',
+            help=_('Allocation UUID (for example, of the last allocation in '
+                   'the list from a previous request). Returns the list of '
+                   'allocations after this UUID.'))
+        parser.add_argument(
+            '--sort',
+            metavar="<key>[:<direction>]",
+            help=_('Sort output by specified allocation fields and directions '
+                   '(asc or desc) (default: asc). Multiple fields and '
+                   'directions can be specified, separated by comma.'))
+        parser.add_argument(
+            '--node',
+            metavar='<node>',
+            help=_("Only list allocations of this node (name or UUID)."))
+        parser.add_argument(
+            '--resource-class',
+            metavar='<resource_class>',
+            help=_("Only list allocations with this resource class."))
+        parser.add_argument(
+            '--state',
+            metavar='<state>',
+            help=_("Only list allocations in this state."))
+
+        # NOTE(dtantsur): the allocation API does not expose the 'detail' flag,
+        # but some fields are inconvenient to display in a table, so we emulate
+        # it on the client side.
+        display_group = parser.add_mutually_exclusive_group(required=False)
+        display_group.add_argument(
+            '--long',
+            default=False,
+            help=_("Show detailed information about the allocations."),
+            action='store_true')
+        display_group.add_argument(
+            '--fields',
+            nargs='+',
+            dest='fields',
+            metavar='<field>',
+            action='append',
+            default=[],
+            choices=res_fields.ALLOCATION_DETAILED_RESOURCE.fields,
+            help=_("One or more allocation fields. Only these fields will be "
+                   "fetched from the server. Can not be used when '--long' "
+                   "is specified."))
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+        client = self.app.client_manager.baremetal
+
+        params = {}
+        if parsed_args.limit is not None and parsed_args.limit < 0:
+            raise exc.CommandError(
+                _('Expected non-negative --limit, got %s') %
+                parsed_args.limit)
+        params['limit'] = parsed_args.limit
+        params['marker'] = parsed_args.marker
+        for field in ('node', 'resource_class', 'state'):
+            value = getattr(parsed_args, field)
+            if value is not None:
+                params[field] = value
+
+        if parsed_args.long:
+            columns = res_fields.ALLOCATION_DETAILED_RESOURCE.fields
+            labels = res_fields.ALLOCATION_DETAILED_RESOURCE.labels
+        elif parsed_args.fields:
+            fields = itertools.chain.from_iterable(parsed_args.fields)
+            resource = res_fields.Resource(list(fields))
+            columns = resource.fields
+            labels = resource.labels
+            params['fields'] = columns
+        else:
+            columns = res_fields.ALLOCATION_RESOURCE.fields
+            labels = res_fields.ALLOCATION_RESOURCE.labels
+
+        self.log.debug("params(%s)", params)
+        data = client.allocation.list(**params)
+
+        data = oscutils.sort_items(data, parsed_args.sort)
+
+        return (labels,
+                (oscutils.get_item_properties(s, columns) for s in data))
+
+
+class DeleteBaremetalAllocation(command.Command):
+    """Unregister baremetal allocation(s)."""
+
+    log = logging.getLogger(__name__ + ".DeleteBaremetalAllocation")
+
+    def get_parser(self, prog_name):
+        parser = super(DeleteBaremetalAllocation, self).get_parser(prog_name)
+        parser.add_argument(
+            "allocations",
+            metavar="<allocation>",
+            nargs="+",
+            help=_("Allocations(s) to delete (name or UUID)."))
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        baremetal_client = self.app.client_manager.baremetal
+
+        failures = []
+        for allocation in parsed_args.allocations:
+            try:
+                baremetal_client.allocation.delete(allocation)
+                print(_('Deleted allocation %s') % allocation)
+            except exc.ClientException as e:
+                failures.append(_("Failed to delete allocation "
+                                  "%(allocation)s:  %(error)s")
+                                % {'allocation': allocation, 'error': e})
+
+        if failures:
+            raise exc.ClientException("\n".join(failures))
diff -Nru python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_conductor.py python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_conductor.py
--- python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_conductor.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_conductor.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,145 @@
+#
+#   Copyright 2015 Red Hat, Inc.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+import itertools
+import logging
+
+from osc_lib.command import command
+from osc_lib import utils as oscutils
+
+from ironicclient.common.i18n import _
+from ironicclient import exc
+from ironicclient.v1 import resource_fields as res_fields
+
+
+class ListBaremetalConductor(command.Lister):
+    """List baremetal conductors"""
+
+    log = logging.getLogger(__name__ + ".ListBaremetalNode")
+
+    def get_parser(self, prog_name):
+        parser = super(ListBaremetalConductor, self).get_parser(prog_name)
+        parser.add_argument(
+            '--limit',
+            metavar='<limit>',
+            type=int,
+            help=_('Maximum number of conductors to return per request, '
+                   '0 for no limit. Default is the maximum number used '
+                   'by the Baremetal API Service.')
+        )
+        parser.add_argument(
+            '--marker',
+            metavar='<conductor>',
+            help=_('Hostname of the conductor (for example, of the last '
+                   'conductor in the list from a previous request). Returns '
+                   'the list of conductors after this conductor.')
+        )
+        parser.add_argument(
+            '--sort',
+            metavar="<key>[:<direction>]",
+            help=_('Sort output by specified conductor fields and directions '
+                   '(asc or desc) (default: asc). Multiple fields and '
+                   'directions can be specified, separated by comma.'),
+        )
+        display_group = parser.add_mutually_exclusive_group(required=False)
+        display_group.add_argument(
+            '--long',
+            default=False,
+            help=_("Show detailed information about the conductors."),
+            action='store_true')
+        display_group.add_argument(
+            '--fields',
+            nargs='+',
+            dest='fields',
+            metavar='<field>',
+            action='append',
+            default=[],
+            choices=res_fields.CONDUCTOR_DETAILED_RESOURCE.fields,
+            help=_("One or more conductor fields. Only these fields will be "
+                   "fetched from the server. Can not be used when '--long' "
+                   "is specified."))
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+        client = self.app.client_manager.baremetal
+
+        columns = res_fields.CONDUCTOR_RESOURCE.fields
+        labels = res_fields.CONDUCTOR_RESOURCE.labels
+
+        params = {}
+        if parsed_args.limit is not None and parsed_args.limit < 0:
+            raise exc.CommandError(
+                _('Expected non-negative --limit, got %s') %
+                parsed_args.limit)
+        params['limit'] = parsed_args.limit
+        params['marker'] = parsed_args.marker
+        if parsed_args.long:
+            params['detail'] = parsed_args.long
+            columns = res_fields.CONDUCTOR_DETAILED_RESOURCE.fields
+            labels = res_fields.CONDUCTOR_DETAILED_RESOURCE.labels
+        elif parsed_args.fields:
+            params['detail'] = False
+            fields = itertools.chain.from_iterable(parsed_args.fields)
+            resource = res_fields.Resource(list(fields))
+            columns = resource.fields
+            labels = resource.labels
+            params['fields'] = columns
+
+        self.log.debug("params(%s)", params)
+        data = client.conductor.list(**params)
+
+        data = oscutils.sort_items(data, parsed_args.sort)
+
+        return (labels,
+                (oscutils.get_item_properties(s, columns, formatters={
+                    'Properties': oscutils.format_dict},) for s in data))
+
+
+class ShowBaremetalConductor(command.ShowOne):
+    """Show baremetal conductor details"""
+
+    log = logging.getLogger(__name__ + ".ShowBaremetalConductor")
+
+    def get_parser(self, prog_name):
+        parser = super(ShowBaremetalConductor, self).get_parser(prog_name)
+        parser.add_argument(
+            "conductor",
+            metavar="<conductor>",
+            help=_("Hostname of the conductor"))
+        parser.add_argument(
+            '--fields',
+            nargs='+',
+            dest='fields',
+            metavar='<field>',
+            action='append',
+            choices=res_fields.CONDUCTOR_DETAILED_RESOURCE.fields,
+            default=[],
+            help=_("One or more conductor fields. Only these fields will be "
+                   "fetched from the server."))
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        baremetal_client = self.app.client_manager.baremetal
+        fields = list(itertools.chain.from_iterable(parsed_args.fields))
+        fields = fields if fields else None
+        conductor = baremetal_client.conductor.get(
+            parsed_args.conductor, fields=fields)._info
+        conductor.pop("links", None)
+
+        return self.dict2columns(conductor)
diff -Nru python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_deploy_template.py python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_deploy_template.py
--- python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_deploy_template.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_deploy_template.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,345 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+import itertools
+import json
+import logging
+
+from osc_lib.command import command
+from osc_lib import utils as oscutils
+
+from ironicclient.common.i18n import _
+from ironicclient.common import utils
+from ironicclient import exc
+from ironicclient.v1 import resource_fields as res_fields
+
+
+_DEPLOY_STEPS_HELP = _(
+    "The deploy steps in JSON format. May be the path to a file containing "
+    "the deploy steps; OR '-', with the deploy steps being read from standard "
+    "input; OR a string. The value should be a list of deploy-step "
+    "dictionaries; each dictionary should have keys 'interface', 'step', "
+    "'args' and 'priority'.")
+
+
+class CreateBaremetalDeployTemplate(command.ShowOne):
+    """Create a new deploy template"""
+
+    log = logging.getLogger(__name__ + ".CreateBaremetalDeployTemplate")
+
+    def get_parser(self, prog_name):
+        parser = super(CreateBaremetalDeployTemplate, self).get_parser(
+            prog_name)
+
+        parser.add_argument(
+            'name',
+            metavar='<name>',
+            help=_('Unique name for this deploy template. Must be a valid '
+                   'trait name')
+        )
+        parser.add_argument(
+            '--uuid',
+            dest='uuid',
+            metavar='<uuid>',
+            help=_('UUID of the deploy template.'))
+        parser.add_argument(
+            '--extra',
+            metavar="<key=value>",
+            action='append',
+            help=_("Record arbitrary key/value metadata. "
+                   "Can be specified multiple times."))
+        parser.add_argument(
+            '--steps',
+            metavar="<steps>",
+            required=True,
+            help=_DEPLOY_STEPS_HELP
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+        baremetal_client = self.app.client_manager.baremetal
+
+        steps = utils.handle_json_arg(parsed_args.steps, 'deploy steps')
+
+        field_list = ['name', 'uuid', 'extra']
+        fields = dict((k, v) for (k, v) in vars(parsed_args).items()
+                      if k in field_list and v is not None)
+        fields = utils.args_array_to_dict(fields, 'extra')
+        template = baremetal_client.deploy_template.create(steps=steps,
+                                                           **fields)
+
+        data = dict([(f, getattr(template, f, '')) for f in
+                     res_fields.DEPLOY_TEMPLATE_DETAILED_RESOURCE.fields])
+
+        return self.dict2columns(data)
+
+
+class ShowBaremetalDeployTemplate(command.ShowOne):
+    """Show baremetal deploy template details."""
+
+    log = logging.getLogger(__name__ + ".ShowBaremetalDeployTemplate")
+
+    def get_parser(self, prog_name):
+        parser = super(ShowBaremetalDeployTemplate, self).get_parser(prog_name)
+        parser.add_argument(
+            "template",
+            metavar="<template>",
+            help=_("Name or UUID of the deploy template.")
+        )
+        parser.add_argument(
+            '--fields',
+            nargs='+',
+            dest='fields',
+            metavar='<field>',
+            action='append',
+            choices=res_fields.DEPLOY_TEMPLATE_DETAILED_RESOURCE.fields,
+            default=[],
+            help=_("One or more deploy template fields. Only these fields "
+                   "will be fetched from the server.")
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        baremetal_client = self.app.client_manager.baremetal
+        fields = list(itertools.chain.from_iterable(parsed_args.fields))
+        fields = fields if fields else None
+
+        template = baremetal_client.deploy_template.get(
+            parsed_args.template, fields=fields)._info
+
+        template.pop("links", None)
+        return zip(*sorted(template.items()))
+
+
+class SetBaremetalDeployTemplate(command.Command):
+    """Set baremetal deploy template properties."""
+
+    log = logging.getLogger(__name__ + ".SetBaremetalDeployTemplate")
+
+    def get_parser(self, prog_name):
+        parser = super(SetBaremetalDeployTemplate, self).get_parser(prog_name)
+
+        parser.add_argument(
+            'template',
+            metavar='<template>',
+            help=_("Name or UUID of the deploy template")
+        )
+        parser.add_argument(
+            '--name',
+            metavar='<name>',
+            help=_('Set unique name of the deploy template. Must be a valid '
+                   'trait name.')
+        )
+        parser.add_argument(
+            '--steps',
+            metavar="<steps>",
+            help=_DEPLOY_STEPS_HELP
+        )
+        parser.add_argument(
+            "--extra",
+            metavar="<key=value>",
+            action='append',
+            help=_('Extra to set on this baremetal deploy template '
+                   '(repeat option to set multiple extras).'),
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        baremetal_client = self.app.client_manager.baremetal
+
+        properties = []
+        if parsed_args.name:
+            name = ["name=%s" % parsed_args.name]
+            properties.extend(utils.args_array_to_patch('add', name))
+        if parsed_args.steps:
+            steps = utils.handle_json_arg(parsed_args.steps, 'deploy steps')
+            steps = ["steps=%s" % json.dumps(steps)]
+            properties.extend(utils.args_array_to_patch('add', steps))
+        if parsed_args.extra:
+            properties.extend(utils.args_array_to_patch(
+                'add', ['extra/' + x for x in parsed_args.extra]))
+
+        if properties:
+            baremetal_client.deploy_template.update(parsed_args.template,
+                                                    properties)
+        else:
+            self.log.warning("Please specify what to set.")
+
+
+class UnsetBaremetalDeployTemplate(command.Command):
+    """Unset baremetal deploy template properties."""
+    log = logging.getLogger(__name__ + ".UnsetBaremetalDeployTemplate")
+
+    def get_parser(self, prog_name):
+        parser = super(UnsetBaremetalDeployTemplate, self).get_parser(
+            prog_name)
+
+        parser.add_argument(
+            'template',
+            metavar='<template>',
+            help=_("Name or UUID of the deploy template")
+        )
+        parser.add_argument(
+            "--extra",
+            metavar="<key>",
+            action='append',
+            help=_('Extra to unset on this baremetal deploy template '
+                   '(repeat option to unset multiple extras).'),
+        )
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        baremetal_client = self.app.client_manager.baremetal
+
+        properties = []
+        if parsed_args.extra:
+            properties.extend(utils.args_array_to_patch('remove',
+                              ['extra/' + x for x in parsed_args.extra]))
+
+        if properties:
+            baremetal_client.deploy_template.update(parsed_args.template,
+                                                    properties)
+        else:
+            self.log.warning("Please specify what to unset.")
+
+
+class DeleteBaremetalDeployTemplate(command.Command):
+    """Delete deploy template(s)."""
+
+    log = logging.getLogger(__name__ + ".DeleteBaremetalDeployTemplate")
+
+    def get_parser(self, prog_name):
+        parser = super(DeleteBaremetalDeployTemplate, self).get_parser(
+            prog_name)
+        parser.add_argument(
+            "templates",
+            metavar="<template>",
+            nargs="+",
+            help=_("Name(s) or UUID(s) of the deploy template(s) to delete.")
+        )
+
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+
+        baremetal_client = self.app.client_manager.baremetal
+
+        failures = []
+        for template in parsed_args.templates:
+            try:
+                baremetal_client.deploy_template.delete(template)
+                print(_('Deleted deploy template %s') % template)
+            except exc.ClientException as e:
+                failures.append(_("Failed to delete deploy template "
+                                  "%(template)s: %(error)s")
+                                % {'template': template, 'error': e})
+
+        if failures:
+            raise exc.ClientException("\n".join(failures))
+
+
+class ListBaremetalDeployTemplate(command.Lister):
+    """List baremetal deploy templates."""
+
+    log = logging.getLogger(__name__ + ".ListBaremetalDeployTemplate")
+
+    def get_parser(self, prog_name):
+        parser = super(ListBaremetalDeployTemplate, self).get_parser(prog_name)
+        parser.add_argument(
+            '--limit',
+            metavar='<limit>',
+            type=int,
+            help=_('Maximum number of deploy templates to return per request, '
+                   '0 for no limit. Default is the maximum number used '
+                   'by the Baremetal API Service.')
+        )
+        parser.add_argument(
+            '--marker',
+            metavar='<template>',
+            help=_('DeployTemplate UUID (for example, of the last deploy '
+                   'template in the list from a previous request). Returns '
+                   'the list of deploy templates after this UUID.')
+        )
+        parser.add_argument(
+            '--sort',
+            metavar="<key>[:<direction>]",
+            help=_('Sort output by specified deploy template fields and '
+                   'directions (asc or desc) (default: asc). Multiple fields '
+                   'and directions can be specified, separated by comma.')
+        )
+        display_group = parser.add_mutually_exclusive_group()
+        display_group.add_argument(
+            '--long',
+            dest='detail',
+            action='store_true',
+            default=False,
+            help=_("Show detailed information about deploy templates.")
+        )
+        display_group.add_argument(
+            '--fields',
+            nargs='+',
+            dest='fields',
+            metavar='<field>',
+            action='append',
+            default=[],
+            choices=res_fields.DEPLOY_TEMPLATE_DETAILED_RESOURCE.fields,
+            help=_("One or more deploy template fields. Only these fields "
+                   "will be fetched from the server. Can not be used when "
+                   "'--long' is specified.")
+        )
+        return parser
+
+    def take_action(self, parsed_args):
+        self.log.debug("take_action(%s)", parsed_args)
+        client = self.app.client_manager.baremetal
+
+        columns = res_fields.DEPLOY_TEMPLATE_RESOURCE.fields
+        labels = res_fields.DEPLOY_TEMPLATE_RESOURCE.labels
+
+        params = {}
+        if parsed_args.limit is not None and parsed_args.limit < 0:
+            raise exc.CommandError(
+                _('Expected non-negative --limit, got %s') %
+                parsed_args.limit)
+        params['limit'] = parsed_args.limit
+        params['marker'] = parsed_args.marker
+
+        if parsed_args.detail:
+            params['detail'] = parsed_args.detail
+            columns = res_fields.DEPLOY_TEMPLATE_DETAILED_RESOURCE.fields
+            labels = res_fields.DEPLOY_TEMPLATE_DETAILED_RESOURCE.labels
+
+        elif parsed_args.fields:
+            params['detail'] = False
+            fields = itertools.chain.from_iterable(parsed_args.fields)
+            resource = res_fields.Resource(list(fields))
+            columns = resource.fields
+            labels = resource.labels
+            params['fields'] = columns
+
+        self.log.debug("params(%s)", params)
+        data = client.deploy_template.list(**params)
+
+        data = oscutils.sort_items(data, parsed_args.sort)
+
+        return (labels,
+                (oscutils.get_item_properties(s, columns) for s in data))
diff -Nru python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_node.py python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_node.py
--- python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_node.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_node.py	2019-03-08 00:29:13.000000000 +0000
@@ -16,6 +16,7 @@
 
 import argparse
 import itertools
+import json
 import logging
 
 from osc_lib.command import command
@@ -30,8 +31,12 @@
 CONFIG_DRIVE_ARG_HELP = _(
     "A gzipped, base64-encoded configuration drive string OR "
     "the path to the configuration drive file OR the path to a "
-    "directory containing the config drive files. In case it's "
-    "a directory, a config drive will be generated from it.")
+    "directory containing the config drive files OR a JSON object to build "
+    "config drive from. In case it's a directory, a config drive will be "
+    "generated from it. In case it's a JSON object with optional keys "
+    "`meta_data`, `user_data` and `network_data`, a config drive will "
+    "be generated on the server side (see the bare metal API reference for "
+    "more details).")
 
 
 SUPPORTED_INTERFACES = ['bios', 'boot', 'console', 'deploy', 'inspect',
@@ -66,12 +71,18 @@
         baremetal_client = self.app.client_manager.baremetal
 
         clean_steps = getattr(parsed_args, 'clean_steps', None)
-        if clean_steps == '-':
-            clean_steps = utils.get_from_stdin('clean steps')
-        if clean_steps:
-            clean_steps = utils.handle_json_or_file_arg(clean_steps)
+        clean_steps = utils.handle_json_arg(clean_steps, 'clean steps')
 
         config_drive = getattr(parsed_args, 'config_drive', None)
+        if config_drive:
+            try:
+                config_drive_dict = json.loads(config_drive)
+            except (ValueError, TypeError):
+                pass
+            else:
+                if isinstance(config_drive_dict, dict):
+                    config_drive = config_drive_dict
+
         rescue_password = getattr(parsed_args, 'rescue_password', None)
 
         baremetal_client.node.set_provision_state(
@@ -437,6 +448,14 @@
             action='store_true',
             default=None,
             help=_('Enable automated cleaning for the node'))
+        parser.add_argument(
+            '--owner',
+            metavar='<owner>',
+            help=_('Owner of the node.'))
+        parser.add_argument(
+            '--description',
+            metavar='<description>',
+            help=_("Description for the node."))
 
         return parser
 
@@ -447,7 +466,7 @@
 
         field_list = ['automated_clean', 'chassis_uuid', 'driver',
                       'driver_info', 'properties', 'extra', 'uuid', 'name',
-                      'conductor_group',
+                      'conductor_group', 'owner', 'description',
                       'resource_class'] + ['%s_interface' % iface
                                            for iface in SUPPORTED_INTERFACES]
         fields = dict((k, v) for (k, v) in vars(parsed_args).items()
@@ -609,10 +628,24 @@
             help=_("Limit list to nodes with conductor group <conductor "
                    "group>"))
         parser.add_argument(
+            '--conductor',
+            metavar='<conductor>',
+            help=_("Limit list to nodes with conductor <conductor>"))
+        parser.add_argument(
             '--chassis',
             dest='chassis',
             metavar='<chassis UUID>',
             help=_("Limit list to nodes of this chassis"))
+        parser.add_argument(
+            '--owner',
+            metavar='<owner>',
+            help=_("Limit list to nodes with owner "
+                   "<owner>"))
+        parser.add_argument(
+            '--description-contains',
+            metavar='<description_contains>',
+            help=_("Limit list to nodes with description contains "
+                   "<description_contains>"))
         display_group = parser.add_mutually_exclusive_group(required=False)
         display_group.add_argument(
             '--long',
@@ -654,7 +687,8 @@
             if getattr(parsed_args, field) is not None:
                 params[field] = getattr(parsed_args, field)
         for field in ['provision_state', 'driver', 'resource_class',
-                      'chassis']:
+                      'chassis', 'conductor', 'owner',
+                      'description_contains']:
             if getattr(parsed_args, field):
                 params[field] = getattr(parsed_args, field)
         if parsed_args.long:
@@ -1162,6 +1196,15 @@
             help=_('Instance information to set on this baremetal node '
                    '(repeat option to set multiple instance infos)'),
         )
+        parser.add_argument(
+            "--owner",
+            metavar='<owner>',
+            help=_('Set the owner for the node')),
+        parser.add_argument(
+            "--description",
+            metavar='<description>',
+            help=_('Set the description for the node'),
+        )
 
         return parser
 
@@ -1175,16 +1218,16 @@
         #             also being modified.
         if parsed_args.target_raid_config:
             raid_config = parsed_args.target_raid_config
-            if raid_config == '-':
-                raid_config = utils.get_from_stdin('target_raid_config')
-            raid_config = utils.handle_json_or_file_arg(raid_config)
+            raid_config = utils.handle_json_arg(raid_config,
+                                                'target_raid_config')
             baremetal_client.node.set_target_raid_config(parsed_args.node,
                                                          raid_config)
 
         properties = []
         for field in ['automated_clean', 'instance_uuid', 'name',
                       'chassis_uuid', 'driver', 'resource_class',
-                      'conductor_group', 'protected', 'protected_reason']:
+                      'conductor_group', 'protected', 'protected_reason',
+                      'owner', 'description']:
             value = getattr(parsed_args, field)
             if value:
                 properties.extend(utils.args_array_to_patch(
@@ -1457,6 +1500,16 @@
             help=_('Unset the protected reason (gets unset automatically when '
                    'protected is unset)'),
         )
+        parser.add_argument(
+            "--owner",
+            action="store_true",
+            help=_('Unset the owner field of the node'),
+        )
+        parser.add_argument(
+            "--description",
+            action="store_true",
+            help=_('Unset the description field of the node'),
+        )
 
         return parser
 
@@ -1479,7 +1532,8 @@
                       'management_interface', 'network_interface',
                       'power_interface', 'raid_interface', 'rescue_interface',
                       'storage_interface', 'vendor_interface',
-                      'protected', 'protected_reason']:
+                      'protected', 'protected_reason', 'owner',
+                      'description']:
             if getattr(parsed_args, field):
                 properties.extend(utils.args_array_to_patch('remove', [field]))
 
diff -Nru python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_port.py python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_port.py
--- python-ironicclient-2.6.0/ironicclient/osc/v1/baremetal_port.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/osc/v1/baremetal_port.py	2019-03-08 00:29:10.000000000 +0000
@@ -56,7 +56,7 @@
             metavar="<key=value>",
             action='append',
             help=_("Record arbitrary key/value metadata. "
-                   "Can be specified multiple times.")
+                   "Argument can be specified multiple times.")
         )
         parser.add_argument(
             '--local-link-connection',
@@ -64,8 +64,10 @@
             action='append',
             help=_("Key/value metadata describing Local link connection "
                    "information. Valid keys are 'switch_info', 'switch_id', "
-                   "and 'port_id'. The keys 'switch_id' and 'port_id' are "
-                   "required. Can be specified multiple times.")
+                   "'port_id' and 'hostname'. The keys 'switch_id' and "
+                   "'port_id' are required. In case of a Smart NIC port, "
+                   "the required keys are 'port_id' and 'hostname'. "
+                   "Argument can be specified multiple times.")
         )
         parser.add_argument(
             '-l',
@@ -98,6 +100,12 @@
             help=_("Name of the physical network to which this port is "
                    "connected."))
 
+        parser.add_argument(
+            '--is-smartnic',
+            dest='is_smartnic',
+            action='store_true',
+            help=_("Indicates whether this Port is a Smart NIC port"))
+
         return parser
 
     def take_action(self, parsed_args):
@@ -123,6 +131,8 @@
                       if k in field_list and v is not None)
         fields = utils.args_array_to_dict(fields, 'extra')
         fields = utils.args_array_to_dict(fields, 'local_link_connection')
+        if parsed_args.is_smartnic:
+            fields['is_smartnic'] = parsed_args.is_smartnic
         port = baremetal_client.port.create(**fields)
 
         data = dict([(f, getattr(port, f, '')) for f in
@@ -215,6 +225,12 @@
             dest='physical_network',
             help=_("Unset the physical network on this baremetal port."))
 
+        parser.add_argument(
+            '--is-smartnic',
+            dest='is_smartnic',
+            action='store_true',
+            help=_("Set Port as not Smart NIC port"))
+
         return parser
 
     def take_action(self, parsed_args):
@@ -232,6 +248,9 @@
         if parsed_args.physical_network:
             properties.extend(utils.args_array_to_patch('remove',
                               ['physical_network']))
+        if parsed_args.is_smartnic:
+            properties.extend(utils.args_array_to_patch(
+                'add', ["is_smartnic=False"]))
 
         if properties:
             baremetal_client.port.update(parsed_args.port, properties)
@@ -282,8 +301,10 @@
             action='append',
             help=_("Key/value metadata describing local link connection "
                    "information. Valid keys are 'switch_info', 'switch_id', "
-                   "and 'port_id'. The keys 'switch_id' and 'port_id' are "
-                   "required. Can be specified multiple times.")
+                   "'port_id' and 'hostname'. The keys 'switch_id' and "
+                   "'port_id' are required. In case of a Smart NIC port, "
+                   "the required keys are 'port_id' and 'hostname'. "
+                   "Argument can be specified multiple times.")
         )
         pxe_enabled_group = parser.add_mutually_exclusive_group(required=False)
         pxe_enabled_group.add_argument(
@@ -309,6 +330,12 @@
             help=_("Set the name of the physical network to which this port "
                    "is connected."))
 
+        parser.add_argument(
+            '--is-smartnic',
+            dest='is_smartnic',
+            action='store_true',
+            help=_("Set port to be Smart NIC port"))
+
         return parser
 
     def take_action(self, parsed_args):
@@ -342,6 +369,9 @@
                                 parsed_args.physical_network]
             properties.extend(utils.args_array_to_patch('add',
                                                         physical_network))
+        if parsed_args.is_smartnic:
+            is_smartnic = ["is_smartnic=%s" % parsed_args.is_smartnic]
+            properties.extend(utils.args_array_to_patch('add', is_smartnic))
 
         if properties:
             baremetal_client.port.update(parsed_args.port, properties)
@@ -413,7 +443,7 @@
             type=int,
             help=_('Maximum number of ports to return per request, '
                    '0 for no limit. Default is the maximum number used '
-                   'by the Ironic API Service.')
+                   'by the Baremetal API Service.')
         )
         parser.add_argument(
             '--marker',
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/functional/osc/v1/base.py python-ironicclient-2.7.0/ironicclient/tests/functional/osc/v1/base.py
--- python-ironicclient-2.6.0/ironicclient/tests/functional/osc/v1/base.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/functional/osc/v1/base.py	2019-03-08 00:29:10.000000000 +0000
@@ -323,3 +323,138 @@
         output = self.openstack('baremetal driver list {0} {1}'
                                 .format(opts, params))
         return json.loads(output)
+
+    def conductor_show(self, hostname, fields=None, params=''):
+        """Show specified baremetal conductors.
+
+        :param String hostname: hostname of the conductor
+        :param List fields: List of fields to show
+        :param List params: Additional kwargs
+        :return: JSON object of driver
+        """
+        opts = self.get_opts(fields=fields)
+        output = self.openstack('baremetal conductor show {0} {1} {2}'
+                                .format(opts, hostname, params))
+        return json.loads(output)
+
+    def conductor_list(self, fields=None, params=''):
+        """List baremetal conductors.
+
+        :param List fields: List of fields to show
+        :param String params: Additional kwargs
+        :return: list of JSON driver objects
+        """
+        opts = self.get_opts(fields=fields)
+        output = self.openstack('baremetal conductor list {0} {1}'
+                                .format(opts, params))
+        return json.loads(output)
+
+    def allocation_create(self, resource_class='allocation-test', params=''):
+        opts = self.get_opts()
+        output = self.openstack('baremetal allocation create {0} '
+                                '--resource-class {1} {2}'
+                                .format(opts, resource_class, params))
+        allocation = json.loads(output)
+        self.addCleanup(self.allocation_delete, allocation['uuid'], True)
+        if not output:
+            self.fail('Baremetal allocation has not been created!')
+
+        return allocation
+
+    def allocation_list(self, fields=None, params=''):
+        """List baremetal allocations.
+
+        :param List fields: List of fields to show
+        :param String params: Additional kwargs
+        :return: list of JSON allocation objects
+        """
+        opts = self.get_opts(fields=fields)
+        output = self.openstack('baremetal allocation list {0} {1}'
+                                .format(opts, params))
+        return json.loads(output)
+
+    def allocation_show(self, identifier, fields=None, params=''):
+        """Show specified baremetal allocation.
+
+        :param String identifier: Name or UUID of the allocation
+        :param List fields: List of fields to show
+        :param List params: Additional kwargs
+        :return: JSON object of allocation
+        """
+        opts = self.get_opts(fields)
+        output = self.openstack('baremetal allocation show {0} {1} {2}'
+                                .format(opts, identifier, params))
+        return json.loads(output)
+
+    def allocation_delete(self, identifier, ignore_exceptions=False):
+        """Try to delete baremetal allocation by name or UUID.
+
+        :param String identifier: Name or UUID of the allocation
+        :param Bool ignore_exceptions: Ignore exception (needed for cleanUp)
+        :return: raw values output
+        :raise: CommandFailed exception when command fails to delete
+            an allocation
+        """
+        try:
+            return self.openstack('baremetal allocation delete {0}'
+                                  .format(identifier))
+        except exceptions.CommandFailed:
+            if not ignore_exceptions:
+                raise
+
+    def deploy_template_create(self, name, params=''):
+        """Create baremetal deploy template and add cleanup.
+
+        :param String name: deploy template name
+        :param String params: additional parameters
+        :return: JSON object of created deploy template
+        """
+        opts = self.get_opts()
+        template = self.openstack('baremetal deploy template create {0} {1} '
+                                  '{2}'.format(opts, name, params))
+        template = json.loads(template)
+        if not template:
+            self.fail('Baremetal deploy template has not been created!')
+        self.addCleanup(self.deploy_template_delete, template['uuid'], True)
+        return template
+
+    def deploy_template_list(self, fields=None, params=''):
+        """List baremetal deploy templates.
+
+        :param List fields: List of fields to show
+        :param String params: Additional kwargs
+        :return: list of JSON deploy template objects
+        """
+        opts = self.get_opts(fields=fields)
+        output = self.openstack('baremetal deploy template list {0} {1}'
+                                .format(opts, params))
+        return json.loads(output)
+
+    def deploy_template_show(self, identifier, fields=None, params=''):
+        """Show specified baremetal deploy template.
+
+        :param String identifier: Name or UUID of the deploy template
+        :param List fields: List of fields to show
+        :param List params: Additional kwargs
+        :return: JSON object of deploy template
+        """
+        opts = self.get_opts(fields)
+        output = self.openstack('baremetal deploy template show {0} {1} {2}'
+                                .format(opts, identifier, params))
+        return json.loads(output)
+
+    def deploy_template_delete(self, identifier, ignore_exceptions=False):
+        """Try to delete baremetal deploy template by UUID.
+
+        :param String identifier: Name or UUID of the deploy template
+        :param Bool ignore_exceptions: Ignore exception (needed for cleanUp)
+        :return: raw values output
+        :raise: CommandFailed exception when command fails to delete a deploy
+            template
+        """
+        try:
+            return self.openstack('baremetal deploy template delete {0}'
+                                  .format(identifier))
+        except exceptions.CommandFailed:
+            if not ignore_exceptions:
+                raise
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/functional/osc/v1/test_baremetal_allocation.py python-ironicclient-2.7.0/ironicclient/tests/functional/osc/v1/test_baremetal_allocation.py
--- python-ironicclient-2.6.0/ironicclient/tests/functional/osc/v1/test_baremetal_allocation.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/functional/osc/v1/test_baremetal_allocation.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,160 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import ddt
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
+
+from ironicclient.tests.functional.osc.v1 import base
+
+
+@ddt.ddt
+class BaremetalAllocationTests(base.TestCase):
+    """Functional tests for baremetal allocation commands."""
+
+    def test_create(self):
+        """Check baremetal allocation create command.
+
+        Test steps:
+        1) Create baremetal allocation in setUp.
+        2) Check that allocation successfully created.
+        """
+        allocation_info = self.allocation_create()
+        self.assertTrue(allocation_info['resource_class'])
+        self.assertEqual(allocation_info['state'], 'allocating')
+
+        allocation_list = self.allocation_list()
+        self.assertIn(allocation_info['uuid'],
+                      [x['UUID'] for x in allocation_list])
+
+    def test_create_name_uuid(self):
+        """Check baremetal allocation create command with name and UUID.
+
+        Test steps:
+        1) Create baremetal allocation with specified name and UUID.
+        2) Check that allocation successfully created.
+        """
+        uuid = data_utils.rand_uuid()
+        name = data_utils.rand_name('baremetal-allocation')
+        allocation_info = self.allocation_create(
+            params='--uuid {0} --name {1}'.format(uuid, name))
+        self.assertEqual(allocation_info['uuid'], uuid)
+        self.assertEqual(allocation_info['name'], name)
+        self.assertTrue(allocation_info['resource_class'])
+        self.assertEqual(allocation_info['state'], 'allocating')
+
+        allocation_list = self.allocation_list()
+        self.assertIn(uuid, [x['UUID'] for x in allocation_list])
+        self.assertIn(name, [x['Name'] for x in allocation_list])
+
+    def test_create_traits(self):
+        """Check baremetal allocation create command with traits.
+
+        Test steps:
+        1) Create baremetal allocation with specified traits.
+        2) Check that allocation successfully created.
+        """
+        allocation_info = self.allocation_create(
+            params='--trait CUSTOM_1 --trait CUSTOM_2')
+        self.assertTrue(allocation_info['resource_class'])
+        self.assertEqual(allocation_info['state'], 'allocating')
+        self.assertIn('CUSTOM_1', allocation_info['traits'])
+        self.assertIn('CUSTOM_2', allocation_info['traits'])
+
+    def test_create_candidate_nodes(self):
+        """Check baremetal allocation create command with candidate nodes.
+
+        Test steps:
+        1) Create two nodes.
+        2) Create baremetal allocation with specified traits.
+        3) Check that allocation successfully created.
+        """
+        name = data_utils.rand_name('baremetal-allocation')
+        node1 = self.node_create(name=name)
+        node2 = self.node_create()
+        allocation_info = self.allocation_create(
+            params='--candidate-node {0} --candidate-node {1}'
+            .format(node1['name'], node2['uuid']))
+        self.assertEqual(allocation_info['state'], 'allocating')
+        # NOTE(dtantsur): names are converted to uuids in the API
+        self.assertIn(node1['uuid'], allocation_info['candidate_nodes'])
+        self.assertIn(node2['uuid'], allocation_info['candidate_nodes'])
+
+    @ddt.data('name', 'uuid')
+    def test_delete(self, key):
+        """Check baremetal allocation delete command with name/UUID argument.
+
+        Test steps:
+        1) Create baremetal allocation.
+        2) Delete baremetal allocation by name/UUID.
+        3) Check that allocation deleted successfully.
+        """
+        name = data_utils.rand_name('baremetal-allocation')
+        allocation = self.allocation_create(params='--name {}'.format(name))
+        output = self.allocation_delete(allocation[key])
+        self.assertIn('Deleted allocation {0}'.format(allocation[key]), output)
+
+        allocation_list = self.allocation_list()
+        self.assertNotIn(allocation['name'],
+                         [x['Name'] for x in allocation_list])
+        self.assertNotIn(allocation['uuid'],
+                         [x['UUID'] for x in allocation_list])
+
+    @ddt.data('name', 'uuid')
+    def test_show(self, key):
+        """Check baremetal allocation show command with name and UUID.
+
+        Test steps:
+        1) Create baremetal allocation.
+        2) Show baremetal allocation calling it with name and UUID arguments.
+        3) Check name, uuid and resource_class in allocation show output.
+        """
+        name = data_utils.rand_name('baremetal-allocation')
+        allocation = self.allocation_create(params='--name {}'.format(name))
+        result = self.allocation_show(allocation[key],
+                                      ['name', 'uuid', 'resource_class'])
+        self.assertEqual(allocation['name'], result['name'])
+        self.assertEqual(allocation['uuid'], result['uuid'])
+        self.assertTrue(result['resource_class'])
+        self.assertNotIn('state', result)
+
+    @ddt.data(
+        ('--uuid', '', 'expected one argument'),
+        ('--uuid', '!@#$^*&%^', 'Expected a UUID'),
+        ('--extra', '', 'expected one argument'),
+        ('--name', '', 'expected one argument'),
+        ('--name', 'not/a/name', 'invalid name'),
+        ('--resource-class', '', 'expected one argument'),
+        ('--resource-class', 'x' * 81,
+         'Value should have a maximum character requirement of 80'),
+        ('--trait', '', 'expected one argument'),
+        ('--trait', 'foo',
+         'A custom trait must start with the prefix CUSTOM_'),
+        ('--candidate-node', '', 'expected one argument'),
+        ('--candidate-node', 'banana?', 'Expected a logical name or UUID'),
+        ('--wait', 'meow', 'invalid int value'))
+    @ddt.unpack
+    def test_create_negative(self, argument, value, ex_text):
+        """Check errors on invalid input parameters."""
+        base_cmd = 'baremetal allocation create'
+        if argument != '--resource-class':
+            base_cmd += ' --resource-class allocation-test'
+        command = self.construct_cmd(base_cmd, argument, value)
+        self.assertRaisesRegex(exceptions.CommandFailed, ex_text,
+                               self.openstack, command)
+
+    def test_create_no_resource_class(self):
+        """Check errors on missing resource class."""
+        base_cmd = 'baremetal allocation create'
+        self.assertRaisesRegex(exceptions.CommandFailed,
+                               '--resource-class is required',
+                               self.openstack, base_cmd)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/functional/osc/v1/test_baremetal_conductor_basic.py python-ironicclient-2.7.0/ironicclient/tests/functional/osc/v1/test_baremetal_conductor_basic.py
--- python-ironicclient-2.6.0/ironicclient/tests/functional/osc/v1/test_baremetal_conductor_basic.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/functional/osc/v1/test_baremetal_conductor_basic.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,38 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from ironicclient.tests.functional.osc.v1 import base
+
+
+class BaremetalConductorTests(base.TestCase):
+    """Functional tests for baremetal conductor commands."""
+
+    def test_list(self):
+        """List available conductors.
+
+        There is at lease one conductor in the functional tests, if not, other
+        tests will fail too.
+        """
+        hostnames = [c['Hostname'] for c in self.conductor_list()]
+        self.assertIsNotNone(hostnames)
+
+    def test_show(self):
+        """Show specified conductor.
+
+        Conductor name varies in different environment, list first, then show
+        one of them.
+        """
+        conductors = self.conductor_list()
+        conductor = self.conductor_show(conductors[0]['Hostname'])
+        self.assertIn('conductor_group', conductor)
+        self.assertIn('alive', conductor)
+        self.assertIn('drivers', conductor)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/functional/osc/v1/test_baremetal_deploy_template_basic.py python-ironicclient-2.7.0/ironicclient/tests/functional/osc/v1/test_baremetal_deploy_template_basic.py
--- python-ironicclient-2.6.0/ironicclient/tests/functional/osc/v1/test_baremetal_deploy_template_basic.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/functional/osc/v1/test_baremetal_deploy_template_basic.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,177 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import json
+
+import ddt
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
+
+from ironicclient.tests.functional.osc.v1 import base
+
+
+@ddt.ddt
+class BaremetalDeployTemplateTests(base.TestCase):
+    """Functional tests for baremetal deploy template commands."""
+
+    @staticmethod
+    def _get_random_trait():
+        return data_utils.rand_name('CUSTOM', '').replace('-', '_')
+
+    def setUp(self):
+        super(BaremetalDeployTemplateTests, self).setUp()
+        self.steps = json.dumps([{
+            'interface': 'bios',
+            'step': 'apply_configuration',
+            'args': {},
+            'priority': 10,
+        }])
+        name = self._get_random_trait()
+        self.template = self.deploy_template_create(
+            name, params="--steps '%s'" % self.steps)
+
+    def tearDown(self):
+        if self.template is not None:
+            self.deploy_template_delete(self.template['uuid'])
+        super(BaremetalDeployTemplateTests, self).tearDown()
+
+    def test_list(self):
+        """Check baremetal deploy template list command.
+
+        Test steps:
+        1) Create baremetal deploy template in setUp.
+        2) List baremetal deploy templates.
+        3) Check deploy template name and UUID in deploy templates list.
+        """
+        template_list = self.deploy_template_list()
+        self.assertIn(self.template['name'],
+                      [template['Name']
+                       for template in template_list])
+        self.assertIn(self.template['uuid'],
+                      [template['UUID']
+                       for template in template_list])
+
+    def test_list_long(self):
+        """Check baremetal deploy template list --long command
+
+        Test steps:
+        1) Create baremetal deploy template in setUp.
+        2) List baremetal deploy templates with detail=True.
+        3) Check deploy template fields in output.
+        """
+        template_list = self.deploy_template_list(params='--long')
+        template = [template for template in template_list
+                    if template['Name'] == self.template['name']][0]
+        self.assertEqual(self.template['extra'], template['Extra'])
+        self.assertEqual(self.template['name'], template['Name'])
+        self.assertEqual(self.template['steps'], template['Steps'])
+        self.assertEqual(self.template['uuid'], template['UUID'])
+
+    def test_show(self):
+        """Check baremetal deploy template show command with UUID.
+
+        Test steps:
+        1) Create baremetal deploy template in setUp.
+        2) Show baremetal deploy template calling it by UUID.
+        3) Check deploy template fields in output.
+        """
+        template = self.deploy_template_show(self.template['uuid'])
+        self.assertEqual(self.template['extra'], template['extra'])
+        self.assertEqual(self.template['name'], template['name'])
+        self.assertEqual(self.template['steps'], template['steps'])
+        self.assertEqual(self.template['uuid'], template['uuid'])
+
+    def test_delete(self):
+        """Check baremetal deploy template delete command.
+
+        Test steps:
+        1) Create baremetal deploy template in setUp.
+        2) Delete baremetal deploy template by UUID.
+        3) Check that deploy template deleted successfully and not in list.
+        """
+        output = self.deploy_template_delete(self.template['uuid'])
+        self.assertIn('Deleted deploy template {0}'.format(
+                      self.template['uuid']), output)
+        template_list = self.deploy_template_list()
+        self.assertNotIn(self.template['name'],
+                         [template['Name'] for template in template_list])
+        self.assertNotIn(self.template['uuid'],
+                         [template['UUID'] for template in template_list])
+        self.template = None
+
+    def test_set_steps(self):
+        """Check baremetal deploy template set command for steps.
+
+        Test steps:
+        1) Create baremetal deploy template in setUp.
+        2) Set steps for deploy template.
+        3) Check that baremetal deploy template steps were set.
+        """
+        steps = [{
+            'interface': 'bios',
+            'step': 'apply_configuration',
+            'args': {},
+            'priority': 20,
+        }]
+        self.openstack("baremetal deploy template set --steps '{0}' {1}"
+                       .format(json.dumps(steps), self.template['uuid']))
+
+        show_prop = self.deploy_template_show(self.template['uuid'],
+                                              fields=['steps'])
+        self.assertEqual(steps, show_prop['steps'])
+
+    def test_set_unset(self):
+        """Check baremetal deploy template set and unset commands.
+
+        Test steps:
+        1) Create baremetal deploy template in setUp.
+        2) Set extra data for deploy template.
+        3) Check that baremetal deploy template extra data was set.
+        4) Unset extra data for deploy template.
+        5) Check that baremetal deploy template  extra data was unset.
+        """
+        extra_key = 'ext'
+        extra_value = 'testdata'
+        self.openstack(
+            'baremetal deploy template set --extra {0}={1} {2}'
+            .format(extra_key, extra_value, self.template['uuid']))
+
+        show_prop = self.deploy_template_show(self.template['uuid'],
+                                              fields=['extra'])
+        self.assertEqual(extra_value, show_prop['extra'][extra_key])
+
+        self.openstack('baremetal deploy template unset --extra {0} {1}'
+                       .format(extra_key, self.template['uuid']))
+
+        show_prop = self.deploy_template_show(self.template['uuid'],
+                                              fields=['extra'])
+        self.assertNotIn(extra_key, show_prop['extra'])
+
+    @ddt.data(
+        ('--uuid', '', 'expected one argument'),
+        ('--uuid', '!@#$^*&%^', 'Expected a UUID'),
+        ('', '', 'too few arguments'),
+        ('', 'not/a/name', 'Deploy template name must be a valid trait'),
+        ('', 'foo', 'Deploy template name must be a valid trait'),
+        ('--steps', '', 'expected one argument'),
+        ('--steps', '[]', 'No deploy steps specified'))
+    @ddt.unpack
+    def test_create_negative(self, argument, value, ex_text):
+        """Check errors on invalid input parameters."""
+        base_cmd = 'baremetal deploy template create'
+        if argument != '':
+            base_cmd += ' %s' % self._get_random_trait()
+        if argument != '--steps':
+            base_cmd += " --steps '%s'" % self.steps
+        command = self.construct_cmd(base_cmd, argument, value)
+        self.assertRaisesRegex(exceptions.CommandFailed, ex_text,
+                               self.openstack, command)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/fakes.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/fakes.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/fakes.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/fakes.py	2019-03-08 00:29:10.000000000 +0000
@@ -14,6 +14,8 @@
 #   under the License.
 #
 
+import json
+
 import mock
 from osc_lib.tests import utils
 
@@ -180,6 +182,43 @@
     'properties': baremetal_volume_target_properties,
 }
 
+baremetal_hostname = 'compute1.localdomain'
+baremetal_conductor_group = 'foo'
+baremetal_alive = True
+baremetal_drivers = ['fake-hardware']
+CONDUCTOR = {
+    'hostname': baremetal_hostname,
+    'conductor_group': baremetal_conductor_group,
+    'alive': baremetal_alive,
+    'drivers': baremetal_drivers,
+}
+
+baremetal_allocation_state = 'active'
+baremetal_resource_class = 'baremetal'
+ALLOCATION = {
+    'resource_class': baremetal_resource_class,
+    'uuid': baremetal_uuid,
+    'name': baremetal_name,
+    'state': baremetal_allocation_state,
+    'node_uuid': baremetal_uuid,
+}
+
+baremetal_deploy_template_uuid = 'ddd-tttttt-dddd'
+baremetal_deploy_template_name = 'DeployTemplate-name'
+baremetal_deploy_template_steps = json.dumps([{
+    'interface': 'raid',
+    'step': 'create_configuration',
+    'args': {},
+    'priority': 10
+}])
+baremetal_deploy_template_extra = {'key1': 'value1', 'key2': 'value2'}
+DEPLOY_TEMPLATE = {
+    'uuid': baremetal_deploy_template_uuid,
+    'name': baremetal_deploy_template_name,
+    'steps': baremetal_deploy_template_steps,
+    'extra': baremetal_deploy_template_extra,
+}
+
 
 class TestBaremetal(utils.TestCommand):
 
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_allocation.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_allocation.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_allocation.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_allocation.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,471 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+import copy
+
+import mock
+from osc_lib.tests import utils as osctestutils
+
+from ironicclient.osc.v1 import baremetal_allocation
+from ironicclient.tests.unit.osc.v1 import fakes as baremetal_fakes
+
+
+class TestBaremetalAllocation(baremetal_fakes.TestBaremetal):
+
+    def setUp(self):
+        super(TestBaremetalAllocation, self).setUp()
+
+        self.baremetal_mock = self.app.client_manager.baremetal
+        self.baremetal_mock.reset_mock()
+
+
+class TestCreateBaremetalAllocation(TestBaremetalAllocation):
+
+    def setUp(self):
+        super(TestCreateBaremetalAllocation, self).setUp()
+
+        self.baremetal_mock.allocation.create.return_value = (
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.ALLOCATION),
+                loaded=True,
+            ))
+
+        self.baremetal_mock.allocation.wait.return_value = (
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.ALLOCATION),
+                loaded=True,
+            ))
+
+        # Get the command object to test
+        self.cmd = baremetal_allocation.CreateBaremetalAllocation(self.app,
+                                                                  None)
+
+    def test_baremetal_allocation_create(self):
+        arglist = [
+            '--resource-class', baremetal_fakes.baremetal_resource_class,
+        ]
+
+        verifylist = [
+            ('resource_class', baremetal_fakes.baremetal_resource_class),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        args = {
+            'resource_class': baremetal_fakes.baremetal_resource_class,
+        }
+
+        self.baremetal_mock.allocation.create.assert_called_once_with(**args)
+
+    def test_baremetal_allocation_create_wait(self):
+        arglist = [
+            '--resource-class', baremetal_fakes.baremetal_resource_class,
+            '--wait',
+        ]
+
+        verifylist = [
+            ('resource_class', baremetal_fakes.baremetal_resource_class),
+            ('wait_timeout', 0),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        args = {
+            'resource_class': baremetal_fakes.baremetal_resource_class,
+        }
+
+        self.baremetal_mock.allocation.create.assert_called_once_with(**args)
+        self.baremetal_mock.allocation.wait.assert_called_once_with(
+            baremetal_fakes.ALLOCATION['uuid'], timeout=0)
+
+    def test_baremetal_allocation_create_wait_with_timeout(self):
+        arglist = [
+            '--resource-class', baremetal_fakes.baremetal_resource_class,
+            '--wait', '3600',
+        ]
+
+        verifylist = [
+            ('resource_class', baremetal_fakes.baremetal_resource_class),
+            ('wait_timeout', 3600),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        args = {
+            'resource_class': baremetal_fakes.baremetal_resource_class,
+        }
+
+        self.baremetal_mock.allocation.create.assert_called_once_with(**args)
+        self.baremetal_mock.allocation.wait.assert_called_once_with(
+            baremetal_fakes.ALLOCATION['uuid'], timeout=3600)
+
+    def test_baremetal_allocation_create_name_extras(self):
+        arglist = [
+            '--resource-class', baremetal_fakes.baremetal_resource_class,
+            '--uuid', baremetal_fakes.baremetal_uuid,
+            '--name', baremetal_fakes.baremetal_name,
+            '--extra', 'key1=value1',
+            '--extra', 'key2=value2'
+        ]
+
+        verifylist = [
+            ('resource_class', baremetal_fakes.baremetal_resource_class),
+            ('uuid', baremetal_fakes.baremetal_uuid),
+            ('name', baremetal_fakes.baremetal_name),
+            ('extra', ['key1=value1', 'key2=value2'])
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        args = {
+            'resource_class': baremetal_fakes.baremetal_resource_class,
+            'uuid': baremetal_fakes.baremetal_uuid,
+            'name': baremetal_fakes.baremetal_name,
+            'extra': {'key1': 'value1', 'key2': 'value2'}
+        }
+
+        self.baremetal_mock.allocation.create.assert_called_once_with(**args)
+
+    def test_baremetal_allocation_create_nodes_and_traits(self):
+        arglist = [
+            '--resource-class', baremetal_fakes.baremetal_resource_class,
+            '--candidate-node', 'node1',
+            '--trait', 'CUSTOM_1',
+            '--candidate-node', 'node2',
+            '--trait', 'CUSTOM_2',
+        ]
+
+        verifylist = [
+            ('resource_class', baremetal_fakes.baremetal_resource_class),
+            ('candidate_nodes', ['node1', 'node2']),
+            ('traits', ['CUSTOM_1', 'CUSTOM_2']),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        args = {
+            'resource_class': baremetal_fakes.baremetal_resource_class,
+            'candidate_nodes': ['node1', 'node2'],
+            'traits': ['CUSTOM_1', 'CUSTOM_2'],
+        }
+
+        self.baremetal_mock.allocation.create.assert_called_once_with(**args)
+
+    def test_baremetal_allocation_create_no_options(self):
+        arglist = []
+        verifylist = []
+
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+
+class TestShowBaremetalAllocation(TestBaremetalAllocation):
+
+    def setUp(self):
+        super(TestShowBaremetalAllocation, self).setUp()
+
+        self.baremetal_mock.allocation.get.return_value = (
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.ALLOCATION),
+                loaded=True))
+
+        self.cmd = baremetal_allocation.ShowBaremetalAllocation(self.app, None)
+
+    def test_baremetal_allocation_show(self):
+        arglist = [baremetal_fakes.baremetal_uuid]
+        verifylist = [('allocation', baremetal_fakes.baremetal_uuid)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.baremetal_mock.allocation.get.assert_called_once_with(
+            baremetal_fakes.baremetal_uuid, fields=None)
+
+        collist = ('name', 'node_uuid', 'resource_class', 'state', 'uuid')
+        self.assertEqual(collist, columns)
+
+        datalist = (
+            baremetal_fakes.baremetal_name,
+            baremetal_fakes.baremetal_uuid,
+            baremetal_fakes.baremetal_resource_class,
+            baremetal_fakes.baremetal_allocation_state,
+            baremetal_fakes.baremetal_uuid,
+        )
+
+        self.assertEqual(datalist, tuple(data))
+
+    def test_baremetal_allocation_show_no_options(self):
+        arglist = []
+        verifylist = []
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+
+class TestBaremetalAllocationList(TestBaremetalAllocation):
+    def setUp(self):
+        super(TestBaremetalAllocationList, self).setUp()
+
+        self.baremetal_mock.allocation.list.return_value = [
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.ALLOCATION),
+                loaded=True)
+        ]
+        self.cmd = baremetal_allocation.ListBaremetalAllocation(self.app, None)
+
+    def test_baremetal_allocation_list(self):
+        arglist = []
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'marker': None,
+            'limit': None}
+        self.baremetal_mock.allocation.list.assert_called_with(**kwargs)
+
+        collist = (
+            "UUID",
+            "Name",
+            "Resource Class",
+            "State",
+            "Node UUID")
+        self.assertEqual(collist, columns)
+
+        datalist = ((baremetal_fakes.baremetal_uuid,
+                     baremetal_fakes.baremetal_name,
+                     baremetal_fakes.baremetal_resource_class,
+                     baremetal_fakes.baremetal_allocation_state,
+                     baremetal_fakes.baremetal_uuid),)
+        self.assertEqual(datalist, tuple(data))
+
+    def test_baremetal_allocation_list_node(self):
+        arglist = ['--node', baremetal_fakes.baremetal_uuid]
+        verifylist = [('node', baremetal_fakes.baremetal_uuid)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'node': baremetal_fakes.baremetal_uuid,
+            'marker': None,
+            'limit': None}
+        self.baremetal_mock.allocation.list.assert_called_once_with(**kwargs)
+
+        collist = (
+            "UUID",
+            "Name",
+            "Resource Class",
+            "State",
+            "Node UUID")
+        self.assertEqual(collist, columns)
+
+        datalist = ((baremetal_fakes.baremetal_uuid,
+                     baremetal_fakes.baremetal_name,
+                     baremetal_fakes.baremetal_resource_class,
+                     baremetal_fakes.baremetal_allocation_state,
+                     baremetal_fakes.baremetal_uuid),)
+        self.assertEqual(datalist, tuple(data))
+
+    def test_baremetal_allocation_list_resource_class(self):
+        arglist = ['--resource-class',
+                   baremetal_fakes.baremetal_resource_class]
+        verifylist = [('resource_class',
+                       baremetal_fakes.baremetal_resource_class)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'resource_class': baremetal_fakes.baremetal_resource_class,
+            'marker': None,
+            'limit': None}
+        self.baremetal_mock.allocation.list.assert_called_once_with(**kwargs)
+
+        collist = (
+            "UUID",
+            "Name",
+            "Resource Class",
+            "State",
+            "Node UUID")
+        self.assertEqual(collist, columns)
+
+        datalist = ((baremetal_fakes.baremetal_uuid,
+                     baremetal_fakes.baremetal_name,
+                     baremetal_fakes.baremetal_resource_class,
+                     baremetal_fakes.baremetal_allocation_state,
+                     baremetal_fakes.baremetal_uuid),)
+        self.assertEqual(datalist, tuple(data))
+
+    def test_baremetal_allocation_list_state(self):
+        arglist = ['--state', baremetal_fakes.baremetal_allocation_state]
+        verifylist = [('state', baremetal_fakes.baremetal_allocation_state)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'state': baremetal_fakes.baremetal_allocation_state,
+            'marker': None,
+            'limit': None}
+        self.baremetal_mock.allocation.list.assert_called_once_with(**kwargs)
+
+        collist = (
+            "UUID",
+            "Name",
+            "Resource Class",
+            "State",
+            "Node UUID")
+        self.assertEqual(collist, columns)
+
+        datalist = ((baremetal_fakes.baremetal_uuid,
+                     baremetal_fakes.baremetal_name,
+                     baremetal_fakes.baremetal_resource_class,
+                     baremetal_fakes.baremetal_allocation_state,
+                     baremetal_fakes.baremetal_uuid),)
+        self.assertEqual(datalist, tuple(data))
+
+    def test_baremetal_allocation_list_long(self):
+        arglist = ['--long']
+        verifylist = [('long', True)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'marker': None,
+            'limit': None,
+        }
+        self.baremetal_mock.allocation.list.assert_called_once_with(**kwargs)
+
+        collist = ('UUID',
+                   'Name',
+                   'State',
+                   'Node UUID',
+                   'Last Error',
+                   'Resource Class',
+                   'Traits',
+                   'Candidate Nodes',
+                   'Extra',
+                   'Created At',
+                   'Updated At')
+        self.assertEqual(collist, columns)
+
+        datalist = ((baremetal_fakes.baremetal_uuid,
+                     baremetal_fakes.baremetal_name,
+                     baremetal_fakes.baremetal_allocation_state,
+                     baremetal_fakes.baremetal_uuid,
+                     '',
+                     baremetal_fakes.baremetal_resource_class,
+                     '',
+                     '',
+                     '',
+                     '',
+                     ''),)
+        self.assertEqual(datalist, tuple(data))
+
+    def test_baremetal_allocation_list_fields(self):
+        arglist = ['--fields', 'uuid', 'node_uuid']
+        verifylist = [('fields', [['uuid', 'node_uuid']])]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'marker': None,
+            'limit': None,
+            'fields': ('uuid', 'node_uuid')
+        }
+        self.baremetal_mock.allocation.list.assert_called_once_with(**kwargs)
+
+    def test_baremetal_allocation_list_fields_multiple(self):
+        arglist = ['--fields', 'uuid', 'node_uuid', '--fields', 'extra']
+        verifylist = [('fields', [['uuid', 'node_uuid'], ['extra']])]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'marker': None,
+            'limit': None,
+            'fields': ('uuid', 'node_uuid', 'extra')
+        }
+        self.baremetal_mock.allocation.list.assert_called_once_with(**kwargs)
+
+    def test_baremetal_allocation_list_invalid_fields(self):
+        arglist = ['--fields', 'uuid', 'invalid']
+        verifylist = [('fields', [['uuid', 'invalid']])]
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+
+class TestBaremetalAllocationDelete(TestBaremetalAllocation):
+
+    def setUp(self):
+        super(TestBaremetalAllocationDelete, self).setUp()
+
+        self.baremetal_mock.allocation.get.return_value = (
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.ALLOCATION),
+                loaded=True))
+
+        self.cmd = baremetal_allocation.DeleteBaremetalAllocation(self.app,
+                                                                  None)
+
+    def test_baremetal_allocation_delete(self):
+        arglist = [baremetal_fakes.baremetal_uuid]
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.baremetal_mock.allocation.delete.assert_called_once_with(
+            baremetal_fakes.baremetal_uuid)
+
+    def test_baremetal_allocation_delete_multiple(self):
+        arglist = [baremetal_fakes.baremetal_uuid,
+                   baremetal_fakes.baremetal_name]
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        self.baremetal_mock.allocation.delete.assert_has_calls(
+            [mock.call(x) for x in arglist]
+        )
+        self.assertEqual(2, self.baremetal_mock.allocation.delete.call_count)
+
+    def test_baremetal_allocation_delete_no_options(self):
+        arglist = []
+        verifylist = []
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py	2019-03-08 00:29:10.000000000 +0000
@@ -145,7 +145,7 @@
 
         # Set expected values
         args = [uuid1, uuid2]
-        self.baremetal_mock.chassis.delete.has_calls(
+        self.baremetal_mock.chassis.delete.assert_has_calls(
             [mock.call(x) for x in args]
         )
         self.assertEqual(2, self.baremetal_mock.chassis.delete.call_count)
@@ -167,7 +167,7 @@
 
         # Set expected values
         args = [uuid1, uuid2]
-        self.baremetal_mock.chassis.delete.has_calls(
+        self.baremetal_mock.chassis.delete.assert_has_calls(
             [mock.call(x) for x in args]
         )
         self.assertEqual(2, self.baremetal_mock.chassis.delete.call_count)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_conductor.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_conductor.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_conductor.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_conductor.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,309 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import copy
+
+from osc_lib.tests import utils as oscutils
+
+from ironicclient.osc.v1 import baremetal_conductor
+from ironicclient.tests.unit.osc.v1 import fakes as baremetal_fakes
+
+
+class TestBaremetalConductor(baremetal_fakes.TestBaremetal):
+
+    def setUp(self):
+        super(TestBaremetalConductor, self).setUp()
+
+        # Get a shortcut to the baremetal manager mock
+        self.baremetal_mock = self.app.client_manager.baremetal
+        self.baremetal_mock.reset_mock()
+
+
+class TestBaremetalConductorList(TestBaremetalConductor):
+
+    def setUp(self):
+        super(TestBaremetalConductorList, self).setUp()
+
+        self.baremetal_mock.conductor.list.return_value = [
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.CONDUCTOR),
+                loaded=True,
+            ),
+        ]
+
+        # Get the command object to test
+        self.cmd = baremetal_conductor.ListBaremetalConductor(self.app, None)
+
+    def test_conductor_list_no_options(self):
+        arglist = []
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        kwargs = {
+            'marker': None,
+            'limit': None,
+        }
+
+        self.baremetal_mock.conductor.list.assert_called_with(
+            **kwargs
+        )
+
+        collist = (
+            "Hostname",
+            "Conductor Group",
+            "Alive",
+        )
+        self.assertEqual(collist, columns)
+        datalist = ((
+            baremetal_fakes.baremetal_hostname,
+            baremetal_fakes.baremetal_conductor_group,
+            baremetal_fakes.baremetal_alive,
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_conductor_list_long(self):
+        arglist = [
+            '--long',
+        ]
+        verifylist = [
+            ('long', True),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        kwargs = {
+            'detail': True,
+            'marker': None,
+            'limit': None,
+        }
+
+        self.baremetal_mock.conductor.list.assert_called_with(
+            **kwargs
+        )
+
+        collist = [
+            'Hostname',
+            'Conductor Group',
+            'Alive',
+            'Drivers',
+            'Created At',
+            'Updated At',
+        ]
+        self.assertEqual(tuple(collist), columns)
+
+        fake_values = {
+            'Hostname': baremetal_fakes.baremetal_hostname,
+            'Conductor Group': baremetal_fakes.baremetal_conductor_group,
+            'Alive': baremetal_fakes.baremetal_alive,
+            'Drivers': baremetal_fakes.baremetal_drivers,
+        }
+        values = tuple(fake_values.get(name, '') for name in collist)
+        self.assertEqual((values,), tuple(data))
+
+    def test_conductor_list_fields(self):
+        arglist = [
+            '--fields', 'hostname', 'alive',
+        ]
+        verifylist = [
+            ('fields', [['hostname', 'alive']]),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        kwargs = {
+            'marker': None,
+            'limit': None,
+            'detail': False,
+            'fields': ('hostname', 'alive'),
+        }
+
+        self.baremetal_mock.conductor.list.assert_called_with(
+            **kwargs
+        )
+
+    def test_conductor_list_fields_multiple(self):
+        arglist = [
+            '--fields', 'hostname', 'alive',
+            '--fields', 'conductor_group',
+        ]
+        verifylist = [
+            ('fields', [['hostname', 'alive'], ['conductor_group']])
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        kwargs = {
+            'marker': None,
+            'limit': None,
+            'detail': False,
+            'fields': ('hostname', 'alive', 'conductor_group')
+        }
+
+        self.baremetal_mock.conductor.list.assert_called_with(
+            **kwargs
+        )
+
+    def test_conductor_list_invalid_fields(self):
+        arglist = [
+            '--fields', 'hostname', 'invalid'
+        ]
+        verifylist = [
+            ('fields', [['hostname', 'invalid']])
+        ]
+
+        self.assertRaises(oscutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+
+class TestBaremetalConductorShow(TestBaremetalConductor):
+    def setUp(self):
+        super(TestBaremetalConductorShow, self).setUp()
+
+        self.baremetal_mock.conductor.get.return_value = (
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.CONDUCTOR),
+                loaded=True,
+            ))
+
+        # Get the command object to test
+        self.cmd = baremetal_conductor.ShowBaremetalConductor(self.app, None)
+
+    def test_conductor_show(self):
+        arglist = ['xxxx.xxxx']
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        args = ['xxxx.xxxx']
+
+        self.baremetal_mock.conductor.get.assert_called_with(
+            *args, fields=None
+        )
+
+        collist = ('alive',
+                   'conductor_group',
+                   'drivers',
+                   'hostname',
+                   )
+        self.assertEqual(collist, columns)
+        datalist = (
+            baremetal_fakes.baremetal_alive,
+            baremetal_fakes.baremetal_conductor_group,
+            baremetal_fakes.baremetal_drivers,
+            baremetal_fakes.baremetal_hostname,
+        )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_conductor_show_no_conductor(self):
+        arglist = []
+        verifylist = []
+
+        self.assertRaises(oscutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+    def test_conductor_show_fields(self):
+        arglist = [
+            'xxxxx',
+            '--fields', 'hostname', 'alive',
+        ]
+        verifylist = [
+            ('conductor', 'xxxxx'),
+            ('fields', [['hostname', 'alive']]),
+        ]
+
+        fake_cond = copy.deepcopy(baremetal_fakes.CONDUCTOR)
+        fake_cond.pop('conductor_group')
+        fake_cond.pop('drivers')
+        self.baremetal_mock.conductor.get.return_value = (
+            baremetal_fakes.FakeBaremetalResource(None, fake_cond,
+                                                  loaded=True))
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        columns, data = self.cmd.take_action(parsed_args)
+        self.assertNotIn('conductor_group', columns)
+
+        # Set expected values
+        args = ['xxxxx']
+        fields = ['hostname', 'alive']
+
+        self.baremetal_mock.conductor.get.assert_called_with(
+            *args, fields=fields
+        )
+
+    def test_conductor_show_fields_multiple(self):
+        arglist = [
+            'xxxxx',
+            '--fields', 'hostname', 'alive',
+            '--fields', 'conductor_group',
+        ]
+        verifylist = [
+            ('conductor', 'xxxxx'),
+            ('fields', [['hostname', 'alive'], ['conductor_group']])
+        ]
+
+        fake_cond = copy.deepcopy(baremetal_fakes.CONDUCTOR)
+        fake_cond.pop('drivers')
+        self.baremetal_mock.conductor.get.return_value = (
+            baremetal_fakes.FakeBaremetalResource(None, fake_cond,
+                                                  loaded=True))
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+        self.assertNotIn('drivers', columns)
+        # Set expected values
+        args = ['xxxxx']
+        fields = ['hostname', 'alive', 'conductor_group']
+
+        self.baremetal_mock.conductor.get.assert_called_with(
+            *args, fields=fields
+        )
+
+    def test_conductor_show_invalid_fields(self):
+        arglist = [
+            'xxxxx',
+            '--fields', 'hostname', 'invalid'
+        ]
+        verifylist = [
+            ('conductor', 'xxxxx'),
+            ('fields', [['hostname', 'invalid']])
+        ]
+
+        self.assertRaises(oscutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_deploy_template.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_deploy_template.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_deploy_template.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_deploy_template.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,450 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+
+import copy
+import json
+
+import mock
+from osc_lib.tests import utils as osctestutils
+
+from ironicclient import exc
+from ironicclient.osc.v1 import baremetal_deploy_template
+from ironicclient.tests.unit.osc.v1 import fakes as baremetal_fakes
+
+
+class TestBaremetalDeployTemplate(baremetal_fakes.TestBaremetal):
+
+    def setUp(self):
+        super(TestBaremetalDeployTemplate, self).setUp()
+
+        self.baremetal_mock = self.app.client_manager.baremetal
+        self.baremetal_mock.reset_mock()
+
+
+class TestCreateBaremetalDeployTemplate(TestBaremetalDeployTemplate):
+    def setUp(self):
+        super(TestCreateBaremetalDeployTemplate, self).setUp()
+
+        self.baremetal_mock.deploy_template.create.return_value = (
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.DEPLOY_TEMPLATE),
+                loaded=True,
+            ))
+
+        # Get the command object to test
+        self.cmd = baremetal_deploy_template.CreateBaremetalDeployTemplate(
+            self.app, None)
+
+    def test_baremetal_deploy_template_create(self):
+        arglist = [
+            baremetal_fakes.baremetal_deploy_template_name,
+            '--steps', baremetal_fakes.baremetal_deploy_template_steps,
+        ]
+
+        verifylist = [
+            ('name', baremetal_fakes.baremetal_deploy_template_name),
+            ('steps', baremetal_fakes.baremetal_deploy_template_steps),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        args = {
+            'name': baremetal_fakes.baremetal_deploy_template_name,
+            'steps': json.loads(
+                baremetal_fakes.baremetal_deploy_template_steps),
+        }
+
+        self.baremetal_mock.deploy_template.create.assert_called_once_with(
+            **args)
+
+    def test_baremetal_deploy_template_create_uuid(self):
+        arglist = [
+            baremetal_fakes.baremetal_deploy_template_name,
+            '--steps', baremetal_fakes.baremetal_deploy_template_steps,
+            '--uuid', baremetal_fakes.baremetal_deploy_template_uuid,
+        ]
+
+        verifylist = [
+            ('name', baremetal_fakes.baremetal_deploy_template_name),
+            ('steps', baremetal_fakes.baremetal_deploy_template_steps),
+            ('uuid', baremetal_fakes.baremetal_deploy_template_uuid),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        args = {
+            'name': baremetal_fakes.baremetal_deploy_template_name,
+            'steps': json.loads(
+                baremetal_fakes.baremetal_deploy_template_steps),
+            'uuid': baremetal_fakes.baremetal_deploy_template_uuid,
+        }
+
+        self.baremetal_mock.deploy_template.create.assert_called_once_with(
+            **args)
+
+    def test_baremetal_deploy_template_create_no_name(self):
+        arglist = [
+            '--steps', baremetal_fakes.baremetal_deploy_template_steps,
+        ]
+
+        verifylist = [
+            ('steps', baremetal_fakes.baremetal_deploy_template_steps),
+        ]
+
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+        self.assertFalse(self.baremetal_mock.deploy_template.create.called)
+
+    def test_baremetal_deploy_template_create_no_steps(self):
+        arglist = [
+            '--name', baremetal_fakes.baremetal_deploy_template_name,
+        ]
+
+        verifylist = [
+            ('name', baremetal_fakes.baremetal_deploy_template_name),
+        ]
+
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+        self.assertFalse(self.baremetal_mock.deploy_template.create.called)
+
+
+class TestShowBaremetalDeployTemplate(TestBaremetalDeployTemplate):
+    def setUp(self):
+        super(TestShowBaremetalDeployTemplate, self).setUp()
+
+        self.baremetal_mock.deploy_template.get.return_value = (
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.DEPLOY_TEMPLATE),
+                loaded=True))
+
+        self.cmd = baremetal_deploy_template.ShowBaremetalDeployTemplate(
+            self.app, None)
+
+    def test_baremetal_deploy_template_show(self):
+        arglist = [baremetal_fakes.baremetal_deploy_template_uuid]
+        verifylist = [('template',
+                      baremetal_fakes.baremetal_deploy_template_uuid)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        args = [baremetal_fakes.baremetal_deploy_template_uuid]
+        self.baremetal_mock.deploy_template.get.assert_called_with(
+            *args, fields=None)
+
+        collist = (
+            'extra',
+            'name',
+            'steps',
+            'uuid')
+        self.assertEqual(collist, columns)
+
+        datalist = (
+            baremetal_fakes.baremetal_deploy_template_extra,
+            baremetal_fakes.baremetal_deploy_template_name,
+            baremetal_fakes.baremetal_deploy_template_steps,
+            baremetal_fakes.baremetal_deploy_template_uuid)
+        self.assertEqual(datalist, tuple(data))
+
+    def test_baremetal_deploy_template_show_no_template(self):
+        arglist = []
+        verifylist = []
+
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+
+class TestBaremetalDeployTemplateSet(TestBaremetalDeployTemplate):
+    def setUp(self):
+        super(TestBaremetalDeployTemplateSet, self).setUp()
+
+        self.baremetal_mock.deploy_template.update.return_value = (
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.DEPLOY_TEMPLATE),
+                loaded=True))
+
+        self.cmd = baremetal_deploy_template.SetBaremetalDeployTemplate(
+            self.app, None)
+
+    def test_baremetal_deploy_template_set_name(self):
+        new_name = 'foo'
+        arglist = [
+            baremetal_fakes.baremetal_deploy_template_uuid,
+            '--name', new_name]
+        verifylist = [
+            ('template', baremetal_fakes.baremetal_deploy_template_uuid),
+            ('name', new_name)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.baremetal_mock.deploy_template.update.assert_called_once_with(
+            baremetal_fakes.baremetal_deploy_template_uuid,
+            [{'path': '/name', 'value': new_name, 'op': 'add'}])
+
+    def test_baremetal_deploy_template_set_steps(self):
+        arglist = [
+            baremetal_fakes.baremetal_deploy_template_uuid,
+            '--steps', baremetal_fakes.baremetal_deploy_template_steps]
+        verifylist = [
+            ('template', baremetal_fakes.baremetal_deploy_template_uuid),
+            ('steps', baremetal_fakes.baremetal_deploy_template_steps)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        expected_steps = json.loads(
+            baremetal_fakes.baremetal_deploy_template_steps)
+        self.cmd.take_action(parsed_args)
+        self.baremetal_mock.deploy_template.update.assert_called_once_with(
+            baremetal_fakes.baremetal_deploy_template_uuid,
+            [{'path': '/steps', 'value': expected_steps, 'op': 'add'}])
+
+    def test_baremetal_deploy_template_set_no_options(self):
+        arglist = []
+        verifylist = []
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+
+class TestBaremetalDeployTemplateUnset(TestBaremetalDeployTemplate):
+    def setUp(self):
+        super(TestBaremetalDeployTemplateUnset, self).setUp()
+
+        self.baremetal_mock.deploy_template.update.return_value = (
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.DEPLOY_TEMPLATE),
+                loaded=True))
+
+        self.cmd = baremetal_deploy_template.UnsetBaremetalDeployTemplate(
+            self.app, None)
+
+    def test_baremetal_deploy_template_unset_extra(self):
+        arglist = [
+            baremetal_fakes.baremetal_deploy_template_uuid, '--extra', 'key1']
+        verifylist = [('template',
+                       baremetal_fakes.baremetal_deploy_template_uuid),
+                      ('extra', ['key1'])]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.baremetal_mock.deploy_template.update.assert_called_once_with(
+            baremetal_fakes.baremetal_deploy_template_uuid,
+            [{'path': '/extra/key1', 'op': 'remove'}])
+
+    def test_baremetal_deploy_template_unset_multiple_extras(self):
+        arglist = [
+            baremetal_fakes.baremetal_deploy_template_uuid,
+            '--extra', 'key1', '--extra', 'key2']
+        verifylist = [('template',
+                       baremetal_fakes.baremetal_deploy_template_uuid),
+                      ('extra', ['key1', 'key2'])]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.baremetal_mock.deploy_template.update.assert_called_once_with(
+            baremetal_fakes.baremetal_deploy_template_uuid,
+            [{'path': '/extra/key1', 'op': 'remove'},
+             {'path': '/extra/key2', 'op': 'remove'}])
+
+    def test_baremetal_deploy_template_unset_no_options(self):
+        arglist = []
+        verifylist = []
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+    def test_baremetal_deploy_template_unset_no_property(self):
+        uuid = baremetal_fakes.baremetal_deploy_template_uuid
+        arglist = [uuid]
+        verifylist = [('template', uuid)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+        self.assertFalse(self.baremetal_mock.deploy_template.update.called)
+
+
+class TestBaremetalDeployTemplateDelete(TestBaremetalDeployTemplate):
+    def setUp(self):
+        super(TestBaremetalDeployTemplateDelete, self).setUp()
+
+        self.cmd = baremetal_deploy_template.DeleteBaremetalDeployTemplate(
+            self.app, None)
+
+    def test_baremetal_deploy_template_delete(self):
+        arglist = ['zzz-zzzzzz-zzzz']
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        args = 'zzz-zzzzzz-zzzz'
+        self.baremetal_mock.deploy_template.delete.assert_called_with(args)
+
+    def test_baremetal_deploy_template_delete_multiple(self):
+        arglist = ['zzz-zzzzzz-zzzz', 'fakename']
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        args = ['zzz-zzzzzz-zzzz', 'fakename']
+        self.baremetal_mock.deploy_template.delete.has_calls(
+            [mock.call(x) for x in args])
+        self.assertEqual(
+            2, self.baremetal_mock.deploy_template.delete.call_count)
+
+    def test_baremetal_deploy_template_delete_multiple_with_fail(self):
+        arglist = ['zzz-zzzzzz-zzzz', 'badname']
+        verifylist = []
+
+        self.baremetal_mock.deploy_template.delete.side_effect = [
+            '', exc.ClientException]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.assertRaises(exc.ClientException,
+                          self.cmd.take_action,
+                          parsed_args)
+
+        args = ['zzz-zzzzzz-zzzz', 'badname']
+        self.baremetal_mock.deploy_template.delete.has_calls(
+            [mock.call(x) for x in args])
+        self.assertEqual(
+            2, self.baremetal_mock.deploy_template.delete.call_count)
+
+    def test_baremetal_deploy_template_delete_no_template(self):
+        arglist = []
+        verifylist = []
+
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
+
+
+class TestBaremetalDeployTemplateList(TestBaremetalDeployTemplate):
+    def setUp(self):
+        super(TestBaremetalDeployTemplateList, self).setUp()
+
+        self.baremetal_mock.deploy_template.list.return_value = [
+            baremetal_fakes.FakeBaremetalResource(
+                None,
+                copy.deepcopy(baremetal_fakes.DEPLOY_TEMPLATE),
+                loaded=True)
+        ]
+
+        self.cmd = baremetal_deploy_template.ListBaremetalDeployTemplate(
+            self.app, None)
+
+    def test_baremetal_deploy_template_list(self):
+        arglist = []
+        verifylist = []
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'marker': None,
+            'limit': None}
+        self.baremetal_mock.deploy_template.list.assert_called_with(**kwargs)
+
+        collist = (
+            "UUID",
+            "Name")
+        self.assertEqual(collist, columns)
+
+        datalist = ((
+            baremetal_fakes.baremetal_deploy_template_uuid,
+            baremetal_fakes.baremetal_deploy_template_name
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_baremetal_deploy_template_list_long(self):
+        arglist = ['--long']
+        verifylist = [('detail', True)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        columns, data = self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'detail': True,
+            'marker': None,
+            'limit': None,
+        }
+        self.baremetal_mock.deploy_template.list.assert_called_with(**kwargs)
+
+        collist = ('UUID', 'Name', 'Steps', 'Extra', 'Created At',
+                   'Updated At')
+        self.assertEqual(collist, columns)
+
+        datalist = ((
+            baremetal_fakes.baremetal_deploy_template_uuid,
+            baremetal_fakes.baremetal_deploy_template_name,
+            baremetal_fakes.baremetal_deploy_template_steps,
+            baremetal_fakes.baremetal_deploy_template_extra,
+            '',
+            '',
+        ), )
+        self.assertEqual(datalist, tuple(data))
+
+    def test_baremetal_deploy_template_list_fields(self):
+        arglist = ['--fields', 'uuid', 'steps']
+        verifylist = [('fields', [['uuid', 'steps']])]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'marker': None,
+            'limit': None,
+            'detail': False,
+            'fields': ('uuid', 'steps')
+        }
+        self.baremetal_mock.deploy_template.list.assert_called_with(**kwargs)
+
+    def test_baremetal_deploy_template_list_fields_multiple(self):
+        arglist = ['--fields', 'uuid', 'name', '--fields', 'steps']
+        verifylist = [('fields', [['uuid', 'name'], ['steps']])]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'marker': None,
+            'limit': None,
+            'detail': False,
+            'fields': ('uuid', 'name', 'steps')
+        }
+        self.baremetal_mock.deploy_template.list.assert_called_with(**kwargs)
+
+    def test_baremetal_deploy_template_list_invalid_fields(self):
+        arglist = ['--fields', 'uuid', 'invalid']
+        verifylist = [('fields', [['uuid', 'invalid']])]
+        self.assertRaises(osctestutils.ParserException,
+                          self.check_parser,
+                          self.cmd, arglist, verifylist)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_node.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_node.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_node.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_node.py	2019-03-08 00:29:13.000000000 +0000
@@ -460,6 +460,16 @@
                                 [('automated_clean', True)],
                                 {'automated_clean': True})
 
+    def test_baremetal_create_with_owner(self):
+        self.check_with_options(['--owner', 'owner 1'],
+                                [('owner', 'owner 1')],
+                                {'owner': 'owner 1'})
+
+    def test_baremetal_create_with_description(self):
+        self.check_with_options(['--description', 'there is no spoon'],
+                                [('description', 'there is no spoon')],
+                                {'description': 'there is no spoon'})
+
 
 class TestBaremetalDelete(TestBaremetal):
     def setUp(self):
@@ -500,7 +510,7 @@
 
         # Set expected values
         args = ['xxx-xxxxxx-xxxx', 'fakename']
-        self.baremetal_mock.node.delete.has_calls(
+        self.baremetal_mock.node.delete.assert_has_calls(
             [mock.call(x) for x in args]
         )
         self.assertEqual(2, self.baremetal_mock.node.delete.call_count)
@@ -519,7 +529,7 @@
 
         # Set expected values
         args = ['xxx-xxxxxx-xxxx', 'badname']
-        self.baremetal_mock.node.delete.has_calls(
+        self.baremetal_mock.node.delete.assert_has_calls(
             [mock.call(x) for x in args]
         )
         self.assertEqual(2, self.baremetal_mock.node.delete.call_count)
@@ -605,11 +615,13 @@
 
         # NOTE(dtantsur): please keep this list sorted for sanity reasons
         collist = [
+            'Allocation UUID',
             'Automated Clean',
             'BIOS Interface',
             'Boot Interface',
             'Chassis UUID',
             'Clean Step',
+            'Conductor',
             'Conductor Group',
             'Console Enabled',
             'Console Interface',
@@ -617,6 +629,7 @@
             'Current RAID configuration',
             'Deploy Interface',
             'Deploy Step',
+            'Description',
             'Driver',
             'Driver Info',
             'Driver Internal Info',
@@ -633,6 +646,7 @@
             'Management Interface',
             'Name',
             'Network Interface',
+            'Owner',
             'Power Interface',
             'Power State',
             'Properties',
@@ -961,6 +975,79 @@
             **kwargs
         )
 
+    def test_baremetal_list_by_conductor(self):
+        conductor = 'fake-conductor'
+        arglist = [
+            '--conductor', conductor,
+        ]
+        verifylist = [
+            ('conductor', conductor),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        kwargs = {
+            'marker': None,
+            'limit': None,
+            'conductor': conductor
+        }
+
+        self.baremetal_mock.node.list.assert_called_with(
+            **kwargs
+        )
+
+    def test_baremetal_list_by_owner(self):
+        owner = 'owner 1'
+        arglist = [
+            '--owner', owner,
+        ]
+        verifylist = [
+            ('owner', owner),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        self.cmd.take_action(parsed_args)
+
+        kwargs = {
+            'marker': None,
+            'limit': None,
+            'owner': owner,
+        }
+
+        self.baremetal_mock.node.list.assert_called_with(
+            **kwargs
+        )
+
+    def test_baremetal_list_has_description(self):
+        description = 'there is no spoon'
+        arglist = [
+            '--description-contains', description,
+        ]
+        verifylist = [
+            ('description_contains', description),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        # DisplayCommandBase.take_action() returns two tuples
+        self.cmd.take_action(parsed_args)
+
+        # Set expected values
+        kwargs = {
+            'marker': None,
+            'limit': None,
+            'description_contains': description
+        }
+
+        self.baremetal_mock.node.list.assert_called_with(
+            **kwargs
+        )
+
     def test_baremetal_list_fields(self):
         arglist = [
             '--fields', 'uuid', 'name',
@@ -1303,6 +1390,25 @@
             'node_uuid', 'active',
             cleansteps=None, configdrive='path/to/drive', rescue_password=None)
 
+    def test_deploy_baremetal_provision_state_active_and_configdrive_dict(
+            self):
+        arglist = ['node_uuid',
+                   '--config-drive', '{"meta_data": {}}']
+        verifylist = [
+            ('node', 'node_uuid'),
+            ('provision_state', 'active'),
+            ('config_drive', '{"meta_data": {}}'),
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.baremetal_mock.node.set_provision_state.assert_called_once_with(
+            'node_uuid', 'active',
+            cleansteps=None, configdrive={'meta_data': {}},
+            rescue_password=None)
+
     def test_deploy_no_wait(self):
         arglist = ['node_uuid']
         verifylist = [
@@ -2510,6 +2616,50 @@
             self.baremetal_mock.node.set_target_raid_config.called)
         self.assertFalse(self.baremetal_mock.node.update.called)
 
+    def test_baremetal_set_owner(self):
+        arglist = [
+            'node_uuid',
+            '--owner', 'owner 1',
+        ]
+        verifylist = [
+            ('node', 'node_uuid'),
+            ('owner', 'owner 1')
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.baremetal_mock.node.update.assert_called_once_with(
+            'node_uuid',
+            [{'path': '/owner',
+              'value': 'owner 1',
+              'op': 'add'}],
+            reset_interfaces=None,
+        )
+
+    def test_baremetal_set_description(self):
+        arglist = [
+            'node_uuid',
+            '--description', 'there is no spoon',
+        ]
+        verifylist = [
+            ('node', 'node_uuid'),
+            ('description', 'there is no spoon')
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.baremetal_mock.node.update.assert_called_once_with(
+            'node_uuid',
+            [{'path': '/description',
+              'value': 'there is no spoon',
+              'op': 'add'}],
+            reset_interfaces=None,
+        )
+
 
 class TestBaremetalShow(TestBaremetal):
     def setUp(self):
@@ -3033,6 +3183,44 @@
     def test_baremetal_unset_vendor_interface(self):
         self._test_baremetal_unset_hw_interface('vendor')
 
+    def test_baremetal_unset_owner(self):
+        arglist = [
+            'node_uuid',
+            '--owner',
+        ]
+        verifylist = [
+            ('node', 'node_uuid'),
+            ('owner', True)
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.baremetal_mock.node.update.assert_called_once_with(
+            'node_uuid',
+            [{'path': '/owner', 'op': 'remove'}]
+        )
+
+    def test_baremetal_unset_description(self):
+        arglist = [
+            'node_uuid',
+            '--description',
+        ]
+        verifylist = [
+            ('node', 'node_uuid'),
+            ('description', True)
+        ]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        self.baremetal_mock.node.update.assert_called_once_with(
+            'node_uuid',
+            [{'path': '/description', 'op': 'remove'}]
+        )
+
 
 class TestValidate(TestBaremetal):
     def setUp(self):
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_portgroup.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_portgroup.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_portgroup.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_portgroup.py	2019-03-08 00:29:10.000000000 +0000
@@ -472,7 +472,7 @@
 
         args = [baremetal_fakes.baremetal_portgroup_uuid,
                 baremetal_fakes.baremetal_portgroup_name]
-        self.baremetal_mock.portgroup.delete.has_calls(
+        self.baremetal_mock.portgroup.delete.assert_has_calls(
             [mock.call(x) for x in args])
         self.assertEqual(2, self.baremetal_mock.portgroup.delete.call_count)
 
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_port.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_port.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_port.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_port.py	2019-03-08 00:29:10.000000000 +0000
@@ -66,7 +66,7 @@
         # Set expected values
         args = {
             'address': baremetal_fakes.baremetal_port_address,
-            'node_uuid': baremetal_fakes.baremetal_uuid,
+            'node_uuid': baremetal_fakes.baremetal_uuid
         }
 
         self.baremetal_mock.port.create.assert_called_once_with(**args)
@@ -249,11 +249,29 @@
         args = {
             'address': baremetal_fakes.baremetal_port_address,
             'node_uuid': baremetal_fakes.baremetal_uuid,
-            'physical_network': baremetal_fakes.baremetal_port_physical_network
+            'physical_network':
+                baremetal_fakes.baremetal_port_physical_network
         }
 
         self.baremetal_mock.port.create.assert_called_once_with(**args)
 
+    def test_baremetal_port_create_smartnic(self):
+        arglist = [
+            baremetal_fakes.baremetal_port_address,
+            '--node', baremetal_fakes.baremetal_uuid,
+            '--is-smartnic']
+        verifylist = [
+            ('node_uuid', baremetal_fakes.baremetal_uuid),
+            ('address', baremetal_fakes.baremetal_port_address),
+            ('is_smartnic', True)]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+        self.cmd.take_action(parsed_args)
+        args = {
+            'address': baremetal_fakes.baremetal_port_address,
+            'node_uuid': baremetal_fakes.baremetal_uuid,
+            'is_smartnic': True}
+        self.baremetal_mock.port.create.assert_called_once_with(**args)
+
 
 class TestShowBaremetalPort(TestBaremetalPort):
     def setUp(self):
@@ -397,6 +415,18 @@
             'port',
             [{'path': '/physical_network', 'op': 'remove'}])
 
+    def test_baremetal_port_unset_is_smartnic(self):
+        arglist = ['port', '--is-smartnic']
+        verifylist = [('port', 'port'),
+                      ('is_smartnic', True)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.baremetal_mock.port.update.assert_called_once_with(
+            'port',
+            [{'path': '/is_smartnic', 'op': 'add', 'value': 'False'}])
+
 
 class TestBaremetalPortSet(TestBaremetalPort):
     def setUp(self):
@@ -549,6 +579,22 @@
         self.cmd.take_action(parsed_args)
         self.assertFalse(self.baremetal_mock.port.update.called)
 
+    def test_baremetal_port_set_is_smartnic(self):
+        arglist = [
+            baremetal_fakes.baremetal_port_uuid,
+            '--is-smartnic']
+        verifylist = [
+            ('port', baremetal_fakes.baremetal_port_uuid),
+            ('is_smartnic', True)]
+
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+        self.baremetal_mock.port.update.assert_called_once_with(
+            baremetal_fakes.baremetal_port_uuid,
+            [{'path': '/is_smartnic', 'value': 'True',
+              'op': 'add'}])
+
 
 class TestBaremetalPortDelete(TestBaremetalPort):
     def setUp(self):
@@ -580,7 +626,7 @@
         self.cmd.take_action(parsed_args)
 
         args = ['zzz-zzzzzz-zzzz', 'fakename']
-        self.baremetal_mock.port.delete.has_calls(
+        self.baremetal_mock.port.delete.assert_has_calls(
             [mock.call(x) for x in args])
         self.assertEqual(2, self.baremetal_mock.port.delete.call_count)
 
@@ -595,7 +641,7 @@
                           parsed_args)
 
         args = ['zzz-zzzzzz-zzzz', 'badname']
-        self.baremetal_mock.port.delete.has_calls(
+        self.baremetal_mock.port.delete.assert_has_calls(
             [mock.call(x) for x in args])
         self.assertEqual(2, self.baremetal_mock.port.delete.call_count)
 
@@ -704,7 +750,7 @@
         collist = ('UUID', 'Address', 'Created At', 'Extra', 'Node UUID',
                    'Local Link Connection', 'Portgroup UUID',
                    'PXE boot enabled', 'Physical Network', 'Updated At',
-                   'Internal Info')
+                   'Internal Info', 'Is Smart NIC port')
         self.assertEqual(collist, columns)
 
         datalist = ((
@@ -716,6 +762,7 @@
             '',
             '',
             '',
+            '',
             '',
             '',
             ''
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_volume_connector.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_volume_connector.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_volume_connector.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_volume_connector.py	2019-03-08 00:29:10.000000000 +0000
@@ -569,7 +569,7 @@
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.baremetal_mock.volume_connector.delete.has_calls(
+        self.baremetal_mock.volume_connector.delete.assert_has_calls(
             [mock.call(baremetal_fakes.baremetal_volume_connector_uuid),
              mock.call(fake_volume_connector_uuid2)])
         self.assertEqual(
@@ -613,7 +613,7 @@
                           self.cmd.take_action,
                           parsed_args)
 
-        self.baremetal_mock.volume_connector.delete.has_calls(
+        self.baremetal_mock.volume_connector.delete.assert_has_calls(
             [mock.call(baremetal_fakes.baremetal_volume_connector_uuid),
              mock.call(fake_volume_connector_uuid2)])
         self.assertEqual(
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_volume_target.py python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_volume_target.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/osc/v1/test_baremetal_volume_target.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/osc/v1/test_baremetal_volume_target.py	2019-03-08 00:29:10.000000000 +0000
@@ -641,7 +641,7 @@
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         self.cmd.take_action(parsed_args)
 
-        self.baremetal_mock.volume_target.delete.has_calls(
+        self.baremetal_mock.volume_target.delete.assert_has_calls(
             [mock.call(baremetal_fakes.baremetal_volume_target_uuid),
              mock.call(fake_volume_target_uuid2)])
         self.assertEqual(
@@ -685,7 +685,7 @@
                           self.cmd.take_action,
                           parsed_args)
 
-        self.baremetal_mock.volume_target.delete.has_calls(
+        self.baremetal_mock.volume_target.delete.assert_has_calls(
             [mock.call(baremetal_fakes.baremetal_volume_target_uuid),
              mock.call(fake_volume_target_uuid2)])
         self.assertEqual(
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/test_client.py python-ironicclient-2.7.0/ironicclient/tests/unit/test_client.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/test_client.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/test_client.py	2019-03-08 00:29:13.000000000 +0000
@@ -32,7 +32,8 @@
     @mock.patch.object(kaloading, 'get_plugin_loader', autospec=True)
     def _test_get_client(self, mock_ks_loader, mock_ks_session,
                          mock_retrieve_data, warn_mock, version=None,
-                         auth='password', warn_mock_call_count=0, **kwargs):
+                         auth='password', warn_mock_call_count=0,
+                         expected_interface=None, **kwargs):
         session = mock_ks_session.return_value.load_from_options.return_value
         session.get_endpoint.return_value = 'http://localhost:6385/v1/f14b4123'
 
@@ -60,7 +61,7 @@
         if not {'endpoint', 'ironic_url'}.intersection(kwargs):
             session.get_endpoint.assert_called_once_with(
                 service_type=kwargs.get('service_type') or 'baremetal',
-                interface=kwargs.get('interface') or 'publicURL',
+                interface=expected_interface,
                 region_name=kwargs.get('region_name'))
         if 'os_ironic_api_version' in kwargs:
             # NOTE(TheJulia): This does not test the negotiation logic
@@ -76,6 +77,15 @@
                 port='6385')
             self.assertEqual(version or v1.DEFAULT_VER,
                              client.http_client.os_ironic_api_version)
+
+        # make sure the interface is conveyed to the client
+        if expected_interface is not None:
+            self.assertEqual(expected_interface,
+                             client.http_client.interface)
+        if kwargs.get('os_endpoint_type'):
+            self.assertEqual(kwargs['os_endpoint_type'],
+                             client.http_client.interface)
+
         return client
 
     def test_get_client_only_ironic_url(self):
@@ -128,6 +138,62 @@
         }
         self._test_get_client(warn_mock_call_count=4, **kwargs)
 
+    def test_get_client_and_endpoint_type(self):
+        kwargs = {
+            'os_project_name': 'PROJECT_NAME',
+            'os_username': 'USERNAME',
+            'os_password': 'PASSWORD',
+            'os_auth_url': 'http://localhost:35357/v2.0',
+            'os_auth_token': '',
+            'os_service_type': '',
+            'os_endpoint_type': 'adminURL'
+        }
+        self._test_get_client(warn_mock_call_count=5,
+                              expected_interface='adminURL', **kwargs)
+
+    def test_get_client_and_interface(self):
+        kwargs = {
+            'os_project_name': 'PROJECT_NAME',
+            'os_username': 'USERNAME',
+            'os_password': 'PASSWORD',
+            'os_auth_url': 'http://localhost:35357/v2.0',
+            'os_auth_token': '',
+            'os_service_type': '',
+            'interface': 'internal'
+        }
+        self._test_get_client(warn_mock_call_count=4,
+                              expected_interface='internal', **kwargs)
+
+    def test_get_client_and_valid_interfaces(self):
+        kwargs = {
+            'os_project_name': 'PROJECT_NAME',
+            'os_username': 'USERNAME',
+            'os_password': 'PASSWORD',
+            'os_auth_url': 'http://localhost:35357/v2.0',
+            'os_auth_token': '',
+            'os_service_type': '',
+            'valid_interfaces': ['internal', 'public']
+        }
+        self._test_get_client(warn_mock_call_count=4,
+                              expected_interface=['internal', 'public'],
+                              **kwargs)
+
+    def test_get_client_and_interface_and_valid_interfaces(self):
+        """Ensure 'valid_interfaces' takes precedence over 'interface'."""
+        kwargs = {
+            'os_project_name': 'PROJECT_NAME',
+            'os_username': 'USERNAME',
+            'os_password': 'PASSWORD',
+            'os_auth_url': 'http://localhost:35357/v2.0',
+            'os_auth_token': '',
+            'os_service_type': '',
+            'interface': ['ignored'],
+            'valid_interfaces': ['internal', 'public']
+        }
+        self._test_get_client(warn_mock_call_count=4,
+                              expected_interface=['internal', 'public'],
+                              **kwargs)
+
     def test_get_client_with_region_no_auth_token(self):
         kwargs = {
             'os_project_name': 'PROJECT_NAME',
@@ -214,7 +280,7 @@
         }
         iroclient.get_client('1', **kwargs)
         session.get_endpoint.assert_called_once_with(service_type='baremetal',
-                                                     interface='publicURL',
+                                                     interface=None,
                                                      region_name=None)
 
     def test_get_client_incorrect_session_passed(self):
@@ -229,7 +295,7 @@
     @mock.patch.object(kaloading.session, 'Session', autospec=True)
     def _test_loader_arguments_passed_correctly(
             self, mock_ks_session, passed_kwargs, expected_kwargs,
-            loader_class):
+            loader_class, expected_interface=None):
         session = mock_ks_session.return_value.load_from_options.return_value
         session.get_endpoint.return_value = 'http://localhost:6385/v1/f14b4123'
 
@@ -246,9 +312,8 @@
             auth=mock.ANY, **session_opts)
         if 'ironic_url' not in passed_kwargs:
             service_type = passed_kwargs.get('service_type') or 'baremetal'
-            interface = passed_kwargs.get('interface') or 'publicURL'
             session.get_endpoint.assert_called_once_with(
-                service_type=service_type, interface=interface,
+                service_type=service_type, interface=expected_interface,
                 region_name=passed_kwargs.get('region_name'))
 
     def test_loader_arguments_admin_token(self):
@@ -282,6 +347,24 @@
             loader_class=identity.Token
         )
 
+    def test_loader_arguments_interface(self):
+        passed_kwargs = {
+            'os_auth_url': 'http://localhost:35357/v3',
+            'os_region_name': 'REGIONONE',
+            'os_auth_token': 'USER_AUTH_TOKEN',
+            'os_project_name': 'admin',
+            'interface': 'internal'
+        }
+        expected_kwargs = {
+            'auth_url': 'http://localhost:35357/v3',
+            'project_name': 'admin',
+            'token': 'USER_AUTH_TOKEN'
+        }
+        self._test_loader_arguments_passed_correctly(
+            passed_kwargs=passed_kwargs, expected_kwargs=expected_kwargs,
+            loader_class=identity.Token, expected_interface='internal'
+        )
+
     def test_loader_arguments_password_tenant_name(self):
         passed_kwargs = {
             'os_auth_url': 'http://localhost:35357/v3',
@@ -344,7 +427,8 @@
                     'max_retries': None,
                     'retry_interval': None,
                     'session': session,
-                    'endpoint_override': 'http://ironic.example.org:6385/'}
+                    'endpoint_override': 'http://ironic.example.org:6385/',
+                    'interface': None}
         )
         self.assertFalse(session.get_endpoint.called)
 
@@ -368,7 +452,8 @@
                     'max_retries': None,
                     'retry_interval': None,
                     'session': session,
-                    'endpoint_override': session.get_endpoint.return_value}
+                    'endpoint_override': session.get_endpoint.return_value,
+                    'interface': None}
         )
 
     @mock.patch.object(iroclient, 'Client', autospec=True)
@@ -385,7 +470,8 @@
                     'max_retries': None,
                     'retry_interval': None,
                     'session': session,
-                    'endpoint_override': session.get_endpoint.return_value}
+                    'endpoint_override': session.get_endpoint.return_value,
+                    'interface': None}
         )
         self.assertFalse(mock_ks_session.called)
 
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_allocation.py python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_allocation.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_allocation.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_allocation.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,330 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import copy
+
+import mock
+import testtools
+
+from ironicclient import exc
+from ironicclient.tests.unit import utils
+import ironicclient.v1.allocation
+
+ALLOCATION = {'uuid': '11111111-2222-3333-4444-555555555555',
+              'name': 'Allocation-name',
+              'state': 'active',
+              'node_uuid': '66666666-7777-8888-9999-000000000000',
+              'last_error': None,
+              'resource_class': 'baremetal',
+              'traits': [],
+              'candidate_nodes': [],
+              'extra': {}}
+
+ALLOCATION2 = {'uuid': '55555555-4444-3333-2222-111111111111',
+               'name': 'Allocation2-name',
+               'state': 'allocating',
+               'node_uuid': None,
+               'last_error': None,
+               'resource_class': 'baremetal',
+               'traits': [],
+               'candidate_nodes': [],
+               'extra': {}}
+
+CREATE_ALLOCATION = copy.deepcopy(ALLOCATION)
+for field in ('state', 'node_uuid', 'last_error'):
+    del CREATE_ALLOCATION[field]
+
+fake_responses = {
+    '/v1/allocations':
+    {
+        'GET': (
+            {},
+            {"allocations": [ALLOCATION, ALLOCATION2]},
+        ),
+        'POST': (
+            {},
+            CREATE_ALLOCATION,
+        ),
+    },
+    '/v1/allocations/%s' % ALLOCATION['uuid']:
+    {
+        'GET': (
+            {},
+            ALLOCATION,
+        ),
+        'DELETE': (
+            {},
+            None,
+        ),
+    },
+    '/v1/allocations/?node=%s' % ALLOCATION['node_uuid']:
+    {
+        'GET': (
+            {},
+            {"allocations": [ALLOCATION]},
+        ),
+    },
+}
+
+fake_responses_pagination = {
+    '/v1/allocations':
+    {
+        'GET': (
+            {},
+            {"allocations": [ALLOCATION],
+             "next": "http://127.0.0.1:6385/v1/allocations/?limit=1"}
+        ),
+    },
+    '/v1/allocations/?limit=1':
+    {
+        'GET': (
+            {},
+            {"allocations": [ALLOCATION2]}
+        ),
+    },
+    '/v1/allocations/?marker=%s' % ALLOCATION['uuid']:
+    {
+        'GET': (
+            {},
+            {"allocations": [ALLOCATION2]}
+        ),
+    },
+}
+
+fake_responses_sorting = {
+    '/v1/allocations/?sort_key=updated_at':
+    {
+        'GET': (
+            {},
+            {"allocations": [ALLOCATION2, ALLOCATION]}
+        ),
+    },
+    '/v1/allocations/?sort_dir=desc':
+    {
+        'GET': (
+            {},
+            {"allocations": [ALLOCATION2, ALLOCATION]}
+        ),
+    },
+}
+
+
+class AllocationManagerTest(testtools.TestCase):
+
+    def setUp(self):
+        super(AllocationManagerTest, self).setUp()
+        self.api = utils.FakeAPI(fake_responses)
+        self.mgr = ironicclient.v1.allocation.AllocationManager(self.api)
+
+    def test_allocations_list(self):
+        allocations = self.mgr.list()
+        expect = [
+            ('GET', '/v1/allocations', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(allocations))
+
+        expected_resp = ({}, {"allocations": [ALLOCATION, ALLOCATION2]},)
+        self.assertEqual(expected_resp,
+                         self.api.responses['/v1/allocations']['GET'])
+
+    def test_allocations_list_by_node(self):
+        allocations = self.mgr.list(node=ALLOCATION['node_uuid'])
+        expect = [
+            ('GET', '/v1/allocations/?node=%s' % ALLOCATION['node_uuid'], {},
+             None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(1, len(allocations))
+
+        expected_resp = ({}, {"allocations": [ALLOCATION, ALLOCATION2]},)
+        self.assertEqual(expected_resp,
+                         self.api.responses['/v1/allocations']['GET'])
+
+    def test_allocations_show(self):
+        allocation = self.mgr.get(ALLOCATION['uuid'])
+        expect = [
+            ('GET', '/v1/allocations/%s' % ALLOCATION['uuid'], {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(ALLOCATION['uuid'], allocation.uuid)
+        self.assertEqual(ALLOCATION['name'], allocation.name)
+        self.assertEqual(ALLOCATION['node_uuid'], allocation.node_uuid)
+        self.assertEqual(ALLOCATION['state'], allocation.state)
+        self.assertEqual(ALLOCATION['resource_class'],
+                         allocation.resource_class)
+
+        expected_resp = ({}, ALLOCATION,)
+        self.assertEqual(
+            expected_resp,
+            self.api.responses['/v1/allocations/%s'
+                               % ALLOCATION['uuid']]['GET'])
+
+    def test_create(self):
+        allocation = self.mgr.create(**CREATE_ALLOCATION)
+        expect = [
+            ('POST', '/v1/allocations', {}, CREATE_ALLOCATION),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertTrue(allocation)
+
+        self.assertIn(
+            ALLOCATION,
+            self.api.responses['/v1/allocations']['GET'][1]['allocations'])
+
+    def test_delete(self):
+        allocation = self.mgr.delete(allocation_id=ALLOCATION['uuid'])
+        expect = [
+            ('DELETE', '/v1/allocations/%s' % ALLOCATION['uuid'], {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertIsNone(allocation)
+
+        expected_resp = ({}, ALLOCATION,)
+        self.assertEqual(
+            expected_resp,
+            self.api.responses['/v1/allocations/%s'
+                               % ALLOCATION['uuid']]['GET'])
+
+
+class AllocationManagerPaginationTest(testtools.TestCase):
+
+    def setUp(self):
+        super(AllocationManagerPaginationTest, self).setUp()
+        self.api = utils.FakeAPI(fake_responses_pagination)
+        self.mgr = ironicclient.v1.allocation.AllocationManager(self.api)
+
+    def test_allocations_list_limit(self):
+        allocations = self.mgr.list(limit=1)
+        expect = [
+            ('GET', '/v1/allocations/?limit=1', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(1, len(allocations))
+
+        expected_resp = (
+            {}, {"next": "http://127.0.0.1:6385/v1/allocations/?limit=1",
+                 "allocations": [ALLOCATION]},)
+        self.assertEqual(expected_resp,
+                         self.api.responses['/v1/allocations']['GET'])
+
+    def test_allocations_list_marker(self):
+        allocations = self.mgr.list(marker=ALLOCATION['uuid'])
+        expect = [
+            ('GET', '/v1/allocations/?marker=%s' % ALLOCATION['uuid'],
+             {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(1, len(allocations))
+
+        expected_resp = (
+            {}, {"next": "http://127.0.0.1:6385/v1/allocations/?limit=1",
+                 "allocations": [ALLOCATION]},)
+        self.assertEqual(expected_resp,
+                         self.api.responses['/v1/allocations']['GET'])
+
+    def test_allocations_list_pagination_no_limit(self):
+        allocations = self.mgr.list(limit=0)
+        expect = [
+            ('GET', '/v1/allocations', {}, None),
+            ('GET', '/v1/allocations/?limit=1', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(allocations))
+
+        expected_resp = (
+            {}, {"next": "http://127.0.0.1:6385/v1/allocations/?limit=1",
+                 "allocations": [ALLOCATION]},)
+        self.assertEqual(expected_resp,
+                         self.api.responses['/v1/allocations']['GET'])
+
+
+class AllocationManagerSortingTest(testtools.TestCase):
+
+    def setUp(self):
+        super(AllocationManagerSortingTest, self).setUp()
+        self.api = utils.FakeAPI(fake_responses_sorting)
+        self.mgr = ironicclient.v1.allocation.AllocationManager(self.api)
+
+    def test_allocations_list_sort_key(self):
+        allocations = self.mgr.list(sort_key='updated_at')
+        expect = [
+            ('GET', '/v1/allocations/?sort_key=updated_at', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(allocations))
+
+        expected_resp = ({}, {"allocations": [ALLOCATION2, ALLOCATION]},)
+        self.assertEqual(
+            expected_resp,
+            self.api.responses['/v1/allocations/?sort_key=updated_at']['GET'])
+
+    def test_allocations_list_sort_dir(self):
+        allocations = self.mgr.list(sort_dir='desc')
+        expect = [
+            ('GET', '/v1/allocations/?sort_dir=desc', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(allocations))
+
+        expected_resp = ({}, {"allocations": [ALLOCATION2, ALLOCATION]},)
+        self.assertEqual(
+            expected_resp,
+            self.api.responses['/v1/allocations/?sort_dir=desc']['GET'])
+
+
+@mock.patch('time.sleep', autospec=True)
+@mock.patch('ironicclient.v1.allocation.AllocationManager.get', autospec=True)
+class AllocationWaitTest(testtools.TestCase):
+
+    def setUp(self):
+        super(AllocationWaitTest, self).setUp()
+        self.mgr = ironicclient.v1.allocation.AllocationManager(mock.Mock())
+
+    def _fake_allocation(self, state, error=None):
+        return mock.Mock(state=state, last_error=error)
+
+    def test_success(self, mock_get, mock_sleep):
+        allocations = [
+            self._fake_allocation('allocating'),
+            self._fake_allocation('allocating'),
+            self._fake_allocation('active'),
+        ]
+        mock_get.side_effect = allocations
+
+        result = self.mgr.wait('alloc1')
+        self.assertIs(result, allocations[2])
+        self.assertEqual(3, mock_get.call_count)
+        self.assertEqual(2, mock_sleep.call_count)
+        mock_get.assert_called_with(self.mgr, 'alloc1')
+
+    def test_error(self, mock_get, mock_sleep):
+        allocations = [
+            self._fake_allocation('allocating'),
+            self._fake_allocation('error'),
+        ]
+        mock_get.side_effect = allocations
+
+        self.assertRaises(exc.StateTransitionFailed,
+                          self.mgr.wait, 'alloc1')
+
+        self.assertEqual(2, mock_get.call_count)
+        self.assertEqual(1, mock_sleep.call_count)
+        mock_get.assert_called_with(self.mgr, 'alloc1')
+
+    def test_timeout(self, mock_get, mock_sleep):
+        mock_get.return_value = self._fake_allocation('allocating')
+
+        self.assertRaises(exc.StateTransitionTimeout,
+                          self.mgr.wait, 'alloc1', timeout=0.001)
+
+        mock_get.assert_called_with(self.mgr, 'alloc1')
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_conductor.py python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_conductor.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_conductor.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_conductor.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,211 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import testtools
+from testtools.matchers import HasLength
+
+from ironicclient.tests.unit import utils
+from ironicclient.v1 import conductor
+
+
+CONDUCTOR1 = {'hostname': 'compute1.localdomain',
+              'conductor_group': 'alpha-team',
+              'alive': True,
+              'drivers': ['ipmitool', 'fake-hardware'],
+              }
+CONDUCTOR2 = {'hostname': 'compute2.localdomain',
+              'conductor_group': 'alpha-team',
+              'alive': True,
+              'drivers': ['ipmitool', 'fake-hardware'],
+              }
+
+fake_responses = {
+    '/v1/conductors':
+    {
+        'GET': (
+            {},
+            {"conductors": [CONDUCTOR1, CONDUCTOR2]}
+        ),
+    },
+    '/v1/conductors/?detail=True':
+    {
+        'GET': (
+            {},
+            {"conductors": [CONDUCTOR1, CONDUCTOR2]}
+        ),
+    },
+    '/v1/conductors/?fields=hostname,alive':
+    {
+        'GET': (
+            {},
+            {"conductors": [CONDUCTOR1]}
+        ),
+    },
+    '/v1/conductors/%s' % CONDUCTOR1['hostname']:
+    {
+        'GET': (
+            {},
+            CONDUCTOR1,
+        ),
+    },
+    '/v1/conductors/%s?fields=hostname,alive' % CONDUCTOR1['hostname']:
+    {
+        'GET': (
+            {},
+            CONDUCTOR1,
+        ),
+    },
+}
+
+fake_responses_pagination = {
+    '/v1/conductors':
+    {
+        'GET': (
+            {},
+            {"conductors": [CONDUCTOR1],
+             "next": "http://127.0.0.1:6385/v1/conductors/?limit=1"}
+        ),
+    },
+    '/v1/conductors/?limit=1':
+    {
+        'GET': (
+            {},
+            {"conductors": [CONDUCTOR2]}
+        ),
+    },
+    '/v1/conductors/?marker=%s' % CONDUCTOR1['hostname']:
+    {
+        'GET': (
+            {},
+            {"conductors": [CONDUCTOR2]}
+        ),
+    },
+}
+
+fake_responses_sorting = {
+    '/v1/conductors/?sort_key=updated_at':
+    {
+        'GET': (
+            {},
+            {"conductors": [CONDUCTOR2, CONDUCTOR1]}
+        ),
+    },
+    '/v1/conductors/?sort_dir=desc':
+    {
+        'GET': (
+            {},
+            {"conductors": [CONDUCTOR2, CONDUCTOR1]}
+        ),
+    },
+}
+
+
+class ConductorManagerTest(testtools.TestCase):
+
+    def setUp(self):
+        super(ConductorManagerTest, self).setUp()
+        self.api = utils.FakeAPI(fake_responses)
+        self.mgr = conductor.ConductorManager(self.api)
+
+    def test_conductor_list(self):
+        conductors = self.mgr.list()
+        expect = [
+            ('GET', '/v1/conductors', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(conductors))
+
+    def test_conductor_list_detail(self):
+        conductors = self.mgr.list(detail=True)
+        expect = [
+            ('GET', '/v1/conductors/?detail=True', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(conductors))
+
+    def test_conductor_list_limit(self):
+        self.api = utils.FakeAPI(fake_responses_pagination)
+        self.mgr = conductor.ConductorManager(self.api)
+        conductors = self.mgr.list(limit=1)
+        expect = [
+            ('GET', '/v1/conductors/?limit=1', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertThat(conductors, HasLength(1))
+
+    def test_conductor_list_marker(self):
+        self.api = utils.FakeAPI(fake_responses_pagination)
+        self.mgr = conductor.ConductorManager(self.api)
+        conductors = self.mgr.list(marker=CONDUCTOR1['hostname'])
+        expect = [
+            ('GET', '/v1/conductors/?marker=%s' % CONDUCTOR1['hostname'],
+             {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertThat(conductors, HasLength(1))
+
+    def test_conductor_list_pagination_no_limit(self):
+        self.api = utils.FakeAPI(fake_responses_pagination)
+        self.mgr = conductor.ConductorManager(self.api)
+        conductors = self.mgr.list(limit=0)
+        expect = [
+            ('GET', '/v1/conductors', {}, None),
+            ('GET', '/v1/conductors/?limit=1', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(conductors))
+
+    def test_conductor_list_sort_key(self):
+        self.api = utils.FakeAPI(fake_responses_sorting)
+        self.mgr = conductor.ConductorManager(self.api)
+        conductors = self.mgr.list(sort_key='updated_at')
+        expect = [
+            ('GET', '/v1/conductors/?sort_key=updated_at', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(conductors))
+
+    def test_conductor_list_sort_dir(self):
+        self.api = utils.FakeAPI(fake_responses_sorting)
+        self.mgr = conductor.ConductorManager(self.api)
+        conductors = self.mgr.list(sort_dir='desc')
+        expect = [
+            ('GET', '/v1/conductors/?sort_dir=desc', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(conductors))
+
+    def test_conductor_list_fields(self):
+        conductors = self.mgr.list(fields=['hostname', 'alive'])
+        expect = [
+            ('GET', '/v1/conductors/?fields=hostname,alive', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(1, len(conductors))
+
+    def test_conductor_show(self):
+        conductor = self.mgr.get(CONDUCTOR1['hostname'])
+        expect = [
+            ('GET', '/v1/conductors/%s' % CONDUCTOR1['hostname'], {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(CONDUCTOR1['hostname'], conductor.hostname)
+
+    def test_conductor_show_fields(self):
+        conductor = self.mgr.get(CONDUCTOR1['hostname'],
+                                 fields=['hostname', 'alive'])
+        expect = [
+            ('GET', '/v1/conductors/%s?fields=hostname,alive' %
+             CONDUCTOR1['hostname'], {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(CONDUCTOR1['hostname'], conductor.hostname)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_deploy_template.py python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_deploy_template.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_deploy_template.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_deploy_template.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,291 @@
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import copy
+
+import testtools
+from testtools.matchers import HasLength
+
+from ironicclient import exc
+from ironicclient.tests.unit import utils
+import ironicclient.v1.deploy_template
+
+DEPLOY_TEMPLATE = {'uuid': '11111111-2222-3333-4444-555555555555',
+                   'name': 'fake-template',
+                   'steps': {},
+                   'extra': {}}
+
+DEPLOY_TEMPLATE2 = {'uuid': '55555555-4444-3333-2222-111111111111',
+                    'name': 'fake-template2',
+                    'steps': {},
+                    'extra': {}}
+
+CREATE_DEPLOY_TEMPLATE = copy.deepcopy(DEPLOY_TEMPLATE)
+del CREATE_DEPLOY_TEMPLATE['uuid']
+
+CREATE_DEPLOY_TEMPLATE_WITH_UUID = copy.deepcopy(DEPLOY_TEMPLATE)
+
+UPDATED_DEPLOY_TEMPLATE = copy.deepcopy(DEPLOY_TEMPLATE)
+NEW_NAME = 'fake-template3'
+UPDATED_DEPLOY_TEMPLATE['name'] = NEW_NAME
+
+fake_responses = {
+    '/v1/deploy_templates':
+    {
+        'GET': (
+            {},
+            {"deploy_templates": [DEPLOY_TEMPLATE]},
+        ),
+        'POST': (
+            {},
+            CREATE_DEPLOY_TEMPLATE,
+        ),
+    },
+    '/v1/deploy_templates/?detail=True':
+    {
+        'GET': (
+            {},
+            {"deploy_templates": [DEPLOY_TEMPLATE]},
+        ),
+    },
+    '/v1/deploy_templates/?fields=uuid,name':
+    {
+        'GET': (
+            {},
+            {"deploy_templates": [DEPLOY_TEMPLATE]},
+        ),
+    },
+    '/v1/deploy_templates/%s' % DEPLOY_TEMPLATE['uuid']:
+    {
+        'GET': (
+            {},
+            DEPLOY_TEMPLATE,
+        ),
+        'DELETE': (
+            {},
+            None,
+        ),
+        'PATCH': (
+            {},
+            UPDATED_DEPLOY_TEMPLATE,
+        ),
+    },
+    '/v1/deploy_templates/%s?fields=uuid,name' % DEPLOY_TEMPLATE['uuid']:
+    {
+        'GET': (
+            {},
+            DEPLOY_TEMPLATE,
+        ),
+    },
+}
+
+fake_responses_pagination = {
+    '/v1/deploy_templates':
+    {
+        'GET': (
+            {},
+            {"deploy_templates": [DEPLOY_TEMPLATE],
+             "next": "http://127.0.0.1:6385/v1/deploy_templates/?limit=1"}
+        ),
+    },
+    '/v1/deploy_templates/?limit=1':
+    {
+        'GET': (
+            {},
+            {"deploy_templates": [DEPLOY_TEMPLATE2]}
+        ),
+    },
+    '/v1/deploy_templates/?marker=%s' % DEPLOY_TEMPLATE['uuid']:
+    {
+        'GET': (
+            {},
+            {"deploy_templates": [DEPLOY_TEMPLATE2]}
+        ),
+    },
+}
+
+fake_responses_sorting = {
+    '/v1/deploy_templates/?sort_key=updated_at':
+    {
+        'GET': (
+            {},
+            {"deploy_templates": [DEPLOY_TEMPLATE2, DEPLOY_TEMPLATE]}
+        ),
+    },
+    '/v1/deploy_templates/?sort_dir=desc':
+    {
+        'GET': (
+            {},
+            {"deploy_templates": [DEPLOY_TEMPLATE2, DEPLOY_TEMPLATE]}
+        ),
+    },
+}
+
+
+class DeployTemplateManagerTest(testtools.TestCase):
+
+    def setUp(self):
+        super(DeployTemplateManagerTest, self).setUp()
+        self.api = utils.FakeAPI(fake_responses)
+        self.mgr = ironicclient.v1.deploy_template.DeployTemplateManager(
+            self.api)
+
+    def test_deploy_templates_list(self):
+        deploy_templates = self.mgr.list()
+        expect = [
+            ('GET', '/v1/deploy_templates', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(1, len(deploy_templates))
+
+    def test_deploy_templates_list_detail(self):
+        deploy_templates = self.mgr.list(detail=True)
+        expect = [
+            ('GET', '/v1/deploy_templates/?detail=True', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(1, len(deploy_templates))
+
+    def test_deploy_template_list_fields(self):
+        deploy_templates = self.mgr.list(fields=['uuid', 'name'])
+        expect = [
+            ('GET', '/v1/deploy_templates/?fields=uuid,name', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(1, len(deploy_templates))
+
+    def test_deploy_template_list_detail_and_fields_fail(self):
+        self.assertRaises(exc.InvalidAttribute, self.mgr.list,
+                          detail=True, fields=['uuid', 'name'])
+
+    def test_deploy_templates_list_limit(self):
+        self.api = utils.FakeAPI(fake_responses_pagination)
+        self.mgr = ironicclient.v1.deploy_template.DeployTemplateManager(
+            self.api)
+        deploy_templates = self.mgr.list(limit=1)
+        expect = [
+            ('GET', '/v1/deploy_templates/?limit=1', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertThat(deploy_templates, HasLength(1))
+
+    def test_deploy_templates_list_marker(self):
+        self.api = utils.FakeAPI(fake_responses_pagination)
+        self.mgr = ironicclient.v1.deploy_template.DeployTemplateManager(
+            self.api)
+        deploy_templates = self.mgr.list(marker=DEPLOY_TEMPLATE['uuid'])
+        expect = [
+            ('GET',
+             '/v1/deploy_templates/?marker=%s' % DEPLOY_TEMPLATE['uuid'], {},
+             None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertThat(deploy_templates, HasLength(1))
+
+    def test_deploy_templates_list_pagination_no_limit(self):
+        self.api = utils.FakeAPI(fake_responses_pagination)
+        self.mgr = ironicclient.v1.deploy_template.DeployTemplateManager(
+            self.api)
+        deploy_templates = self.mgr.list(limit=0)
+        expect = [
+            ('GET', '/v1/deploy_templates', {}, None),
+            ('GET', '/v1/deploy_templates/?limit=1', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertThat(deploy_templates, HasLength(2))
+
+    def test_deploy_templates_list_sort_key(self):
+        self.api = utils.FakeAPI(fake_responses_sorting)
+        self.mgr = ironicclient.v1.deploy_template.DeployTemplateManager(
+            self.api)
+        deploy_templates = self.mgr.list(sort_key='updated_at')
+        expect = [
+            ('GET', '/v1/deploy_templates/?sort_key=updated_at', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(deploy_templates))
+
+    def test_deploy_templates_list_sort_dir(self):
+        self.api = utils.FakeAPI(fake_responses_sorting)
+        self.mgr = ironicclient.v1.deploy_template.DeployTemplateManager(
+            self.api)
+        deploy_templates = self.mgr.list(sort_dir='desc')
+        expect = [
+            ('GET', '/v1/deploy_templates/?sort_dir=desc', {}, None)
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(2, len(deploy_templates))
+
+    def test_deploy_templates_show(self):
+        deploy_template = self.mgr.get(DEPLOY_TEMPLATE['uuid'])
+        expect = [
+            ('GET', '/v1/deploy_templates/%s' % DEPLOY_TEMPLATE['uuid'], {},
+             None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(DEPLOY_TEMPLATE['uuid'], deploy_template.uuid)
+        self.assertEqual(DEPLOY_TEMPLATE['name'], deploy_template.name)
+        self.assertEqual(DEPLOY_TEMPLATE['steps'], deploy_template.steps)
+        self.assertEqual(DEPLOY_TEMPLATE['extra'], deploy_template.extra)
+
+    def test_deploy_template_show_fields(self):
+        deploy_template = self.mgr.get(DEPLOY_TEMPLATE['uuid'],
+                                       fields=['uuid', 'name'])
+        expect = [
+            ('GET', '/v1/deploy_templates/%s?fields=uuid,name' %
+             DEPLOY_TEMPLATE['uuid'], {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(DEPLOY_TEMPLATE['uuid'], deploy_template.uuid)
+        self.assertEqual(DEPLOY_TEMPLATE['name'], deploy_template.name)
+
+    def test_create(self):
+        deploy_template = self.mgr.create(**CREATE_DEPLOY_TEMPLATE)
+        expect = [
+            ('POST', '/v1/deploy_templates', {}, CREATE_DEPLOY_TEMPLATE),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertTrue(deploy_template)
+
+    def test_create_with_uuid(self):
+        deploy_template = self.mgr.create(**CREATE_DEPLOY_TEMPLATE_WITH_UUID)
+        expect = [
+            ('POST', '/v1/deploy_templates', {},
+             CREATE_DEPLOY_TEMPLATE_WITH_UUID),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertTrue(deploy_template)
+
+    def test_delete(self):
+        deploy_template = self.mgr.delete(
+            template_id=DEPLOY_TEMPLATE['uuid'])
+        expect = [
+            ('DELETE', '/v1/deploy_templates/%s' % DEPLOY_TEMPLATE['uuid'], {},
+             None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertIsNone(deploy_template)
+
+    def test_update(self):
+        patch = {'op': 'replace',
+                 'value': NEW_NAME,
+                 'path': '/name'}
+        deploy_template = self.mgr.update(
+            template_id=DEPLOY_TEMPLATE['uuid'], patch=patch)
+        expect = [
+            ('PATCH', '/v1/deploy_templates/%s' % DEPLOY_TEMPLATE['uuid'],
+             {}, patch),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertEqual(NEW_NAME, deploy_template.name)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_events.py python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_events.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_events.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_events.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,58 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import testtools
+
+from ironicclient.tests.unit import utils
+from ironicclient.v1 import events
+
+FAKE_EVENT = {"event": "type.event"}
+FAKE_NETWORK_PORT_EVENT = {
+    'event': "network.bind_port",
+    'port_id': '11111111-aaaa-bbbb-cccc-555555555555',
+    'mac_address': 'de:ad:ca:fe:ba:be',
+    'status': 'ACTIVE',
+    'device_id': '22222222-aaaa-bbbb-cccc-555555555555',
+    'binding:host_id': '22222222-aaaa-bbbb-cccc-555555555555',
+    'binding:vnic_type': 'baremetal',
+}
+FAKE_EVENTS = {'events': [FAKE_EVENT]}
+FAKE_NETWORK_PORT_EVENTS = {'events': [FAKE_NETWORK_PORT_EVENT]}
+
+fake_responses = {
+    '/v1/events':
+        {
+            'POST': (
+                {},
+                None
+            )
+        }
+}
+
+
+class EventManagerTest(testtools.TestCase):
+    def setUp(self):
+        super(EventManagerTest, self).setUp()
+        self.api = utils.FakeAPI(fake_responses)
+        self.mgr = events.EventManager(self.api)
+
+    def test_event(self):
+        evts = self.mgr.create(**FAKE_EVENTS)
+        expect = [('POST', '/v1/events', {}, FAKE_EVENTS)]
+        self.assertEqual(expect, self.api.calls)
+        self.assertIsNone(evts)
+
+    def test_network_port_event(self):
+        evts = self.mgr.create(**FAKE_NETWORK_PORT_EVENTS)
+        expect = [('POST', '/v1/events', {}, FAKE_NETWORK_PORT_EVENTS)]
+        self.assertEqual(expect, self.api.calls)
+        self.assertIsNone(evts)
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_node.py python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_node.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_node.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_node.py	2019-03-08 00:29:13.000000000 +0000
@@ -215,6 +215,13 @@
             {"nodes": [NODE2]},
         )
     },
+    '/v1/nodes/?conductor=fake-conductor':
+    {
+        'GET': (
+            {},
+            {"nodes": [NODE2]},
+        )
+    },
     '/v1/nodes/detail?instance_uuid=%s' % NODE2['instance_uuid']:
     {
         'GET': (
@@ -825,6 +832,15 @@
         self.assertThat(nodes, HasLength(1))
         self.assertEqual(NODE2['uuid'], getattr(nodes[0], 'uuid'))
 
+    def test_node_list_with_conductor(self):
+        nodes = self.mgr.list(conductor='fake-conductor')
+        expect = [
+            ('GET', '/v1/nodes/?conductor=fake-conductor', {}, None),
+        ]
+        self.assertEqual(expect, self.api.calls)
+        self.assertThat(nodes, HasLength(1))
+        self.assertEqual(NODE2['uuid'], getattr(nodes[0], 'uuid'))
+
     def test_node_list_detail(self):
         nodes = self.mgr.list(detail=True)
         expect = [
@@ -1370,6 +1386,16 @@
         expect = [
             ('PUT', '/v1/nodes/%s/states/provision' % NODE1['uuid'], {}, body),
         ]
+        self.assertEqual(expect, self.api.calls)
+
+    def test_node_set_provision_state_with_configdrive_as_dict(self):
+        target_state = 'active'
+        self.mgr.set_provision_state(NODE1['uuid'], target_state,
+                                     configdrive={'user_data': ''})
+        body = {'target': target_state, 'configdrive': {'user_data': ''}}
+        expect = [
+            ('PUT', '/v1/nodes/%s/states/provision' % NODE1['uuid'], {}, body),
+        ]
         self.assertEqual(expect, self.api.calls)
 
     def test_node_set_provision_state_with_configdrive_file(self):
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_node_shell.py python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_node_shell.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_node_shell.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_node_shell.py	2019-03-08 00:29:10.000000000 +0000
@@ -33,13 +33,16 @@
         with mock.patch.object(cliutils, 'print_dict', fake_print_dict):
             node = object()
             n_shell._print_node_show(node)
-        exp = ['automated_clean',
+        exp = ['allocation_uuid',
+               'automated_clean',
                'chassis_uuid',
                'clean_step',
                'created_at',
+               'conductor',
                'conductor_group',
                'console_enabled',
                'deploy_step',
+               'description',
                'driver',
                'driver_info',
                'driver_internal_info',
@@ -58,6 +61,7 @@
                'inspect_interface',
                'management_interface',
                'network_interface',
+               'owner',
                'power_interface',
                'raid_interface',
                'rescue_interface',
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_port.py python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_port.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_port.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_port.py	2019-03-08 00:29:10.000000000 +0000
@@ -29,6 +29,7 @@
         'local_link_connection': {},
         'portgroup_uuid': '55555555-4444-3333-2222-111111111111',
         'physical_network': 'physnet1',
+        'is_smartnic': False,
         'extra': {}}
 
 PORT2 = {'uuid': '55555555-4444-3333-2222-111111111111',
@@ -38,6 +39,7 @@
          'local_link_connection': {},
          'portgroup_uuid': '55555555-4444-3333-2222-111111111111',
          'physical_network': 'physnet2',
+         'is_smartnic': True,
          'extra': {}}
 
 CREATE_PORT = copy.deepcopy(PORT)
@@ -303,6 +305,7 @@
                          port.local_link_connection)
         self.assertEqual(PORT['portgroup_uuid'], port.portgroup_uuid)
         self.assertEqual(PORT['physical_network'], port.physical_network)
+        self.assertEqual(PORT['is_smartnic'], port.is_smartnic)
 
     def test_ports_show_by_address(self):
         port = self.mgr.get_by_address(PORT['address'])
@@ -319,6 +322,7 @@
                          port.local_link_connection)
         self.assertEqual(PORT['portgroup_uuid'], port.portgroup_uuid)
         self.assertEqual(PORT['physical_network'], port.physical_network)
+        self.assertEqual(PORT['is_smartnic'], port.is_smartnic)
 
     def test_port_show_fields(self):
         port = self.mgr.get(PORT['uuid'], fields=['uuid', 'address'])
diff -Nru python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_port_shell.py python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_port_shell.py
--- python-ironicclient-2.6.0/ironicclient/tests/unit/v1/test_port_shell.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/tests/unit/v1/test_port_shell.py	2019-03-08 00:29:10.000000000 +0000
@@ -33,7 +33,7 @@
             p_shell._print_port_show(port)
         exp = ['address', 'created_at', 'extra', 'node_uuid',
                'physical_network', 'updated_at', 'uuid', 'pxe_enabled',
-               'local_link_connection', 'internal_info',
+               'local_link_connection', 'internal_info', 'is_smartnic',
                'portgroup_uuid']
         act = actual.keys()
         self.assertEqual(sorted(exp), sorted(act))
diff -Nru python-ironicclient-2.6.0/ironicclient/v1/allocation.py python-ironicclient-2.7.0/ironicclient/v1/allocation.py
--- python-ironicclient-2.6.0/ironicclient/v1/allocation.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/v1/allocation.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,141 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import logging
+
+from ironicclient.common import base
+from ironicclient.common.i18n import _
+from ironicclient.common import utils
+from ironicclient import exc
+
+
+LOG = logging.getLogger(__name__)
+
+
+class Allocation(base.Resource):
+    def __repr__(self):
+        return "<Allocation %s>" % self._info
+
+
+class AllocationManager(base.CreateManager):
+    resource_class = Allocation
+    _resource_name = 'allocations'
+    _creation_attributes = ['extra', 'name', 'resource_class', 'uuid',
+                            'traits', 'candidate_nodes']
+
+    def list(self, resource_class=None, state=None, node=None, limit=None,
+             marker=None, sort_key=None, sort_dir=None, fields=None):
+        """Retrieve a list of allocations.
+
+        :param resource_class: Optional, get allocations with this resource
+                               class.
+        :param state: Optional, get allocations in this state. One of
+                      ``allocating``, ``active`` or ``error``.
+        :param node: UUID or name of the node of the allocation.
+        :param marker: Optional, the UUID of an allocation, eg the last
+                       allocation from a previous result set. Return
+                       the next result set.
+        :param limit: The maximum number of results to return per
+                      request, if:
+
+            1) limit > 0, the maximum number of allocations to return.
+            2) limit == 0, return the entire list of allocations.
+            3) limit == None, the number of items returned respect the
+               maximum imposed by the Ironic API (see Ironic's
+               api.max_limit option).
+
+        :param sort_key: Optional, field used for sorting.
+
+        :param sort_dir: Optional, direction of sorting, either 'asc' (the
+                         default) or 'desc'.
+
+        :param fields: Optional, a list with a specified set of fields
+                       of the resource to be returned.
+
+        :returns: A list of allocations.
+        :raises: InvalidAttribute if a subset of fields is requested with
+                 detail option set.
+
+        """
+        if limit is not None:
+            limit = int(limit)
+
+        filters = utils.common_filters(marker, limit, sort_key, sort_dir,
+                                       fields)
+        for name, value in [('resource_class', resource_class),
+                            ('state', state), ('node', node)]:
+            if value is not None:
+                filters.append('%s=%s' % (name, value))
+
+        if filters:
+            path = '?' + '&'.join(filters)
+        else:
+            path = ''
+
+        if limit is None:
+            return self._list(self._path(path), "allocations")
+        else:
+            return self._list_pagination(self._path(path), "allocations",
+                                         limit=limit)
+
+    def get(self, allocation_id, fields=None):
+        """Get an allocation with the specified identifier.
+
+        :param allocation_id: The UUID or name of an allocation.
+        :param fields: Optional, a list with a specified set of fields
+                       of the resource to be returned. Can not be used
+                       when 'detail' is set.
+
+        :returns: an :class:`Allocation` object.
+
+        """
+        return self._get(resource_id=allocation_id, fields=fields)
+
+    def delete(self, allocation_id):
+        """Delete the Allocation.
+
+        :param allocation_id: The UUID or name of an allocation.
+        """
+        return self._delete(resource_id=allocation_id)
+
+    def wait(self, allocation_id, timeout=0, poll_interval=1,
+             poll_delay_function=None):
+        """Wait for the Allocation to become active.
+
+        :param timeout: timeout in seconds, no timeout if 0.
+        :param poll_interval: interval in seconds between polls.
+        :param poll_delay_function: function to use to wait between polls
+            (defaults to time.sleep). Should take one argument - delay time
+            in seconds. Any exceptions raised inside it will abort the wait.
+        :return: updated :class:`Allocation` object.
+        :raises: StateTransitionFailed if allocation reaches the error state.
+        :raises: StateTransitionTimeout on timeout.
+        """
+        timeout_msg = _('Allocation %(allocation)s failed to become active '
+                        'in %(timeout)s seconds') % {
+                            'allocation': allocation_id,
+                            'timeout': timeout}
+        for _count in utils.poll(timeout, poll_interval, poll_delay_function,
+                                 timeout_msg):
+            allocation = self.get(allocation_id)
+            if allocation.state == 'error':
+                raise exc.StateTransitionFailed(
+                    _('Allocation %(allocation)s failed: %(error)s') %
+                    {'allocation': allocation_id,
+                     'error': allocation.last_error})
+            elif allocation.state == 'active':
+                return allocation
+
+            LOG.debug('Still waiting for allocation %(allocation)s to become '
+                      'active, the current state is %(actual)s',
+                      {'allocation': allocation_id,
+                       'actual': allocation.state})
diff -Nru python-ironicclient-2.6.0/ironicclient/v1/client.py python-ironicclient-2.7.0/ironicclient/v1/client.py
--- python-ironicclient-2.6.0/ironicclient/v1/client.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/v1/client.py	2019-03-08 00:29:10.000000000 +0000
@@ -20,8 +20,12 @@
 from ironicclient.common.http import DEFAULT_VER
 from ironicclient.common.i18n import _
 from ironicclient import exc
+from ironicclient.v1 import allocation
 from ironicclient.v1 import chassis
+from ironicclient.v1 import conductor
+from ironicclient.v1 import deploy_template
 from ironicclient.v1 import driver
+from ironicclient.v1 import events
 from ironicclient.v1 import node
 from ironicclient.v1 import port
 from ironicclient.v1 import portgroup
@@ -97,6 +101,11 @@
             self.http_client)
         self.driver = driver.DriverManager(self.http_client)
         self.portgroup = portgroup.PortgroupManager(self.http_client)
+        self.conductor = conductor.ConductorManager(self.http_client)
+        self.events = events.EventManager(self.http_client)
+        self.allocation = allocation.AllocationManager(self.http_client)
+        self.deploy_template = deploy_template.DeployTemplateManager(
+            self.http_client)
 
     @property
     def current_api_version(self):
diff -Nru python-ironicclient-2.6.0/ironicclient/v1/conductor.py python-ironicclient-2.7.0/ironicclient/v1/conductor.py
--- python-ironicclient-2.6.0/ironicclient/v1/conductor.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/v1/conductor.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,79 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from ironicclient.common import base
+from ironicclient.common.i18n import _
+from ironicclient.common import utils
+from ironicclient import exc
+
+
+class Conductor(base.Resource):
+    def __repr__(self):
+        return "<Conductor %s>" % self._info
+
+
+class ConductorManager(base.Manager):
+    resource_class = Conductor
+    _resource_name = 'conductors'
+
+    def list(self, marker=None, limit=None, sort_key=None, sort_dir=None,
+             fields=None, detail=False):
+        """Retrieve a list of conductors.
+
+        :param marker: Optional, the hostname of a conductor, eg the last
+                       conductor from a previous result set. Return
+                       the next result set.
+        :param limit: The maximum number of results to return per
+                      request, if:
+
+            1) limit > 0, the maximum number of ports to return.
+            2) limit == 0, return the entire list of ports.
+            3) limit param is NOT specified (None), the number of items
+               returned respect the maximum imposed by the Ironic API
+               (see Ironic's api.max_limit option).
+
+        :param sort_key: Optional, field used for sorting.
+
+        :param sort_dir: Optional, direction of sorting, either 'asc' (the
+                         default) or 'desc'.
+
+        :param fields: Optional, a list with a specified set of fields
+                       of the resource to be returned. Can not be used
+                       when 'detail' is set.
+
+        :param detail: Optional, boolean whether to return detailed information
+                       about conductors.
+
+        :returns: A list of conductors.
+
+        """
+        if limit is not None:
+            limit = int(limit)
+
+        if detail and fields:
+            raise exc.InvalidAttribute(_("Can't fetch a subset of fields "
+                                         "with 'detail' set"))
+
+        filters = utils.common_filters(marker, limit, sort_key, sort_dir,
+                                       fields, detail)
+        path = ''
+        if filters:
+            path += '?' + '&'.join(filters)
+
+        if limit is None:
+            return self._list(self._path(path), "conductors")
+        else:
+            return self._list_pagination(self._path(path), "conductors",
+                                         limit=limit)
+
+    def get(self, hostname, fields=None):
+        return self._get(resource_id=hostname, fields=fields)
diff -Nru python-ironicclient-2.6.0/ironicclient/v1/deploy_template.py python-ironicclient-2.7.0/ironicclient/v1/deploy_template.py
--- python-ironicclient-2.6.0/ironicclient/v1/deploy_template.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/v1/deploy_template.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,86 @@
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from ironicclient.common import base
+from ironicclient.common.i18n import _
+from ironicclient.common import utils
+from ironicclient import exc
+
+
+class DeployTemplate(base.Resource):
+    def __repr__(self):
+        return "<DeployTemplate %s>" % self._info
+
+
+class DeployTemplateManager(base.CreateManager):
+    resource_class = DeployTemplate
+    _creation_attributes = ['extra', 'name', 'steps', 'uuid']
+    _resource_name = 'deploy_templates'
+
+    def list(self, limit=None, marker=None, sort_key=None, sort_dir=None,
+             detail=False, fields=None):
+        """Retrieve a list of deploy templates.
+
+        :param marker: Optional, the UUID of a deploy template, eg the last
+                       template from a previous result set. Return the next
+                       result set.
+        :param limit: The maximum number of results to return per
+                      request, if:
+
+            1) limit > 0, the maximum number of deploy templates to return.
+            2) limit == 0, return the entire list of deploy templates.
+            3) limit param is NOT specified (None), the number of items
+               returned respect the maximum imposed by the Ironic API
+               (see Ironic's api.max_limit option).
+
+        :param sort_key: Optional, field used for sorting.
+
+        :param sort_dir: Optional, direction of sorting, either 'asc' (the
+                         default) or 'desc'.
+
+        :param detail: Optional, boolean whether to return detailed information
+                       about deploy templates.
+
+        :param fields: Optional, a list with a specified set of fields
+                       of the resource to be returned. Can not be used
+                       when 'detail' is set.
+
+        :returns: A list of deploy templates.
+
+        """
+        if limit is not None:
+            limit = int(limit)
+
+        if detail and fields:
+            raise exc.InvalidAttribute(_("Can't fetch a subset of fields "
+                                         "with 'detail' set"))
+
+        filters = utils.common_filters(marker, limit, sort_key, sort_dir,
+                                       fields, detail=detail)
+        path = ''
+        if filters:
+            path += '?' + '&'.join(filters)
+
+        if limit is None:
+            return self._list(self._path(path), "deploy_templates")
+        else:
+            return self._list_pagination(self._path(path), "deploy_templates",
+                                         limit=limit)
+
+    def get(self, template_id, fields=None):
+        return self._get(resource_id=template_id, fields=fields)
+
+    def delete(self, template_id):
+        return self._delete(resource_id=template_id)
+
+    def update(self, template_id, patch):
+        return self._update(resource_id=template_id, patch=patch)
diff -Nru python-ironicclient-2.6.0/ironicclient/v1/events.py python-ironicclient-2.7.0/ironicclient/v1/events.py
--- python-ironicclient-2.6.0/ironicclient/v1/events.py	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/v1/events.py	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,29 @@
+#
+# Copyright 2016 Mirantis, Inc.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+
+from ironicclient.common import base
+
+
+class Event(base.Resource):
+    def __repr__(self):
+        return "<Event: %s>" % self.name
+
+
+class EventManager(base.CreateManager):
+    resource_class = Event
+    _creation_attributes = ['events']
+    _resource_name = 'events'
diff -Nru python-ironicclient-2.6.0/ironicclient/v1/node.py python-ironicclient-2.7.0/ironicclient/v1/node.py
--- python-ironicclient-2.6.0/ironicclient/v1/node.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/v1/node.py	2019-03-08 00:29:13.000000000 +0000
@@ -14,7 +14,6 @@
 
 import logging
 import os
-import time
 
 from oslo_utils import strutils
 
@@ -61,7 +60,7 @@
              detail=False, sort_key=None, sort_dir=None, fields=None,
              provision_state=None, driver=None, resource_class=None,
              chassis=None, fault=None, os_ironic_api_version=None,
-             conductor_group=None):
+             conductor_group=None, conductor=None):
         """Retrieve a list of nodes.
 
         :param associated: Optional. Either a Boolean or a string
@@ -115,6 +114,8 @@
 
         :param conductor_group: Optional. String value to get only nodes
                                 with the given conductor group set.
+        :param conductor: Optional. String value to get only nodes
+                          mapped to the given conductor.
 
         :returns: A list of nodes.
 
@@ -144,6 +145,8 @@
             filters.append('chassis_uuid=%s' % chassis)
         if conductor_group is not None:
             filters.append('conductor_group=%s' % conductor_group)
+        if conductor is not None:
+            filters.append('conductor=%s' % conductor)
 
         path = ''
         if detail:
@@ -512,9 +515,11 @@
              'rescue', 'unrescue'.
         :param configdrive: A gzipped, base64-encoded configuration drive
             string OR the path to the configuration drive file OR the path to
-            a directory containing the config drive files. In case it's a
-            directory, a config drive will be generated from it. This is only
-            valid when setting state to 'active'.
+            a directory containing the config drive files OR a dictionary to
+            build config drive from. In case it's a directory, a config drive
+            will be generated from it. In case it's a dictionary, a config
+            drive will be generated on the server side (requires API version
+            1.56). This is only valid when setting state to 'active'.
         :param cleansteps: The clean steps as a list of clean-step
             dictionaries; each dictionary should have keys 'interface' and
             'step', and optional key 'args'. This must be specified (and is
@@ -531,11 +536,12 @@
         path = "%s/states/provision" % node_uuid
         body = {'target': state}
         if configdrive:
-            if os.path.isfile(configdrive):
-                with open(configdrive, 'rb') as f:
-                    configdrive = f.read()
-            if os.path.isdir(configdrive):
-                configdrive = utils.make_configdrive(configdrive)
+            if not isinstance(configdrive, dict):
+                if os.path.isfile(configdrive):
+                    with open(configdrive, 'rb') as f:
+                        configdrive = f.read()
+                if os.path.isdir(configdrive):
+                    configdrive = utils.make_configdrive(configdrive)
 
             body['configdrive'] = configdrive
         elif cleansteps:
@@ -678,19 +684,16 @@
         :raises: StateTransitionFailed if node reached an error state
         :raises: StateTransitionTimeout on timeout
         """
-        if not isinstance(timeout, (int, float)) or timeout < 0:
-            raise ValueError(_('Timeout must be a non-negative number'))
-
-        threshold = time.time() + timeout
         expected_state = expected_state.lower()
-        poll_delay_function = (time.sleep if poll_delay_function is None
-                               else poll_delay_function)
-        if not callable(poll_delay_function):
-            raise TypeError(_('poll_delay_function must be callable'))
+        timeout_msg = _('Node %(node)s failed to reach state %(state)s in '
+                        '%(timeout)s seconds') % {'node': node_ident,
+                                                  'state': expected_state,
+                                                  'timeout': timeout}
 
         # TODO(dtantsur): use version negotiation to request API 1.8 and use
         # the "fields" argument to reduce amount of data sent.
-        while not timeout or time.time() < threshold:
+        for _count in utils.poll(timeout, poll_interval, poll_delay_function,
+                                 timeout_msg):
             node = self.get(node_ident)
             if node.provision_state == expected_state:
                 LOG.debug('Node %(node)s reached provision state %(state)s',
@@ -717,10 +720,3 @@
                       '%(state)s, the current state is %(actual)s',
                       {'node': node_ident, 'state': expected_state,
                        'actual': node.provision_state})
-            poll_delay_function(poll_interval)
-
-        raise exc.StateTransitionTimeout(
-            _('Node %(node)s failed to reach state %(state)s in '
-              '%(timeout)s seconds') % {'node': node_ident,
-                                        'state': expected_state,
-                                        'timeout': timeout})
diff -Nru python-ironicclient-2.6.0/ironicclient/v1/port.py python-ironicclient-2.7.0/ironicclient/v1/port.py
--- python-ironicclient-2.6.0/ironicclient/v1/port.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/v1/port.py	2019-03-08 00:29:10.000000000 +0000
@@ -29,7 +29,7 @@
     resource_class = Port
     _creation_attributes = ['address', 'extra', 'local_link_connection',
                             'node_uuid', 'physical_network', 'portgroup_uuid',
-                            'pxe_enabled', 'uuid']
+                            'pxe_enabled', 'uuid', 'is_smartnic']
     _resource_name = 'ports'
 
     def list(self, address=None, limit=None, marker=None, sort_key=None,
diff -Nru python-ironicclient-2.6.0/ironicclient/v1/resource_fields.py python-ironicclient-2.7.0/ironicclient/v1/resource_fields.py
--- python-ironicclient-2.6.0/ironicclient/v1/resource_fields.py	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/ironicclient/v1/resource_fields.py	2019-03-08 00:29:10.000000000 +0000
@@ -32,14 +32,18 @@
 
     FIELDS = {
         'address': 'Address',
+        'alive': 'Alive',
+        'allocation_uuid': 'Allocation UUID',
         'async': 'Async',
         'automated_clean': 'Automated Clean',
         'attach': 'Response is attachment',
         'bios_name': 'BIOS setting name',
         'bios_value': 'BIOS setting value',
         'boot_index': 'Boot Index',
+        'candidate_nodes': 'Candidate Nodes',
         'chassis_uuid': 'Chassis UUID',
         'clean_step': 'Clean Step',
+        'conductor': 'Conductor',
         'conductor_group': 'Conductor Group',
         'console_enabled': 'Console Enabled',
         'created_at': 'Created At',
@@ -60,6 +64,7 @@
         'driver': 'Driver',
         'driver_info': 'Driver Info',
         'driver_internal_info': 'Driver Internal Info',
+        'drivers': 'Drivers',
         'enabled_bios_interfaces': 'Enabled BIOS Interfaces',
         'enabled_boot_interfaces': 'Enabled Boot Interfaces',
         'enabled_console_interfaces': 'Enabled Console Interfaces',
@@ -73,6 +78,7 @@
         'enabled_storage_interfaces': 'Enabled Storage Interfaces',
         'enabled_vendor_interfaces': 'Enabled Vendor Interfaces',
         'extra': 'Extra',
+        'hostname': 'Hostname',
         'hosts': 'Active host(s)',
         'http_methods': 'Supported HTTP methods',
         'inspection_finished_at': 'Inspection Finished At',
@@ -87,6 +93,7 @@
         'mode': 'Mode',
         'name': 'Name',
         'node_uuid': 'Node UUID',
+        'owner': 'Owner',
         'power_state': 'Power State',
         'properties': 'Properties',
         'protected': 'Protected',
@@ -96,6 +103,8 @@
         'raid_config': 'Current RAID configuration',
         'reservation': 'Reservation',
         'resource_class': 'Resource Class',
+        'state': 'State',
+        'steps': 'Steps',
         'target_power_state': 'Target Power State',
         'target_provision_state': 'Target Provision State',
         'target_raid_config': 'Target RAID configuration',
@@ -124,6 +133,7 @@
         'physical_network': 'Physical Network',
         'id': 'ID',
         'connector_id': 'Connector ID',
+        'is_smartnic': 'Is Smart NIC port',
     }
 
     def __init__(self, field_ids, sort_excluded=None, override_labels=None):
@@ -205,11 +215,13 @@
 # corresponding headings, so some items (like raid_config) may seem out of
 # order here.
 NODE_DETAILED_RESOURCE = Resource(
-    ['automated_clean',
+    ['allocation_uuid',
+     'automated_clean',
      'bios_interface',
      'boot_interface',
      'chassis_uuid',
      'clean_step',
+     'conductor',
      'conductor_group',
      'console_enabled',
      'console_interface',
@@ -217,6 +229,7 @@
      'raid_config',
      'deploy_interface',
      'deploy_step',
+     'description',
      'driver',
      'driver_info',
      'driver_internal_info',
@@ -233,6 +246,7 @@
      'management_interface',
      'name',
      'network_interface',
+     'owner',
      'power_interface',
      'power_state',
      'properties',
@@ -254,6 +268,7 @@
      'vendor_interface',
      ],
     sort_excluded=[
+        'allocation_uuid',
         # The server cannot sort on "chassis_uuid" because it isn't a column in
         # the "nodes" database table. "chassis_id" is stored, but it is
         # internal to ironic. See bug #1443003 for more details.
@@ -298,6 +313,7 @@
      'physical_network',
      'updated_at',
      'internal_info',
+     'is_smartnic',
      ],
     sort_excluded=[
         'extra',
@@ -450,3 +466,69 @@
      ],
     sort_excluded=['node_uuid']
 )
+
+# Conductors
+CONDUCTOR_DETAILED_RESOURCE = Resource(
+    ['hostname',
+     'conductor_group',
+     'alive',
+     'drivers',
+     'created_at',
+     'updated_at',
+     ],
+    sort_excluded=[
+        'alive',
+        'drivers',
+    ])
+CONDUCTOR_RESOURCE = Resource(
+    ['hostname',
+     'conductor_group',
+     'alive',
+     ],
+    sort_excluded=['alive']
+)
+
+# Allocations
+ALLOCATION_DETAILED_RESOURCE = Resource(
+    ['uuid',
+     'name',
+     'state',
+     'node_uuid',
+     'last_error',
+     'resource_class',
+     'traits',
+     'candidate_nodes',
+     'extra',
+     'created_at',
+     'updated_at',
+     ],
+    sort_excluded=[
+        'candidate_nodes',
+        'traits',
+    ])
+ALLOCATION_RESOURCE = Resource(
+    ['uuid',
+     'name',
+     'resource_class',
+     'state',
+     'node_uuid',
+     ],
+)
+
+# Deploy templates
+DEPLOY_TEMPLATE_DETAILED_RESOURCE = Resource(
+    ['uuid',
+     'name',
+     'steps',
+     'extra',
+     'created_at',
+     'updated_at',
+     ],
+    sort_excluded=['extra', 'steps']
+)
+
+DEPLOY_TEMPLATE_RESOURCE = Resource(
+    ['uuid',
+     'name',
+     ],
+)
diff -Nru python-ironicclient-2.6.0/PKG-INFO python-ironicclient-2.7.0/PKG-INFO
--- python-ironicclient-2.6.0/PKG-INFO	2019-01-15 01:38:03.000000000 +0000
+++ python-ironicclient-2.7.0/PKG-INFO	2019-03-08 00:31:10.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ironicclient
-Version: 2.6.0
+Version: 2.7.0
 Summary: OpenStack Bare Metal Provisioning API Client Library
 Home-page: https://docs.openstack.org/python-ironicclient/latest/
 Author: OpenStack
diff -Nru python-ironicclient-2.6.0/python_ironicclient.egg-info/entry_points.txt python-ironicclient-2.7.0/python_ironicclient.egg-info/entry_points.txt
--- python-ironicclient-2.6.0/python_ironicclient.egg-info/entry_points.txt	2019-01-15 01:38:03.000000000 +0000
+++ python-ironicclient-2.7.0/python_ironicclient.egg-info/entry_points.txt	2019-03-08 00:31:10.000000000 +0000
@@ -2,13 +2,25 @@
 ironic = ironicclient.shell:main
 
 [openstack.baremetal.v1]
+baremetal_allocation_create = ironicclient.osc.v1.baremetal_allocation:CreateBaremetalAllocation
+baremetal_allocation_delete = ironicclient.osc.v1.baremetal_allocation:DeleteBaremetalAllocation
+baremetal_allocation_list = ironicclient.osc.v1.baremetal_allocation:ListBaremetalAllocation
+baremetal_allocation_show = ironicclient.osc.v1.baremetal_allocation:ShowBaremetalAllocation
 baremetal_chassis_create = ironicclient.osc.v1.baremetal_chassis:CreateBaremetalChassis
 baremetal_chassis_delete = ironicclient.osc.v1.baremetal_chassis:DeleteBaremetalChassis
 baremetal_chassis_list = ironicclient.osc.v1.baremetal_chassis:ListBaremetalChassis
 baremetal_chassis_set = ironicclient.osc.v1.baremetal_chassis:SetBaremetalChassis
 baremetal_chassis_show = ironicclient.osc.v1.baremetal_chassis:ShowBaremetalChassis
 baremetal_chassis_unset = ironicclient.osc.v1.baremetal_chassis:UnsetBaremetalChassis
+baremetal_conductor_list = ironicclient.osc.v1.baremetal_conductor:ListBaremetalConductor
+baremetal_conductor_show = ironicclient.osc.v1.baremetal_conductor:ShowBaremetalConductor
 baremetal_create = ironicclient.osc.v1.baremetal_create:CreateBaremetal
+baremetal_deploy_template_create = ironicclient.osc.v1.baremetal_deploy_template:CreateBaremetalDeployTemplate
+baremetal_deploy_template_delete = ironicclient.osc.v1.baremetal_deploy_template:DeleteBaremetalDeployTemplate
+baremetal_deploy_template_list = ironicclient.osc.v1.baremetal_deploy_template:ListBaremetalDeployTemplate
+baremetal_deploy_template_set = ironicclient.osc.v1.baremetal_deploy_template:SetBaremetalDeployTemplate
+baremetal_deploy_template_show = ironicclient.osc.v1.baremetal_deploy_template:ShowBaremetalDeployTemplate
+baremetal_deploy_template_unset = ironicclient.osc.v1.baremetal_deploy_template:UnsetBaremetalDeployTemplate
 baremetal_driver_list = ironicclient.osc.v1.baremetal_driver:ListBaremetalDriver
 baremetal_driver_passthru_call = ironicclient.osc.v1.baremetal_driver:PassthruCallBaremetalDriver
 baremetal_driver_passthru_list = ironicclient.osc.v1.baremetal_driver:PassthruListBaremetalDriver
diff -Nru python-ironicclient-2.6.0/python_ironicclient.egg-info/pbr.json python-ironicclient-2.7.0/python_ironicclient.egg-info/pbr.json
--- python-ironicclient-2.6.0/python_ironicclient.egg-info/pbr.json	2019-01-15 01:38:03.000000000 +0000
+++ python-ironicclient-2.7.0/python_ironicclient.egg-info/pbr.json	2019-03-08 00:31:10.000000000 +0000
@@ -1 +1 @@
-{"git_version": "cdcd08d", "is_release": true}
\ No newline at end of file
+{"git_version": "4af8a79", "is_release": true}
\ No newline at end of file
diff -Nru python-ironicclient-2.6.0/python_ironicclient.egg-info/PKG-INFO python-ironicclient-2.7.0/python_ironicclient.egg-info/PKG-INFO
--- python-ironicclient-2.6.0/python_ironicclient.egg-info/PKG-INFO	2019-01-15 01:38:03.000000000 +0000
+++ python-ironicclient-2.7.0/python_ironicclient.egg-info/PKG-INFO	2019-03-08 00:31:10.000000000 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-ironicclient
-Version: 2.6.0
+Version: 2.7.0
 Summary: OpenStack Bare Metal Provisioning API Client Library
 Home-page: https://docs.openstack.org/python-ironicclient/latest/
 Author: OpenStack
diff -Nru python-ironicclient-2.6.0/python_ironicclient.egg-info/SOURCES.txt python-ironicclient-2.7.0/python_ironicclient.egg-info/SOURCES.txt
--- python-ironicclient-2.6.0/python_ironicclient.egg-info/SOURCES.txt	2019-01-15 01:38:03.000000000 +0000
+++ python-ironicclient-2.7.0/python_ironicclient.egg-info/SOURCES.txt	2019-03-08 00:31:10.000000000 +0000
@@ -41,8 +41,11 @@
 ironicclient/osc/__init__.py
 ironicclient/osc/plugin.py
 ironicclient/osc/v1/__init__.py
+ironicclient/osc/v1/baremetal_allocation.py
 ironicclient/osc/v1/baremetal_chassis.py
+ironicclient/osc/v1/baremetal_conductor.py
 ironicclient/osc/v1/baremetal_create.py
+ironicclient/osc/v1/baremetal_deploy_template.py
 ironicclient/osc/v1/baremetal_driver.py
 ironicclient/osc/v1/baremetal_node.py
 ironicclient/osc/v1/baremetal_port.py
@@ -67,7 +70,10 @@
 ironicclient/tests/functional/osc/__init__.py
 ironicclient/tests/functional/osc/v1/__init__.py
 ironicclient/tests/functional/osc/v1/base.py
+ironicclient/tests/functional/osc/v1/test_baremetal_allocation.py
 ironicclient/tests/functional/osc/v1/test_baremetal_chassis_basic.py
+ironicclient/tests/functional/osc/v1/test_baremetal_conductor_basic.py
+ironicclient/tests/functional/osc/v1/test_baremetal_deploy_template_basic.py
 ironicclient/tests/functional/osc/v1/test_baremetal_driver_basic.py
 ironicclient/tests/functional/osc/v1/test_baremetal_node_basic.py
 ironicclient/tests/functional/osc/v1/test_baremetal_node_create_negative.py
@@ -97,8 +103,11 @@
 ironicclient/tests/unit/osc/test_plugin.py
 ironicclient/tests/unit/osc/v1/__init__.py
 ironicclient/tests/unit/osc/v1/fakes.py
+ironicclient/tests/unit/osc/v1/test_baremetal_allocation.py
 ironicclient/tests/unit/osc/v1/test_baremetal_chassis.py
+ironicclient/tests/unit/osc/v1/test_baremetal_conductor.py
 ironicclient/tests/unit/osc/v1/test_baremetal_create.py
+ironicclient/tests/unit/osc/v1/test_baremetal_deploy_template.py
 ironicclient/tests/unit/osc/v1/test_baremetal_driver.py
 ironicclient/tests/unit/osc/v1/test_baremetal_node.py
 ironicclient/tests/unit/osc/v1/test_baremetal_port.py
@@ -106,13 +115,17 @@
 ironicclient/tests/unit/osc/v1/test_baremetal_volume_connector.py
 ironicclient/tests/unit/osc/v1/test_baremetal_volume_target.py
 ironicclient/tests/unit/v1/__init__.py
+ironicclient/tests/unit/v1/test_allocation.py
 ironicclient/tests/unit/v1/test_chassis.py
 ironicclient/tests/unit/v1/test_chassis_shell.py
 ironicclient/tests/unit/v1/test_client.py
+ironicclient/tests/unit/v1/test_conductor.py
 ironicclient/tests/unit/v1/test_create_resources.py
 ironicclient/tests/unit/v1/test_create_resources_shell.py
+ironicclient/tests/unit/v1/test_deploy_template.py
 ironicclient/tests/unit/v1/test_driver.py
 ironicclient/tests/unit/v1/test_driver_shell.py
+ironicclient/tests/unit/v1/test_events.py
 ironicclient/tests/unit/v1/test_node.py
 ironicclient/tests/unit/v1/test_node_shell.py
 ironicclient/tests/unit/v1/test_port.py
@@ -125,13 +138,17 @@
 ironicclient/tests/unit/v1/test_volume_target.py
 ironicclient/tests/unit/v1/test_volume_target_shell.py
 ironicclient/v1/__init__.py
+ironicclient/v1/allocation.py
 ironicclient/v1/chassis.py
 ironicclient/v1/chassis_shell.py
 ironicclient/v1/client.py
+ironicclient/v1/conductor.py
 ironicclient/v1/create_resources.py
 ironicclient/v1/create_resources_shell.py
+ironicclient/v1/deploy_template.py
 ironicclient/v1/driver.py
 ironicclient/v1/driver_shell.py
+ironicclient/v1/events.py
 ironicclient/v1/node.py
 ironicclient/v1/node_shell.py
 ironicclient/v1/port.py
@@ -159,11 +176,17 @@
 python_ironicclient.egg-info/top_level.txt
 releasenotes/notes/.placeholder
 releasenotes/notes/SHA1-hash-auth-token-f8dce46f854c002c.yaml
+releasenotes/notes/accept-valid_interfaces-3b8f5e3e362e04cd.yaml
 releasenotes/notes/add-chassis_uuid-removal-possibility-5bc0bc3a7953eaa5.yaml
+releasenotes/notes/add-conductor-cli-233249ebc9d5a5f3.yaml
 releasenotes/notes/add-create-command-3df5efbbecc33276.yaml
 releasenotes/notes/add-environment-variable-to-specify-version-cache-timeout-dfa5f6d4af0ea1d3.yaml
+releasenotes/notes/add-events-support-53c461d28abf010b.yaml
+releasenotes/notes/add-is-smartnic-port-attr-ed46d887aec276ed.yaml
 releasenotes/notes/add-json-option-0cf29be2a97e0212.yaml
 releasenotes/notes/add-neutron-integration-fields-cee7596c49722de6.yaml
+releasenotes/notes/add-node-description-support-6efd0882eaa0c788.yaml
+releasenotes/notes/add-node-owner-c2dce5a6075ce2b7.yaml
 releasenotes/notes/add-node-resource-class-6040d1d6c734522c.yaml
 releasenotes/notes/add-pecan-exc-construction-a776408f7ae110dc.yaml
 releasenotes/notes/add-port-internal-info-74a03ebd8b0a3dfc.yaml
@@ -179,6 +202,7 @@
 releasenotes/notes/add-volume-target-cli-e062303f4b3b40f0.yaml
 releasenotes/notes/add_api_versions-a59e5b6899833c33.yaml
 releasenotes/notes/add_automated_clean_field-d2a0c824a4e90bf4.yaml
+releasenotes/notes/allocation-api-5f13082a8b36d788.yaml
 releasenotes/notes/allow-api-user-to-use-latest-6b80e9f584eaaa4e.yaml
 releasenotes/notes/allow-client-to-request-list-of-versions-88f019cad76e6464.yaml
 releasenotes/notes/bug-1524745-adds-node-create-args-a7ace744515e5943.yaml
@@ -188,7 +212,9 @@
 releasenotes/notes/bug-1724974-add-wanboot-to-supported-boot-devices.yaml
 releasenotes/notes/bug-1745099-allow-integer-portgroup-mode-6be4d3b35e216486.yaml
 releasenotes/notes/conductor-group-9cfab3756aa108e4.yaml
+releasenotes/notes/configdrive-7bd2b67830691b2e.yaml
 releasenotes/notes/continue-del-next-node-8827e67e1c41a0a5.yaml
+releasenotes/notes/deploy-templates-df354ce825b00430.yaml
 releasenotes/notes/deprecate-http-client-8d664e5ec50ec403.yaml
 releasenotes/notes/deprecate-ironic-cli-686b7a238ddf3e25.yaml
 releasenotes/notes/display-empty-string-for-chassis-uuid-if-it-is-empty-a5471c3aa740a27d.yaml
@@ -242,6 +268,7 @@
 releasenotes/notes/osc-soft-reboot-poweroff-121b8043567f54a9.yaml
 releasenotes/notes/osc-versioned-endpoint-fix-08f6b7af2f47a5d6.yaml
 releasenotes/notes/osc-wait-option-for-provisioning-commands-b6f5b875d573c9c8.yaml
+releasenotes/notes/pass-interface-argument-deb92e3feb0bf051.yaml
 releasenotes/notes/port-physical-network-6ea8860d773e473c.yaml
 releasenotes/notes/prelude-2-0-release-ee44150902d3d399.yaml
 releasenotes/notes/protected-72d7419245a4f6c3.yaml
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/accept-valid_interfaces-3b8f5e3e362e04cd.yaml python-ironicclient-2.7.0/releasenotes/notes/accept-valid_interfaces-3b8f5e3e362e04cd.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/accept-valid_interfaces-3b8f5e3e362e04cd.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/accept-valid_interfaces-3b8f5e3e362e04cd.yaml	2019-03-08 00:29:13.000000000 +0000
@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    The consumer of ironicclient may be deriving their ``get_client`` kwargs
+    from config inherited from ksa, where the ``interface`` option has been
+    deprecated in favor of ``valid_interfaces``. To accomodate this, we now
+    accept ``valid_interfaces`` as a kwarg, giving it precedence over
+    ``interface``. However, we still accept ``interface``, as the consumer may
+    be deriving kwargs from a non-conf source (such as an already-created ksa
+    Adapter where ``valid_interfaces`` has already been translated to
+    ``interfaces``).
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/add-conductor-cli-233249ebc9d5a5f3.yaml python-ironicclient-2.7.0/releasenotes/notes/add-conductor-cli-233249ebc9d5a5f3.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/add-conductor-cli-233249ebc9d5a5f3.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/add-conductor-cli-233249ebc9d5a5f3.yaml	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Adds the ability to list and show conductors known by the Bare Metal
+    service, as well as showing the ``conductor`` field on the node,
+    introduced in API 1.49.
\ No newline at end of file
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/add-events-support-53c461d28abf010b.yaml python-ironicclient-2.7.0/releasenotes/notes/add-events-support-53c461d28abf010b.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/add-events-support-53c461d28abf010b.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/add-events-support-53c461d28abf010b.yaml	2019-03-08 00:29:13.000000000 +0000
@@ -0,0 +1,8 @@
+---
+features:
+  - |
+    Adds the ``Event`` resource and the ``client.events.create`` Python SDK
+    method to support publishing events to the Bare Metal service using
+    the /v1/events API endpoint (introduced in API version 1.54).
+
+    .. Note:: Events are not intended for end-user usage. (Internal use only.)
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/add-is-smartnic-port-attr-ed46d887aec276ed.yaml python-ironicclient-2.7.0/releasenotes/notes/add-is-smartnic-port-attr-ed46d887aec276ed.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/add-is-smartnic-port-attr-ed46d887aec276ed.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/add-is-smartnic-port-attr-ed46d887aec276ed.yaml	2019-03-08 00:29:13.000000000 +0000
@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    Adds support for Smart NIC ports by adding the ``--is-smartnic``
+    argument to the following CLI commands:
+
+    * ``openstack baremetal port create``
+    * ``openstack baremetal port set``
+    * ``openstack baremetal port unset``
+
+    This was introduced in API version 1.53.
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/add-node-description-support-6efd0882eaa0c788.yaml python-ironicclient-2.7.0/releasenotes/notes/add-node-description-support-6efd0882eaa0c788.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/add-node-description-support-6efd0882eaa0c788.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/add-node-description-support-6efd0882eaa0c788.yaml	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Adds ``description`` field support, which is introduced in ironic API
+    1.51. This field is used to store informational text about the node.
+    User can also do queries for nodes where their ``description`` field
+    contains specified substring.
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/add-node-owner-c2dce5a6075ce2b7.yaml python-ironicclient-2.7.0/releasenotes/notes/add-node-owner-c2dce5a6075ce2b7.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/add-node-owner-c2dce5a6075ce2b7.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/add-node-owner-c2dce5a6075ce2b7.yaml	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Adds support to display and update the ``owner`` field of nodes,
+    which is introduced in API 1.50.
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/allocation-api-5f13082a8b36d788.yaml python-ironicclient-2.7.0/releasenotes/notes/allocation-api-5f13082a8b36d788.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/allocation-api-5f13082a8b36d788.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/allocation-api-5f13082a8b36d788.yaml	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,10 @@
+---
+features:
+  - |
+    Adds Python API and CLI for the allocation API introduced in API version
+    1.52. Adds new commands:
+
+    * ``openstack baremetal allocation create``
+    * ``openstack baremetal allocation delete``
+    * ``openstack baremetal allocation get``
+    * ``openstack baremetal allocation list``
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/configdrive-7bd2b67830691b2e.yaml python-ironicclient-2.7.0/releasenotes/notes/configdrive-7bd2b67830691b2e.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/configdrive-7bd2b67830691b2e.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/configdrive-7bd2b67830691b2e.yaml	2019-03-08 00:29:13.000000000 +0000
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Supports passing a JSON object to ``--config-drive`` to build the config
+    drive on the server side (requires API version 1.56) to the following
+    commands:
+
+    * ``openstack baremetal node deploy <node> --config-drive '{...}'``
+    * ``openstack baremetal node rebuild <node> --config-drive '{...}'``
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/deploy-templates-df354ce825b00430.yaml python-ironicclient-2.7.0/releasenotes/notes/deploy-templates-df354ce825b00430.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/deploy-templates-df354ce825b00430.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/deploy-templates-df354ce825b00430.yaml	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,11 @@
+---
+features:
+  - |
+    Adds Python API and CLI for the deploy templates API introduced in API
+    version 1.55. The following new commands are available:
+
+    * ``openstack baremetal deploy template create``
+    * ``openstack baremetal deploy template delete``
+    * ``openstack baremetal deploy template list``
+    * ``openstack baremetal deploy template set``
+    * ``openstack baremetal deploy template show``
diff -Nru python-ironicclient-2.6.0/releasenotes/notes/pass-interface-argument-deb92e3feb0bf051.yaml python-ironicclient-2.7.0/releasenotes/notes/pass-interface-argument-deb92e3feb0bf051.yaml
--- python-ironicclient-2.6.0/releasenotes/notes/pass-interface-argument-deb92e3feb0bf051.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-ironicclient-2.7.0/releasenotes/notes/pass-interface-argument-deb92e3feb0bf051.yaml	2019-03-08 00:29:10.000000000 +0000
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    The ``interface`` argument was being ignored so that the HTTP client was
+    always using the public endpoint for Ironic. This fixes it so that the
+    ``interface`` argument is taken into consideration. See
+    `story 2005118 <https://storyboard.openstack.org/#!/story/2005118>`_.
diff -Nru python-ironicclient-2.6.0/setup.cfg python-ironicclient-2.7.0/setup.cfg
--- python-ironicclient-2.6.0/setup.cfg	2019-01-15 01:38:03.000000000 +0000
+++ python-ironicclient-2.7.0/setup.cfg	2019-03-08 00:31:10.000000000 +0000
@@ -27,6 +27,10 @@
 openstack.cli.extension = 
 	baremetal = ironicclient.osc.plugin
 openstack.baremetal.v1 = 
+	baremetal_allocation_create = ironicclient.osc.v1.baremetal_allocation:CreateBaremetalAllocation
+	baremetal_allocation_delete = ironicclient.osc.v1.baremetal_allocation:DeleteBaremetalAllocation
+	baremetal_allocation_list = ironicclient.osc.v1.baremetal_allocation:ListBaremetalAllocation
+	baremetal_allocation_show = ironicclient.osc.v1.baremetal_allocation:ShowBaremetalAllocation
 	baremetal_chassis_create = ironicclient.osc.v1.baremetal_chassis:CreateBaremetalChassis
 	baremetal_chassis_delete = ironicclient.osc.v1.baremetal_chassis:DeleteBaremetalChassis
 	baremetal_chassis_list = ironicclient.osc.v1.baremetal_chassis:ListBaremetalChassis
@@ -34,6 +38,12 @@
 	baremetal_chassis_show = ironicclient.osc.v1.baremetal_chassis:ShowBaremetalChassis
 	baremetal_chassis_unset = ironicclient.osc.v1.baremetal_chassis:UnsetBaremetalChassis
 	baremetal_create = ironicclient.osc.v1.baremetal_create:CreateBaremetal
+	baremetal_deploy_template_create = ironicclient.osc.v1.baremetal_deploy_template:CreateBaremetalDeployTemplate
+	baremetal_deploy_template_delete = ironicclient.osc.v1.baremetal_deploy_template:DeleteBaremetalDeployTemplate
+	baremetal_deploy_template_list = ironicclient.osc.v1.baremetal_deploy_template:ListBaremetalDeployTemplate
+	baremetal_deploy_template_set = ironicclient.osc.v1.baremetal_deploy_template:SetBaremetalDeployTemplate
+	baremetal_deploy_template_unset = ironicclient.osc.v1.baremetal_deploy_template:UnsetBaremetalDeployTemplate
+	baremetal_deploy_template_show = ironicclient.osc.v1.baremetal_deploy_template:ShowBaremetalDeployTemplate
 	baremetal_driver_list = ironicclient.osc.v1.baremetal_driver:ListBaremetalDriver
 	baremetal_driver_passthru_call = ironicclient.osc.v1.baremetal_driver:PassthruCallBaremetalDriver
 	baremetal_driver_passthru_list = ironicclient.osc.v1.baremetal_driver:PassthruListBaremetalDriver
@@ -103,6 +113,8 @@
 	baremetal_volume_target_set = ironicclient.osc.v1.baremetal_volume_target:SetBaremetalVolumeTarget
 	baremetal_volume_target_show = ironicclient.osc.v1.baremetal_volume_target:ShowBaremetalVolumeTarget
 	baremetal_volume_target_unset = ironicclient.osc.v1.baremetal_volume_target:UnsetBaremetalVolumeTarget
+	baremetal_conductor_list = ironicclient.osc.v1.baremetal_conductor:ListBaremetalConductor
+	baremetal_conductor_show = ironicclient.osc.v1.baremetal_conductor:ShowBaremetalConductor
 
 [wheel]
 universal = 1
diff -Nru python-ironicclient-2.6.0/zuul.d/project.yaml python-ironicclient-2.7.0/zuul.d/project.yaml
--- python-ironicclient-2.6.0/zuul.d/project.yaml	2019-01-15 01:36:19.000000000 +0000
+++ python-ironicclient-2.7.0/zuul.d/project.yaml	2019-03-08 00:29:10.000000000 +0000
@@ -6,6 +6,7 @@
       - openstack-python-jobs
       - openstack-python35-jobs
       - openstack-python36-jobs
+      - openstack-python37-jobs
       - openstackclient-plugin-jobs
       - publish-openstack-docs-pti
       - release-notes-jobs-python3