Use six.moves.urllib.parse instead of urlparse

To keep Python 3.x compatibility, use six.moves.urllib.parse to
replace urlparse.

Closes-Bug: #1279611
Change-Id: I712035926f449e1bc5ab1fe85927369b826cb9cc

neutron/agent/metadata/agent.py

@@ -20,12 +20,12 @@ import hashlib
 import hmac
 import os
 import socket
-import urlparse
 
 import eventlet
 import httplib2
 from neutronclient.v2_0 import client
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 
 from neutron.agent.common import config as agent_conf

neutron/agent/metadata/namespace_proxy.py

@@ -18,11 +18,12 @@
 
 import httplib
 import socket
-import urlparse
+
 
 import eventlet
 import httplib2
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 
 from neutron.agent.linux import daemon

neutron/api/v2/router.py

@@ -13,10 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import urlparse
-
 from oslo.config import cfg
 import routes as routes_mapper
+import six.moves.urllib.parse as urlparse
 import webob
 import webob.dec
 import webob.exc

neutron/plugins/nicira/api_client/request.py

@@ -24,9 +24,9 @@ import copy
 import httplib
 import logging
 import time
-import urlparse
 
 import six
+import six.moves.urllib.parse as urlparse
 
 from neutron.openstack.common import excutils
 from neutron.plugins.nicira.api_client.common import (

neutron/tests/unit/nicira/fake_nvpapiclient.py

@@ -15,7 +15,8 @@
 #    under the License.
 
 import json
-import urlparse
+
+import six.moves.urllib.parse as urlparse
 
 from neutron.openstack.common import log as logging
 from neutron.openstack.common import uuidutils

neutron/tests/unit/test_api_v2.py

@@ -16,10 +16,10 @@
 #    under the License.
 
 import os
-import urlparse
 
 import mock
 from oslo.config import cfg
+import six.moves.urllib.parse as urlparse
 import webob
 from webob import exc
 import webtest