diff -Nru python-openstackclient-3.14.0/AUTHORS python-openstackclient-3.14.2/AUTHORS
--- python-openstackclient-3.14.0/AUTHORS	2018-01-25 14:28:58.000000000 +0000
+++ python-openstackclient-3.14.2/AUTHORS	2018-06-04 03:31:42.000000000 +0000
@@ -78,6 +78,7 @@
 Dougal Matthews <dougal@redhat.com>
 Einst Crazy <yu.changcai@99cloud.net>
 Elena Ezhova <eezhova@mirantis.com>
+Emilien Macchi <emilien@redhat.com>
 Eric Brown <browne@vmware.com>
 Fang Zhen <zhen.fang@easystack.cn>
 Fei Long Wang <flwang@catalyst.net.nz>
@@ -233,6 +234,7 @@
 Sascha Peilicke <saschpe@gmx.de>
 Sascha Peilicke <speilicke@suse.com>
 Sean Dague <sean@dague.net>
+Sean McGinnis <sean.mcginnis@gmail.com>
 Sean Perry <sean.perry@hp.com>
 Sean Perry <sean.perry@hpe.com>
 Shane Wang <shane.wang@intel.com>
diff -Nru python-openstackclient-3.14.0/ChangeLog python-openstackclient-3.14.2/ChangeLog
--- python-openstackclient-3.14.0/ChangeLog	2018-01-25 14:28:57.000000000 +0000
+++ python-openstackclient-3.14.2/ChangeLog	2018-06-04 03:31:41.000000000 +0000
@@ -1,6 +1,23 @@
 CHANGES
 =======
 
+3.14.2
+------
+
+* Re-implement novaclient bits removed in 10.0
+* Clean up W503 and E402 pep8 errors
+
+3.14.1
+------
+
+* neutron: add --mtu for create/set network
+* Rename python-openstacksdk to openstacksdk
+* Handle SDK changes
+* Updated from global requirements
+* Updated from global requirements
+* Update UPPER\_CONSTRAINTS\_FILE for stable/queens
+* Update .gitreview for stable/queens
+
 3.14.0
 ------
 
