From 5d92fc0d0a7c606fdcf7a3565801ae361389d9ab Mon Sep 17 00:00:00 2001 From: Dean Troyer Date: Mon, 2 Mar 2015 13:49:40 -0600 Subject: Handle novaclient >2.20.0 As of 2.21.0 novaclient moved all of the v1_1 classes to v2 with a deprecation warning. The version-non-specific interfaces provided in novaclient.client are insufficient to support a few specific commands in OSC so we need to conditionally import directly from the correct classes. Closes-Bug: #1418024 Change-Id: I864b1908737803069dc1419c9cbca391b985c932 --- openstackclient/compute/v2/security_group.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'openstackclient/compute/v2/security_group.py') diff --git a/openstackclient/compute/v2/security_group.py b/openstackclient/compute/v2/security_group.py index f7ffb1d1..13a2103f 100644 --- a/openstackclient/compute/v2/security_group.py +++ b/openstackclient/compute/v2/security_group.py @@ -24,7 +24,12 @@ from cliff import lister from cliff import show from keystoneclient import exceptions as ksc_exc -from novaclient.v1_1 import security_group_rules + +try: + from novaclient.v2 import security_group_rules +except ImportError: + from novaclient.v1_1 import security_group_rules + from openstackclient.common import parseractions from openstackclient.common import utils -- cgit v1.2.1