Merge remote-tracking branch 'origin/develop' into feature/Add_arbor_support

.gitlab-ci.yml

+include:
+    - project: 'vr-group/in-situ-pipeline/insite'
+      ref: develop
+      file: '/test-setup.yml'
+
+variables:
+    INFO_NODE_COMMIT: $CI_COMMIT_SHA
+
+api_test:
+    extends: .api_test

info_node/controllers/nest_controller.py

@@ -120,13 +120,12 @@ def nest_put_gids(gids, address):  # noqa: E501
 
     :rtype: Status
     """
-    #for gid in gids:
-    #    if gid in nest_storage.data.index.values:
-    #        return Status(code=400, message="At least one gid already registered")
-
     for gid in gids:
-        nest_storage.data.loc[gid] = [Node(address=address), None, None, multimeters]
+        if gid in nest_storage.data.index.values:
+            return Status(code=400, message="At least one gid already registered")
 
+    for gid in gids:
+        nest_storage.data.loc[gid] = [Node(address=address), None, None]
     return ok_status
 
 
@@ -144,11 +143,20 @@ def nest_put_multimeter_info(id, attributes=None, gids=None):  # noqa: E501
 
     :rtype: Status
     """
-    new_mult = MultimeterInfoInner(id, attributes,[])
-
-    if new_mult in nest_storage.multimeters:
-        return Status(code=400, message="Multimeter already registered")
-    
+    new_multimeter = True
+    for multimeter in nest_storage.multimeters:
+        if multimeter.id == id:
+            multimeter.attributes = attributes
+            multimeter.gids = gids
+            new_multimeter = False
+            break   
+
+    if new_multimeter:
+        if gids == None:
+            gids = []
+        if attributes == None:
+            attributes = []
+        new_mult = MultimeterInfoInner(id, attributes, gids)
         nest_storage.multimeters.append(new_mult)
 
     return ok_status

info_node/models/storage.py

@@ -7,16 +7,18 @@ class Storage(object):
     time_info = SimulationTimeInfo(start=0.0, end=0.0, current=0.0)
     nodes = []
     time_per_node = {}
+    multimeters = []
     num_populations = 0
     data = pd.DataFrame({
-      "gid": [],
-      "node": [],
-      "population": [],
-      "properties": []
+      "gid": [1],
+      "node": ["simulation node"],
+      "population": [1],
+      "properties": [["example", "properties"]]
     })
 
     def __init__(self):
       self.data = self.data.set_index("gid")
+      self.data = self.data.drop(0, axis=0)
 
     def UpdateSimulationtime(self):
       if len(self.time_per_node) == len(self.nodes) and len(self.time_per_node) > 0: