Fix urllib/unicode related issues for Python 2/3

replace unicode by six.text_type
replace urlparse by six.moves.urllib.parse
remove the ignore for F821 from the flake8 config

PS: as there is a bug of pylint 1.9, six.moves.urllib.parse
should be import as follows:
e.g.
 from doc of module six:
   from six.moves.urllib.parse import urlparse
   urlparse(endpoint).path

 here:
   from six.moves import urllib
   urllib.parse.urlparse(endpoint).path

pylint bug: pylint-dev/pylint#2180

Story: 2003427
Task: 24605
Task: 24608

Change-Id: I098ba8093dbf08dd91acaf403291ebb469195558
Signed-off-by: SidneyAn <ran1.an@intel.com>

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/objects.py

@@ -315,10 +315,10 @@ def get_service_url(self, service, strip_version=False):
                 if endpoint is None:
                     endpoint = service_info.endpoint_override
                 else:
-                    from urlparse import urlparse
+                    from six.moves import urllib
                     # this is necessary to keep tenant_id in place
                     endpoint = \
-                        service_info.endpoint_override + urlparse(endpoint).path
+                        service_info.endpoint_override + urllib.parse.urlparse(endpoint).path
 
             if strip_version:
                 endpoint = self._url_strip_version(endpoint)

nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_strategy.py

@@ -6,6 +6,7 @@
 import json
 import pecan
 from pecan import rest
+import six
 from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