diff -Nru python-openstackclient-3.14.0/debian/changelog python-openstackclient-3.14.2/debian/changelog
--- python-openstackclient-3.14.0/debian/changelog	2018-02-12 14:30:43.000000000 +0000
+++ python-openstackclient-3.14.2/debian/changelog	2018-11-05 13:38:38.000000000 +0000
@@ -1,3 +1,10 @@
+python-openstackclient (3.14.2-0ubuntu1) bionic; urgency=medium
+
+  * d/gbp.conf: Create stable/queens branch.
+  * New stable point release for OpenStack Queens (LP: #1800490).
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Mon, 05 Nov 2018 08:38:38 -0500
+
 python-openstackclient (3.14.0-0ubuntu1) bionic; urgency=medium
 
   * New upstream release.
diff -Nru python-openstackclient-3.14.0/debian/gbp.conf python-openstackclient-3.14.2/debian/gbp.conf
--- python-openstackclient-3.14.0/debian/gbp.conf	2018-02-12 14:30:43.000000000 +0000
+++ python-openstackclient-3.14.2/debian/gbp.conf	2018-11-05 13:38:38.000000000 +0000
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = master
+debian-branch = stable/queens
 upstream-tag = %(version)s
 pristine-tar = True
 
diff -Nru python-openstackclient-3.14.0/doc/source/cli/command-objects/network.rst python-openstackclient-3.14.2/doc/source/cli/command-objects/network.rst
--- python-openstackclient-3.14.0/doc/source/cli/command-objects/network.rst	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/doc/source/cli/command-objects/network.rst	2018-06-04 03:28:38.000000000 +0000
@@ -24,6 +24,7 @@
         [--enable | --disable]
         [--share | --no-share]
         [--description <description>]
+        [--mtu <mtu>]
         [--availability-zone-hint <availability-zone>]
         [--enable-port-security | --disable-port-security]
         [--external [--default | --no-default] | --internal]
@@ -74,6 +75,12 @@
 
     *Network version 2 only*
 
+.. option:: --mtu <mtu>
+
+    Set network mtu
+
+    *Network version 2 only*
+
 .. option:: --availability-zone-hint <availability-zone>
 
     Availability Zone in which to create this network
@@ -353,6 +360,7 @@
         [--enable | --disable]
         [--share | --no-share]
         [--description <description>]
+        [--mtu <mtu>]
         [--enable-port-security | --disable-port-security]
         [--external [--default | --no-default] | --internal]
         [--provider-network-type <provider-network-type>]
@@ -386,6 +394,10 @@
 
     Set network description
 
+.. option:: --mtu <mtu>
+
+    Set network mtu
+
 .. option:: --enable-port-security
 
     Enable port security by default for ports created on
diff -Nru python-openstackclient-3.14.0/openstackclient/api/compute_v2.py python-openstackclient-3.14.2/openstackclient/api/compute_v2.py
--- python-openstackclient-3.14.0/openstackclient/api/compute_v2.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/api/compute_v2.py	2018-06-04 03:28:38.000000000 +0000
@@ -93,7 +93,51 @@
 
         return ret
 
-    # Flaoting IPs
+    # Floating IPs
+
+    def floating_ip_add(
+        self,
+        server,
+        address,
+        fixed_address=None,
+    ):
+        """Add a floating IP to a server
+
+        :param server:
+            The :class:`Server` (or its ID) to add an IP to.
+        :param address:
+            The FloatingIP or string floating address to add.
+        :param fixed_address:
+            The FixedIP the floatingIP should be associated with (optional)
+        """
+
+        url = '/servers'
+
+        server = self.find(
+            url,
+            attr='name',
+            value=server,
+        )
+
+        address = address.ip if hasattr(address, 'ip') else address
+        if fixed_address:
+            if hasattr(fixed_address, 'ip'):
+                fixed_address = fixed_address.ip
+
+            body = {
+                'address': address,
+                'fixed_address': fixed_address,
+            }
+        else:
+            body = {
+                'address': address,
+            }
+
+        return self._request(
+            "POST",
+            "/%s/%s/action" % (url, server['id']),
+            json={'addFloatingIp': body},
+        )
 
     def floating_ip_create(
         self,
@@ -175,6 +219,38 @@
 
         return self.list(url)["floating_ips"]
 
+    def floating_ip_remove(
+        self,
+        server,
+        address,
+    ):
+        """Remove a floating IP from a server
+
+        :param server:
+            The :class:`Server` (or its ID) to add an IP to.
+        :param address:
+            The FloatingIP or string floating address to add.
+        """
+
+        url = '/servers'
+
+        server = self.find(
+            url,
+            attr='name',
+            value=server,
+        )
+
+        address = address.ip if hasattr(address, 'ip') else address
+        body = {
+            'address': address,
+        }
+
+        return self._request(
+            "POST",
+            "/%s/%s/action" % (url, server['id']),
+            json={'removeFloatingIp': body},
+        )
+
     # Floating IP Pools
 
     def floating_ip_pool_list(
@@ -192,6 +268,84 @@
 
         return self.list(url)["floating_ip_pools"]
 
+    # Hosts
+
+    def host_list(
+        self,
+        zone=None,
+    ):
+        """Lists hypervisor Hosts
+
+        https://developer.openstack.org/api-ref/compute/#list-hosts
+        Valid for Compute 2.0 - 2.42
+
+        :param string zone:
+            Availability zone
+        :returns: A dict of the floating IP attributes
+        """
+
+        url = "/os-hosts"
+        if zone:
+            url = '/os-hosts?zone=%s' % zone
+
+        return self.list(url)["hosts"]
+
+    def host_set(
+        self,
+        host=None,
+        status=None,
+        maintenance_mode=None,
+        **params
+    ):
+        """Modify host properties
+
+        https://developer.openstack.org/api-ref/compute/#update-host-status
+        Valid for Compute 2.0 - 2.42
+
+        status
+        maintenance_mode
+        """
+
+        url = "/os-hosts"
+
+        params = {}
+        if status:
+            params['status'] = status
+        if maintenance_mode:
+            params['maintenance_mode'] = maintenance_mode
+        if params == {}:
+            # Don't bother calling if nothing given
+            return None
+        else:
+            return self._request(
+                "PUT",
+                "/%s/%s" % (url, host),
+                json=params,
+            ).json()
+
+    def host_show(
+        self,
+        host=None,
+    ):
+        """Show host
+
+        https://developer.openstack.org/api-ref/compute/#show-host-details
+        Valid for Compute 2.0 - 2.42
+        """
+
+        url = "/os-hosts"
+
+        r_host = self.find(
+            url,
+            attr='host_name',
+            value=host,
+        )
+
+        data = []
+        for h in r_host:
+            data.append(h['resource'])
+        return data
+
     # Networks
 
     def network_create(
diff -Nru python-openstackclient-3.14.0/openstackclient/common/extension.py python-openstackclient-3.14.2/openstackclient/common/extension.py
--- python-openstackclient-3.14.0/openstackclient/common/extension.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/common/extension.py	2018-06-04 03:28:38.000000000 +0000
@@ -75,8 +75,10 @@
         # by default we want to show everything, unless the
         # user specifies one or more of the APIs to show
         # for now, only identity and compute are supported.
-        show_all = (not parsed_args.identity and not parsed_args.compute
-                    and not parsed_args.volume and not parsed_args.network)
+        show_all = (not parsed_args.identity and
+                    not parsed_args.compute and
+                    not parsed_args.volume and
+                    not parsed_args.network)
 
         if parsed_args.identity or show_all:
             identity_client = self.app.client_manager.identity
diff -Nru python-openstackclient-3.14.0/openstackclient/compute/v2/host.py python-openstackclient-3.14.2/openstackclient/compute/v2/host.py
--- python-openstackclient-3.14.0/openstackclient/compute/v2/host.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/compute/v2/host.py	2018-06-04 03:28:38.000000000 +0000
@@ -40,9 +40,9 @@
             "Service",
             "Zone"
         )
-        data = compute_client.hosts.list_all(parsed_args.zone)
+        data = compute_client.api.host_list(parsed_args.zone)
         return (columns,
-                (utils.get_item_properties(
+                (utils.get_dict_properties(
                     s, columns,
                 ) for s in data))
 
@@ -95,13 +95,7 @@
 
         compute_client = self.app.client_manager.compute
 
-        # More than one hosts will be returned by using find_resource()
-        # so that the return value cannot be used in host update() method.
-        # find_resource() is just used for checking existence of host and
-        # keeping the exception message consistent with other commands.
-        utils.find_resource(compute_client.hosts, parsed_args.host)
-
-        compute_client.hosts.update(
+        compute_client.api.host_set(
             parsed_args.host,
             kwargs
         )
@@ -128,8 +122,10 @@
             "Memory MB",
             "Disk GB"
         )
-        data = compute_client.hosts.get(parsed_args.host)
+
+        data = compute_client.api.host_show(parsed_args.host)
+
         return (columns,
-                (utils.get_item_properties(
+                (utils.get_dict_properties(
                     s, columns,
                 ) for s in data))
diff -Nru python-openstackclient-3.14.0/openstackclient/compute/v2/server.py python-openstackclient-3.14.2/openstackclient/compute/v2/server.py
--- python-openstackclient-3.14.0/openstackclient/compute/v2/server.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/compute/v2/server.py	2018-06-04 03:28:48.000000000 +0000
@@ -32,6 +32,7 @@
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
+from openstackclient.network import common as network_common
 
 
 LOG = logging.getLogger(__name__)
@@ -234,11 +235,10 @@
         )
 
 
-class AddFloatingIP(command.Command):
+class AddFloatingIP(network_common.NetworkAndComputeCommand):
     _description = _("Add floating IP address to server")
 
-    def get_parser(self, prog_name):
-        parser = super(AddFloatingIP, self).get_parser(prog_name)
+    def update_parser_common(self, parser):
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -252,19 +252,37 @@
         parser.add_argument(
             "--fixed-ip-address",
             metavar="<ip-address>",
-            help=_("Fixed IP address to associate with this floating IP "
-                   "address"),
+            help=_(
+                "Fixed IP address to associate with this floating IP address"
+            ),
         )
         return parser
 
-    def take_action(self, parsed_args):
+    def take_action_network(self, client, parsed_args):
         compute_client = self.app.client_manager.compute
 
+        attrs = {}
+        obj = client.find_ip(
+            parsed_args.ip_address,
+            ignore_missing=False,
+        )
         server = utils.find_resource(
-            compute_client.servers, parsed_args.server)
+            compute_client.servers,
+            parsed_args.server,
+        )
+        port = list(client.ports(device_id=server.id))[0]
+        attrs['port_id'] = port.id
+        if parsed_args.fixed_ip_address:
+            attrs['fixed_ip_address'] = parsed_args.fixed_ip_address
+
+        client.update_ip(obj, **attrs)
 
-        server.add_floating_ip(parsed_args.ip_address,
-                               parsed_args.fixed_ip_address)
+    def take_action_compute(self, client, parsed_args):
+        client.api.floating_ip_add(
+            parsed_args.server,
+            parsed_args.ip_address,
+            fixed_address=parsed_args.fixed_ip_address,
+        )
 
 
 class AddPort(command.Command):
@@ -1482,11 +1500,10 @@
         server.remove_fixed_ip(parsed_args.ip_address)
 
 
-class RemoveFloatingIP(command.Command):
+class RemoveFloatingIP(network_common.NetworkAndComputeCommand):
     _description = _("Remove floating IP address from server")
 
-    def get_parser(self, prog_name):
-        parser = super(RemoveFloatingIP, self).get_parser(prog_name)
+    def update_parser_common(self, parser):
         parser.add_argument(
             "server",
             metavar="<server>",
@@ -1501,13 +1518,21 @@
         )
         return parser
 
-    def take_action(self, parsed_args):
-        compute_client = self.app.client_manager.compute
+    def take_action_network(self, client, parsed_args):
+        attrs = {}
+        obj = client.find_ip(
+            parsed_args.ip_address,
+            ignore_missing=False,
+        )
+        attrs['port_id'] = None
 
-        server = utils.find_resource(
-            compute_client.servers, parsed_args.server)
+        client.update_ip(obj, **attrs)
 
-        server.remove_floating_ip(parsed_args.ip_address)
+    def take_action_compute(self, client, parsed_args):
+        client.api.floating_ip_remove(
+            parsed_args.server,
+            parsed_args.ip_address,
+        )
 
 
 class RemovePort(command.Command):
diff -Nru python-openstackclient-3.14.0/openstackclient/identity/v3/role.py python-openstackclient-3.14.2/openstackclient/identity/v3/role.py
--- python-openstackclient-3.14.0/openstackclient/identity/v3/role.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/identity/v3/role.py	2018-06-04 03:28:38.000000000 +0000
@@ -126,8 +126,8 @@
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        if (not parsed_args.user and not parsed_args.domain
-                and not parsed_args.group and not parsed_args.project):
+        if (not parsed_args.user and not parsed_args.domain and
+                not parsed_args.group and not parsed_args.project):
             msg = _("Role not added, incorrect set of arguments "
                     "provided. See openstack --help for more details")
             raise exceptions.CommandError(msg)
@@ -399,8 +399,8 @@
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
 
-        if (not parsed_args.user and not parsed_args.domain
-                and not parsed_args.group and not parsed_args.project):
+        if (not parsed_args.user and not parsed_args.domain and
+                not parsed_args.group and not parsed_args.project):
             msg = _("Incorrect set of arguments provided. "
                     "See openstack --help for more details")
             raise exceptions.CommandError(msg)
diff -Nru python-openstackclient-3.14.0/openstackclient/image/v1/image.py python-openstackclient-3.14.2/openstackclient/image/v1/image.py
--- python-openstackclient-3.14.0/openstackclient/image/v1/image.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/image/v1/image.py	2018-06-04 03:28:38.000000000 +0000
@@ -21,11 +21,6 @@
 import os
 import sys
 
-if os.name == "nt":
-    import msvcrt
-else:
-    msvcrt = None
-
 from glanceclient.common import utils as gc_utils
 from osc_lib.cli import parseractions
 from osc_lib.command import command
@@ -35,6 +30,11 @@
 from openstackclient.api import utils as api_utils
 from openstackclient.i18n import _
 
+if os.name == "nt":
+    import msvcrt
+else:
+    msvcrt = None
+
 
 CONTAINER_CHOICES = ["ami", "ari", "aki", "bare", "docker", "ova", "ovf"]
 DEFAULT_CONTAINER_FORMAT = 'bare'
diff -Nru python-openstackclient-3.14.0/openstackclient/__init__.py python-openstackclient-3.14.2/openstackclient/__init__.py
--- python-openstackclient-3.14.0/openstackclient/__init__.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/__init__.py	2018-06-04 03:28:38.000000000 +0000
@@ -11,10 +11,10 @@
 #   under the License.
 #
 
-__all__ = ['__version__']
-
 import pbr.version
 
+__all__ = ['__version__']
+
 version_info = pbr.version.VersionInfo('python-openstackclient')
 try:
     __version__ = version_info.version_string()
diff -Nru python-openstackclient-3.14.0/openstackclient/network/common.py python-openstackclient-3.14.2/openstackclient/network/common.py
--- python-openstackclient-3.14.0/openstackclient/network/common.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/network/common.py	2018-06-04 03:28:38.000000000 +0000
@@ -48,7 +48,10 @@
         parser = super(NetworkAndComputeCommand, self).get_parser(prog_name)
         parser = self.update_parser_common(parser)
         LOG.debug('common parser: %s', parser)
-        if self.app.client_manager.is_network_endpoint_enabled():
+        if (
+            self.app is None or
+            self.app.client_manager.is_network_endpoint_enabled()
+        ):
             return self.update_parser_network(parser)
         else:
             return self.update_parser_compute(parser)
diff -Nru python-openstackclient-3.14.0/openstackclient/network/v2/network.py python-openstackclient-3.14.2/openstackclient/network/v2/network.py
--- python-openstackclient-3.14.0/openstackclient/network/v2/network.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/network/v2/network.py	2018-06-04 03:28:38.000000000 +0000
@@ -107,6 +107,10 @@
     if parsed_args.description:
         attrs['description'] = parsed_args.description
 
+    # set mtu
+    if parsed_args.mtu:
+        attrs['mtu'] = parsed_args.mtu
+
     # update_external_network_options
     if parsed_args.internal:
         attrs['router:external'] = False
@@ -217,6 +221,11 @@
             metavar='<description>',
             help=_("Set network description")
         )
+        parser.add_argument(
+            '--mtu',
+            metavar='<mtu>',
+            help=_("Set network mtu")
+        )
         identity_common.add_project_domain_option_to_parser(parser)
         parser.add_argument(
             '--availability-zone-hint',
@@ -619,6 +628,11 @@
             metavar="<description",
             help=_("Set network description")
         )
+        parser.add_argument(
+            '--mtu',
+            metavar="<mtu",
+            help=_("Set network mtu")
+        )
         port_security_group = parser.add_mutually_exclusive_group()
         port_security_group.add_argument(
             '--enable-port-security',
diff -Nru python-openstackclient-3.14.0/openstackclient/network/v2/router.py python-openstackclient-3.14.2/openstackclient/network/v2/router.py
--- python-openstackclient-3.14.0/openstackclient/network/v2/router.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/network/v2/router.py	2018-06-04 03:28:38.000000000 +0000
@@ -86,8 +86,8 @@
         attrs['distributed'] = False
     if parsed_args.distributed:
         attrs['distributed'] = True
-    if ('availability_zone_hints' in parsed_args
-            and parsed_args.availability_zone_hints is not None):
+    if ('availability_zone_hints' in parsed_args and
+            parsed_args.availability_zone_hints is not None):
         attrs['availability_zone_hints'] = parsed_args.availability_zone_hints
     if parsed_args.description is not None:
         attrs['description'] = parsed_args.description
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/functional/common/test_extension.py python-openstackclient-3.14.2/openstackclient/tests/functional/common/test_extension.py
--- python-openstackclient-3.14.0/openstackclient/tests/functional/common/test_extension.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/functional/common/test_extension.py	2018-06-04 03:28:48.000000000 +0000
@@ -105,7 +105,14 @@
         try:
             self.openstack('extension show ' + name)
         except tempest_exc.CommandFailed as e:
-            self.assertIn('ResourceNotFound', str(e))
+            # NOTE(dtroyer): We have to test for both strings because the
+            #                change in the SDK between 0.9.19 and 0.11.x
+            #                spans our allowed range in stable/queens.
+            not_found = (
+                'ResourceNotFound' in str(e) or
+                'No Extension found for' in str(e)
+            )
+            self.assertTrue(not_found)
             self.assertIn(name, str(e))
         else:
             self.fail('CommandFailed should be raised')
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_network_agent.py python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_network_agent.py
--- python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_network_agent.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_network_agent.py	2018-06-04 03:28:38.000000000 +0000
@@ -42,8 +42,7 @@
 
         # agent show
         cmd_output = json.loads(self.openstack(
-            'network agent show -f json ' +
-            agent_ids[0]
+            'network agent show -f json %s' % agent_ids[0]
         ))
         self.assertEqual(
             agent_ids[0],
@@ -52,15 +51,12 @@
 
         # agent set
         raw_output = self.openstack(
-            'network agent set ' +
-            '--disable ' +
-            agent_ids[0]
+            'network agent set --disable %s' % agent_ids[0]
         )
         self.assertOutput('', raw_output)
 
         cmd_output = json.loads(self.openstack(
-            'network agent show -f json ' +
-            agent_ids[0]
+            'network agent show -f json %s' % agent_ids[0]
         ))
         self.assertEqual(
             "DOWN",
@@ -68,15 +64,12 @@
         )
 
         raw_output = self.openstack(
-            'network agent set ' +
-            '--enable ' +
-            agent_ids[0]
+            'network agent set --enable %s' % agent_ids[0]
         )
         self.assertOutput('', raw_output)
 
         cmd_output = json.loads(self.openstack(
-            'network agent show -f json ' +
-            agent_ids[0]
+            'network agent show -f json %s' % agent_ids[0]
         ))
         self.assertEqual(
             "UP",
@@ -98,12 +91,10 @@
 
         name1 = uuid.uuid4().hex
         cmd_output1 = json.loads(self.openstack(
-            'network create -f json ' +
-            '--description aaaa ' +
-            name1
+            'network create -f json --description aaaa %s' % name1
         ))
 
-        self.addCleanup(self.openstack, 'network delete ' + name1)
+        self.addCleanup(self.openstack, 'network delete %s' % name1)
 
         # Get network ID
         network_id = cmd_output1['id']
@@ -116,20 +107,20 @@
 
         # Add Agent to Network
         self.openstack(
-            'network agent add network --dhcp '
-            + agent_id + ' ' + network_id
+            'network agent add network --dhcp %s %s' %
+            (agent_id, network_id)
         )
 
         # Test network agent list --network
         cmd_output3 = json.loads(self.openstack(
-            'network agent list -f json --network ' + network_id
+            'network agent list -f json --network %s' % network_id
         ))
 
         # Cleanup
         # Remove Agent from Network
         self.openstack(
-            'network agent remove network --dhcp '
-            + agent_id + ' ' + network_id
+            'network agent remove network --dhcp %s %s' %
+            (agent_id, network_id)
         )
 
         # Assert
@@ -142,9 +133,9 @@
         """Add agent to router, list agents on router, delete."""
         name = uuid.uuid4().hex
         cmd_output = json.loads(self.openstack(
-            'router create -f json ' + name))
+            'router create -f json %s' % name))
 
-        self.addCleanup(self.openstack, 'router delete ' + name)
+        self.addCleanup(self.openstack, 'router delete %s' % name)
         # Get router ID
         router_id = cmd_output['id']
         # Get l3 agent id
@@ -157,19 +148,19 @@
 
         # Add router to agent
         self.openstack(
-            'network agent add router --l3 ' + agent_id + ' ' + router_id)
+            'network agent add router --l3 %s %s' % (agent_id, router_id))
 
         # Test router list --agent
         cmd_output = json.loads(self.openstack(
-            'network agent list -f json --router ' + router_id))
+            'network agent list -f json --router %s' % router_id))
 
         agent_ids = [x['ID'] for x in cmd_output]
         self.assertIn(agent_id, agent_ids)
 
         # Remove router from agent
         self.openstack(
-            'network agent remove router --l3 ' + agent_id + ' ' + router_id)
+            'network agent remove router --l3 %s %s' % (agent_id, router_id))
         cmd_output = json.loads(self.openstack(
-            'network agent list -f json --router ' + router_id))
+            'network agent list -f json --router %s' % router_id))
         agent_ids = [x['ID'] for x in cmd_output]
         self.assertNotIn(agent_id, agent_ids)
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_network_flavor.py python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_network_flavor.py
--- python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_network_flavor.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_network_flavor.py	2018-06-04 03:28:38.000000000 +0000
@@ -39,13 +39,13 @@
         # Create Service Flavor
         cmd_output2 = json.loads(self.openstack(
             'network flavor profile create -f json --description '
-            + 'fakedescription' + ' --enable --metainfo ' + 'Extrainfo'
+            'fakedescription --enable --metainfo Extrainfo'
         ))
         service_profile_id = cmd_output2.get('id')
 
