Fix api version handling, which completely breaks the client

The neutron client does not work with recent openstacksdk versions
(>=0.18.0): http://paste.openstack.org/raw/734040/

This change addresses a mismatch in the api version format.
The neutron client passes a dict while the openstack sdk expects a
string.

Change-Id: I33c868f1c1e40d7673ba6651abedf3dfe0850660
Closes-Bug: #1801360

neutronclient/neutron/client.py

@@ -28,7 +28,7 @@ def make_client(instance):
     """Returns an neutron client."""
     neutron_client = utils.get_client_class(
         API_NAME,
-        instance._api_version[API_NAME],
+        instance._api_version,
         API_VERSIONS,
     )
     instance.initialize()

neutronclient/shell.py

@@ -596,8 +596,6 @@ class NeutronShell(app.App):
 
         super(NeutronShell, self).initialize_app(argv)
 
-        self.api_version = {'network': self.api_version}
-
         # If the user is not asking for help, make sure they
         # have given us auth.
         cmd_name = None