@@ -50,57 +51,57 @@ class SwUpdateStrategyStageStepData(wsme_types.Base):
     Software Update Strategy - Stage Step Data
     """
     step_id = wsme_types.wsattr(int, name='step-id')
-    step_name = wsme_types.wsattr(unicode, name='step-name')
+    step_name = wsme_types.wsattr(six.text_type, name='step-name')
     timeout = wsme_types.wsattr(int, name='timeout')
-    entity_type = wsme_types.wsattr(unicode, name='entity-type')
-    entity_uuids = wsme_types.wsattr([unicode], name='entity-uuids')
-    entity_names = wsme_types.wsattr([unicode], name='entity-names')
-    result = wsme_types.wsattr(unicode, name='result')
-    reason = wsme_types.wsattr(unicode, name='reason')
-    start_date_time = wsme_types.wsattr(unicode, name='start-date-time')
-    end_date_time = wsme_types.wsattr(unicode, name='end-date-time')
+    entity_type = wsme_types.wsattr(six.text_type, name='entity-type')
+    entity_uuids = wsme_types.wsattr([six.text_type], name='entity-uuids')
+    entity_names = wsme_types.wsattr([six.text_type], name='entity-names')
+    result = wsme_types.wsattr(six.text_type, name='result')
+    reason = wsme_types.wsattr(six.text_type, name='reason')
+    start_date_time = wsme_types.wsattr(six.text_type, name='start-date-time')
+    end_date_time = wsme_types.wsattr(six.text_type, name='end-date-time')
 
 
 class SwUpdateStrategyStageData(wsme_types.Base):
     """
     Software Update Strategy - Stage Data
     """
     stage_id = wsme_types.wsattr(int, name='stage-id')
-    stage_name = wsme_types.wsattr(unicode, name='stage-name')
+    stage_name = wsme_types.wsattr(six.text_type, name='stage-name')
     timeout = wsme_types.wsattr(int, name='timeout')
     total_steps = wsme_types.wsattr(int, name='total-steps')
     current_step = wsme_types.wsattr(int, name='current-step')
     steps = wsme_types.wsattr([SwUpdateStrategyStageStepData], name='steps')
     inprogress = wsme_types.wsattr(bool, name='inprogress')
-    result = wsme_types.wsattr(unicode, name='result')
-    reason = wsme_types.wsattr(unicode, name='reason')
-    start_date_time = wsme_types.wsattr(unicode, name='start-date-time')
-    end_date_time = wsme_types.wsattr(unicode, name='end-date-time')
+    result = wsme_types.wsattr(six.text_type, name='result')
+    reason = wsme_types.wsattr(six.text_type, name='reason')
+    start_date_time = wsme_types.wsattr(six.text_type, name='start-date-time')
+    end_date_time = wsme_types.wsattr(six.text_type, name='end-date-time')
 
 
 class SwUpdateStrategyPhaseData(wsme_types.Base):
     """
     Software Update Strategy - Phase Data
     """
-    phase_name = wsme_types.wsattr(unicode, name='phase-name')
+    phase_name = wsme_types.wsattr(six.text_type, name='phase-name')
     timeout = wsme_types.wsattr(int, name='timeout')
     total_stages = wsme_types.wsattr(int, name='total-stages')
     current_stage = wsme_types.wsattr(int, name='current-stage')
     stop_at_stage = wsme_types.wsattr(int, name='stop-at-stage')
     stages = wsme_types.wsattr([SwUpdateStrategyStageData], name='stages')
     inprogress = wsme_types.wsattr(bool, name='inprogress')
     completion_percentage = wsme_types.wsattr(int, name='completion-percentage')
-    result = wsme_types.wsattr(unicode, name='result')
-    reason = wsme_types.wsattr(unicode, name='reason')
-    start_date_time = wsme_types.wsattr(unicode, name='start-date-time')
-    end_date_time = wsme_types.wsattr(unicode, name='end-date-time')
+    result = wsme_types.wsattr(six.text_type, name='result')
+    reason = wsme_types.wsattr(six.text_type, name='reason')
+    start_date_time = wsme_types.wsattr(six.text_type, name='start-date-time')
+    end_date_time = wsme_types.wsattr(six.text_type, name='end-date-time')
 
 
 class SwUpdateStrategyData(wsme_types.Base):
     """
     Software Update Strategy - Data
     """
-    uuid = wsme_types.wsattr(unicode, name='uuid')
+    uuid = wsme_types.wsattr(six.text_type, name='uuid')
     name = wsme_types.wsattr(SwUpdateNames, name='name')
     controller_apply_type = wsme_types.wsattr(SwUpdateApplyTypes,
                                               name='controller-apply-type')
@@ -116,8 +117,8 @@ class SwUpdateStrategyData(wsme_types.Base):
                                                 name='default-instance-action')
     alarm_restrictions = wsme_types.wsattr(SwUpdateAlarmRestrictionTypes,
                                            name='alarm-restrictions')
-    state = wsme_types.wsattr(unicode, name='state')
-    current_phase = wsme_types.wsattr(unicode, name='current-phase')
+    state = wsme_types.wsattr(six.text_type, name='state')
+    current_phase = wsme_types.wsattr(six.text_type, name='current-phase')
     current_phase_completion_percentage \
         = wsme_types.wsattr(int, name='current-phase-completion-percentage')
     build_phase = wsme_types.wsattr(SwUpdateStrategyPhaseData, name='build-phase')
@@ -265,7 +266,7 @@ class SwUpdateStrategyActionAPI(rest.RestController):
     """
     Software Update Strategy Action Rest API
     """
-    @wsme_pecan.wsexpose(SwUpdateStrategyQueryData, unicode,
+    @wsme_pecan.wsexpose(SwUpdateStrategyQueryData, six.text_type,
                          body=SwUpdateStrategyActionData,
                          status_code=httplib.ACCEPTED)
     def post(self, request_data):
@@ -350,7 +351,7 @@ class SwUpdateStrategyAPI(rest.RestController):
     """
     actions = SwUpdateStrategyActionAPI()
 
-    @wsme_pecan.wsexpose(SwUpdateStrategyQueryData, unicode, status_code=httplib.OK)
+    @wsme_pecan.wsexpose(SwUpdateStrategyQueryData, six.text_type, status_code=httplib.OK)
     def get_one(self, strategy_uuid):
         if not validate.valid_uuid_str(strategy_uuid):
             DLOG.error("Invalid strategy uuid received, uuid=%s." % strategy_uuid)
@@ -418,7 +419,7 @@ def get_all(self):
         DLOG.error("Unexpected result received, result=%s." % response.result)
         return pecan.abort(httplib.INTERNAL_SERVER_ERROR)
 
