Merge pull request #302 from fabric-testbed/fim_event_log

Fim version and slice name from CFEL

Author: kthare10

Dockerfile-auth

@@ -1,7 +1,7 @@
 FROM python:3.9.0
 MAINTAINER Komal Thareja<[email protected]>
 
-ARG HANDLERS_VER=1.5.0
+ARG HANDLERS_VER=1.5.1
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

fabric_cf/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.5.0"
+__version__ = "1.5.1"
 __VERSION__ = __version__

fabric_cf/actor/core/common/event_logger.py

@@ -59,7 +59,7 @@ def log_slice_event(self, *, slice_object: SliceAvro, action: ActionId, topology
         Log Slice Event for metrics
         """
         try:
-            log_message = f"CFEL Slice event slc:{slice_object.get_slice_name()}:{slice_object.get_slice_id()} " \
+            log_message = f"CFEL Slice event slc:{slice_object.get_slice_id()} " \
                           f"{action} by prj:{slice_object.get_project_id()} " \
                           f"usr:{slice_object.get_owner().get_oidc_sub_claim()}:{slice_object.get_owner().get_email()}"
 
@@ -82,7 +82,7 @@ def log_sliver_event(self, *, slice_object: SliceAvro, sliver: BaseSliver):
             lc = LogCollector()
             lc.collect_resource_attributes(source=sliver)
 
-            log_message = f"CFEL Sliver event slc:{slice_object.get_slice_name()}:{slice_object.get_slice_id()} " \
+            log_message = f"CFEL Sliver event slc:{slice_object.get_slice_id()} " \
                           f"slvr:{sliver.get_reservation_info().reservation_id} of " \
                           f"type {sliver.get_type()} {sliver.get_reservation_info().reservation_state} " \
                           f"by prj:{slice_object.get_project_id()} usr:{slice_object.get_owner().get_oidc_sub_claim()}" \

fabric_cf/authority/docker-compose.yml

@@ -21,7 +21,7 @@ services:
       - NEO4J_server_http_listen__address=${NEO4J_server_http_advertised__address:-:7474}
       - NEO4J_server_https_advertised__address=${NEO4J_server_https_advertised__address:-:7473}
       - NEO4J_server_https_listen__address=${NEO4J_server_https_advertised__address:-:7473}
-      - NEO4J_dbms_memory_pagecache_size=${NEO4J_dbms_memory_pagecache_size:-512M}
+      - NEO4J_server_memory_pagecache_size=${NEO4J_server_memory_pagecache_size:-512M}
   database:
     image: fabrictestbed/postgres:12.3
     container_name: site1-am-db
@@ -52,7 +52,7 @@ services:
       network: host
       context: ../../../
       dockerfile: Dockerfile-auth
-    image: authority:1.5.0
+    image: authority:1.5.1
     container_name: site1-am
     restart: always
     depends_on:

fabric_cf/authority/env.template

@@ -27,7 +27,7 @@ NEO4J_server_http_advertised__address=:7474
 NEO4J_server_http_listen__address=:7474
 NEO4J_server_https_advertised__address=:7473
 NEO4J_server_https_listen__address=:7473
-NEO4J_dbms_memory_pagecache_size=2G
+NEO4J_server_memory_pagecache_size=2G
 
 # postgres configuration
 POSTGRES_HOST=database
@@ -43,4 +43,4 @@ PDP_GID=1000
 PDP_UID=1000
 
 CF_GID=1000
-CF_UID=1000
+CF_UID=1000

fabric_cf/broker/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       - NEO4J_server_http_listen__address=${NEO4J_server_http_advertised__address:-server:7474}
       - NEO4J_server_https_advertised__address=${NEO4J_server_https_advertised__address:-server:7473}
       - NEO4J_server_https_listen__address=${NEO4J_server_https_advertised__address:-server:7473}
-      - NEO4J_dbms_memory_pagecache_size=${NEO4J_dbms_memory_pagecache_size:-512M}
+      - NEO4J_server_memory_pagecache_size=${NEO4J_server_memory_pagecache_size:-512M}
   database:
     image: fabrictestbed/postgres:12.3
     container_name: broker-db
@@ -54,7 +54,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-broker
-    image: broker:1.5.0
+    image: broker:1.5.1
     container_name: broker
     restart: always
     networks:

fabric_cf/broker/env.template

@@ -27,7 +27,7 @@ NEO4J_server_http_advertised__address=:8474
 NEO4J_server_http_listen__address=:8474
 NEO4J_server_https_advertised__address=:8473
 NEO4J_server_https_listen__address=:8473
-NEO4J_dbms_memory_pagecache_size=8G
+NEO4J_server_memory_pagecache_size=8G
 
 # postgres configuration
 POSTGRES_HOST=database
@@ -43,4 +43,4 @@ PDP_GID=1000
 PDP_UID=1000
 
 CF_GID=1000
-CF_UID=1000
+CF_UID=1000

fabric_cf/orchestrator/docker-compose.yml

@@ -37,7 +37,7 @@ services:
       - NEO4J_server_http_listen__address=${NEO4J_server_http_advertised__address:-:7474}
       - NEO4J_server_https_advertised__address=${NEO4J_server_https_advertised__address:-:7473}
       - NEO4J_server_https_listen__address=${NEO4J_server_https_advertised__address:-:7473}
-      - NEO4J_dbms_memory_pagecache_size=${NEO4J_dbms_memory_pagecache_size:-512M}
+      - NEO4J_server_memory_pagecache_size=${NEO4J_server_memory_pagecache_size:-512M}
   database:
     image: fabrictestbed/postgres:12.3
     container_name: orchestrator-db
@@ -68,7 +68,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-orchestrator
-    image: orchestrator:1.5.0
+    image: orchestrator:1.5.1
     container_name: orchestrator
     restart: always
     depends_on:

fabric_cf/orchestrator/env.template

@@ -27,7 +27,7 @@ NEO4J_server_http_advertised__address=:9474
 NEO4J_server_http_listen__address=:9474
 NEO4J_server_https_advertised__address=:9473
 NEO4J_server_https_listen__address=:9473
-NEO4J_dbms_memory_pagecache_size=8G
+NEO4J_server_memory_pagecache_size=8G
 
 # postgres configuration
 POSTGRES_HOST=database
@@ -43,4 +43,4 @@ PDP_GID=1000
 PDP_UID=1000
 
 CF_GID=1000
-CF_UID=1000
+CF_UID=1000

pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     "PyYAML",
     "fabric_fss_utils==1.5.0",
     "fabric-message-bus==1.5.0",
-    "fabric-fim==1.5.0"]
+    "fabric-fim==1.5.2"]
 
 [project.optional-dependencies]
 test = ["pytest",