diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-14 04:22:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-14 04:22:03 +0000 |
| commit | 287fe3610af6297b654dc30ee587aa0f7eecaeaa (patch) | |
| tree | 6b91a34be273f921f59e8032ae8bb2ca546c8d20 /openstackclient/network | |
| parent | 5c402c1da23cde8b566e406b4e56bd2be2e1a729 (diff) | |
| parent | be192676bd2f2beeea0ec4265d5f78a8cf9af637 (diff) | |
| download | python-openstackclient-287fe3610af6297b654dc30ee587aa0f7eecaeaa.tar.gz | |
Merge "osc-lib: parseractions"
Diffstat (limited to 'openstackclient/network')
| -rw-r--r-- | openstackclient/network/v2/port.py | 2 | ||||
| -rw-r--r-- | openstackclient/network/v2/router.py | 2 | ||||
| -rw-r--r-- | openstackclient/network/v2/security_group_rule.py | 2 | ||||
| -rw-r--r-- | openstackclient/network/v2/subnet.py | 2 | ||||
| -rw-r--r-- | openstackclient/network/v2/subnet_pool.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py index 643207d9..a040f20f 100644 --- a/openstackclient/network/v2/port.py +++ b/openstackclient/network/v2/port.py @@ -16,11 +16,11 @@ import argparse import logging +from osc_lib.cli import parseractions from osc_lib import exceptions from osc_lib import utils from openstackclient.common import command -from openstackclient.common import parseractions from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/network/v2/router.py b/openstackclient/network/v2/router.py index eab8b22c..db3a90e1 100644 --- a/openstackclient/network/v2/router.py +++ b/openstackclient/network/v2/router.py @@ -17,10 +17,10 @@ import argparse import json import logging +from osc_lib.cli import parseractions from osc_lib import utils from openstackclient.common import command -from openstackclient.common import parseractions from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/network/v2/security_group_rule.py b/openstackclient/network/v2/security_group_rule.py index 0132ef4e..7c810786 100644 --- a/openstackclient/network/v2/security_group_rule.py +++ b/openstackclient/network/v2/security_group_rule.py @@ -20,11 +20,11 @@ try: except ImportError: from novaclient.v1_1 import security_group_rules as compute_secgroup_rules +from osc_lib.cli import parseractions from osc_lib import exceptions from osc_lib import utils import six -from openstackclient.common import parseractions from openstackclient.i18n import _ from openstackclient.identity import common as identity_common from openstackclient.network import common diff --git a/openstackclient/network/v2/subnet.py b/openstackclient/network/v2/subnet.py index 2b12ee03..6bdb9a54 100644 --- a/openstackclient/network/v2/subnet.py +++ b/openstackclient/network/v2/subnet.py @@ -15,11 +15,11 @@ import copy +from osc_lib.cli import parseractions from osc_lib import exceptions from osc_lib import utils from openstackclient.common import command -from openstackclient.common import parseractions from openstackclient.i18n import _ from openstackclient.identity import common as identity_common diff --git a/openstackclient/network/v2/subnet_pool.py b/openstackclient/network/v2/subnet_pool.py index 23993300..7e0bb2c0 100644 --- a/openstackclient/network/v2/subnet_pool.py +++ b/openstackclient/network/v2/subnet_pool.py @@ -13,10 +13,10 @@ """Subnet pool action implementations""" +from osc_lib.cli import parseractions from osc_lib import utils from openstackclient.common import command -from openstackclient.common import parseractions from openstackclient.i18n import _ from openstackclient.identity import common as identity_common |