From 0f01a337c79dd2364e678030968d17caf15fcd8b Mon Sep 17 00:00:00 2001
From: hazelnutsgz <guozhen.she@intel.com>
Date: Thu, 18 Oct 2018 13:33:58 +0800
Subject: [PATCH] Fix the conflict of urlparse between python2 and python3

Change-Id: I5a031b3f076127ca967d07d75af6fe8c60eb5661
Task: 24628
Story: 2003432
---
 .../starlingx-dashboard/starlingx_dashboard/api/patch.py   | 7 +++++--
 .../starlingx-dashboard/starlingx_dashboard/api/vim.py     | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/patch.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/patch.py
index 3d90fb41..b4f828f1 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/patch.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/patch.py
@@ -14,7 +14,10 @@
 #
 
 import logging
-import urlparse
+try:
+    from urlparse import urlparse
+except ModuleNotFoundError:
+    from urllib.parse import urlparse
 
 import requests
 
@@ -93,7 +96,7 @@ class Client(object):
 
 
 def _patching_client(request):
-    o = urlparse.urlparse(base.url_for(request, 'patching'))
+    o = urlparse(base.url_for(request, 'patching'))
     url = "://".join((o.scheme, o.netloc))
     return Client("v1", url, token_id=request.user.token.id)
 
diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/vim.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/vim.py
index dd14f8a4..8f3b39bc 100755
--- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/vim.py
+++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/api/vim.py
@@ -14,7 +14,10 @@
 #
 
 import logging
-import urlparse
+try:
+    from urlparse import urlparse
+except ModuleNotFoundError:
+    from urllib.parse import urlparse
 
 from openstack_dashboard.api import base
 
@@ -59,7 +62,7 @@ class Client(object):
 
 
 def _sw_update_client(request):
-    o = urlparse.urlparse(base.url_for(request, 'nfv'))
+    o = urlparse(base.url_for(request, 'nfv'))
     url = "://".join((o.scheme, o.netloc))
     return Client(url, token_id=request.user.token.id)