Skip to content

Commit

Permalink
quantum-plugin-nicira imports mock but was not used
Browse files Browse the repository at this point in the history
The import of mock prevents quantum from starting when using the
nvp plugin since mock is not an install dependency. This patch
removes where mock was imported but did not actually need to be.

Fixes bug 1097451

Change-Id: If1569d437fe523e4fac8d686da52b0508ca1cbf3
  • Loading branch information
aaronorosen committed Jan 14, 2013
1 parent 166a7aa commit 9f1bf8d
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions quantum/plugins/nicira/nicira_nvp_plugin/api_client/common.py
Expand Up @@ -17,16 +17,13 @@
#

import httplib
import mock


def _conn_str(conn):
if isinstance(conn, httplib.HTTPSConnection):
proto = "https://"
elif isinstance(conn, httplib.HTTPConnection):
proto = "http://"
elif isinstance(conn, mock.Mock):
proto = "http://"
else:
raise TypeError('_conn_str() invalid connection type: %s' % type(conn))

Expand Down

0 comments on commit 9f1bf8d

Please sign in to comment.