-        self.addCleanup(self.openstack, 'network flavor delete ' +
+        self.addCleanup(self.openstack, 'network flavor delete %s' %
                         flavor_id)
-        self.addCleanup(self.openstack, 'network flavor profile delete ' +
+        self.addCleanup(self.openstack, 'network flavor profile delete %s' %
                         service_profile_id)
         # Add flavor to service profile
         self.openstack(
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_network.py python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_network.py
--- python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_network.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_network.py	2018-06-04 03:28:38.000000000 +0000
@@ -209,7 +209,7 @@
             cmd_output["description"],
         )
 
-        del_output = self.openstack('network delete ' + name1 + ' ' + name2)
+        del_output = self.openstack('network delete %s %s' % (name1, name2))
         self.assertOutput('', del_output)
 
     def test_network_list(self):
@@ -224,7 +224,7 @@
             network_options +
             name1
         ))
-        self.addCleanup(self.openstack, 'network delete ' + name1)
+        self.addCleanup(self.openstack, 'network delete %s' % name1)
         self.assertIsNotNone(cmd_output["id"])
         if self.haz_network:
             self.assertEqual(
@@ -264,10 +264,8 @@
         else:
             network_options = '--subnet 4.5.6.7/28 '
         cmd_output = json.loads(self.openstack(
-            'network create -f json ' +
-            '--share ' +
-            network_options +
-            name2
+            'network create -f json --share %s%s' %
+            (network_options, name2)
         ))
         self.addCleanup(self.openstack, 'network delete ' + name2)
         self.assertIsNotNone(cmd_output["id"])
@@ -313,8 +311,7 @@
         # Test list --long
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--long"
+                "network list -f json --long"
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertIn(name1, col_name)
@@ -323,9 +320,7 @@
         # Test list --long --enable
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--enable " +
-                "--long"
+                "network list -f json --enable --long"
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertIn(name1, col_name)
@@ -334,9 +329,7 @@
         # Test list --long --disable
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--disable " +
-                "--long"
+                "network list -f json --disable --long"
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertNotIn(name1, col_name)
@@ -345,8 +338,7 @@
         # Test list --share
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--share "
+                "network list -f json --share "
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertNotIn(name1, col_name)
@@ -355,8 +347,7 @@
         # Test list --no-share
         if self.haz_network:
             cmd_output = json.loads(self.openstack(
-                "network list -f json " +
-                "--no-share "
+                "network list -f json --no-share "
             ))
             col_name = [x["Name"] for x in cmd_output]
             self.assertIn(name1, col_name)
@@ -368,12 +359,10 @@
 
         name1 = uuid.uuid4().hex
         cmd_output1 = json.loads(self.openstack(
-            'network create -f json ' +
-            '--description aaaa ' +
-            name1
+            'network create -f json --description aaaa %s' % name1
         ))
 
-        self.addCleanup(self.openstack, 'network delete ' + name1)
+        self.addCleanup(self.openstack, 'network delete %s' % name1)
 
         # Get network ID
         network_id = cmd_output1['id']
@@ -386,20 +375,19 @@
 
         # Add Agent to Network
         self.openstack(
-            'network agent add network --dhcp '
-            + agent_id + ' ' + network_id
+            'network agent add network --dhcp %s %s' % (agent_id, network_id)
         )
 
         # Test network list --agent
         cmd_output3 = json.loads(self.openstack(
-            'network list -f json --agent ' + agent_id
+            'network list -f json --agent %s' % agent_id
         ))
 
         # Cleanup
         # Remove Agent from Network
         self.openstack(
-            'network agent remove network --dhcp '
-            + agent_id + ' ' + network_id
+            'network agent remove network --dhcp %s %s' %
+            (agent_id, network_id)
         )
 
         # Assert
@@ -415,16 +403,16 @@
 
         name = uuid.uuid4().hex
         cmd_output = json.loads(self.openstack(
-            'network create -f json ' +
-            '--description aaaa ' +
-            '--enable ' +
-            '--no-share ' +
-            '--internal ' +
-            '--no-default ' +
-            '--enable-port-security ' +
+            'network create -f json '
+            '--description aaaa '
+            '--enable '
+            '--no-share '
+            '--internal '
+            '--no-default '
+            '--enable-port-security %s' %
             name
         ))
-        self.addCleanup(self.openstack, 'network delete ' + name)
+        self.addCleanup(self.openstack, 'network delete %s' % name)
         self.assertIsNotNone(cmd_output["id"])
         self.assertEqual(
             'aaaa',
@@ -453,12 +441,12 @@
         )
 
         raw_output = self.openstack(
-            'network set ' +
-            '--description cccc ' +
-            '--disable ' +
-            '--share ' +
-            '--external ' +
-            '--disable-port-security ' +
+            'network set '
+            '--description cccc '
+            '--disable '
+            '--share '
+            '--external '
+            '--disable-port-security %s' %
             name
         )
         self.assertOutput('', raw_output)
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_network_qos_rule.py python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_network_qos_rule.py
--- python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_network_qos_rule.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_network_qos_rule.py	2018-06-04 03:28:48.000000000 +0000
@@ -28,62 +28,60 @@
         if not self.haz_network:
             self.skipTest("No Network service present")
 
-        self.QOS_POLICY_NAME = 'qos_policy_' + uuid.uuid4().hex
+        self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
 
         self.openstack(
-            'network qos policy create ' +
-            self.QOS_POLICY_NAME
+            'network qos policy create %s' % self.QOS_POLICY_NAME
         )
         self.addCleanup(self.openstack,
-                        'network qos policy delete ' + self.QOS_POLICY_NAME)
+                        'network qos policy delete %s' % self.QOS_POLICY_NAME)
         cmd_output = json.loads(self.openstack(
-            'network qos rule create -f json ' +
-            '--type minimum-bandwidth ' +
-            '--min-kbps 2800 ' +
-            '--egress ' +
+            'network qos rule create -f json '
+            '--type minimum-bandwidth '
+            '--min-kbps 2800 '
+            '--egress %s' %
             self.QOS_POLICY_NAME
         ))
         self.RULE_ID = cmd_output['id']
         self.addCleanup(self.openstack,
-                        'network qos rule delete ' +
-                        self.QOS_POLICY_NAME + ' ' +
-                        self.RULE_ID)
+                        'network qos rule delete %s %s' %
+                        (self.QOS_POLICY_NAME, self.RULE_ID))
         self.assertTrue(self.RULE_ID)
 
     def test_qos_rule_create_delete(self):
         # This is to check the output of qos rule delete
         policy_name = uuid.uuid4().hex
-        self.openstack('network qos policy create -f json ' + policy_name)
+        self.openstack('network qos policy create -f json %s' % policy_name)
         self.addCleanup(self.openstack,
-                        'network qos policy delete ' + policy_name)
+                        'network qos policy delete %s' % policy_name)
         rule = json.loads(self.openstack(
-            'network qos rule create -f json ' +
-            '--type minimum-bandwidth ' +
-            '--min-kbps 2800 ' +
-            '--egress ' + policy_name
+            'network qos rule create -f json '
+            '--type minimum-bandwidth '
+            '--min-kbps 2800 '
+            '--egress %s' % policy_name
         ))
         raw_output = self.openstack(
-            'network qos rule delete ' +
-            policy_name + ' ' + rule['id'])
+            'network qos rule delete %s %s' %
+            (policy_name, rule['id']))
         self.assertEqual('', raw_output)
 
     def test_qos_rule_list(self):
         cmd_output = json.loads(self.openstack(
-            'network qos rule list -f json ' + self.QOS_POLICY_NAME))
+            'network qos rule list -f json %s' % self.QOS_POLICY_NAME))
         self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output])
 
     def test_qos_rule_show(self):
         cmd_output = json.loads(self.openstack(
-            'network qos rule show -f json ' +
-            self.QOS_POLICY_NAME + ' ' + self.RULE_ID))
+            'network qos rule show -f json %s %s' %
+            (self.QOS_POLICY_NAME, self.RULE_ID)))
         self.assertEqual(self.RULE_ID, cmd_output['id'])
 
     def test_qos_rule_set(self):
-        self.openstack('network qos rule set --min-kbps 7500 ' +
-                       self.QOS_POLICY_NAME + ' ' + self.RULE_ID)
+        self.openstack('network qos rule set --min-kbps 7500 %s %s' %
+                       (self.QOS_POLICY_NAME, self.RULE_ID))
         cmd_output = json.loads(self.openstack(
-            'network qos rule show -f json ' +
-            self.QOS_POLICY_NAME + ' ' + self.RULE_ID))
+            'network qos rule show -f json %s %s' %
+            (self.QOS_POLICY_NAME, self.RULE_ID)))
         self.assertEqual(7500, cmd_output['min_kbps'])
 
 
@@ -96,58 +94,57 @@
         if not self.haz_network:
             self.skipTest("No Network service present")
 
-        self.QOS_POLICY_NAME = 'qos_policy_' + uuid.uuid4().hex
+        self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
         self.openstack(
-            'network qos policy create ' +
-            self.QOS_POLICY_NAME
+            'network qos policy create %s' % self.QOS_POLICY_NAME
         )
         self.addCleanup(self.openstack,
-                        'network qos policy delete ' + self.QOS_POLICY_NAME)
+                        'network qos policy delete %s' % self.QOS_POLICY_NAME)
         cmd_output = json.loads(self.openstack(
-            'network qos rule create -f json ' +
-            '--type dscp-marking ' +
-            '--dscp-mark 8 ' +
+            'network qos rule create -f json '
+            '--type dscp-marking '
+            '--dscp-mark 8 %s' %
             self.QOS_POLICY_NAME
         ))
         self.RULE_ID = cmd_output['id']
         self.addCleanup(self.openstack,
-                        'network qos rule delete ' +
-                        self.QOS_POLICY_NAME + ' ' + self.RULE_ID)
+                        'network qos rule delete %s %s' %
+                        (self.QOS_POLICY_NAME, self.RULE_ID))
         self.assertTrue(self.RULE_ID)
 
     def test_qos_rule_create_delete(self):
         # This is to check the output of qos rule delete
         policy_name = uuid.uuid4().hex
