Tenant id is now extracted from headers;

eq function added to api Resource class

Change-Id: Ia28260a794c2e30fdcd57941421ea2cbbfc8f216

savanna/service/api.py

@@ -49,8 +49,7 @@ def create_node_template(values):
 
     name = values.pop('name')
     node_type_id = storage.get_node_type(name=values.pop('node_type')).id
-    # todo(slukjanov): take tenant_id from headers
-    tenant_id = "tenant-01"
+    tenant_id = request.headers['X-Tenant-Id']
     flavor_id = values.pop('flavor_id')
 
     nt = storage.create_node_template(name, node_type_id, tenant_id,
@@ -79,8 +78,7 @@ def create_cluster(values):
 
     name = values.pop('name')
     base_image_id = values.pop('base_image_id')
-    # todo(slukjanov): take tenant_id from headers
-    tenant_id = "tenant-01"
+    tenant_id = request.headers['X-Tenant-Id']
     templates = values.pop('node_templates')
 
     # todo(slukjanov): check that we can create objects in the specified tenant
@@ -174,6 +172,9 @@ class Resource(object):
     def __repr__(self):
         return '<%s %s>' % (self._name, self._info)
 
+    def __eq__(self, other):
+        return self._name == other._name and self._info == other._info
+
     @property
     def dict(self):
         return self._info

savanna/tests/unit/test_api_v02.py

@@ -64,6 +64,7 @@ def _stub_auth_token(*args, **kwargs):
 
     def _filter(app):
         def _handler(env, start_response):
+            env['HTTP_X_TENANT_ID'] = 'tenant-id-1'
             return app(env, start_response)
 
         return _handler