-    @wsme_pecan.wsexpose(None, unicode, body=SwUpdateStrategyDeleteData,
+    @wsme_pecan.wsexpose(None, six.text_type, body=SwUpdateStrategyDeleteData,
                          status_code=httplib.OK)
     def delete(self, request_data):
         rpc_request = rpc.APIRequestDeleteSwUpdateStrategy()

nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_computes_api.py

@@ -4,6 +4,7 @@
 #
 import json
 import pecan
+import six
 from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
@@ -25,7 +26,7 @@ class ComputeOperateRequestData(wsme_types.Base):
     Virtualised Resources - Compute Operate Request Data
     """
     compute_operation = wsme_types.wsattr(ComputeOperationType, mandatory=True)
-    compute_operation_data = wsme_types.wsattr(unicode, mandatory=False,
+    compute_operation_data = wsme_types.wsattr(six.text_type, mandatory=False,
                                                default=None)
 
 
@@ -57,7 +58,7 @@ def _do_operation(rpc_request):
                    % (rpc_request, response.result))
         return httplib.INTERNAL_SERVER_ERROR
 
-    @wsme_pecan.wsexpose(None, unicode, body=ComputeOperateRequestData,
+    @wsme_pecan.wsexpose(None, six.text_type, body=ComputeOperateRequestData,
                          status_code=httplib.ACCEPTED)
     def post(self, compute_id, request_data):
         """
@@ -153,7 +154,7 @@ def _do_migrate(rpc_request):
                    % (rpc_request, response.result))
         return httplib.INTERNAL_SERVER_ERROR
 
