neutron

Merge lp:~snaiksat/neutron/sumit-l2network-plugin-extensions into lp:~cisco-openstack/neutron/l2network-plugin-extensions

  1. sumit-l2network-plugin-extensions
  2. Merge into l2network-plugin-extensions
Proposed by Sumit Naiksatam
Status: Merged
Merged at revision: 94
Proposed branch: lp:~snaiksat/neutron/sumit-l2network-plugin-extensions
Merge into: lp:~cisco-openstack/neutron/l2network-plugin-extensions
Diff against target: 71 lines (+5/-5)
5 files modified
quantum/plugins/cisco/common/cisco_credentials.py (+1/-1)
quantum/plugins/cisco/l2network_model.py (+1/-1)
quantum/plugins/cisco/l2network_plugin.py (+1/-1)
quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py (+1/-1)
quantum/plugins/cisco/ucs/cisco_ucs_plugin.py (+1/-1)
To merge this branch: bzr merge lp:~snaiksat/neutron/sumit-l2network-plugin-extensions
Reviewer Review Type Date Requested Status
Ying Liu (community) Approve
Review via email: mp+72942@code.launchpad.net

Description of the change

Changing the order of imports to conform with convention.

To post a comment you must log in.
Revision history for this message
Ying Liu (yinliu2) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'quantum/plugins/cisco/common/cisco_credentials.py'
2--- quantum/plugins/cisco/common/cisco_credentials.py 2011-08-16 23:03:32 +0000
3+++ quantum/plugins/cisco/common/cisco_credentials.py 2011-08-25 19:03:48 +0000
4@@ -22,8 +22,8 @@
5 import logging as LOG
6 import os
7
8+from quantum.plugins.cisco.common import cisco_configparser as confp
9 from quantum.plugins.cisco.common import cisco_constants as const
10-from quantum.plugins.cisco.common import cisco_configparser as confp
11
12 LOG.basicConfig(level=LOG.WARN)
13 LOG.getLogger(const.LOGGER_COMPONENT_NAME)
14
15=== modified file 'quantum/plugins/cisco/l2network_model.py'
16--- quantum/plugins/cisco/l2network_model.py 2011-08-23 18:36:50 +0000
17+++ quantum/plugins/cisco/l2network_model.py 2011-08-25 19:03:48 +0000
18@@ -23,9 +23,9 @@
19 import logging as LOG
20
21 from quantum.common import utils
22-from quantum.plugins.cisco.l2network_model_base import L2NetworkModelBase
23 from quantum.plugins.cisco import l2network_plugin_configuration as conf
24 from quantum.plugins.cisco.common import cisco_constants as const
25+from quantum.plugins.cisco.l2network_model_base import L2NetworkModelBase
26
27 LOG.basicConfig(level=LOG.WARN)
28 LOG.getLogger(const.LOGGER_COMPONENT_NAME)
29
30=== modified file 'quantum/plugins/cisco/l2network_plugin.py'
31--- quantum/plugins/cisco/l2network_plugin.py 2011-08-24 20:36:32 +0000
32+++ quantum/plugins/cisco/l2network_plugin.py 2011-08-25 19:03:48 +0000
33@@ -27,8 +27,8 @@
34 from quantum.common import utils
35 from quantum.quantum_plugin_base import QuantumPluginBase
36 from quantum.plugins.cisco import l2network_plugin_configuration as conf
37+from quantum.plugins.cisco.common import cisco_exceptions as cexc
38 from quantum.plugins.cisco.common import cisco_constants as const
39-from quantum.plugins.cisco.common import cisco_exceptions as cexc
40 from quantum.plugins.cisco.common import cisco_credentials as cred
41 from quantum.plugins.cisco.db import api as db
42 from quantum.plugins.cisco.db import l2network_db as cdb
43
44=== modified file 'quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py'
45--- quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py 2011-08-16 23:03:32 +0000
46+++ quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py 2011-08-25 19:03:48 +0000
47@@ -27,8 +27,8 @@
48 import logging as LOG
49 from xml.etree import ElementTree as et
50
51+from quantum.plugins.cisco.common import cisco_exceptions as cexc
52 from quantum.plugins.cisco.common import cisco_constants as const
53-from quantum.plugins.cisco.common import cisco_exceptions as cexc
54 from quantum.plugins.cisco.ucs import cisco_getvif as gvif
55
56
57
58=== modified file 'quantum/plugins/cisco/ucs/cisco_ucs_plugin.py'
59--- quantum/plugins/cisco/ucs/cisco_ucs_plugin.py 2011-08-16 03:19:54 +0000
60+++ quantum/plugins/cisco/ucs/cisco_ucs_plugin.py 2011-08-25 19:03:48 +0000
61@@ -23,9 +23,9 @@
62
63 from quantum.common import exceptions as exc
64 from quantum.common import utils
65+from quantum.plugins.cisco.common import cisco_exceptions as cexc
66 from quantum.plugins.cisco.common import cisco_constants as const
67 from quantum.plugins.cisco.common import cisco_credentials as cred
68-from quantum.plugins.cisco.common import cisco_exceptions as cexc
69 from quantum.plugins.cisco.common import cisco_utils as cutil
70 from quantum.plugins.cisco.l2device_plugin_base import L2DevicePluginBase
71 from quantum.plugins.cisco.ucs import cisco_ucs_configuration as conf

Subscribers

People subscribed via source and target branches