From 2e3869feb25a1575447de186b9b39d2c8d8084bc Mon Sep 17 00:00:00 2001
From: Susmitha <susmitha@platform9.com>
Date: Mon, 27 Jun 2016 16:11:57 -0700
Subject: [PATCH] Changes for restricting instance lease to not exceed tenant
 lease

---
 mors/lease_manager.py | 25 +++++++++++++++++--------
 test/test_api.py      | 10 ++++++++++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/mors/lease_manager.py b/mors/lease_manager.py
index 26864be..b52c60e 100644
--- a/mors/lease_manager.py
+++ b/mors/lease_manager.py
@@ -93,9 +93,12 @@ class LeaseManager:
                 map(lambda x: get_vm_lease_data(x), self.domain_mgr.get_instance_leases_by_tenant(tenant_uuid))
         }
 
-    # To Be Implemented
     def check_instance_lease_violation(self, instance_lease, tenant_lease):
-        return True
+        violation = False
+        expiry = instance_lease['expiry']
+        if (datetime.utcnow() + timedelta(seconds=tenant_lease['expiry_mins']*60)) < expiry:
+            violation = True
+        return violation
 
     def get_instance_lease(self, context, instance_id):
         data = self.domain_mgr.get_instance_lease(instance_id)
@@ -107,20 +110,26 @@ class LeaseManager:
     def add_instance_lease(self, context, tenant_uuid, instance_lease_obj):
         logger.info("Add instance lease %s", instance_lease_obj)
         tenant_lease = self.domain_mgr.get_tenant_lease(tenant_uuid)
-        self.check_instance_lease_violation(instance_lease_obj, tenant_lease)
-        self.domain_mgr.add_instance_lease(instance_lease_obj['instance_uuid'],
+        if not self.check_instance_lease_violation(instance_lease_obj, tenant_lease):
+            self.domain_mgr.add_instance_lease(instance_lease_obj['instance_uuid'],
                                            tenant_uuid,
                                            instance_lease_obj['expiry'],
                                            context.user_id,
                                            datetime.utcnow())
+        else:
+            raise ValueError("Instance lease exceeds tenant lease")
 
     def update_instance_lease(self, context, tenant_uuid, instance_lease_obj):
         logger.info("Update instance lease %s", instance_lease_obj)
-        self.domain_mgr.update_instance_lease(instance_lease_obj['instance_uuid'],
+        tenant_lease = self.domain_mgr.get_tenant_lease(tenant_uuid)
+        if not self.check_instance_lease_violation(instance_lease_obj, tenant_lease):
+            self.domain_mgr.update_instance_lease(instance_lease_obj['instance_uuid'],
                                               tenant_uuid,
                                               instance_lease_obj['expiry'],
                                               context.user_id,
                                               datetime.utcnow())
+        else:
+            raise ValueError("Instance lease exceeds tenant lease")
 
     def delete_instance_lease(self, context, instance_uuid):
         logger.info("Delete instance lease %s", instance_uuid)
@@ -134,7 +143,7 @@ class LeaseManager:
     def _get_vms_to_delete_for_tenant(self, tenant_uuid, expiry_mins):
         vms_to_delete = []
         vm_ids_to_delete = set()
-        do_not_delete = set()
+        do_not_delete = set() 
         now = datetime.utcnow()
         add_seconds = timedelta(seconds=expiry_mins*60)
         instance_leases = self.get_tenant_and_associated_instance_leases(None, tenant_uuid)['all_vms']
@@ -150,8 +159,8 @@ class LeaseManager:
         tenant_vms = self.lease_handler.get_all_vms(tenant_uuid)
         for vm in tenant_vms:
             expiry_date = vm['created_at'] + add_seconds
-            if now > expiry_date and vm['instance_uuid'] not in do_not_delete \
-                                and vm['instance_uuid'] not in vm_ids_to_delete:
+            if now > expiry_date and vm['instance_uuid'] not in vm_ids_to_delete \
+                                 and vm['instance_uuid'] not in do_not_delete:
                 logger.info("Instance %s queued up for deletion creation date %s", vm['instance_uuid'],
                             vm['created_at'])
                 vms_to_delete.append(vm)
diff --git a/test/test_api.py b/test/test_api.py
index 277e29d..076707f 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -162,6 +162,16 @@ def test_update_instance():
     logger.debug(r.text)
     assert_equal(r.status_code, 200)
 
+@test(depends_on=[test_update_instance])
+def test_update_instance_violation():
+    expiry = datetime.utcnow() + timedelta(days=4)
+    expiry_str = datetime.strftime(expiry, DATE_FORMAT)
+    r = requests.put('http://127.0.0.1:' + port + '/v1/tenant/' + tenant_id1 + '/instance/' + instance_id1,
+                      json={"instance_uuid": instance_id1, "expiry": expiry_str},
+                      headers=headers)
+    logger.debug(r.text)
+    assert_equal(r.status_code, 422)
+
 @test(depends_on=[test_update_instance])
 def test_get_instance2():
     r = requests.get('http://127.0.0.1:' + port + '/v1/tenant/' + tenant_id1 + '/instance/' + instance_id1,