-        self.openstack('network qos policy create -f json ' + policy_name)
+        self.openstack('network qos policy create -f json %s' % policy_name)
         self.addCleanup(self.openstack,
-                        'network qos policy delete ' + policy_name)
+                        'network qos policy delete %s' % policy_name)
         rule = json.loads(self.openstack(
-            'network qos rule create -f json ' +
-            '--type dscp-marking ' +
-            '--dscp-mark 8 ' + policy_name
+            'network qos rule create -f json '
+            '--type dscp-marking '
+            '--dscp-mark 8 %s' % policy_name
         ))
         raw_output = self.openstack(
-            'network qos rule delete ' +
-            policy_name + ' ' + rule['id'])
+            'network qos rule delete %s %s' %
+            (policy_name, rule['id']))
         self.assertEqual('', raw_output)
 
     def test_qos_rule_list(self):
         cmd_output = json.loads(self.openstack(
-            'network qos rule list -f json ' + self.QOS_POLICY_NAME))
+            'network qos rule list -f json %s' % self.QOS_POLICY_NAME))
         self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output])
 
     def test_qos_rule_show(self):
         cmd_output = json.loads(self.openstack(
-            'network qos rule show -f json ' +
-            self.QOS_POLICY_NAME + ' ' + self.RULE_ID))
+            'network qos rule show -f json %s %s' %
+            (self.QOS_POLICY_NAME, self.RULE_ID)))
         self.assertEqual(self.RULE_ID, cmd_output['id'])
 
     def test_qos_rule_set(self):
-        self.openstack('network qos rule set --dscp-mark 32 ' +
-                       self.QOS_POLICY_NAME + ' ' + self.RULE_ID)
+        self.openstack('network qos rule set --dscp-mark 32 %s %s' %
+                       (self.QOS_POLICY_NAME, self.RULE_ID))
         cmd_output = json.loads(self.openstack(
-            'network qos rule show -f json ' +
-            self.QOS_POLICY_NAME + ' ' + self.RULE_ID))
+            'network qos rule show -f json %s %s' %
+            (self.QOS_POLICY_NAME, self.RULE_ID)))
         self.assertEqual(32, cmd_output['dscp_mark'])
 
 
@@ -160,65 +157,64 @@
         if not self.haz_network:
             self.skipTest("No Network service present")
 
-        self.QOS_POLICY_NAME = 'qos_policy_' + uuid.uuid4().hex
+        self.QOS_POLICY_NAME = 'qos_policy_%s' % uuid.uuid4().hex
         self.openstack(
-            'network qos policy create ' +
-            self.QOS_POLICY_NAME
+            'network qos policy create %s' % self.QOS_POLICY_NAME
         )
         self.addCleanup(self.openstack,
-                        'network qos policy delete ' + self.QOS_POLICY_NAME)
+                        'network qos policy delete %s' % self.QOS_POLICY_NAME)
         cmd_output = json.loads(self.openstack(
-            'network qos rule create -f json ' +
-            '--type bandwidth-limit ' +
-            '--max-kbps 10000 ' +
-            '--max-burst-kbits 1400 ' +
-            '--egress ' +
+            'network qos rule create -f json '
+            '--type bandwidth-limit '
+            '--max-kbps 10000 '
+            '--max-burst-kbits 1400 '
+            '--egress %s' %
             self.QOS_POLICY_NAME
         ))
         self.RULE_ID = cmd_output['id']
         self.addCleanup(self.openstack,
-                        'network qos rule delete ' +
-                        self.QOS_POLICY_NAME + ' ' + self.RULE_ID)
+                        'network qos rule delete %s %s' %
+                        (self.QOS_POLICY_NAME, self.RULE_ID))
         self.assertTrue(self.RULE_ID)
 
     def test_qos_rule_create_delete(self):
         # This is to check the output of qos rule delete
         policy_name = uuid.uuid4().hex
-        self.openstack('network qos policy create -f json ' + policy_name)
+        self.openstack('network qos policy create -f json %s' % policy_name)
         self.addCleanup(self.openstack,
-                        'network qos policy delete ' + policy_name)
+                        'network qos policy delete %s' % policy_name)
         rule = json.loads(self.openstack(
-            'network qos rule create -f json ' +
-            '--type bandwidth-limit ' +
-            '--max-kbps 10000 ' +
-            '--max-burst-kbits 1400 ' +
-            '--egress ' + policy_name
+            'network qos rule create -f json '
+            '--type bandwidth-limit '
+            '--max-kbps 10000 '
+            '--max-burst-kbits 1400 '
+            '--egress %s' % policy_name
         ))
         raw_output = self.openstack(
-            'network qos rule delete ' +
-            policy_name + ' ' + rule['id'])
+            'network qos rule delete %s %s' %
+            (policy_name, rule['id']))
         self.assertEqual('', raw_output)
 
     def test_qos_rule_list(self):
         cmd_output = json.loads(self.openstack(
-            'network qos rule list -f json '
-            + self.QOS_POLICY_NAME))
+            'network qos rule list -f json %s' %
+            self.QOS_POLICY_NAME))
         self.assertIn(self.RULE_ID, [rule['ID'] for rule in cmd_output])
 
     def test_qos_rule_show(self):
         cmd_output = json.loads(self.openstack(
-            'network qos rule show -f json ' +
-            self.QOS_POLICY_NAME + ' ' + self.RULE_ID))
+            'network qos rule show -f json %s %s' %
+            (self.QOS_POLICY_NAME, self.RULE_ID)))
         self.assertEqual(self.RULE_ID, cmd_output['id'])
 
     def test_qos_rule_set(self):
-        self.openstack('network qos rule set --max-kbps 15000 ' +
-                       '--max-burst-kbits 1800 ' +
-                       '--ingress ' +
-                       self.QOS_POLICY_NAME + ' ' + self.RULE_ID)
+        self.openstack('network qos rule set --max-kbps 15000 '
+                       '--max-burst-kbits 1800 '
+                       '--ingress %s %s' %
+                       (self.QOS_POLICY_NAME, self.RULE_ID))
         cmd_output = json.loads(self.openstack(
-            'network qos rule show -f json ' +
-            self.QOS_POLICY_NAME + ' ' + self.RULE_ID))
+            'network qos rule show -f json %s %s' %
+            (self.QOS_POLICY_NAME, self.RULE_ID)))
         self.assertEqual(15000, cmd_output['max_kbps'])
         self.assertEqual(1800, cmd_output['max_burst_kbps'])
         self.assertEqual('ingress', cmd_output['direction'])
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_port.py python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_port.py
--- python-openstackclient-3.14.0/openstackclient/tests/functional/network/v2/test_port.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/functional/network/v2/test_port.py	2018-06-04 03:28:38.000000000 +0000
@@ -33,7 +33,7 @@
 
             # Create a network for the port tests
             cls.openstack(
-                'network create ' + cls.NETWORK_NAME
+                'network create %s' % cls.NETWORK_NAME
             )
 
     @classmethod
@@ -41,7 +41,7 @@
         try:
             if cls.haz_network:
                 raw_output = cls.openstack(
-                    'network delete ' + cls.NETWORK_NAME
+                    'network delete %s' % cls.NETWORK_NAME
                 )
                 cls.assertOutput('', raw_output)
         finally:
@@ -56,8 +56,8 @@
     def test_port_delete(self):
         """Test create, delete multiple"""
         json_output = json.loads(self.openstack(
-            'port create -f json --network ' +
-            self.NETWORK_NAME + ' ' + self.NAME
+            'port create -f json --network %s %s' %
+            (self.NETWORK_NAME, self.NAME)
         ))
         id1 = json_output.get('id')
         self.assertIsNotNone(id1)
@@ -65,8 +65,8 @@
         self.assertEqual(self.NAME, json_output.get('name'))
 
         json_output = json.loads(self.openstack(
-            'port create -f json --network ' + self.NETWORK_NAME + ' ' +
-            self.NAME + 'x'
+            'port create -f json --network %s %sx' %
+            (self.NETWORK_NAME, self.NAME)
         ))
         id2 = json_output.get('id')
         self.assertIsNotNone(id2)
@@ -74,31 +74,31 @@
         self.assertEqual(self.NAME + 'x', json_output.get('name'))
 
         # Clean up after ourselves
-        raw_output = self.openstack('port delete ' + id1 + ' ' + id2)
+        raw_output = self.openstack('port delete %s %s' % (id1, id2))
         self.assertOutput('', raw_output)
 
     def test_port_list(self):
         """Test create defaults, list, delete"""
         json_output = json.loads(self.openstack(
-            'port create -f json --network ' + self.NETWORK_NAME + ' ' +
-            self.NAME
+            'port create -f json --network %s %s' %
+            (self.NETWORK_NAME, self.NAME)
         ))
         id1 = json_output.get('id')
         self.assertIsNotNone(id1)
         mac1 = json_output.get('mac_address')
         self.assertIsNotNone(mac1)
-        self.addCleanup(self.openstack, 'port delete ' + id1)
+        self.addCleanup(self.openstack, 'port delete %s' % id1)
         self.assertEqual(self.NAME, json_output.get('name'))
 
         json_output = json.loads(self.openstack(
-            'port create -f json --network ' + self.NETWORK_NAME + ' ' +
-            self.NAME + 'x'
+            'port create -f json --network %s %sx' %
+            (self.NETWORK_NAME, self.NAME)
         ))
         id2 = json_output.get('id')
         self.assertIsNotNone(id2)
         mac2 = json_output.get('mac_address')
         self.assertIsNotNone(mac2)
-        self.addCleanup(self.openstack, 'port delete ' + id2)
+        self.addCleanup(self.openstack, 'port delete %s' % id2)
         self.assertEqual(self.NAME + 'x', json_output.get('name'))
 
         # Test list
@@ -122,7 +122,7 @@
 
         # Test list --mac-address
         json_output = json.loads(self.openstack(
-            'port list -f json --mac-address ' + mac2
+            'port list -f json --mac-address %s' % mac2
         ))
         item_map = {item.get('ID'): item.get('MAC Address') for item in
                     json_output}
@@ -145,26 +145,26 @@
         """Test create, set, show, delete"""
         name = uuid.uuid4().hex
         json_output = json.loads(self.openstack(
-            'port create -f json ' +
-            '--network ' + self.NETWORK_NAME + ' ' +
-            '--description xyzpdq ' +
-            '--disable ' +
-            name
+            'port create -f json '
+            '--network %s '
+            '--description xyzpdq '
+            '--disable %s' %
+            (self.NETWORK_NAME, name)
         ))
         id1 = json_output.get('id')
-        self.addCleanup(self.openstack, 'port delete ' + id1)
+        self.addCleanup(self.openstack, 'port delete %s' % id1)
         self.assertEqual(name, json_output.get('name'))
         self.assertEqual('xyzpdq', json_output.get('description'))
         self.assertEqual('DOWN', json_output.get('admin_state_up'))
 
         raw_output = self.openstack(
-            'port set ' + '--enable ' +
+            'port set --enable %s' %
             name
         )
         self.assertOutput('', raw_output)
 
         json_output = json.loads(self.openstack(
-            'port show -f json ' + name
+            'port show -f json %s' % name
         ))
         sg_id = json_output.get('security_group_ids')
 
