diff --git a/nfv/nfv-client/nfv_client/openstack/rest_api.py b/nfv/nfv-client/nfv_client/openstack/rest_api.py index fc6c6484..e1219c6d 100755 --- a/nfv/nfv-client/nfv_client/openstack/rest_api.py +++ b/nfv/nfv-client/nfv_client/openstack/rest_api.py @@ -5,7 +5,7 @@ # import json import urllib2 -import httplib +from six.moves import http_client as httplib def request(token_id, method, api_cmd, api_cmd_headers=None, api_cmd_payload=None): diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/clients/kubernetes_client.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/clients/kubernetes_client.py index ea54cff8..0360abea 100644 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/clients/kubernetes_client.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/clients/kubernetes_client.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import kubernetes from kubernetes.client.rest import ApiException diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_block_storage_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_block_storage_api.py index 05738159..bee76cc9 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_block_storage_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_block_storage_api.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib from nfv_common import debug diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py index eb089616..ecc2d6dd 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # import collections -import httplib +from six.moves import http_client as httplib import json import six import socket diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_guest_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_guest_api.py index 622a6725..6ed08bee 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_guest_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_guest_api.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # import json -import httplib +from six.moves import http_client as httplib from nfv_common import debug diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_identity_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_identity_api.py index 855e47b5..53205c5e 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_identity_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_identity_api.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # import uuid -import httplib +from six.moves import http_client as httplib from nfv_common import debug diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_image_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_image_api.py index b84d3155..d2639c45 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_image_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_image_api.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib from nfv_common import debug diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py index 4eb9ea83..eef158eb 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # import json -import httplib +from six.moves import http_client as httplib import os from nfv_common import debug diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_network_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_network_api.py index 470d5106..5452ce09 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_network_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_network_api.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib from nfv_common import debug diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_sw_mgmt_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_sw_mgmt_api.py index 605d03b7..7c38662e 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_sw_mgmt_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_sw_mgmt_api.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib from nfv_common import debug diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py index 71a6dda1..04612c3d 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import json import re import socket diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/unit_test.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/unit_test.py index a4193982..888f7a44 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/unit_test.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/unit_test.py @@ -7,7 +7,7 @@ import argparse import config import time import socket -import httplib +from six.moves import http_client as httplib from nfv_plugins.nfvi_plugins.openstack import openstack from nfv_plugins.nfvi_plugins.openstack import ceilometer diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/root.py b/nfv/nfv-vim/nfv_vim/api/controllers/root.py index 2d1db58d..3e7c7357 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/root.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/root.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import pecan from pecan import rest from wsme import types as wsme_types diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py index 676e5b4b..7764c6da 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import pecan from pecan import rest from wsme import types as wsme_types diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_controller.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_controller.py index 3b25e355..1072b5e3 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_controller.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_controller.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import pecan from pecan import rest from wsme import types as wsme_types diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/_controller.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/_controller.py index 78e34b4f..ad808b86 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/_controller.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/_controller.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import pecan from pecan import rest from wsme import types as wsme_types diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_patch.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_patch.py index ee7685ec..36369e7b 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_patch.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_patch.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import pecan from pecan import rest from wsme import types as wsme_types diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_strategy.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_strategy.py index 4080de9e..d4b1ada5 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_strategy.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_strategy.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import json import pecan from pecan import rest diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_upgrade.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_upgrade.py index daa678b7..9f88b7ed 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_upgrade.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_upgrade.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import pecan from pecan import rest from wsme import types as wsme_types diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_computes_api.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_computes_api.py index 8869b0d0..5595776b 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_computes_api.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_computes_api.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import json import pecan from wsme import types as wsme_types diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_controller.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_controller.py index 2805d22b..d80c02e2 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_controller.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_controller.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import pecan from pecan import rest from wsme import types as wsme_types diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_image_api.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_image_api.py index 044ee700..7578ab53 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_image_api.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_image_api.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import json import pecan from pecan import rest diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_api.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_api.py index 57cdeae4..40365cd7 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_api.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_api.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import pecan from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_middleware.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_middleware.py index 3ac40d9e..7cc1c3c8 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_middleware.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_middleware.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import pecan from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_volume_api.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_volume_api.py index 77f78b79..8950c14d 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_volume_api.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_volume_api.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import json import pecan from wsme import types as wsme_types diff --git a/nfv/nfv-vim/nfv_vim/api/openstack/_rest_api.py b/nfv/nfv-vim/nfv_vim/api/openstack/_rest_api.py index 3a2d7e78..0d4830d0 100755 --- a/nfv/nfv-vim/nfv_vim/api/openstack/_rest_api.py +++ b/nfv/nfv-vim/nfv_vim/api/openstack/_rest_api.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -import httplib +from six.moves import http_client as httplib import urllib2 from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py index 20b99efb..62b3d193 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py +++ b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # import datetime -import httplib +from six.moves import http_client as httplib import json import re import socket