From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Wed, 6 Jul 2016 15:31:12 +0000 (+0200)
Subject: Fixed some references to utils
X-Git-Tag: v1.0.0~75
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=66aa03745ce8fe86b2a2d555317ddf94f74e90fa;p=osm%2FRO.git

Fixed some references to utils

Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/httpserver.py b/httpserver.py
index 2fa4200d..7e4a82c3 100644
--- a/httpserver.py
+++ b/httpserver.py
@@ -783,7 +783,7 @@ def http_post_deploy(tenant_id):
     '''post topology deploy.'''
     print "http_post_deploy by tenant " + tenant_id 
 
-    http_content, used_schema = format_in( nsd_schema_v01, ("version",), {"v0.2": nsd_schema_v02})
+    http_content, used_schema = format_in( nsd_schema_v01, ("schema_version",), {2: nsd_schema_v02})
     #r = utils.remove_extra_items(http_content, used_schema)
     #if r is not None: print "http_post_deploy: Warning: remove extra items ", r
     print "http_post_deploy input: ",  http_content
@@ -816,7 +816,7 @@ def http_post_verify(tenant_id):
 def http_post_scenarios(tenant_id):
     '''add a scenario into the catalogue. Creates the scenario and its internal structure in the OPENMANO DB'''
     print "http_post_scenarios by tenant " + tenant_id 
-    http_content, used_schema = format_in( nsd_schema_v01, ("schema_version",), {"0.2": nsd_schema_v02})
+    http_content, used_schema = format_in( nsd_schema_v01, ("schema_version",), {2: nsd_schema_v02})
     #r = utils.remove_extra_items(http_content, used_schema)
     #if r is not None: print "http_post_scenarios: Warning: remove extra items ", r
     print "http_post_scenarios input: ",  http_content
diff --git a/nfvo.py b/nfvo.py
index c7932262..d528f857 100644
--- a/nfvo.py
+++ b/nfvo.py
@@ -2370,7 +2370,7 @@ def vim_action_delete(mydb, tenant_id, datacenter, item, name):
     if tenant_id == "any":
         tenant_id=None
 
-    if af.check_valid_uuid(datacenter): 
+    if utils.check_valid_uuid(datacenter): 
         result, vims = get_vim(mydb, nfvo_tenant=tenant_id, datacenter_id=datacenter)
     else:
         result, vims = get_vim(mydb, nfvo_tenant=tenant_id, datacenter_name=datacenter)
@@ -2446,4 +2446,4 @@ def vim_action_create(mydb, tenant_id, datacenter, item, descriptor):
         return result, content
     return vim_action_get(mydb, tenant_id, datacenter, item, content)
 
-    
\ No newline at end of file
+    
diff --git a/utils.py b/utils.py
index 81a01588..81027739 100755
--- a/utils.py
+++ b/utils.py
@@ -22,7 +22,7 @@
 ##
 
 '''
-auxiliary_functions is a module that implements functions that are used by all openmano modules,
+utils is a module that implements functions that are used by all openmano modules,
 dealing with aspects such as reading/writing files, formatting inputs/outputs for quick translation
 from dictionaries to appropriate database dictionaries, etc.
 '''