@@ -174,30 +174,30 @@
         self.assertIsNotNone(json_output.get('mac_address'))
 
         raw_output = self.openstack(
-            'port unset --security-group ' + sg_id + ' ' + id1)
+            'port unset --security-group %s %s' % (sg_id, id1))
         self.assertOutput('', raw_output)
 
         json_output = json.loads(self.openstack(
-            'port show -f json ' + name
+            'port show -f json %s' % name
         ))
         self.assertEqual('', json_output.get('security_group_ids'))
 
     def test_port_admin_set(self):
         """Test create, set (as admin), show, delete"""
         json_output = json.loads(self.openstack(
-            'port create -f json ' +
-            '--network ' + self.NETWORK_NAME + ' ' + self.NAME
+            'port create -f json '
+            '--network %s %s' % (self.NETWORK_NAME, self.NAME)
         ))
         id_ = json_output.get('id')
-        self.addCleanup(self.openstack, 'port delete ' + id_)
+        self.addCleanup(self.openstack, 'port delete %s' % id_)
 
         raw_output = self.openstack(
             '--os-username admin '
-            + 'port set --mac-address 11:22:33:44:55:66 '
-            + self.NAME)
+            'port set --mac-address 11:22:33:44:55:66 %s' %
+            self.NAME)
         self.assertOutput('', raw_output)
         json_output = json.loads(self.openstack(
-            'port show -f json ' + self.NAME
+            'port show -f json %s' % self.NAME
         ))
         self.assertEqual(json_output.get('mac_address'), '11:22:33:44:55:66')
 
@@ -205,41 +205,41 @@
         """Test create, set, show, delete"""
         sg_name1 = uuid.uuid4().hex
         json_output = json.loads(self.openstack(
-            'security group create -f json ' +
+            'security group create -f json %s' %
             sg_name1
         ))
         sg_id1 = json_output.get('id')
-        self.addCleanup(self.openstack, 'security group delete ' + sg_id1)
+        self.addCleanup(self.openstack, 'security group delete %s' % sg_id1)
 
         sg_name2 = uuid.uuid4().hex
         json_output = json.loads(self.openstack(
-            'security group create -f json ' +
+            'security group create -f json %s' %
             sg_name2
         ))
         sg_id2 = json_output.get('id')
-        self.addCleanup(self.openstack, 'security group delete ' + sg_id2)
+        self.addCleanup(self.openstack, 'security group delete %s' % sg_id2)
 
         name = uuid.uuid4().hex
         json_output = json.loads(self.openstack(
-            'port create -f json ' +
-            '--network ' + self.NETWORK_NAME + ' ' +
-            '--security-group ' + sg_name1 + ' ' +
-            name
+            'port create -f json '
+            '--network %s '
+            '--security-group %s %s' %
+            (self.NETWORK_NAME, sg_name1, name)
         ))
         id1 = json_output.get('id')
-        self.addCleanup(self.openstack, 'port delete ' + id1)
+        self.addCleanup(self.openstack, 'port delete %s' % id1)
         self.assertEqual(name, json_output.get('name'))
         self.assertEqual(sg_id1, json_output.get('security_group_ids'))
 
         raw_output = self.openstack(
-            'port set ' +
-            '--security-group ' + sg_name2 + ' ' +
-            name
+            'port set '
+            '--security-group %s %s' %
+            (sg_name2, name)
         )
         self.assertOutput('', raw_output)
 
         json_output = json.loads(self.openstack(
-            'port show -f json ' + name
+            'port show -f json %s' % name
         ))
         self.assertEqual(name, json_output.get('name'))
         self.assertIn(
@@ -254,11 +254,11 @@
         )
 
         raw_output = self.openstack(
-            'port unset --security-group ' + sg_id1 + ' ' + id1)
+            'port unset --security-group %s %s' % (sg_id1, id1))
         self.assertOutput('', raw_output)
 
         json_output = json.loads(self.openstack(
-            'port show -f json ' + name
+            'port show -f json %s' % name
         ))
         self.assertEqual(
             # TODO(dtroyer): output formatters should do this on JSON!
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/functional/object/v1/test_object.py python-openstackclient-3.14.2/openstackclient/tests/functional/object/v1/test_object.py
--- python-openstackclient-3.14.0/openstackclient/tests/functional/object/v1/test_object.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/functional/object/v1/test_object.py	2018-06-04 03:28:38.000000000 +0000
@@ -53,39 +53,39 @@
         self.openstack('container save ' + self.CONTAINER_NAME)
         # TODO(stevemar): Assert returned fields
 
-        raw_output = self.openstack('object create ' + self.CONTAINER_NAME
-                                    + ' ' + object_file)
+        raw_output = self.openstack('object create %s %s' %
+                                    (self.CONTAINER_NAME, object_file))
         items = self.parse_listing(raw_output)
         self.assert_show_fields(items, OBJECT_FIELDS)
 
-        raw_output = self.openstack('object list ' + self.CONTAINER_NAME)
+        raw_output = self.openstack('object list %s' % self.CONTAINER_NAME)
         items = self.parse_listing(raw_output)
         self.assert_table_structure(items, BASIC_LIST_HEADERS)
 
-        self.openstack('object save ' + self.CONTAINER_NAME
-                       + ' ' + object_file)
+        self.openstack('object save %s %s' %
+                       (self.CONTAINER_NAME, object_file))
         # TODO(stevemar): Assert returned fields
 
         tmp_file = 'tmp.txt'
         self.addCleanup(os.remove, tmp_file)
-        self.openstack('object save ' + self.CONTAINER_NAME
-                       + ' ' + object_file + ' --file ' + tmp_file)
+        self.openstack('object save %s %s --file %s' %
+                       (self.CONTAINER_NAME, object_file, tmp_file))
         # TODO(stevemar): Assert returned fields
 
-        raw_output = self.openstack('object save ' + self.CONTAINER_NAME
-                                    + ' ' + object_file + ' --file -')
+        raw_output = self.openstack('object save %s %s --file -' %
+                                    (self.CONTAINER_NAME, object_file))
         self.assertEqual(raw_output, 'test content')
 
-        self.openstack('object show ' + self.CONTAINER_NAME
-                       + ' ' + object_file)
+        self.openstack('object show %s %s' %
+                       (self.CONTAINER_NAME, object_file))
         # TODO(stevemar): Assert returned fields
 
-        raw_output = self.openstack('object delete ' + self.CONTAINER_NAME
-                                    + ' ' + object_file)
+        raw_output = self.openstack('object delete %s %s' %
+                                    (self.CONTAINER_NAME, object_file))
         self.assertEqual(0, len(raw_output))
 
-        self.openstack('object create ' + self.CONTAINER_NAME
-                       + ' ' + object_file)
-        raw_output = self.openstack('container delete -r ' +
+        self.openstack('object create %s %s' %
+                       (self.CONTAINER_NAME, object_file))
+        raw_output = self.openstack('container delete -r %s' %
                                     self.CONTAINER_NAME)
         self.assertEqual(0, len(raw_output))
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/functional/volume/v1/test_volume_type.py python-openstackclient-3.14.2/openstackclient/tests/functional/volume/v1/test_volume_type.py
--- python-openstackclient-3.14.0/openstackclient/tests/functional/volume/v1/test_volume_type.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/functional/volume/v1/test_volume_type.py	2018-06-04 03:28:38.000000000 +0000
@@ -26,13 +26,13 @@
     def setUpClass(cls):
         super(VolumeTypeTests, cls).setUpClass()
         cmd_output = json.loads(cls.openstack(
-            'volume type create -f json ' + cls.NAME))
+            'volume type create -f json %s' % cls.NAME))
         cls.assertOutput(cls.NAME, cmd_output['name'])
 
     @classmethod
     def tearDownClass(cls):
         try:
-            raw_output = cls.openstack('volume type delete ' + cls.NAME)
+            raw_output = cls.openstack('volume type delete %s' % cls.NAME)
             cls.assertOutput('', raw_output)
         finally:
             super(VolumeTypeTests, cls).tearDownClass()
@@ -43,47 +43,47 @@
 
     def test_volume_type_show(self):
         cmd_output = json.loads(self.openstack(
-            'volume type show -f json ' + self.NAME))
+            'volume type show -f json %s' % self.NAME))
         self.assertEqual(self.NAME, cmd_output['name'])
 
     def test_volume_type_set_unset_properties(self):
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d ' + self.NAME)
+            'volume type set --property a=b --property c=d %s' % self.NAME)
         self.assertEqual("", raw_output)
 
         cmd_output = json.loads(self.openstack(
             'volume type show -f json ' + self.NAME))
         self.assertEqual("a='b', c='d'", cmd_output['properties'])
 
-        raw_output = self.openstack('volume type unset --property a '
-                                    + self.NAME)
+        raw_output = self.openstack('volume type unset --property a %s' %
+                                    self.NAME)
         self.assertEqual("", raw_output)
         cmd_output = json.loads(self.openstack(
-            'volume type show -f json ' + self.NAME))
+            'volume type show -f json %s' % self.NAME))
         self.assertEqual("c='d'", cmd_output['properties'])
 
     def test_volume_type_set_unset_multiple_properties(self):
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d ' + self.NAME)
+            'volume type set --property a=b --property c=d %s' % self.NAME)
         self.assertEqual("", raw_output)
 
         cmd_output = json.loads(self.openstack(
-            'volume type show -f json ' + self.NAME))
+            'volume type show -f json %s' % self.NAME))
         self.assertEqual("a='b', c='d'", cmd_output['properties'])
 
         raw_output = self.openstack(
-            'volume type unset --property a --property c ' + self.NAME)
+            'volume type unset --property a --property c %s' % self.NAME)
         self.assertEqual("", raw_output)
         cmd_output = json.loads(self.openstack(
-            'volume type show -f json ' + self.NAME))
+            'volume type show -f json %s' % self.NAME))
         self.assertEqual("", cmd_output['properties'])
 
     def test_multi_delete(self):
         vol_type1 = uuid.uuid4().hex
         vol_type2 = uuid.uuid4().hex
-        self.openstack('volume type create ' + vol_type1)
+        self.openstack('volume type create %s' % vol_type1)
         time.sleep(5)
-        self.openstack('volume type create ' + vol_type2)
+        self.openstack('volume type create %s' % vol_type2)
         time.sleep(5)
         cmd = 'volume type delete %s %s' % (vol_type1, vol_type2)
         raw_output = self.openstack(cmd)
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/functional/volume/v2/test_volume_type.py python-openstackclient-3.14.2/openstackclient/tests/functional/volume/v2/test_volume_type.py
--- python-openstackclient-3.14.0/openstackclient/tests/functional/volume/v2/test_volume_type.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/functional/volume/v2/test_volume_type.py	2018-06-04 03:28:38.000000000 +0000
@@ -26,13 +26,13 @@
     def setUpClass(cls):
         super(VolumeTypeTests, cls).setUpClass()
         cmd_output = json.loads(cls.openstack(
-            'volume type create -f json --private ' + cls.NAME))
+            'volume type create -f json --private %s' % cls.NAME))
         cls.assertOutput(cls.NAME, cmd_output['name'])
 
     @classmethod
     def tearDownClass(cls):
         try:
-            raw_output = cls.openstack('volume type delete ' + cls.NAME)
+            raw_output = cls.openstack('volume type delete %s' % cls.NAME)
             cls.assertOutput('', raw_output)
         finally:
             super(VolumeTypeTests, cls).tearDownClass()
