Change from_db_model to create the correct uri

Change-Id: Idbf61639854029b6d5003f58baaae171c0b3a817
Closes-Bug: #1285017

solum/api/controllers/v1/datamodel/types.py

@@ -46,7 +46,7 @@ class Base(wtypes.Base):
     def from_db_model(cls, m, host_url):
         json = m.as_dict()
         json['type'] = m.__tablename__
-        json['uri'] = '%s/v1/%s/%s' % (host_url, json['type'], m.uuid)
+        json['uri'] = '%s/v1/%s/%s' % (host_url, m.__resource__, m.uuid)
         del json['id']
         return cls(**(json))
 

solum/objects/sqlalchemy/extension.py

@@ -21,6 +21,7 @@ from solum.openstack.common.db.sqlalchemy import session as db_session
 class Extension(sql.Base, abstract.Extension):
     """Represent an extension in sqlalchemy."""
 
+    __resource__ = 'extensions'
     __tablename__ = 'extension'
     __table_args__ = sql.table_args()
 

solum/objects/sqlalchemy/operation.py

@@ -20,6 +20,7 @@ from solum.objects.sqlalchemy import models as sql
 class Operation(sql.Base, abstract.Operation):
     """Represent an operation in sqlalchemy."""
 
+    __resource__ = 'operations'
     __tablename__ = 'operation'
     __table_args__ = sql.table_args()
 

solum/objects/sqlalchemy/plan.py

@@ -23,6 +23,7 @@ from solum.openstack.common.db.sqlalchemy import session as db_session
 class Plan(sql.Base, abstract.Plan):
     """Represent a plan in sqlalchemy."""
 
+    __resource__ = 'plans'
     __tablename__ = 'plan'
     __table_args__ = sql.table_args()
 

solum/objects/sqlalchemy/sensor.py

@@ -21,6 +21,7 @@ from solum.openstack.common.db.sqlalchemy import session as db_session
 class Sensor(sql.Base, abstract.Sensor):
     """Represent an sensor in sqlalchemy."""
 
+    __resource__ = 'sensors'
     __tablename__ = 'sensor'
     __table_args__ = sql.table_args()
 

solum/objects/sqlalchemy/service.py

@@ -22,6 +22,7 @@ from solum.objects.sqlalchemy import models as sql
 class Service(sql.Base, abstract.Service):
     """Represent a service in sqlalchemy."""
 
+    __resource__ = 'services'
     __tablename__ = 'service'
     __table_args__ = sql.table_args()
 

solum/tests/api/v1/test_types.py

@@ -53,5 +53,5 @@ class TestTypes(base.BaseTestCase):
         self.assertEqual(data['project_id'], p.project_id)
         self.assertEqual('plan', p.type)
         self.assertEqual(data['user_id'], p.user_id)
-        self.assertEqual('%s/v1/%s/%s' % (host_url, p.type, data['uuid']),
-                         p.uri)
+        self.assertEqual('%s/v1/%s/%s' % (host_url, obj.__resource__,
+                                          data['uuid']), p.uri)