Merge pull request #177 from fabric-testbed/rel1.2

Rel1.2 - Mega merge for all the 1.2 features

Author: kthare10

Dockerfile-auth

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

MANIFEST.in

@@ -1,5 +1,6 @@
 include README.md
 include LICENSE
+include requirements.txt
 include fabric_cf/orchestrator/swagger_server/swagger/swagger.yaml
 include fabric_cf/actor/security/data/*.json
 include fabric_cf/authority/config.site.am.yaml

docker-compose-test.yaml

@@ -257,3 +257,13 @@ services:
       - ./secrets/snakeoil-ca-1.crt:/etc/fabric/message_bus/ssl/cacert.pem
       - ./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
+    container_name: pdp
+    restart: always
+    user: ${PDP_UID:-1000}:${PDP_GID:-1000}
+    ports:
+      - 8080:8080
+    volumes:
+      - ${PDP_NEW_CONF_PATH_HOST:-./newconf}:/conf
+      - ${PDP_NEW_POLICIES_PATH_HOST:-./newpolicies}:/policies

fabricNo.AnyActorNoPolicy.xml

@@ -1 +1 @@
-__VERSION__ = "1.1.2"
+__VERSION__ = "1.2rc4"

fabric_cf/__init__.py

@@ -52,6 +52,7 @@
     from fabric_cf.actor.core.kernel.resource_set import ResourceSet
     from fabric_cf.actor.core.time.term import Term
 
+
 class ActorType(Enum):
     """
     Enum for Actor Type
@@ -286,8 +287,7 @@ def queue_event(self, *, incoming: ABCActorEvent):
 
     @abstractmethod
     def query(self, *, query: dict = None, caller: AuthToken = None,
-              actor_proxy: ABCActorProxy = None, handler: ABCQueryResponseHandler = None,
-              id_token: str = None):
+              actor_proxy: ABCActorProxy = None, handler: ABCQueryResponseHandler = None):
         """
         Processes a query request from the specified caller.
 
@@ -296,7 +296,6 @@ def query(self, *, query: dict = None, caller: AuthToken = None,
             caller: caller
             actor_proxy: actor proxy
             handler: handler
-            id_token: id_token
 
         Returns:
             query response

fabric_cf/actor/core/apis/abc_actor_mixin.py

@@ -40,13 +40,12 @@ class ABCActorProxy(ABCProxy):
     IActorProxy represents the proxy interface to a generic actor
     """
     @abstractmethod
-    def prepare_query(self, *, callback: ABCCallbackProxy, query: dict, caller: AuthToken, id_token: str):
+    def prepare_query(self, *, callback: ABCCallbackProxy, query: dict, caller: AuthToken):
         """
         Prepares the query
 
         Args:
             callback: proxy call back which handles the query
             query: query
             caller: caller of the query
-            id_token: id token
         """

fabric_cf/actor/core/apis/abc_actor_proxy.py

@@ -54,25 +54,29 @@ def eject(self, *, resources: ResourceSet):
         """
 
     @abstractmethod
-    def extend_lease(self, *, reservation: ABCAuthorityReservation, caller: AuthToken = None):
+    def extend_lease(self, *, reservation: ABCAuthorityReservation, caller: AuthToken = None,
+                     callback: ABCControllerCallbackProxy = None,):
         """
         Processes an extend lease request for the reservation.
 
         @param reservation reservation representing a request for a lease
                extension
         @param caller : caller
+        @param callback : callback
 
         @raises Exception in case of error
         """
 
     @abstractmethod
-    def modify_lease(self, *, reservation: ABCAuthorityReservation, caller: AuthToken):
+    def modify_lease(self, *, reservation: ABCAuthorityReservation, caller: AuthToken,
+                     callback: ABCControllerCallbackProxy = None,):
         """
         Processes an modify lease request for the reservation.
 
         @param reservation :  reservation representing a request for a lease
                modification
         @param caller : caller
+        @param callback : callback
 
         @raises Exception in case of error
         """
@@ -90,7 +94,8 @@ def freed(self, *, resources: ResourceSet):
         """
 
     @abstractmethod
-    def redeem(self, *, reservation: ABCReservationMixin, callback: ABCControllerCallbackProxy = None, caller: AuthToken = None):
+    def redeem(self, *, reservation: ABCReservationMixin, callback: ABCControllerCallbackProxy = None,
+               caller: AuthToken = None):
         """
         Processes a redeem request for the reservation.
 

fabric_cf/actor/core/apis/abc_authority.py

@@ -72,4 +72,22 @@ def set_broker_callback(self, *, broker_callback: ABCCallbackProxy):
     def get_broker_callback(self) -> ABCCallbackProxy:
         """
         Get the Broker Callback Proxy
-        """
+        """
+
+    @abstractmethod
+    def prepare_extend_lease(self):
+        """
+        Prepare for an incoming extend request on this existing
+        reservation. Note: unlocked
+
+        @throws Exception thrown if request is rejected (e.g., ticket not valid)
+        """
+
+    @abstractmethod
+    def prepare_modify_lease(self):
+        """
+        Prepare for an incoming modify request on this existing
+        reservation. Note: unlocked
+
+        @throws Exception thrown if request is rejected (e.g., ticket not valid)
+        """

fabric_cf/actor/core/apis/abc_authority_reservation.py

@@ -117,17 +117,18 @@ def restart_configuration_actions(self, *, reservation: ABCReservationMixin):
         """
 
     @abstractmethod
-    def create_slice(self, *, slice_id: ID, name: str):
+    def create_slice(self, *, slice_id: ID, name: str, project_id: str):
         """
         Creates a new slice.
 
         Args:
             slice_id: guid for the slice
             name: slice name
+            project_id: project id
         Returns:
-            a slice object
+            slice object
         Raises:
-            Exception in case of error
+            Exception if creation fails
         """
 
     @abstractmethod

fabric_cf/actor/core/apis/abc_base_plugin.py

@@ -75,7 +75,7 @@ def prepare_relinquish(self, *, reservation: ABCReservationMixin, callback: ABCC
 
     @abstractmethod
     def prepare_claim_delegation(self, *, delegation: ABCDelegation, callback: ABCClientCallbackProxy,
-                                 caller: AuthToken, id_token: str = None) -> ABCRPCRequestState:
+                                 caller: AuthToken) -> ABCRPCRequestState:
         """
         Prepare a claim delegation
         @params delegation: delegation
@@ -85,7 +85,7 @@ def prepare_claim_delegation(self, *, delegation: ABCDelegation, callback: ABCCl
 
     @abstractmethod
     def prepare_reclaim_delegation(self, *, delegation: ABCDelegation, callback: ABCClientCallbackProxy,
-                                   caller: AuthToken, id_token: str = None) -> ABCRPCRequestState:
+                                   caller: AuthToken) -> ABCRPCRequestState:
         """
         Prepare a reclaim delegation
         @params delegation: delegation

fabric_cf/actor/core/apis/abc_broker_proxy.py

@@ -82,3 +82,17 @@ def set_source(self, *, source: ABCDelegation):
 
         @params source : the source delegation.
         """
+
+    @abstractmethod
+    def is_exporting(self) -> bool:
+        """
+        Checks if the reservation is exporting.
+
+        @return true if the reservation is exporting
+        """
+
+    @abstractmethod
+    def set_exporting(self):
+        """
+        Marks the reservation as exporting.
+        """

fabric_cf/actor/core/apis/abc_broker_reservation.py

@@ -28,6 +28,8 @@
 from abc import abstractmethod
 from typing import TYPE_CHECKING
 
+from fim.slivers.base_sliver import BaseSliver
+
 from fabric_cf.actor.core.apis.abc_actor_mixin import ABCActorMixin
 from fabric_cf.actor.core.apis.abc_delegation import ABCDelegation
 
@@ -151,43 +153,41 @@ def tickets_client(self, *, rset: ReservationSet):
         """
 
     @abstractmethod
-    def modify(self, *, reservation_id: ID, modify_properties: dict):
+    def modify(self, *, reservation_id: ID, modified_sliver: BaseSliver):
         """
         Issue modify request for given reservation. Note: the reservation
         must have already been registered with the actor.
 
         @param reservation_id reservationID for the reservation to modify
-        @param modify_properties property list for modify
+        @param modified_sliver modified_sliver
         @throws Exception in case of error
         """
 
     @abstractmethod
     def claim_delegation_client(self, *, delegation_id: str = None, slice_object: ABCSlice = None,
-                                broker: ABCBrokerProxy = None, id_token: str = None) -> ABCDelegation:
+                                broker: ABCBrokerProxy = None) -> ABCDelegation:
         """
         Claims already exported resources from the given broker. The delegation
         will be stored in the default slice.
 
         @param delegation_id delegation identifier of the exported delegation
         @param slice_object slice
         @param broker broker proxy
-        @param id_token id token
 
         @returns delegation
         @raises Exception in case of failure
         """
 
     @abstractmethod
     def reclaim_delegation_client(self, *, delegation_id: str = None, slice_object: ABCSlice = None,
-                                  broker: ABCBrokerProxy = None, id_token: str = None) -> ABCDelegation:
+                                  broker: ABCBrokerProxy = None) -> ABCDelegation:
         """
         Reclaims already exported resources from the given broker. The delegation
         will be stored in the default slice.
 
         @param delegation_id delegation identifier of the exported delegation
         @param slice_object slice
         @param broker broker proxy
-        @param id_token id token
 
         @returns delegation
         @raises Exception in case of failure

fabric_cf/actor/core/apis/abc_client_actor.py

@@ -96,12 +96,11 @@ def demand_reservation_rid(self, *, rid: ID, caller: AuthToken) -> ResultAvro:
         """
 
     @abstractmethod
-    def get_brokers(self, *, caller: AuthToken, broker_id: ID = None, id_token: str = None) -> ResultProxyAvro:
+    def get_brokers(self, *, caller: AuthToken, broker_id: ID = None) -> ResultProxyAvro:
         """
         Get all brokers
         @param caller: caller
         @param broker_id : broker_id
-        @param id_token: id token
         @return list of all the brokers
         """
 
@@ -128,25 +127,21 @@ def get_broker_query_model(self, *, broker: ID, caller: AuthToken, id_token: str
         """
 
     @abstractmethod
-    def claim_delegations(self, *, broker: ID, did: ID, caller: AuthToken,
-                          id_token: str = None) -> ResultDelegationAvro:
+    def claim_delegations(self, *, broker: ID, did: ID, caller: AuthToken) -> ResultDelegationAvro:
         """
         Claim delegations
         @param broker : broker ID
         @param did : delegations ID
         @param caller: caller
-        @param id_token: id token
         @return ResultDelegationAvro
         """
 
     @abstractmethod
-    def reclaim_delegations(self, *, broker: ID, did: ID, caller: AuthToken,
-                            id_token: str = None) -> ResultDelegationAvro:
+    def reclaim_delegations(self, *, broker: ID, did: ID, caller: AuthToken) -> ResultDelegationAvro:
         """
         ReClaim delegations
         @param broker : broker ID
         @param did : delegations ID
         @param caller: caller
-        @param id_token: id token
         @return ResultDelegationAvro
         """

fabric_cf/actor/core/apis/abc_client_actor_management_object.py

@@ -29,6 +29,9 @@
 
 from abc import abstractmethod, ABC
 from typing import TYPE_CHECKING
+
+from fim.slivers.base_sliver import BaseSliver
+
 if TYPE_CHECKING:
     from fabric_cf.actor.core.apis.abc_authority_proxy import ABCAuthorityProxy
     from fabric_cf.actor.core.apis.abc_reservation_mixin import ABCReservationMixin
@@ -122,15 +125,11 @@ def is_active(self) -> bool:
         """
 
     @abstractmethod
-    def modify(self, *, concrete_set: ABCConcreteSet, configure: bool):
+    def modify(self, *, sliver: BaseSliver):
         """
         Updates the units in the current set with information contained in the
-        passed set. Note that the passed set may contain only a subset of the
-        units contained in the current set. Optionally triggers configuration
-        actions for all removed/modified units.
-        @param concrete_set:  set containing the update data
-        @param configure :  if true, configuration actions will be triggered for all
-                   modified units
+        passed sliver.
+        @param sliver:  Updated Sliver
         @raises Exception in case of error
         """
 

fabric_cf/actor/core/apis/abc_concrete_set.py

@@ -33,8 +33,6 @@
 if TYPE_CHECKING:
     from fabric_cf.actor.core.apis.abc_controller_reservation import ABCControllerReservation
     from fabric_cf.actor.core.util.reservation_set import ReservationSet
-    from fabric_cf.actor.security.auth_token import AuthToken
-    from fabric_cf.actor.core.apis.abc_reservation_mixin import ABCReservationMixin
 
 
 class ABCController(ABCClientActor):