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)
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")
@bottle.route(url_base + '/<tenant_id>/scenarios/<scenario_id>', method='DELETE')
def http_delete_scenario_id(tenant_id, scenario_id):
'''delete a scenario from database, can use both uuid or name'''
+ logger.debug('FROM %s %s %s', bottle.request.remote_addr, bottle.request.method, bottle.request.url)
try:
#check valid tenant_id
if tenant_id != "any":
- nfvo.check_tenant(mydb, tenant_id)
+ nfvo.check_tenant(mydb, tenant_id)
#obtain data
data = mydb.delete_scenario(scenario_id, tenant_id)
#print json.dumps(data, indent=4)