New file setup.py: builds a python package

[osm/RO.git] / httpserver.py

diff --git a/httpserver.py b/httpserver.py
index 65d7ede..a0216e1 100644 (file)
--- a/httpserver.py
+++ b/httpserver.py
@@ -483,14 +483,14 @@ def http_get_datacenter_id(tenant_id, datacenter_id):
                     try:
                         config_dict = yaml.load(vim_tenant['config'])
                         vim_tenant['config'] = config_dict
-                    except Exception, e:
+                    except Exception as e:
                         logger.error("Exception '%s' while trying to load config information", str(e))
 
         if datacenter['config'] != None:
             try:
                 config_dict = yaml.load(datacenter['config'])
                 datacenter['config'] = config_dict
-            except Exception, e:
+            except Exception as e:
                 logger.error("Exception '%s' while trying to load config information", str(e))
         #change_keys_http2db(content, http2db_datacenter, reverse=True)
         convert_datetime2str(datacenter)
@@ -975,9 +975,9 @@ def http_post_scenarios(tenant_id):
         if used_schema == nsd_schema_v01:
             scenario_id = nfvo.new_scenario(mydb, tenant_id, http_content)
         elif used_schema == nsd_schema_v02:
-            scenario_id = nfvo.new_scenario_v02(mydb, tenant_id, http_content)
+            scenario_id = nfvo.new_scenario_v02(mydb, tenant_id, http_content, "0.2")
         elif used_schema == nsd_schema_v03:
-            scenario_id = nfvo.new_scenario_v03(mydb, tenant_id, http_content)
+            scenario_id = nfvo.new_scenario_v02(mydb, tenant_id, http_content, "0.3")
         else:
             logger.warning('Unexpected schema_version: %s', http_content.get("schema_version"))
             bottle.abort(HTTP_Bad_Request, "Invalid schema version")