@@ -49,55 +49,55 @@
 
     def test_volume_type_show(self):
         cmd_output = json.loads(self.openstack(
-            'volume type show -f json ' + self.NAME))
+            'volume type show -f json %s' % self.NAME))
         self.assertEqual(self.NAME, cmd_output['name'])
 
     def test_volume_type_set_unset_properties(self):
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d ' + self.NAME)
+            'volume type set --property a=b --property c=d %s' % self.NAME)
         self.assertEqual("", raw_output)
         cmd_output = json.loads(self.openstack(
-            'volume type show -f json ' + self.NAME))
+            'volume type show -f json %s' % self.NAME))
         # TODO(amotoki): properties output should be machine-readable
         self.assertEqual("a='b', c='d'", cmd_output['properties'])
 
-        raw_output = self.openstack('volume type unset --property a '
-                                    + self.NAME)
+        raw_output = self.openstack('volume type unset --property a %s' %
+                                    self.NAME)
         self.assertEqual("", raw_output)
         cmd_output = json.loads(self.openstack(
-            'volume type show -f json ' + self.NAME))
+            'volume type show -f json %s' % self.NAME))
         self.assertEqual("c='d'", cmd_output['properties'])
 
     def test_volume_type_set_unset_multiple_properties(self):
         raw_output = self.openstack(
-            'volume type set --property a=b --property c=d ' + self.NAME)
+            'volume type set --property a=b --property c=d %s' % self.NAME)
         self.assertEqual("", raw_output)
         cmd_output = json.loads(self.openstack(
-            'volume type show -f json ' + self.NAME))
+            'volume type show -f json %s' % self.NAME))
         self.assertEqual("a='b', c='d'", cmd_output['properties'])
 
         raw_output = self.openstack(
-            'volume type unset --property a --property c ' + self.NAME)
+            'volume type unset --property a --property c %s' % self.NAME)
         self.assertEqual("", raw_output)
         cmd_output = json.loads(self.openstack(
-            'volume type show -f json ' + self.NAME))
+            'volume type show -f json %s' % self.NAME))
         self.assertEqual("", cmd_output['properties'])
 
     def test_volume_type_set_unset_project(self):
         raw_output = self.openstack(
-            'volume type set --project admin ' + self.NAME)
+            'volume type set --project admin %s' % self.NAME)
         self.assertEqual("", raw_output)
 
         raw_output = self.openstack(
-            'volume type unset --project admin ' + self.NAME)
+            'volume type unset --project admin %s' % self.NAME)
         self.assertEqual("", raw_output)
 
     def test_multi_delete(self):
         vol_type1 = uuid.uuid4().hex
         vol_type2 = uuid.uuid4().hex
-        self.openstack('volume type create ' + vol_type1)
+        self.openstack('volume type create %s' % vol_type1)
         time.sleep(5)
-        self.openstack('volume type create ' + vol_type2)
+        self.openstack('volume type create %s' % vol_type2)
         time.sleep(5)
         cmd = 'volume type delete %s %s' % (vol_type1, vol_type2)
         raw_output = self.openstack(cmd)
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/unit/api/test_compute_v2.py python-openstackclient-3.14.2/openstackclient/tests/unit/api/test_compute_v2.py
--- python-openstackclient-3.14.0/openstackclient/tests/unit/api/test_compute_v2.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/unit/api/test_compute_v2.py	2018-06-04 03:28:38.000000000 +0000
@@ -55,6 +55,43 @@
         FAKE_FLOATING_IP_RESP_2,
     ]
 
+    FAKE_SERVER_RESP_1 = {
+        'id': 1,
+        'name': 'server1',
+    }
+
+    def test_floating_ip_add_id(self):
+        self.requests_mock.register_uri(
+            'POST',
+            FAKE_URL + '/servers/1/action',
+            json={'server': {}},
+            status_code=200,
+        )
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/servers/1',
+            json={'server': self.FAKE_SERVER_RESP_1},
+            status_code=200,
+        )
+        ret = self.api.floating_ip_add('1', '1.0.1.0')
+        self.assertEqual(200, ret.status_code)
+
+    def test_floating_ip_add_name(self):
+        self.requests_mock.register_uri(
+            'POST',
+            FAKE_URL + '/servers/1/action',
+            json={'server': {}},
+            status_code=200,
+        )
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/servers/server1',
+            json={'server': self.FAKE_SERVER_RESP_1},
+            status_code=200,
+        )
+        ret = self.api.floating_ip_add('server1', '1.0.1.0')
+        self.assertEqual(200, ret.status_code)
+
     def test_floating_ip_create(self):
         self.requests_mock.register_uri(
             'POST',
@@ -144,6 +181,36 @@
         ret = self.api.floating_ip_list()
         self.assertEqual(self.LIST_FLOATING_IP_RESP, ret)
 
+    def test_floating_ip_remove_id(self):
+        self.requests_mock.register_uri(
+            'POST',
+            FAKE_URL + '/servers/1/action',
+            status_code=200,
+        )
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/servers/1',
+            json={'server': self.FAKE_SERVER_RESP_1},
+            status_code=200,
+        )
+        ret = self.api.floating_ip_remove('1', '1.0.1.0')
+        self.assertEqual(200, ret.status_code)
+
+    def test_floating_ip_remove_name(self):
+        self.requests_mock.register_uri(
+            'POST',
+            FAKE_URL + '/servers/1/action',
+            status_code=200,
+        )
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/servers/server1',
+            json={'server': self.FAKE_SERVER_RESP_1},
+            status_code=200,
+        )
+        ret = self.api.floating_ip_remove('server1', '1.0.1.0')
+        self.assertEqual(200, ret.status_code)
+
 
 class TestFloatingIPPool(TestComputeAPIv2):
 
@@ -163,6 +230,115 @@
         self.assertEqual(self.LIST_FLOATING_IP_POOL_RESP, ret)
 
 
+class TestHost(TestComputeAPIv2):
+
+    FAKE_HOST_RESP_1 = {
+        "zone": "internal",
+        "host_name": "myhost",
+        "service": "conductor",
+    }
+
+    FAKE_HOST_RESP_2 = {
+        "zone": "internal",
+        "host_name": "myhost",
+        "service": "scheduler",
+    }
+
+    FAKE_HOST_RESP_3 = {
+        "zone": "nova",
+        "host_name": "myhost",
+        "service": "compute",
+    }
+
+    LIST_HOST_RESP = [
+        FAKE_HOST_RESP_1,
+        FAKE_HOST_RESP_2,
+        FAKE_HOST_RESP_3,
+    ]
+
+    def test_host_list_no_options(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/os-hosts',
+            json={'hosts': self.LIST_HOST_RESP},
+            status_code=200,
+        )
+        ret = self.api.host_list()
+        self.assertEqual(self.LIST_HOST_RESP, ret)
+
+    def test_host_list_zone(self):
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/os-hosts?zone=nova',
+            json={'hosts': [self.FAKE_HOST_RESP_3]},
+            status_code=200,
+        )
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/os-hosts',
+            json={'hosts': [self.FAKE_HOST_RESP_3]},
+            status_code=200,
+        )
+        ret = self.api.host_list(zone='nova')
+        self.assertEqual([self.FAKE_HOST_RESP_3], ret)
+
+    def test_host_set_none(self):
+        ret = self.api.host_set(host='myhost')
+        self.assertIsNone(ret)
+
+    def test_host_set(self):
+        self.requests_mock.register_uri(
+            'PUT',
+            FAKE_URL + '/os-hosts/myhost',
+            json={},
+            status_code=200,
+        )
+        ret = self.api.host_set(host='myhost', status='enabled')
+        self.assertEqual({}, ret)
+
+    def test_host_show(self):
+        FAKE_RESOURCE_1 = {
+            "cpu": 2,
+            "disk_gb": 1028,
+            "host": "c1a7de0ac9d94e4baceae031d05caae3",
+            "memory_mb": 8192,
+            "project": "(total)",
+        }
+        FAKE_RESOURCE_2 = {
+            "cpu": 0,
+            "disk_gb": 0,
+            "host": "c1a7de0ac9d94e4baceae031d05caae3",
+            "memory_mb": 512,
+            "project": "(used_now)",
+        }
+        FAKE_RESOURCE_3 = {
+            "cpu": 0,
+            "disk_gb": 0,
+            "host": "c1a7de0ac9d94e4baceae031d05caae3",
+            "memory_mb": 0,
+            "project": "(used_max)",
+        }
+        FAKE_HOST_RESP = [
+            {'resource': FAKE_RESOURCE_1},
+            {'resource': FAKE_RESOURCE_2},
+            {'resource': FAKE_RESOURCE_3},
+        ]
+        FAKE_HOST_LIST = [
+            FAKE_RESOURCE_1,
+            FAKE_RESOURCE_2,
+            FAKE_RESOURCE_3,
+        ]
+
+        self.requests_mock.register_uri(
+            'GET',
+            FAKE_URL + '/os-hosts/myhost',
+            json={'host': FAKE_HOST_RESP},
+            status_code=200,
+        )
+        ret = self.api.host_show(host='myhost')
+        self.assertEqual(FAKE_HOST_LIST, ret)
+
+
 class TestNetwork(TestComputeAPIv2):
 
     FAKE_NETWORK_RESP = {
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/unit/compute/v2/fakes.py python-openstackclient-3.14.2/openstackclient/tests/unit/compute/v2/fakes.py
--- python-openstackclient-3.14.0/openstackclient/tests/unit/compute/v2/fakes.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/unit/compute/v2/fakes.py	2018-06-04 03:28:48.000000000 +0000
@@ -1230,10 +1230,7 @@
             'project': 'project-' + uuid.uuid4().hex,
         }
         host_info.update(attrs)
-        host = fakes.FakeResource(
-            info=copy.deepcopy(host_info),
-            loaded=True)
-        return host
+        return host_info
 
 
 class FakeServerGroup(object):
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/unit/compute/v2/test_host.py python-openstackclient-3.14.2/openstackclient/tests/unit/compute/v2/test_host.py
--- python-openstackclient-3.14.0/openstackclient/tests/unit/compute/v2/test_host.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/unit/compute/v2/test_host.py	2018-06-04 03:28:38.000000000 +0000
@@ -13,6 +13,8 @@
 #   under the License.
 #
 
+import mock
+
 from openstackclient.compute.v2 import host
 from openstackclient.tests.unit.compute.v2 import fakes as compute_fakes
 from openstackclient.tests.unit import utils as tests_utils
@@ -23,11 +25,13 @@
     def setUp(self):
         super(TestHost, self).setUp()
 
-        # Get a shortcut to the FlavorManager Mock
-        self.host_mock = self.app.client_manager.compute.hosts
-        self.host_mock.reset_mock()
+        # Get a shortcut to the compute client
+        self.compute = self.app.client_manager.compute
 
 
+@mock.patch(
+    'openstackclient.api.compute_v2.APIv2.host_list'
+)
 class TestHostList(TestHost):
 
     host = compute_fakes.FakeHost.create_one_host()
@@ -39,19 +43,18 @@
     )
 
     data = [(
-        host.host_name,
-        host.service,
-        host.zone,
+        host['host_name'],
+        host['service'],
+        host['zone'],
     )]
 
     def setUp(self):
         super(TestHostList, self).setUp()
 
-        self.host_mock.list_all.return_value = [self.host]
-
         self.cmd = host.ListHost(self.app, None)
 
-    def test_host_list_no_option(self):
+    def test_host_list_no_option(self, h_mock):
+        h_mock.return_value = [self.host]
         arglist = []
         verifylist = []
 
