Modify api to support edition of closed entity

Author: Marx314

Dockerfile

@@ -7,11 +7,15 @@ ADD README.md /opt/almanach/src/
 ADD requirements.txt /opt/almanach/src/
 ADD LICENSE /opt/almanach/src/
 ADD almanach/resources/config/almanach.cfg /etc/almanach.cfg
+COPY docker-entrypoint.sh /opt/almanach/entrypoint.sh
 
-WORKDIR /opt/almanach
-
-RUN cd src && \
+RUN cd /opt/almanach/src && \
     pip install -r requirements.txt && \
-    PBR_VERSION=2.0.dev0 python setup.py install
+    PBR_VERSION=2.0.dev0 python setup.py install && \
+    chmod +x /opt/almanach/entrypoint.sh
+
+VOLUME /opt/almanach
 
 USER nobody
+
+ENTRYPOINT ["/opt/almanach/entrypoint.sh"]

README.md

@@ -68,8 +68,8 @@ Running Almanach with Docker
 The actual Docker configuration assume that you already have RabbitMQ (mandatory for Openstack) and MongoDB configured for Almanach.
 
 ```bash
-export RABBITMQ_URL="amqp://openstack:openstack@my-hostname:5672/"
-export MONGODB_URL="mongodb://almanach:almanach@my-hostname:27017/almanach"
+export RABBITMQ_URL="amqp://guest:guest@messaging:5672/"
+export MONGODB_URL="mongodb://almanach:almanach@database:27017/almanach"
 
 docker-compose build
 docker-compose up

almanach/adapters/api_route_v1.py

@@ -14,16 +14,20 @@
 
 import logging
 import json
-import jsonpickle
-
 from datetime import datetime
 from functools import wraps
-from almanach.common.validation_exception import InvalidAttributeException
+
+import jsonpickle
+
 from flask import Blueprint, Response, request
+
 from werkzeug.wrappers import BaseResponse
 
+from almanach.common.exceptions.almanach_entity_not_found_exception import AlmanachEntityNotFoundException
+from almanach.common.exceptions.multiple_entities_matching_query import MultipleEntitiesMatchingQuery
+from almanach.common.exceptions.validation_exception import InvalidAttributeException
 from almanach import config
-from almanach.common.date_format_exception import DateFormatException
+from almanach.common.exceptions.date_format_exception import DateFormatException
 
 api = Blueprint("api", __name__)
 controller = None
@@ -53,9 +57,18 @@ def decorator(*args, **kwargs):
         except InvalidAttributeException as e:
             logging.warning(e.get_error_message())
             return encode({"error": e.get_error_message()}), 400, {"Content-Type": "application/json"}
+        except MultipleEntitiesMatchingQuery as e:
+            logging.warning(e.message)
+            return encode({"error": "Multiple entities found while updating closed"}), 400, {
+                "Content-Type": "application/json"}
+        except AlmanachEntityNotFoundException as e:
+            logging.warning(e.message)
+            return encode({"error": "Entity not found for updating closed"}), 400, {"Content-Type": "application/json"}
+
         except Exception as e:
             logging.exception(e)
             return Response(encode({"error": e.message}), 500, {"Content-Type": "application/json"})
+
     return decorator
 
 
@@ -256,7 +269,12 @@ def list_entity(project_id):
 def update_instance_entity(instance_id):
     data = json.loads(request.data)
     logging.info("Updating instance entity with id %s with data %s", instance_id, data)
-    return controller.update_active_instance_entity(instance_id=instance_id, **data)
+    if 'start' in request.args:
+        start, end = get_period()
+        result = controller.update_inactive_entity(instance_id=instance_id, start=start, end=end, **data)
+    else:
+        result = controller.update_active_instance_entity(instance_id=instance_id, **data)
+    return result
 
 
 @api.route("/volume_types", methods=["GET"])

almanach/adapters/database_adapter.py

@@ -13,14 +13,15 @@
 # limitations under the License.
 
 import logging
-import pymongo
 
+import pymongo
 from pymongo.errors import ConfigurationError
+from pymongomodem.utils import decode_output, encode_input
+
 from almanach import config
-from almanach.common.almanach_exception import AlmanachException
-from almanach.common.volume_type_not_found_exception import VolumeTypeNotFoundException
+from almanach.common.exceptions.almanach_exception import AlmanachException
+from almanach.common.exceptions.volume_type_not_found_exception import VolumeTypeNotFoundException
 from almanach.core.model import build_entity_from_dict, VolumeType
-from pymongomodem.utils import decode_output, encode_input
 
 
 def database(function):
@@ -55,7 +56,6 @@ def ensureindex(db):
 
 
 class DatabaseAdapter(object):
-
     def __init__(self):
         self.db = None
 
@@ -90,6 +90,22 @@ def list_entities(self, project_id, start, end, entity_type=None):
         entities = self._get_entities_from_db(args)
         return [build_entity_from_dict(entity) for entity in entities]
 
+    @database
+    def list_entities_by_id(self, entity_id, start, end):
+        entities = self.db.entity.find({"entity_id": entity_id,
+                                        "start": {"$gte": start},
+                                        "$and": [
+                                            {"end": {"$ne": None}},
+                                            {"end": {"$lte": end}}
+                                            ]
+                                        }, {"_id": 0})
+        return [build_entity_from_dict(entity) for entity in entities]
+
+    @database
+    def update_closed_entity(self, entity, data):
+        self.db.entity.update({"entity_id": entity.entity_id, "start": entity.start, "end": entity.end},
+                              {"$set": data})
+
     @database
     def insert_entity(self, entity):
         self._insert_entity(entity.as_dict())

almanach/common/almanach_entity_not_found_exception.py

@@ -0,0 +1,18 @@
+# Copyright 2016 Internap.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from almanach.common.exceptions.almanach_exception import AlmanachException
+
+
+class AlmanachEntityNotFoundException(AlmanachException):
+    pass

almanach/common/exceptions/__init__.py

@@ -11,9 +11,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from almanach.common.exceptions.almanach_exception import AlmanachException
 
 
-class DateFormatException(Exception):
+class DateFormatException(AlmanachException):
 
     def __init__(self, message=None):
         if not message:

almanach/common/exceptions/almanach_entity_not_found_exception.py

@@ -0,0 +1,18 @@
+# Copyright 2016 Internap.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+from almanach.common.exceptions.almanach_exception import AlmanachException
+
+
+class MultipleEntitiesMatchingQuery(AlmanachException):
+    pass