add-purpose-field-to-esi-lease

CCI-MOC · Jun 14, 2023 · bb7ef8c · bb7ef8c
1 parent fda372a
commit bb7ef8c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/esi_leap/api/controllers/v1/lease.py b/esi_leap/api/controllers/v1/lease.py
@@ -53,6 +53,7 @@ class Lease(base.ESILEAPBase):
     end_time = wsme.wsattr(datetime.datetime)
     status = wsme.wsattr(wtypes.text, readonly=True)
     properties = {wtypes.text: types.jsontype}
+    purpose = wsme.wsattr(wtypes.text)
     offer_uuid = wsme.wsattr(wtypes.text, readonly=True)
     parent_lease_uuid = wsme.wsattr(wtypes.text, readonly=True)
 

diff --git a/esi_leap/db/sqlalchemy/models.py b/esi_leap/db/sqlalchemy/models.py
@@ -88,6 +88,7 @@ class Lease(Base):
     name = Column(String(35), nullable=True, unique=False)
     project_id = Column(String(255), nullable=False)
     owner_id = Column(String(255), nullable=False)
+    purpose = Column(String(255), nullable=True)
     resource_type = Column(String(36), nullable=False)
     resource_uuid = Column(String(36), nullable=False)
     start_time = Column(DateTime)

diff --git a/esi_leap/objects/lease.py b/esi_leap/objects/lease.py
@@ -75,6 +75,7 @@ class LeaseCRUDPayload(notification.NotificationPayloadBase):
         'uuid': fields.UUIDField(),
         'project_id': fields.StringField(),
         'owner_id': fields.StringField(),
+        'purpose': fields.StringField(),
         'resource_type': fields.StringField(),
         'resource_uuid': fields.StringField(),
         'start_time': fields.DateTimeField(nullable=True),

diff --git a/esi_leap/tests/api/controllers/v1/test_lease.py b/esi_leap/tests/api/controllers/v1/test_lease.py
@@ -101,7 +101,8 @@ def test_post(self, mock_create, mock_cra, mock_generate_uuid,
             'resource_type': 'test_node',
             'resource_uuid': '1234567890',
             'start_time': '2016-07-16T19:20:30',
-            'end_time': '2016-08-16T19:20:30'
+            'end_time': '2016-08-16T19:20:30',
+            'purpose': 'test_purpose'
         }
         return_data = data.copy()
         return_data['owner_id'] = self.context.project_id

diff --git a/esi_leap/tests/db/sqlalchemy/test_api.py b/esi_leap/tests/db/sqlalchemy/test_api.py
@@ -92,6 +92,7 @@
     name='l1',
     resource_uuid='1111',
     resource_type='dummy_node',
+    purpose='test_purpose',
     start_time=now + datetime.timedelta(days=10),
     end_time=now + datetime.timedelta(days=20),
     properties={},
@@ -105,6 +106,7 @@
     name='l1',
     resource_uuid='1111',
     resource_type='dummy_node',
+    purpose='test_purpose',
     start_time=now + datetime.timedelta(days=20),
     end_time=now + datetime.timedelta(days=30),
     properties={},
@@ -118,6 +120,7 @@
     name='l1',
     resource_uuid='1111',
     resource_type='dummy_node',
+    purpose='test_purpose',
     start_time=now + datetime.timedelta(days=50),
     end_time=now + datetime.timedelta(days=60),
     properties={},
@@ -131,6 +134,7 @@
     name='l4',
     resource_uuid='1111',
     resource_type='dummy_node',
+    purpose='test_purpose',
     start_time=now + datetime.timedelta(days=85),
     end_time=now + datetime.timedelta(days=90),
     properties={},
@@ -143,6 +147,7 @@
     name='l5',
     resource_uuid='1111',
     resource_type='dummy_node',
+    purpose='test_purpose',
     start_time=now + datetime.timedelta(days=90),
     end_time=now + datetime.timedelta(days=100),
     uuid='55555',
@@ -156,6 +161,7 @@
     name='l6',
     resource_uuid='2222',
     resource_type='dummy_node',
+    purpose='test_purpose',
     start_time=now + datetime.timedelta(days=5),
     end_time=now + datetime.timedelta(days=30),
     uuid='6666',
@@ -589,6 +595,7 @@ def setUp(self):
             owner_id=uuidutils.generate_uuid(),
             resource_uuid='1111',
             resource_type='dummy_node',
+            purpose='test_purpose',
             start_time=now + datetime.timedelta(days=50),
             end_time=now + datetime.timedelta(days=100),
             status=statuses.ACTIVE,
@@ -600,6 +607,7 @@ def setUp(self):
             parent_lease_uuid=self.parent_lease_data['uuid'],
             resource_uuid='1111',
             resource_type='dummy_node',
+            purpose='test_purpose',
             start_time=now + datetime.timedelta(days=60),
             end_time=now + datetime.timedelta(days=70),
             status=statuses.ACTIVE,

diff --git a/esi_leap/tests/objects/test_lease.py b/esi_leap/tests/objects/test_lease.py
@@ -64,6 +64,7 @@ def setUp(self):
             'properties': {},
             'resource_type': 'dummy_node',
             'resource_uuid': '1718',
+            'purpose': 'test_purpose',
             'offer_uuid': None,
             'parent_lease_uuid': None,
             'created_at': None,
@@ -82,6 +83,7 @@ def setUp(self):
             'end_time': self.start_time + datetime.timedelta(days=10),
             'resource_type': 'dummy_node',
             'resource_uuid': '1718',
+            'purpose': 'test_purpose',
         }
         self.test_lease_create_offer_dict = self.test_lease_create_dict.copy()
         self.test_lease_create_offer_dict['offer_uuid'] = self.test_offer.uuid