@@ -59,44 +62,48 @@
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.host_mock.list_all.assert_called_with(None)
+        h_mock.assert_called_with(None)
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
-    def test_host_list_with_option(self):
+    def test_host_list_with_option(self, h_mock):
+        h_mock.return_value = [self.host]
         arglist = [
-            '--zone', self.host.zone,
+            '--zone', self.host['zone'],
         ]
         verifylist = [
-            ('zone', self.host.zone),
+            ('zone', self.host['zone']),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.host_mock.list_all.assert_called_with(self.host.zone)
+        h_mock.assert_called_with(self.host['zone'])
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
 
+@mock.patch(
+    'openstackclient.api.compute_v2.APIv2.host_set'
+)
 class TestHostSet(TestHost):
 
     def setUp(self):
         super(TestHostSet, self).setUp()
 
         self.host = compute_fakes.FakeHost.create_one_host()
-        self.host_mock.get.return_value = self.host
-        self.host_mock.update.return_value = None
 
         self.cmd = host.SetHost(self.app, None)
 
-    def test_host_set_no_option(self):
+    def test_host_set_no_option(self, h_mock):
+        h_mock.return_value = self.host
+        h_mock.update.return_value = None
         arglist = [
-            self.host.host
+            self.host['host'],
         ]
         verifylist = [
-            ('host', self.host.host)
+            ('host', self.host['host']),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -105,18 +112,20 @@
         self.assertIsNone(result)
 
         body = {}
-        self.host_mock.update.assert_called_with(self.host.host, body)
+        h_mock.assert_called_with(self.host['host'], body)
 
-    def test_host_set(self):
+    def test_host_set(self, h_mock):
+        h_mock.return_value = self.host
+        h_mock.update.return_value = None
         arglist = [
             '--enable',
             '--disable-maintenance',
-            self.host.host
+            self.host['host'],
         ]
         verifylist = [
             ('enable', True),
             ('enable_maintenance', False),
-            ('host', self.host.host)
+            ('host', self.host['host']),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
@@ -125,9 +134,12 @@
         self.assertIsNone(result)
 
         body = {'status': 'enable', 'maintenance_mode': 'disable'}
-        self.host_mock.update.assert_called_with(self.host.host, body)
+        h_mock.assert_called_with(self.host['host'], body)
 
 
+@mock.patch(
+    'openstackclient.api.compute_v2.APIv2.host_show'
+)
 class TestHostShow(TestHost):
 
     host = compute_fakes.FakeHost.create_one_host()
@@ -139,22 +151,22 @@
         'Memory MB',
         'Disk GB',
     )
+
     data = [(
-        host.host,
-        host.project,
-        host.cpu,
-        host.memory_mb,
-        host.disk_gb,
+        host['host'],
+        host['project'],
+        host['cpu'],
+        host['memory_mb'],
+        host['disk_gb'],
     )]
 
     def setUp(self):
         super(TestHostShow, self).setUp()
 
-        self.host_mock.get.return_value = [self.host]
-
         self.cmd = host.ShowHost(self.app, None)
 
-    def test_host_show_no_option(self):
+    def test_host_show_no_option(self, h_mock):
+        h_mock.host_show.return_value = [self.host]
         arglist = []
         verifylist = []
 
@@ -162,18 +174,19 @@
         self.assertRaises(tests_utils.ParserException, self.check_parser,
                           self.cmd, arglist, verifylist)
 
-    def test_host_show_with_option(self):
+    def test_host_show_with_option(self, h_mock):
+        h_mock.return_value = [self.host]
         arglist = [
-            self.host.host_name,
+            self.host['host_name'],
         ]
         verifylist = [
-            ('host', self.host.host_name),
+            ('host', self.host['host_name']),
         ]
 
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
         columns, data = self.cmd.take_action(parsed_args)
 
-        self.host_mock.get.assert_called_with(self.host.host_name)
+        h_mock.assert_called_with(self.host['host_name'])
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/unit/compute/v2/test_server.py python-openstackclient-3.14.2/openstackclient/tests/unit/compute/v2/test_server.py
--- python-openstackclient-3.14.0/openstackclient/tests/unit/compute/v2/test_server.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/unit/compute/v2/test_server.py	2018-06-04 03:28:48.000000000 +0000
@@ -141,48 +141,148 @@
         self._test_server_add_fixed_ip(extralist, '5.6.7.8')
 
 
-class TestServerAddFloatingIP(TestServer):
+@mock.patch(
+    'openstackclient.api.compute_v2.APIv2.floating_ip_add'
+)
+class TestServerAddFloatingIPCompute(compute_fakes.TestComputev2):
 
     def setUp(self):
-        super(TestServerAddFloatingIP, self).setUp()
+        super(TestServerAddFloatingIPCompute, self).setUp()
+
+        self.app.client_manager.network_endpoint_enabled = False
 
         # Get the command object to test
         self.cmd = server.AddFloatingIP(self.app, None)
 
-        # Set add_floating_ip method to be tested.
-        self.methods = {
-            'add_floating_ip': None,
-        }
+    def test_server_add_floating_ip_default(self, fip_mock):
+        _floating_ip = compute_fakes.FakeFloatingIP.create_one_floating_ip()
+        arglist = [
+            'server1',
+            _floating_ip['ip'],
+        ]
+        verifylist = [
+            ('server', 'server1'),
+            ('ip_address', _floating_ip['ip']),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        self.find_port = mock.Mock()
-        self.app.client_manager.network.find_port = self.find_port
+        self.cmd.take_action(parsed_args)
 
-    def _test_server_add_floating_ip(self, extralist, fixed_ip_address):
-        servers = self.setup_servers_mock(count=1)
+        fip_mock.assert_called_once_with(
+            'server1',
+            _floating_ip['ip'],
+            fixed_address=None,
+        )
 
+    def test_server_add_floating_ip_fixed(self, fip_mock):
+        _floating_ip = compute_fakes.FakeFloatingIP.create_one_floating_ip()
         arglist = [
-            servers[0].id,
-            '1.2.3.4',
-        ] + extralist
+            '--fixed-ip-address', _floating_ip['fixed_ip'],
+            'server1',
+            _floating_ip['ip'],
+        ]
         verifylist = [
-            ('server', servers[0].id),
-            ('ip_address', '1.2.3.4'),
-            ('fixed_ip_address', fixed_ip_address),
+            ('fixed_ip_address', _floating_ip['fixed_ip']),
+            ('server', 'server1'),
+            ('ip_address', _floating_ip['ip']),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
 
-        servers[0].add_floating_ip.assert_called_once_with('1.2.3.4',
-                                                           fixed_ip_address)
-        self.assertIsNone(result)
+        fip_mock.assert_called_once_with(
+            'server1',
+            _floating_ip['ip'],
+            fixed_address=_floating_ip['fixed_ip'],
+        )
+
+
+class TestServerAddFloatingIPNetwork(
+    TestServer,
+    network_fakes.TestNetworkV2,
+):
+
+    def setUp(self):
+        super(TestServerAddFloatingIPNetwork, self).setUp()
+
+        self.app.client_manager.network = mock.Mock()
+        self.network = self.app.client_manager.network
+        self.network.update_ip = mock.Mock(return_value=None)
+
+        # Get the command object to test
+        self.cmd = server.AddFloatingIP(self.app, self.namespace)
+
+    def test_server_add_floating_ip_default(self):
+        _server = compute_fakes.FakeServer.create_one_server()
+        self.servers_mock.get.return_value = _server
+        _port = network_fakes.FakePort.create_one_port()
+        _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
+        self.network.find_ip = mock.Mock(return_value=_floating_ip)
+        self.network.ports = mock.Mock(return_value=[_port])
+        arglist = [
+            _server.id,
+            _floating_ip['ip'],
+        ]
+        verifylist = [
+            ('server', _server.id),
+            ('ip_address', _floating_ip['ip']),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        self.cmd.take_action(parsed_args)
+
+        attrs = {
+            'port_id': _port.id,
+        }
 
-    def test_server_add_floating_ip(self):
-        self._test_server_add_floating_ip([], None)
+        self.network.find_ip.assert_called_once_with(
+            _floating_ip['ip'],
+            ignore_missing=False,
+        )
+        self.network.ports.assert_called_once_with(
+            device_id=_server.id,
+        )
+        self.network.update_ip.assert_called_once_with(
+            _floating_ip,
+            **attrs
+        )
+
+    def test_server_add_floating_ip_fixed(self):
+        _server = compute_fakes.FakeServer.create_one_server()
+        self.servers_mock.get.return_value = _server
+        _port = network_fakes.FakePort.create_one_port()
+        _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
+        self.network.find_ip = mock.Mock(return_value=_floating_ip)
+        self.network.ports = mock.Mock(return_value=[_port])
+        arglist = [
+            '--fixed-ip-address', _floating_ip['fixed_ip'],
+            _server.id,
+            _floating_ip['ip'],
+        ]
+        verifylist = [
+            ('fixed_ip_address', _floating_ip['fixed_ip']),
+            ('server', _server.id),
+            ('ip_address', _floating_ip['ip']),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-    def test_server_add_floating_ip_to_fixed_ip(self):
-        extralist = ['--fixed-ip-address', '5.6.7.8']
-        self._test_server_add_floating_ip(extralist, '5.6.7.8')
+        self.cmd.take_action(parsed_args)
+
+        attrs = {
+            'port_id': _port.id,
+        }
+
+        self.network.find_ip.assert_called_once_with(
+            _floating_ip['ip'],
+            ignore_missing=False,
+        )
+        self.network.ports.assert_called_once_with(
+            device_id=_server.id,
+        )
+        self.network.update_ip.assert_called_once_with(
+            _floating_ip,
+            **attrs
+        )
 
 
 class TestServerAddPort(TestServer):
@@ -2302,36 +2402,80 @@
         self.server.rescue.assert_called_with(image=None, password=password)
 
 
-class TestServerRemoveFloatingIP(TestServer):
+@mock.patch(
+    'openstackclient.api.compute_v2.APIv2.floating_ip_remove'
+)
+class TestServerRemoveFloatingIPCompute(compute_fakes.TestComputev2):
 
     def setUp(self):
-        super(TestServerRemoveFloatingIP, self).setUp()
+        super(TestServerRemoveFloatingIPCompute, self).setUp()
+
+        self.app.client_manager.network_endpoint_enabled = False
 
         # Get the command object to test
         self.cmd = server.RemoveFloatingIP(self.app, None)
 
-        # Set unshelve method to be tested.
-        self.methods = {
-            'remove_floating_ip': None,
-        }
+    def test_server_remove_floating_ip(self, fip_mock):
+        _floating_ip = compute_fakes.FakeFloatingIP.create_one_floating_ip()
 
-    def test_server_remove_floating_ip(self):
-        servers = self.setup_servers_mock(count=1)
+        arglist = [
+            'server1',
+            _floating_ip['ip'],
+        ]
+        verifylist = [
+            ('server', 'server1'),
+            ('ip_address', _floating_ip['ip']),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
+        self.cmd.take_action(parsed_args)
+
+        fip_mock.assert_called_once_with(
+            'server1',
+            _floating_ip['ip'],
+        )
+
+
+class TestServerRemoveFloatingIPNetwork(network_fakes.TestNetworkV2):
+
+    def setUp(self):
+        super(TestServerRemoveFloatingIPNetwork, self).setUp()
+
+        self.app.client_manager.network = mock.Mock()
+        self.network = self.app.client_manager.network
+        self.network.update_ip = mock.Mock(return_value=None)
+
+        # Get the command object to test
+        self.cmd = server.RemoveFloatingIP(self.app, self.namespace)
+
+    def test_server_remove_floating_ip_default(self):
+        _server = compute_fakes.FakeServer.create_one_server()
+        _floating_ip = network_fakes.FakeFloatingIP.create_one_floating_ip()
+        self.network.find_ip = mock.Mock(return_value=_floating_ip)
         arglist = [
-            servers[0].id,
-            '1.2.3.4',
+            _server.id,
+            _floating_ip['ip'],
         ]
         verifylist = [
-            ('server', servers[0].id),
-            ('ip_address', '1.2.3.4'),
+            ('server', _server.id),
+            ('ip_address', _floating_ip['ip']),
         ]
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
 
-        result = self.cmd.take_action(parsed_args)
+        self.cmd.take_action(parsed_args)
 
-        servers[0].remove_floating_ip.assert_called_once_with('1.2.3.4')
-        self.assertIsNone(result)
+        attrs = {
+            'port_id': None,
+        }
+
+        self.network.find_ip.assert_called_once_with(
+            _floating_ip['ip'],
+            ignore_missing=False,
+        )
+        self.network.update_ip.assert_called_once_with(
+            _floating_ip,
+            **attrs
+        )
 
 
 class TestServerRemovePort(TestServer):
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/unit/network/v2/fakes.py python-openstackclient-3.14.2/openstackclient/tests/unit/network/v2/fakes.py
--- python-openstackclient-3.14.0/openstackclient/tests/unit/network/v2/fakes.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/unit/network/v2/fakes.py	2018-06-04 03:28:48.000000000 +0000
@@ -335,6 +335,7 @@
             'name': 'network-name-' + uuid.uuid4().hex,
             'status': 'ACTIVE',
             'description': 'network-description-' + uuid.uuid4().hex,
+            'mtu': '1350',
             'tenant_id': 'project-id-' + uuid.uuid4().hex,
             'admin_state_up': True,
             'shared': False,
diff -Nru python-openstackclient-3.14.0/openstackclient/tests/unit/network/v2/test_network.py python-openstackclient-3.14.2/openstackclient/tests/unit/network/v2/test_network.py
--- python-openstackclient-3.14.0/openstackclient/tests/unit/network/v2/test_network.py	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/openstackclient/tests/unit/network/v2/test_network.py	2018-06-04 03:28:38.000000000 +0000
@@ -64,6 +64,7 @@
         'ipv4_address_scope',
         'ipv6_address_scope',
         'is_default',
+        'mtu',
         'name',
         'port_security_enabled',
         'project_id',
@@ -87,6 +88,7 @@
         _network.ipv4_address_scope_id,
         _network.ipv6_address_scope_id,
         _network.is_default,
+        _network.mtu,
         _network.name,
         _network.is_port_security_enabled,
         _network.project_id,
@@ -149,6 +151,7 @@
             "--disable",
             "--share",
             "--description", self._network.description,
+            "--mtu", self._network.mtu,
             "--project", self.project.name,
             "--project-domain", self.domain.name,
             "--availability-zone-hint", "nova",
@@ -165,6 +168,7 @@
             ('disable', True),
             ('share', True),
             ('description', self._network.description),
+            ('mtu', self._network.mtu),
             ('project', self.project.name),
             ('project_domain', self.domain.name),
             ('availability_zone_hints', ["nova"]),
@@ -188,6 +192,7 @@
             'name': self._network.name,
             'shared': True,
             'description': self._network.description,
+            'mtu': self._network.mtu,
             # TODO(dtroyer): Remove tenant_id when we clean up the SDK refactor
             'tenant_id': self.project.id,
             'project_id': self.project.id,
@@ -286,6 +291,7 @@
         'ipv4_address_scope',
         'ipv6_address_scope',
         'is_default',
+        'mtu',
         'name',
         'port_security_enabled',
         'project_id',
@@ -309,6 +315,7 @@
         _network.ipv4_address_scope_id,
         _network.ipv6_address_scope_id,
         _network.is_default,
+        _network.mtu,
         _network.name,
         _network.is_port_security_enabled,
         _network.project_id,
@@ -1023,6 +1030,7 @@
         'ipv4_address_scope',
         'ipv6_address_scope',
         'is_default',
+        'mtu',
         'name',
         'port_security_enabled',
         'project_id',
@@ -1046,6 +1054,7 @@
         _network.ipv4_address_scope_id,
         _network.ipv6_address_scope_id,
         _network.is_default,
+        _network.mtu,
         _network.name,
         _network.is_port_security_enabled,
         _network.project_id,
diff -Nru python-openstackclient-3.14.0/PKG-INFO python-openstackclient-3.14.2/PKG-INFO
--- python-openstackclient-3.14.0/PKG-INFO	2018-01-25 14:29:00.000000000 +0000
+++ python-openstackclient-3.14.2/PKG-INFO	2018-06-04 03:31:44.000000000 +0000
@@ -1,12 +1,11 @@
 Metadata-Version: 1.1
 Name: python-openstackclient
-Version: 3.14.0
+Version: 3.14.2
 Summary: OpenStack Command-line Client
 Home-page: https://docs.openstack.org/python-openstackclient/latest/
 Author: OpenStack
 Author-email: openstack-dev@lists.openstack.org
 License: UNKNOWN
-Description-Content-Type: UNKNOWN
 Description: ========================
         Team and repository tags
         ========================
diff -Nru python-openstackclient-3.14.0/python_openstackclient.egg-info/pbr.json python-openstackclient-3.14.2/python_openstackclient.egg-info/pbr.json
--- python-openstackclient-3.14.0/python_openstackclient.egg-info/pbr.json	2018-01-25 14:28:58.000000000 +0000
+++ python-openstackclient-3.14.2/python_openstackclient.egg-info/pbr.json	2018-06-04 03:31:42.000000000 +0000
@@ -1 +1 @@
-{"git_version": "fbee4eb", "is_release": true}
\ No newline at end of file
+{"git_version": "6c8967d", "is_release": true}
\ No newline at end of file
diff -Nru python-openstackclient-3.14.0/python_openstackclient.egg-info/PKG-INFO python-openstackclient-3.14.2/python_openstackclient.egg-info/PKG-INFO
--- python-openstackclient-3.14.0/python_openstackclient.egg-info/PKG-INFO	2018-01-25 14:28:58.000000000 +0000
+++ python-openstackclient-3.14.2/python_openstackclient.egg-info/PKG-INFO	2018-06-04 03:31:42.000000000 +0000
@@ -1,12 +1,11 @@
 Metadata-Version: 1.1
 Name: python-openstackclient
-Version: 3.14.0
+Version: 3.14.2
 Summary: OpenStack Command-line Client
 Home-page: https://docs.openstack.org/python-openstackclient/latest/
 Author: OpenStack
 Author-email: openstack-dev@lists.openstack.org
 License: UNKNOWN
-Description-Content-Type: UNKNOWN
 Description: ========================
         Team and repository tags
         ========================
diff -Nru python-openstackclient-3.14.0/python_openstackclient.egg-info/SOURCES.txt python-openstackclient-3.14.2/python_openstackclient.egg-info/SOURCES.txt
--- python-openstackclient-3.14.0/python_openstackclient.egg-info/SOURCES.txt	2018-01-25 14:29:00.000000000 +0000
+++ python-openstackclient-3.14.2/python_openstackclient.egg-info/SOURCES.txt	2018-06-04 03:31:44.000000000 +0000
@@ -882,6 +882,7 @@
 releasenotes/notes/network-add-qos-policy-a25e868e67142f90.yaml
 releasenotes/notes/network-flavor-command-support-afe3a9da962a09bf.yaml
 releasenotes/notes/neutron-client-flavors-81387171f67a3c82.yaml
+releasenotes/notes/neutron_mtu-d87e53e2d76f8612.yaml
 releasenotes/notes/no-project-usage-list-e88eb49aa2e96cf7.yaml
 releasenotes/notes/object-stdout-db76cc500948b0e8.yaml
 releasenotes/notes/recursive-container-delete-983361aa9c35ffed.yaml
diff -Nru python-openstackclient-3.14.0/releasenotes/notes/neutron_mtu-d87e53e2d76f8612.yaml python-openstackclient-3.14.2/releasenotes/notes/neutron_mtu-d87e53e2d76f8612.yaml
--- python-openstackclient-3.14.0/releasenotes/notes/neutron_mtu-d87e53e2d76f8612.yaml	1970-01-01 00:00:00.000000000 +0000
+++ python-openstackclient-3.14.2/releasenotes/notes/neutron_mtu-d87e53e2d76f8612.yaml	2018-06-04 03:28:38.000000000 +0000
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Add ``--mtu`` option to ``network create`` and ``network set``
+    commands, allowing CLI users to set the MTU for Neutron networks.
diff -Nru python-openstackclient-3.14.0/test-requirements.txt python-openstackclient-3.14.2/test-requirements.txt
--- python-openstackclient-3.14.0/test-requirements.txt	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/test-requirements.txt	2018-06-04 03:28:48.000000000 +0000
@@ -26,10 +26,10 @@
 python-congressclient<2000,>=1.9.0 # Apache-2.0
 python-designateclient>=2.7.0 # Apache-2.0
 python-heatclient>=1.10.0 # Apache-2.0
-python-ironicclient>=1.14.0 # Apache-2.0
+python-ironicclient>=2.2.0 # Apache-2.0
 python-ironic-inspector-client>=1.5.0 # Apache-2.0
 python-karborclient>=0.6.0 # Apache-2.0
-python-mistralclient>=3.1.0 # Apache-2.0
+python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0
 python-muranoclient>=0.8.2 # Apache-2.0
 python-neutronclient>=6.3.0 # Apache-2.0
 python-octaviaclient>=1.3.0 # Apache-2.0
diff -Nru python-openstackclient-3.14.0/tox.ini python-openstackclient-3.14.2/tox.ini
--- python-openstackclient-3.14.0/tox.ini	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/tox.ini	2018-06-04 03:28:48.000000000 +0000
@@ -11,7 +11,7 @@
          OS_STDERR_CAPTURE=1
          OS_TEST_TIMEOUT=60
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens}
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
 commands = stestr run {posargs}
@@ -106,14 +106,14 @@
 
 [testenv:docs]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands = python setup.py build_sphinx
 
 [testenv:releasenotes]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+  -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands =
diff -Nru python-openstackclient-3.14.0/.zuul.yaml python-openstackclient-3.14.2/.zuul.yaml
--- python-openstackclient-3.14.0/.zuul.yaml	2018-01-25 14:25:53.000000000 +0000
+++ python-openstackclient-3.14.2/.zuul.yaml	2018-06-04 03:28:48.000000000 +0000
@@ -11,7 +11,7 @@
       - openstack/os-client-config
       - openstack/osc-lib
       - openstack/python-openstackclient
-      - openstack/python-openstacksdk
+      - openstack/openstacksdk
     vars:
       tox_envlist: py27
       # Set work dir to openstackclient so that if it's triggered by one of the
@@ -33,7 +33,7 @@
       - openstack/os-client-config
       - openstack/osc-lib
       - openstack/python-openstackclient
-      - openstack/python-openstacksdk
+      - openstack/openstacksdk
     vars:
       # Set work dir to openstackclient so that if it's triggered by one of the
       # other repos the tests will run in the same place
@@ -54,7 +54,7 @@
       - openstack/os-client-config
       - openstack/osc-lib
       - openstack/python-openstackclient
-      - openstack/python-openstacksdk
+      - openstack/openstacksdk
     vars:
       # Set work dir to openstackclient so that if it's triggered by one of the
       # other repos the tests will run in the same place
@@ -158,11 +158,11 @@
       - openstack/os-client-config
       - openstack/osc-lib
       - openstack/python-openstackclient
-      - openstack/python-openstacksdk
+      - openstack/openstacksdk
     vars:
       devstack_localrc:
         USE_PYTHON3: true
-        LIBS_FROM_GIT: python-openstackclient,python-openstacksdk,osc-lib,os-client-config
+        LIBS_FROM_GIT: python-openstackclient,openstacksdk,osc-lib,os-client-config
         # This is insufficient, but leaving it here as a reminder of what may
         # someday be all we need to make this work
         # disable_python3_package swift