From f053737a7b5dbf4b2ccee3c483da8371367dbeb7 Mon Sep 17 00:00:00 2001
From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Thu, 8 Sep 2016 08:17:37 +0200
Subject: [PATCH] v0.4.7 remove folder utils moving files to parent to avoid an
 empty __utils.py__ file without license

Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---
 utils/RADclass.py => RADclass.py                       | 0
 utils/auxiliary_functions.py => auxiliary_functions.py | 0
 utils/definitionsClass.py => definitionsClass.py       | 0
 host_thread.py                                         | 2 +-
 httpserver.py                                          | 2 +-
 openvimd.py                                            | 6 +++---
 vim_db.py                                              | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename utils/RADclass.py => RADclass.py (100%)
 rename utils/auxiliary_functions.py => auxiliary_functions.py (100%)
 rename utils/definitionsClass.py => definitionsClass.py (100%)

diff --git a/utils/RADclass.py b/RADclass.py
similarity index 100%
rename from utils/RADclass.py
rename to RADclass.py
diff --git a/utils/auxiliary_functions.py b/auxiliary_functions.py
similarity index 100%
rename from utils/auxiliary_functions.py
rename to auxiliary_functions.py
diff --git a/utils/definitionsClass.py b/definitionsClass.py
similarity index 100%
rename from utils/definitionsClass.py
rename to definitionsClass.py
diff --git a/host_thread.py b/host_thread.py
index 0aba077..1049e40 100644
--- a/host_thread.py
+++ b/host_thread.py
@@ -40,7 +40,7 @@ import libvirt
 from vim_schema import localinfo_schema, hostinfo_schema
 import random
 #from logging import Logger
-#import utils.auxiliary_functions as af
+#import auxiliary_functions as af
 
 #TODO: insert a logging system
 
diff --git a/httpserver.py b/httpserver.py
index 2be5164..9112182 100644
--- a/httpserver.py
+++ b/httpserver.py
@@ -34,7 +34,7 @@ import yaml
 import json
 import threading
 import datetime
-from utils import RADclass
+import RADclass
 from jsonschema import validate as js_v, exceptions as js_e
 import host_thread as ht
 from vim_schema import host_new_schema, host_edit_schema, tenant_new_schema, \
diff --git a/openvimd.py b/openvimd.py
index 220c90a..3a13623 100755
--- a/openvimd.py
+++ b/openvimd.py
@@ -30,12 +30,12 @@ and host controllers
 
 __author__="Alfonso Tierno"
 __date__ ="$10-jul-2014 12:07:15$"
-__version__="0.4.6-r466"
-version_date="Jul 2016"
+__version__="0.4.7-r494"
+version_date="Sep 2016"
 database_version="0.7"      #expected database schema version
 
 import httpserver
-from utils import auxiliary_functions as af
+import auxiliary_functions as af
 import sys
 import getopt
 import time
diff --git a/vim_db.py b/vim_db.py
index 93f2f45..002d994 100644
--- a/vim_db.py
+++ b/vim_db.py
@@ -34,7 +34,7 @@ __date__ ="$10-jul-2014 12:07:15$"
 
 import MySQLdb as mdb
 import uuid as myUuid
-from utils import auxiliary_functions as af
+import auxiliary_functions as af
 import json
 import logging
 
-- 
2.25.1