diff options
Diffstat (limited to 'openstackclient/compute/v2')
| -rw-r--r-- | openstackclient/compute/v2/security_group.py | 7 | ||||
| -rw-r--r-- | openstackclient/compute/v2/server.py | 6 |
2 files changed, 11 insertions, 2 deletions
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 diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index f0a59d34..3d28cc15 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -26,7 +26,11 @@ import sys from cliff import command from cliff import lister from cliff import show -from novaclient.v1_1 import servers + +try: + from novaclient.v2 import servers +except ImportError: + from novaclient.v1_1 import servers from openstackclient.common import exceptions from openstackclient.common import parseractions |