Merge pull request #352 from fabric-testbed/rel1.6

Rel1.6 changes

Author: kthare10

Dockerfile-auth

@@ -1,7 +1,7 @@
-FROM python:3.9.0
+FROM python:3.11.0
 MAINTAINER Komal Thareja<[email protected]>
 
-ARG HANDLERS_VER=1.5.2
+ARG HANDLERS_VER=1.6.0
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
@@ -23,7 +23,7 @@ RUN pip3 install .
 RUN mkdir -p "/etc/fabric/message_bus/schema"
 RUN mkdir -p "/etc/fabric/actor/config"
 RUN mkdir -p "/var/log/actor"
-RUN cp /usr/local/lib/python3.9/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
+RUN cp /usr/local/lib/python3.11/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
 RUN pip3 install fabric-am-handlers==${HANDLERS_VER}
 RUN sh /usr/src/app/install.sh
 

Dockerfile-broker

@@ -1,4 +1,4 @@
-FROM python:3.9.0
+FROM python:3.11.0
 MAINTAINER Komal Thareja<[email protected]>
 
 RUN mkdir -p /usr/src/app
@@ -21,7 +21,7 @@ RUN pip3 install .
 RUN mkdir -p "/etc/fabric/message_bus/schema"
 RUN mkdir -p "/etc/fabric/actor/config"
 RUN mkdir -p "/var/log/actor"
-RUN cp /usr/local/lib/python3.9/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
+RUN cp /usr/local/lib/python3.11/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
 RUN sh /usr/src/app/install.sh
 
 ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh"]

Dockerfile-cf

@@ -1,4 +1,4 @@
-FROM python:3.9.0
+FROM python:3.11.0
 MAINTAINER Komal Thareja<[email protected]>
 
 RUN mkdir -p /usr/src/app
@@ -20,10 +20,10 @@ RUN pip3 install .
 RUN mkdir -p "/etc/fabric/message_bus/schema"
 RUN mkdir -p "/etc/fabric/actor/config"
 RUN mkdir -p "/var/log/actor"
-RUN cp /usr/local/lib/python3.9/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
+RUN cp /usr/local/lib/python3.11/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
 
-RUN echo "0 2 * * * root /usr/local/bin/python3.9 /usr/src/app/audit.py -f /etc/fabric/actor/config/config.yaml -d 30 -c slices -o remove" >> /etc/crontab
-RUN echo "0/15 * * * * root /usr/local/bin/python3.9 /usr/src/app/audit.py -f /etc/fabric/actor/config/config.yaml -d 30 -c slivers -o close" >> /etc/crontab
+RUN echo "0 2 * * * root /usr/local/bin/python3.11 /usr/src/app/audit.py -f /etc/fabric/actor/config/config.yaml -d 30 -c slices -o remove" >> /etc/crontab
+RUN echo "0/15 * * * * root /usr/local/bin/python3.11 /usr/src/app/audit.py -f /etc/fabric/actor/config/config.yaml -d 30 -c slivers -o close" >> /etc/crontab
 RUN service cron reload
 RUN service cron restart
 

Dockerfile-orchestrator

@@ -1,4 +1,4 @@
-FROM python:3.9.0
+FROM python:3.11.0
 MAINTAINER Komal Thareja<[email protected]>
 
 RUN mkdir -p /usr/src/app
@@ -22,7 +22,7 @@ RUN pip3 install .
 RUN mkdir -p "/etc/fabric/message_bus/schema"
 RUN mkdir -p "/etc/fabric/actor/config"
 RUN mkdir -p "/var/log/actor"
-RUN cp /usr/local/lib/python3.9/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
+RUN cp /usr/local/lib/python3.11/site-packages/fabric_mb/message_bus/schema/*.avsc /etc/fabric/message_bus/schema
 RUN sh /usr/src/app/install.sh
 
 ENTRYPOINT ["/usr/src/app/docker-entrypoint.sh"]

docker-compose-test.yaml

@@ -257,7 +257,7 @@ services:
       - ./secrets/kafkacat1.client.key:/etc/fabric/message_bus/ssl/client.key
       - ./secrets/kafkacat1-ca1-signed.pem:/etc/fabric/message_bus/ssl/client.pem
   pdp:
-    image: fabrictestbed/authzforce-pdp:3.1.0
+    image: fabrictestbed/authzforce-pdp:6.1.0
     container_name: pdp
     restart: always
     user: ${PDP_UID:-1000}:${PDP_GID:-1000}

docker-entrypoint.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 service cron start
-python3.9 -m $1
+python3.11 -m $1

fabric_cf/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.5.2"
+__version__ = "1.6.0"
 __VERSION__ = __version__

fabric_cf/actor/core/apis/abc_actor_management_object.py

@@ -187,6 +187,14 @@ def update_slice(self, *, slice_mng: SliceAvro, caller: AuthToken, modify_state:
         @return result status with error information in case of failure
         """
 
+    def delete_slice(self, *, slice_id: ID, caller: AuthToken) -> ResultAvro:
+        """
+        Deletes the specified slice - moves the slice into Closing state.
+        @param slice_id slice ID
+        @param caller caller
+        @return result status with error information in case of failure
+        """
+
     def add_slice(self, *, slice_obj: SliceAvro, caller: AuthToken) -> ResultStringAvro:
         """
         Adds a new slice

fabric_cf/actor/core/apis/abc_actor_mixin.py

@@ -441,6 +441,17 @@ def modify_slice(self, *, slice_object: ABCSlice):
             Exception in case of error
         """
 
+    @abstractmethod
+    def delete_slice(self, *, slice_id: ID):
+        """
+        Delete the slice registered with the actor. Moves the slice into Closing State
+
+        Args:
+            slice_id: slice id
+        Raises:
+            Exception in case of error
+        """
+
     @abstractmethod
     def remove_slice(self, *, slice_object: ABCSlice):
         """

fabric_cf/actor/core/apis/abc_authority.py

@@ -31,14 +31,14 @@
 from fim.graph.resources.neo4j_arm import Neo4jARMGraph
 
 from fabric_cf.actor.core.apis.abc_server_actor import ABCServerActor
-from fabric_cf.actor.core.kernel.poa import Poa
 
 if TYPE_CHECKING:
     from fabric_cf.actor.core.apis.abc_authority_reservation import ABCAuthorityReservation
     from fabric_cf.actor.core.apis.abc_controller_callback_proxy import ABCControllerCallbackProxy
     from fabric_cf.actor.core.apis.abc_reservation_mixin import ABCReservationMixin
     from fabric_cf.actor.core.kernel.resource_set import ResourceSet
     from fabric_cf.actor.security.auth_token import AuthToken
+    from fabric_cf.actor.core.kernel.poa import Poa
 
 
 class ABCAuthority(ABCServerActor):