Logs, doc & cli

doc/source/api-ref/vmexpire.inc

@@ -127,6 +127,37 @@ Response
   - project_id: project_id
   - user_id: user_id
 
+  Add expiration
+  =================
+
+  .. rest_method:: POST /vmexpires/{id}
+
+  Add an openstack instance to the vmexpire database.
+
+  Normal response codes: 202
+
+  Error response codes: badRequest(400), unauthorized(401),
+  forbidden(403)
+
+  Request
+  -------
+
+  .. rest_parameters::parameters.yaml
+
+    - id: openstack instance id
+
+  Response
+  --------
+
+  .. rest_parameters:: parameters.yaml
+
+    - vmexpire: vmexpire
+    - id: expiration_id
+    - instance_id: instance_id
+    - intance_name: instance_name
+    - project_id: project_id
+    - user_id: user_id
+
 Delete expiration
 =================
 

os_vm_expire/cmd/expire_manage.py

@@ -227,7 +227,7 @@ def list(self, instanceid=None, days=None):
           help='Expiration id')
     def extend(self, expirationid):
         if not expirationid:
-            print("Missing id paramerer")
+            print("Missing id parameter")
             return
         repositories.setup_database_engine_and_factory()
         repo = repositories.get_vmexpire_repository()
@@ -246,6 +246,24 @@ def remove(self, expirationid):
         repositories.setup_database_engine_and_factory()
         repo = repositories.get_vmexpire_repository()
         repo.delete_entity_by_id(entity_id=expirationid)
+        repositories.commit()
+        print("VM expiration successfully removed!")
+
+    add_description = "Add a VM to the expiration database"
+
+    @args('--id', metavar='<instance-id>', dest='instanceid',
+          help='Instance id')
+    def add(self, instanceid):
+        if not instanceid:
+            print("Missing id parameter")
+            return
+        repositories.setup_database_engine_and_factory()
+        repo = repositories.get_vmexpire_repository()
+        instance = repo.add_vm(instanceid)
+        if not instance:
+            print("Failure to add VM expiration, check logs")
+            return
+
         repositories.commit()
         print("VM expiration successfully generated!")
 

os_vm_expire/model/repositories.py

@@ -325,7 +325,7 @@ def add_vm(self, instance_uuid, session=None):
         if not instance_data:
             LOG.debug("Not found for %s", instance_uuid)
             entity = None
-            _raise_entity_not_found(self._do_entity_name(), instance_uuid)
+            _raise_entity_not_found("Openstack instance", instance_uuid)
 
         entity = models.VmExpire()
         entity.instance_id = instance_uuid