3 files changed, 71 insertions, 13 deletions

diff --git a/openstackclient/compute/client.py b/openstackclient/compute/client.py
index 9dda32d6..8ac5f324 100644
--- a/openstackclient/compute/client.py
+++ b/openstackclient/compute/client.py
@@ -15,6 +15,7 @@
 
 import logging
 
+from openstackclient.common import exceptions
 from openstackclient.common import utils
 
 LOG = logging.getLogger(__name__)
@@ -26,6 +27,9 @@ API_VERSIONS = {
     "2": "novaclient.client",
 }
 
+# Save the microversion if in use
+_compute_api_version = None
+
 
 def make_client(instance):
     """Returns a compute service client."""
@@ -38,10 +42,12 @@ def make_client(instance):
     except ImportError:
         from novaclient.v1_1.contrib import list_extensions
 
-    compute_client = nova_client.get_client_class(
-        instance._api_version[API_NAME],
-    )
-    LOG.debug('Instantiating compute client: %s', compute_client)
+    if _compute_api_version is not None:
+        version = _compute_api_version
+    else:
+        version = instance._api_version[API_NAME]
+
+    LOG.debug('Instantiating compute client for V%s' % version)
 
     # Set client http_log_debug to True if verbosity level is high enough
     http_log_debug = utils.get_effective_log_level() <= logging.DEBUG
@@ -51,7 +57,8 @@ def make_client(instance):
     # Remember interface only if it is set
     kwargs = utils.build_kwargs_dict('endpoint_type', instance._interface)
 
-    client = compute_client(
+    client = nova_client.Client(
+        version,
         session=instance.session,
         extensions=extensions,
         http_log_debug=http_log_debug,
@@ -73,3 +80,45 @@ def build_option_parser(parser):
              DEFAULT_API_VERSION +
              ' (Env: OS_COMPUTE_API_VERSION)')
     return parser
+
+
+def check_api_version(check_version):
+    """Validate version supplied by user
+
+    Returns:
+    * True if version is OK
+    * False if the version has not been checked and the previous plugin
+      check should be performed
+    * throws an exception if the version is no good
+
+    TODO(dtroyer): make the exception thrown a version-related one
+    """
+
+    # Defer client imports until we actually need them
+    try:
+        from novaclient import api_versions
+    except ImportError:
+        # Retain previous behaviour
+        return False
+
+    import novaclient
+
+    global _compute_api_version
+
+    # Copy some logic from novaclient 2.27.0 for basic version detection
+    # NOTE(dtroyer): This is only enough to resume operations using API
+    #                version 2.0 or any valid version supplied by the user.
+    _compute_api_version = api_versions.get_api_version(check_version)
+
+    if _compute_api_version > api_versions.APIVersion("2.0"):
+        if not _compute_api_version.matches(
+            novaclient.API_MIN_VERSION,
+            novaclient.API_MAX_VERSION,
+        ):
+            raise exceptions.CommandError(
+                "versions supported by client: %s - %s" % (
+                    novaclient.API_MIN_VERSION.get_string(),
+                    novaclient.API_MAX_VERSION.get_string(),
+                ),
+            )
+    return True
diff --git a/openstackclient/compute/v2/security_group.py b/openstackclient/compute/v2/security_group.py
index 3dc9bae0..25c2ed3f 100644
--- a/openstackclient/compute/v2/security_group.py
+++ b/openstackclient/compute/v2/security_group.py
@@ -50,10 +50,10 @@ def _xform_security_group_rule(sgroup):
         info['ip_range'] = info['ip_range']['cidr']
     else:
         info['ip_range'] = ''
-    if info['ip_protocol'] == 'icmp':
-        info['port_range'] = ''
-    elif info['ip_protocol'] is None:
+    if info['ip_protocol'] is None:
         info['ip_protocol'] = ''
+    elif info['ip_protocol'].lower() == 'icmp':
+        info['port_range'] = ''
     return info
 
 
@@ -307,7 +307,10 @@ class CreateSecurityGroupRule(show.ShowOne):
             compute_client.security_groups,
             parsed_args.group,
         )
-        from_port, to_port = parsed_args.dst_port
+        if parsed_args.proto.lower() == 'icmp':
+            from_port, to_port = -1, -1
+        else:
+            from_port, to_port = parsed_args.dst_port
         data = compute_client.security_group_rules.create(
             group.id,
             parsed_args.proto,
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py
index 30a1b063..46e78e6d 100644
--- a/openstackclient/compute/v2/server.py
+++ b/openstackclient/compute/v2/server.py
@@ -108,14 +108,20 @@ def _prep_server_detail(compute_client, server):
     image_info = info.get('image', {})
     if image_info:
         image_id = image_info.get('id', '')
-        image = utils.find_resource(compute_client.images, image_id)
-        info['image'] = "%s (%s)" % (image.name, image_id)
+        try:
+            image = utils.find_resource(compute_client.images, image_id)
+            info['image'] = "%s (%s)" % (image.name, image_id)
+        except Exception:
+            info['image'] = image_id
 
     # Convert the flavor blob to a name
     flavor_info = info.get('flavor', {})
     flavor_id = flavor_info.get('id', '')
-    flavor = utils.find_resource(compute_client.flavors, flavor_id)
-    info['flavor'] = "%s (%s)" % (flavor.name, flavor_id)
+    try:
+        flavor = utils.find_resource(compute_client.flavors, flavor_id)
+        info['flavor'] = "%s (%s)" % (flavor.name, flavor_id)
+    except Exception:
+        info['flavor'] = flavor_id
 
     # NOTE(dtroyer): novaclient splits these into separate entries...
     # Format addresses in a useful way