-    @wsme_pecan.wsexpose(None, unicode, body=ComputeMigrateRequestData,
+    @wsme_pecan.wsexpose(None, six.text_type, body=ComputeMigrateRequestData,
                          status_code=httplib.ACCEPTED)
     def post(self, compute_id, request_data):
         """
@@ -201,17 +202,17 @@ class ComputeCreateVirtualCpuPinningType(wsme_types.Base):
     Virtualised Resources - Compute Create Virtual CPU Pinning Type
     """
     cpu_pinning_policy = wsme_types.wsattr(CpuPinningPolicy, mandatory=False)
-    cpu_pinning_map = wsme_types.wsattr(unicode, mandatory=False)
+    cpu_pinning_map = wsme_types.wsattr(six.text_type, mandatory=False)
 
 
 class ComputeCreateVirtualCpuType(wsme_types.Base):
     """
     Virtualised Resources - Compute Create Virtual CPU Type
     """
-    cpu_architecture = wsme_types.wsattr(unicode, mandatory=False)
+    cpu_architecture = wsme_types.wsattr(six.text_type, mandatory=False)
     num_virtual_cpu = wsme_types.wsattr(int, mandatory=True)
     virtual_cpu_clock = wsme_types.wsattr(int, mandatory=False)
-    virtual_cpu_oversubscription_policy = wsme_types.wsattr(unicode,
+    virtual_cpu_oversubscription_policy = wsme_types.wsattr(six.text_type,
                                                             mandatory=False)
     virtual_cpu_pinning = wsme_types.wsattr(ComputeCreateVirtualCpuPinningType,
                                             mandatory=False)
@@ -222,7 +223,7 @@ class ComputeCreateVirtualMemoryType(wsme_types.Base):
     Virtualised Resources - Compute Create Virtual Memory Type
     """
     virtual_mem_size = wsme_types.wsattr(int, mandatory=True)
-    virtual_mem_oversubscription_policy = wsme_types.wsattr(unicode,
+    virtual_mem_oversubscription_policy = wsme_types.wsattr(six.text_type,
                                                             mandatory=False)
     numa_enabled = wsme_types.wsattr(bool, mandatory=False)
 
@@ -239,7 +240,7 @@ class ComputeCreateFlavourType(wsme_types.Base):
     """
     Virtualised Resources - Compute Create Flavour Type
     """
-    flavour_id = wsme_types.wsattr(unicode, mandatory=True)
+    flavour_id = wsme_types.wsattr(six.text_type, mandatory=True)
     virtual_cpu = wsme_types.wsattr(ComputeCreateVirtualCpuType,
                                     mandatory=True)
     virtual_memory = wsme_types.wsattr(ComputeCreateVirtualMemoryType,
@@ -252,29 +253,29 @@ class ComputeCreateData(wsme_types.Base):
     """
     Virtualised Resources - Compute Create Data
     """
-    compute_id = wsme_types.wsattr(unicode, mandatory=True)
-    reservation_id = wsme_types.wsattr(unicode, mandatory=False)
+    compute_id = wsme_types.wsattr(six.text_type, mandatory=True)
+    reservation_id = wsme_types.wsattr(six.text_type, mandatory=False)
     compute_data = wsme_types.wsattr(ComputeCreateFlavourType, mandatory=True)
-    image_id = wsme_types.wsattr(unicode, mandatory=True)
-    meta_data = wsme_types.wsattr(unicode, mandatory=False, default=None)
+    image_id = wsme_types.wsattr(six.text_type, mandatory=True)
+    meta_data = wsme_types.wsattr(six.text_type, mandatory=False, default=None)
 
 
 class ComputeQueryVirtualCpuPinningType(wsme_types.Base):
     """
     Virtualised Resources - Compute Query Virtual CPU Pinning Type
     """
     cpu_pinning_policy = CpuPinningPolicy
-    cpu_pinning_map = [unicode]
+    cpu_pinning_map = [six.text_type]
 
 
 class ComputeQueryVirtualCpuType(wsme_types.Base):
     """
     Virtualised Resources - Compute Query Virtual CPU Type
     """
-    cpu_architecture = unicode
+    cpu_architecture = six.text_type
     num_virtual_cpu = int
     virtual_cpu_clock = int
-    virtual_cpu_oversubscription_policy = unicode
+    virtual_cpu_oversubscription_policy = six.text_type
     virtual_cpu_pinning = ComputeQueryVirtualCpuPinningType
 
 
@@ -283,7 +284,7 @@ class ComputeQueryVirtualMemoryType(wsme_types.Base):
     Virtualised Resources - Compute Query Virtual Memory Type
     """
     virtual_mem_size = int
-    virtual_mem_oversubscription_policy = unicode
+    virtual_mem_oversubscription_policy = six.text_type
     numa_enabled = bool
 
 
@@ -299,36 +300,36 @@ class ComputeQueryStorageResourceType(wsme_types.Base):
     """
     Virtualised Resources - Compute Query Storage Resource Type
     """
-    resource_id = unicode
+    resource_id = six.text_type
     storage_attributes = ComputeQueryVirtualStorageType
-    owner_id = unicode
-    host_id = unicode
-    status = unicode
-    meta_data = unicode
+    owner_id = six.text_type
+    host_id = six.text_type
+    status = six.text_type
+    meta_data = six.text_type
 
 
 class ComputeQueryAttributesResourceType(wsme_types.Base):
     """
     Virtualised Resources - Compute Query Attributes Resource Type
     """
-    flavour_id = unicode
-    acceleration_capabilities = unicode
+    flavour_id = six.text_type
+    acceleration_capabilities = six.text_type
     virtual_memory = ComputeQueryVirtualMemoryType
     virtual_cpu = ComputeQueryVirtualCpuType
-    flavour_original_name = unicode
+    flavour_original_name = six.text_type
 
 
 class ComputeQueryResourceType(wsme_types.Base):
     """
     Virtualised Resources - Compute Query Resource Type
     """
-    compute_id = unicode
+    compute_id = six.text_type
     compute_attributes = ComputeQueryAttributesResourceType
-    vc_image_id = unicode
+    vc_image_id = six.text_type
     virtual_disks = [ComputeQueryStorageResourceType]
-    host_id = unicode
-    status = unicode
-    meta_data = unicode
+    host_id = six.text_type
+    status = six.text_type
+    meta_data = six.text_type
 
 
 class ComputeQueryData(wsme_types.Base):
@@ -402,7 +403,7 @@ def _get_compute_details(compute_id, compute):
                    % (compute_id, response.result))
         return httplib.INTERNAL_SERVER_ERROR
 
-    @wsme_pecan.wsexpose(ComputeQueryData, unicode, status_code=httplib.OK)
+    @wsme_pecan.wsexpose(ComputeQueryData, six.text_type, status_code=httplib.OK)
     def get_one(self, compute_id):
         if not validate.valid_uuid_str(compute_id):
             DLOG.error("Invalid uuid received, uuid=%s." % compute_id)
@@ -555,7 +556,7 @@ def post(self, compute_create_data):
                    % (compute_create_data.compute_id, response.result))
         return pecan.abort(httplib.INTERNAL_SERVER_ERROR)
 
-    @wsme_pecan.wsexpose(None, unicode, status_code=httplib.NO_CONTENT)
+    @wsme_pecan.wsexpose(None, six.text_type, status_code=httplib.NO_CONTENT)
     def delete(self, compute_id):
         DLOG.verbose("Compute-API delete called for compute %s." % compute_id)