diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-23 20:19:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-23 20:19:28 +0000 |
| commit | 923467279a9387ed498a0fc2c7c315a7d7749a84 (patch) | |
| tree | 80eefc14d36d104810bd123eac575a92560217d9 | |
| parent | a6497a43ec42919e68b4b7eee9745568a35c6637 (diff) | |
| parent | be6bd82d43fbcb8d1512d8eb5b7a106332364c31 (diff) | |
| download | neutron-923467279a9387ed498a0fc2c7c315a7d7749a84.tar.gz | |
Merge "Remove duplicate import of constants module"
| -rw-r--r-- | .pylintrc | 1 | ||||
| -rw-r--r-- | neutron/plugins/vmware/vshield/edge_appliance_driver.py | 14 |
2 files changed, 6 insertions, 9 deletions
@@ -56,7 +56,6 @@ disable= redefined-builtin, redefined-outer-name, redefine-in-handler, - reimported, signature-differs, star-args, super-init-not-called, diff --git a/neutron/plugins/vmware/vshield/edge_appliance_driver.py b/neutron/plugins/vmware/vshield/edge_appliance_driver.py index 9ce708457b..700b989190 100644 --- a/neutron/plugins/vmware/vshield/edge_appliance_driver.py +++ b/neutron/plugins/vmware/vshield/edge_appliance_driver.py @@ -16,9 +16,7 @@ from neutron.openstack.common import excutils from neutron.openstack.common import jsonutils from neutron.openstack.common import log as logging from neutron.plugins.vmware.common import utils -from neutron.plugins.vmware.vshield.common import ( - constants as vcns_const) -from neutron.plugins.vmware.vshield.common import constants as common_constants +from neutron.plugins.vmware.vshield.common import constants as vcns_const from neutron.plugins.vmware.vshield.common import exceptions from neutron.plugins.vmware.vshield.tasks import constants from neutron.plugins.vmware.vshield.tasks import tasks @@ -108,11 +106,11 @@ class EdgeApplianceDriver(object): def _edge_status_to_level(self, status): if status == 'GREEN': - status_level = common_constants.RouterStatus.ROUTER_STATUS_ACTIVE + status_level = vcns_const.RouterStatus.ROUTER_STATUS_ACTIVE elif status in ('GREY', 'YELLOW'): - status_level = common_constants.RouterStatus.ROUTER_STATUS_DOWN + status_level = vcns_const.RouterStatus.ROUTER_STATUS_DOWN else: - status_level = common_constants.RouterStatus.ROUTER_STATUS_ERROR + status_level = vcns_const.RouterStatus.ROUTER_STATUS_ERROR return status_level def _enable_loadbalancer(self, edge): @@ -131,13 +129,13 @@ class EdgeApplianceDriver(object): except exceptions.VcnsApiException as e: LOG.exception(_("VCNS: Failed to get edge status:\n%s"), e.response) - status_level = common_constants.RouterStatus.ROUTER_STATUS_ERROR + status_level = vcns_const.RouterStatus.ROUTER_STATUS_ERROR try: desc = jsonutils.loads(e.response) if desc.get('errorCode') == ( vcns_const.VCNS_ERROR_CODE_EDGE_NOT_RUNNING): status_level = ( - common_constants.RouterStatus.ROUTER_STATUS_DOWN) + vcns_const.RouterStatus.ROUTER_STATUS_DOWN) except ValueError: LOG.exception(e.response) |