2to3 conversion for osm_ro
Signed-off-by: Marco Ceppi <marco.ceppi@canonical.com>
diff --git a/osm_ro/vim_thread.py b/osm_ro/vim_thread.py
index 22a882e..8ce029f 100644
--- a/osm_ro/vim_thread.py
+++ b/osm_ro/vim_thread.py
@@ -57,11 +57,11 @@
import threading
import time
-import Queue
+import queue
import logging
-import vimconn
+from . import vimconn
import yaml
-from db_base import db_base_Exception
+from .db_base import db_base_Exception
from lib_osm_openvim.ovim import ovimException
__author__ = "Alfonso Tierno, Pablo Montes"
@@ -116,7 +116,7 @@
self.db_lock = db_lock
self.task_lock = task_lock
- self.task_queue = Queue.Queue(2000)
+ self.task_queue = queue.Queue(2000)
self.refresh_tasks = []
"""Contains time ordered task list for refreshing the status of VIM VMs and nets"""
@@ -206,7 +206,7 @@
try:
now = time.time()
vim_dict = self.vim.refresh_vms_status(vm_to_refresh_list)
- for vim_id, vim_info in vim_dict.items():
+ for vim_id, vim_info in list(vim_dict.items()):
# look for task
task_need_update = False
task = vm_to_refresh_dict[vim_id]
@@ -309,7 +309,7 @@
try:
now = time.time()
vim_dict = self.vim.refresh_nets_status(net_to_refresh_list)
- for vim_id, vim_info in vim_dict.items():
+ for vim_id, vim_info in list(vim_dict.items()):
# look for task
task = net_to_refresh_dict[vim_id]
self.logger.debug("get-net net_id=%s result=%s", task["vim_id"], str(vim_info))
@@ -557,7 +557,7 @@
try:
self.task_queue.put(task, False)
return None
- except Queue.Full:
+ except queue.Full:
raise vimconn.vimconnException(self.name + ": timeout inserting a task")
def del_task(self, task):
@@ -688,7 +688,7 @@
vm_vim_id = task["vim_id"]
interfaces = task["extra"].get("interfaces", ())
try:
- for iface in interfaces.values():
+ for iface in list(interfaces.values()):
if iface.get("sdn_port_id"):
try:
with self.db_lock: