cyclades: use project as tenant_id in API

snf-cyclades-app/synnefo/api/networks.py

@@ -201,7 +201,7 @@ def network_to_dict(network, detail=True):
 
         state = "SNF:DRAINED" if network.drained else network.state
         d['user_id'] = network.userid
-        d['tenant_id'] = network.userid
+        d['tenant_id'] = network.project
         d['type'] = network.flavor
         d['updated'] = api.utils.isoformat(network.updated)
         d['created'] = api.utils.isoformat(network.created)

snf-cyclades-app/synnefo/api/servers.py

@@ -171,7 +171,7 @@ def vm_to_dict(vm, detail=False):
     d['links'] = util.vm_to_links(vm.id)
     if detail:
         d['user_id'] = vm.userid
-        d['tenant_id'] = vm.userid
+        d['tenant_id'] = vm.project
         d['status'] = logic_utils.get_rsapi_state(vm)
         d['SNF:task_state'] = logic_utils.get_task_state(vm)
         d['progress'] = 100 if d['status'] == 'ACTIVE' else vm.buildpercentage