Merge pull request #416 from fabric-testbed/pci-rescan

Support for POA to trigger PCI Rescan

Author: kthare10

Dockerfile-auth

@@ -1,7 +1,7 @@
 FROM python:3.11.0
 MAINTAINER Komal Thareja<[email protected]>
 
-ARG HANDLERS_VER=1.8.4
+ARG HANDLERS_VER=1.9.0rc3
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
@@ -19,7 +19,7 @@ COPY pyproject.toml /usr/src/app/
 COPY README.md /usr/src/app/
 COPY LICENSE /usr/src/app/
 COPY tools/audit.py /usr/src/app/
-COPY export/ /usr/src/app/export/
+COPY tools/export.py /usr/src/app/
 COPY tools/install.sh /usr/src/app/
 
 RUN pip3 install .

Dockerfile-cf

@@ -16,7 +16,7 @@ COPY README.md /usr/src/app/
 COPY LICENSE /usr/src/app/
 COPY tools/audit.py /usr/src/app/
 COPY tools/export.py /usr/src/app/
-COPY export/ /usr/src/app/export/
+COPY tools/export.py /usr/src/app/
 COPY tools/install.sh /usr/src/app/
 
 RUN pip3 install .

fabric_cf/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.8.7"
+__version__ = "1.9.0rc1"
 __VERSION__ = __version__

fabric_cf/actor/core/kernel/poa.py

@@ -85,13 +85,14 @@ class Poa:
     """
     def __init__(self, *, poa_id: str = uuid4().__str__(), operation: str, reservation: ABCReservationMixin = None,
                  sliver_id: ID = None, vcpu_cpu_map: List[Dict[str, str]] = None, node_set: List[str] = None,
-                 keys: List[str] = None):
+                 keys: List[str] = None, bdf: List[str] = None):
         self.poa_id = poa_id
         self.operation = operation
         self.state = PoaStates.Nascent
         self.reservation = reservation
         self.sliver_id = sliver_id
         self.vcpu_cpu_map = vcpu_cpu_map
+        self.bdf = bdf
         self.node_set = node_set
         self.keys = keys
         # Sequence number for outgoing poa messages. Increases with every new message.
@@ -339,6 +340,9 @@ def clone(self):
         if self.keys is not None:
             result.keys = self.keys.copy()
 
+        if self.bdf is not None:
+            result.bdf = self.bdf.copy()
+
         result.error_code = self.error_code
 
         if self.reservation is not None:
@@ -364,6 +368,8 @@ def to_dict(self) -> dict:
             result['node_set'] = self.node_set
         if self.keys is not None:
             result['keys'] = self.keys
+        if self.bdf is not None:
+            result['bdf'] = self.bdf
         return result
 
     def __str__(self):
@@ -373,7 +379,8 @@ def __str__(self):
 class PoaFactory:
     @staticmethod
     def create(*, poa_id: str, operation: str, sliver_id: ID, vcpu_cpu_map: List[Dict[str, str]] = None,
-               node_set: List[str] = None, keys: List[Dict[str, str]] = None) -> Poa:
+               node_set: List[str] = None, keys: List[Dict[str, str]] = None,
+               bdf: List[str] = None) -> Poa:
         """
         Create POA
         :param poa_id:
@@ -382,8 +389,9 @@ def create(*, poa_id: str, operation: str, sliver_id: ID, vcpu_cpu_map: List[Dic
         :param vcpu_cpu_map:
         :param node_set:
         :param keys:
+        :param bdf:
         :return:
         """
         result = Poa(poa_id=poa_id, operation=operation, vcpu_cpu_map=vcpu_cpu_map, node_set=node_set,
-                     sliver_id=sliver_id, keys=keys)
+                     sliver_id=sliver_id, keys=keys, bdf=bdf)
         return result

fabric_cf/actor/core/manage/client_actor_management_object_helper.py

@@ -607,7 +607,7 @@ def poa(self, *, poa: PoaAvro, caller: AuthToken) -> ResultAvro:
             return result
 
         self.logger.debug(f"reservation: {poa.rid} | operation = {poa.operation} | "
-                          f"vcpu_cpu_map = {poa.vcpu_cpu_map} | node_set = {poa.node_set}")
+                          f"vcpu_cpu_map = {poa.vcpu_cpu_map} | node_set = {poa.node_set} | bdf = {poa.bdf}")
         try:
 
             class Runner(ABCActorRunnable):

fabric_cf/actor/core/proxies/kafka/translate.py

@@ -394,7 +394,8 @@ def translate_poa_avro_to_poa(*, poa_avro: PoaAvro) -> Union[Poa, None]:
 
         poa_obj = PoaFactory.create(poa_id=poa_avro.poa_id, operation=poa_avro.get_operation(),
                                     sliver_id=ID(uid=poa_avro.rid), vcpu_cpu_map=poa_avro.get_vcpu_cpu_map(),
-                                    node_set=poa_avro.get_node_set(), keys=poa_avro.get_keys())
+                                    node_set=poa_avro.get_node_set(), keys=poa_avro.get_keys(),
+                                    bdf=poa_avro.get_bdf())
         poa_obj.sequence_poa_in = poa_avro.sequence
         poa_obj.slice_id = poa_avro.slice_id
         # NOTE: Sliver, Slice and Project Info to be set by the caller
@@ -409,7 +410,7 @@ def translate_poa_to_poa_avro(*, poa: Poa) -> Union[PoaAvro, None]:
         poa_avro = PoaAvro(operation=poa.operation, rid=str(poa.sliver_id), poa_id=poa.poa_id,
                            vcpu_cpu_map=poa.vcpu_cpu_map, node_set=poa.node_set, auth=auth_avro,
                            project_id=poa.get_slice().get_project_id(), slice_id=str(poa.get_slice_id()),
-                           keys=poa.keys)
+                           keys=poa.keys, bdf=poa.bdf)
         poa_avro.sequence = poa.sequence_poa_out
         return poa_avro
 

fabric_cf/orchestrator/core/orchestrator_handler.py

@@ -917,7 +917,7 @@ def check_maintenance_mode(self, *, token: FabricToken, reservations: List[Reser
     def poa(self, *, token: str, sliver_id: str, poa: PoaAvro) -> tuple[str, str]:
         try:
             controller = self.controller_state.get_management_actor()
-            self.logger.debug(f"poa invoked for Controller: {controller}")
+            self.logger.debug(f"poa invoked for Controller: {controller} pos: {poa}")
 
             rid = ID(uid=sliver_id) if sliver_id is not None else None