Merge "Add description column to device_profiles db"

cyborg/db/sqlalchemy/alembic/versions/60d8ac91fd20_add_description_field_to_dps.py

@@ -0,0 +1,19 @@
+"""add_description_field_to_dps
+
+Revision ID: 60d8ac91fd20
+Revises: 7a4fd0fc3f8c
+Create Date: 2020-01-19 16:15:04.231512
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '60d8ac91fd20'
+down_revision = '7a4fd0fc3f8c'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    op.add_column('device_profiles', sa.Column('description',
+                  sa.Text(), nullable=True))

cyborg/db/sqlalchemy/models.py

@@ -191,6 +191,7 @@ class DeviceProfile(Base):
     uuid = Column(String(36), nullable=False)
     name = Column(String(255), nullable=False, unique=True)
     profile_json = Column(Text, nullable=False)
+    description = Column(Text, nullable=True)
 
 
 class ExtArq(Base):

cyborg/tests/unit/db/test_db_device_profile.py

@@ -31,19 +31,27 @@ class TestDbDeviceProfile(base.DbTestCase):
         queried_dp = self.dbapi.device_profile_get_by_uuid(
             self.context, created_dp['uuid'])
         self.assertEqual(created_dp['uuid'], queried_dp['uuid'])
+        self.assertIn('description', queried_dp)
 
     def test_get_by_id(self):
         created_dp = utils.create_test_device_profile(self.context)
         queried_dp = self.dbapi.device_profile_get_by_id(
             self.context, created_dp['id'])
         self.assertEqual(created_dp['id'], queried_dp['id'])
+        self.assertIn('description', queried_dp)
 
-    def test_update(self):
+    def test_update_with_name(self):
         created_dp = utils.create_test_device_profile(self.context)
         queried_dp = self.dbapi.device_profile_update(
             self.context, created_dp['uuid'], {'name': 'updated_name'})
         self.assertEqual('updated_name', queried_dp['name'])
 
+    def test_update_with_description(self):
+        created_dp = utils.create_test_device_profile(self.context)
+        queried_dp = self.dbapi.device_profile_update(
+            self.context, created_dp['uuid'], {'description': 'fake-desc'})
+        self.assertEqual('fake-desc', queried_dp['description'])
+
     def test_list(self):
         uuids = []
         for i in range(1, 4):

cyborg/tests/unit/db/utils.py

@@ -177,6 +177,7 @@ def get_test_device_profile(**kw):
         'id': kw.get('id', 1),
         'uuid': kw.get('uuid', 'c0f43d55-03bf-4831-8639-9bbdb6be2478'),
         'name': kw.get('name', 'name'),
+        'description': kw.get('description', 'fake_dp_desc'),
         'profile_json': kw.get(
             'profile_json',
             '{"version": "1.0", \