X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=httpserver.py;h=8cd482f939e389889084ba6421a7fd9ac528b626;hb=refs%2Fchanges%2F88%2F988%2F2;hp=cd40882ff2edf5a9cd757878d739cf26fa308d96;hpb=edca7b3cd61081d0d84de9acc4dec39daaa07419;p=osm%2FRO.git

diff --git a/httpserver.py b/httpserver.py
index cd40882f..8cd482f9 100644
--- a/httpserver.py
+++ b/httpserver.py
@@ -450,7 +450,7 @@ def http_get_datacenter_id(tenant_id, datacenter_id):
         what = 'uuid' if utils.check_valid_uuid(datacenter_id) else 'name'
         where_={}
         where_[what] = datacenter_id
-        select_=['uuid', 'name','vim_url', 'vim_url_admin', 'type', 'config', 'description', 'd.created_at as created_at']
+        select_=['uuid', 'name','vim_url', 'vim_url_admin', 'type', 'd.config as config', 'description', 'd.created_at as created_at']
         if tenant_id != 'any':
             select_.append("datacenter_tenant_id")
             where_['td.nfvo_tenant_id']= tenant_id
@@ -470,13 +470,22 @@ def http_get_datacenter_id(tenant_id, datacenter_id):
         if tenant_id != 'any':
             #get vim tenant info
             vim_tenants = mydb.get_rows(
-                    SELECT=("vim_tenant_name", "vim_tenant_id", "user"),
+                    SELECT=("vim_tenant_name", "vim_tenant_id", "user", "passwd", "config"),
                     FROM="datacenter_tenants",
                     WHERE={"uuid": datacenters[0]["datacenter_tenant_id"]},
                     ORDER_BY=("created", ) )
             del datacenter["datacenter_tenant_id"]
             datacenter["vim_tenants"] = vim_tenants
-    
+            for vim_tenant in vim_tenants:
+                if vim_tenant["passwd"]:
+                    vim_tenant["passwd"] = "******"
+                if vim_tenant['config'] != None:
+                    try:
+                        config_dict = yaml.load(vim_tenant['config'])
+                        vim_tenant['config'] = config_dict
+                    except Exception, e:
+                        logger.error("Exception '%s' while trying to load config information", str(e))
+
         if datacenter['config'] != None:
             try:
                 config_dict = yaml.load(datacenter['config'])
@@ -719,8 +728,9 @@ def http_associate_datacenters(tenant_id, datacenter_id):
                                     http_content['datacenter'].get('vim_tenant'),
                                     http_content['datacenter'].get('vim_tenant_name'),
                                     http_content['datacenter'].get('vim_username'),
-                                    http_content['datacenter'].get('vim_password')
-                         )
+                                    http_content['datacenter'].get('vim_password'),
+                                    http_content['datacenter'].get('config')
+        )
         return http_get_datacenter_id(tenant_id, id_)
     except (nfvo.NfvoException, db_base_Exception) as e:
         logger.error("http_associate_datacenters error {}: {}".format(e.http_code, str(e)))
@@ -986,14 +996,14 @@ def http_post_scenarios(tenant_id):
 def http_post_scenario_action(tenant_id, scenario_id):
     '''take an action over a scenario'''
     logger.debug('FROM %s %s %s', bottle.request.remote_addr, bottle.request.method, bottle.request.url)
-    #check valid tenant_id
+    # parse input data
+    http_content, _ = format_in(scenario_action_schema)
+    r = utils.remove_extra_items(http_content, scenario_action_schema)
+    if r:
+        logger.debug("Remove received extra items %s", str(r))
     try:
-        nfvo.check_tenant(mydb, tenant_id) 
-        #parse input data
-        http_content,_ = format_in( scenario_action_schema )
-        r = utils.remove_extra_items(http_content, scenario_action_schema)
-        if r:
-            logger.debug("Remove received extra items %s", str(r))
+        # check valid tenant_id
+        nfvo.check_tenant(mydb, tenant_id)
         if "start" in http_content:
             data = nfvo.start_scenario(mydb, tenant_id, scenario_id, http_content['start']['instance_name'], \
                         http_content['start'].get('description',http_content['start']['instance_name']),
@@ -1116,15 +1126,15 @@ def http_put_scenario_id(tenant_id, scenario_id):
 def http_post_instances(tenant_id):
     '''create an instance-scenario'''
     logger.debug('FROM %s %s %s', bottle.request.remote_addr, bottle.request.method, bottle.request.url)
+    # parse input data
+    http_content, used_schema = format_in(instance_scenario_create_schema_v01)
+    r = utils.remove_extra_items(http_content, used_schema)
+    if r is not None:
+        logger.warning("http_post_instances: Warning: remove extra items %s", str(r))
     try:
         #check valid tenant_id
         if tenant_id != "any":
             nfvo.check_tenant(mydb, tenant_id) 
-        #parse input data
-        http_content,used_schema = format_in( instance_scenario_create_schema_v01)
-        r = utils.remove_extra_items(http_content, used_schema)
-        if r is not None:
-            logger.warning("http_post_instances: Warning: remove extra items %s", str(r))
         data = nfvo.create_instance(mydb, tenant_id, http_content["instance"])
         return format_out(data)
     except (nfvo.NfvoException, db_base_Exception) as e:
@@ -1215,16 +1225,16 @@ def http_delete_instance_id(tenant_id, instance_id):
 def http_post_instance_scenario_action(tenant_id, instance_id):
     '''take an action over a scenario instance'''
     logger.debug('FROM %s %s %s', bottle.request.remote_addr, bottle.request.method, bottle.request.url)
+    # parse input data
+    http_content, _ = format_in(instance_scenario_action_schema)
+    r = utils.remove_extra_items(http_content, instance_scenario_action_schema)
+    if r:
+        logger.debug("Remove received extra items %s", str(r))
     try:
         #check valid tenant_id
         if tenant_id != "any":
             nfvo.check_tenant(mydb, tenant_id) 
 
-        #parse input data
-        http_content,_ = format_in( instance_scenario_action_schema )
-        r = utils.remove_extra_items(http_content, instance_scenario_action_schema)
-        if r:
-            logger.debug("Remove received extra items %s", str(r))
         #print "http_post_instance_scenario_action input: ", http_content
         #obtain data
         instance = mydb.get_instance_scenario(instance_id, tenant_id)