Merge pull request #414 from fabric-testbed/modify-interface-bw

Modify interface bw

Author: kthare10

Dockerfile-auth

@@ -1,7 +1,7 @@
 FROM python:3.11.0
 MAINTAINER Komal Thareja<komal.thareja@gmail.com>
 
-ARG HANDLERS_VER=1.8.2
+ARG HANDLERS_VER=1.8.4
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

fabric_cf/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.8.4"
+__version__ = "1.8.6"
 __VERSION__ = __version__

fabric_cf/actor/core/policy/network_node_inventory.py

@@ -146,10 +146,16 @@ def __update_shared_nic_labels_and_capacities(*, available: ComponentSliver,
         assigned_bdf = delegated_label.bdf[0]
         assigned_numa = delegated_label.numa[0]
 
+        # Updated the Requested component with VLAN, BDF, MAC
+        req_ns_name = next(iter(requested.network_service_info.network_services))
+        req_ns = requested.network_service_info.network_services[req_ns_name]
+        req_ifs_name = next(iter(req_ns.interface_info.interfaces))
+        req_ifs = req_ns.interface_info.interfaces[req_ifs_name]
+
         # Check if the requested component's VLAN exists in the delegated labels
-        if requested.labels and requested.labels.vlan and \
-                requested.labels.vlan in ifs_delegated_labels.vlan:
-            vlan_index = ifs_delegated_labels.vlan.index(requested.labels.vlan)
+        if req_ifs.labels and req_ifs.labels.vlan and \
+                req_ifs.labels.vlan in ifs_delegated_labels.vlan:
+            vlan_index = ifs_delegated_labels.vlan.index(req_ifs.labels.vlan)
             bdf_for_requested_vlan = ifs_delegated_labels.bdf[vlan_index]
 
             if bdf_for_requested_vlan in delegated_label.bdf:
@@ -163,12 +169,6 @@ def __update_shared_nic_labels_and_capacities(*, available: ComponentSliver,
         # Find index of assigned BDF in the interface delegated labels
         assigned_index = ifs_delegated_labels.bdf.index(assigned_bdf)
 
-        # Updated the Requested component with VLAN, BDF, MAC
-        req_ns_name = next(iter(requested.network_service_info.network_services))
-        req_ns = requested.network_service_info.network_services[req_ns_name]
-        req_ifs_name = next(iter(req_ns.interface_info.interfaces))
-        req_ifs = req_ns.interface_info.interfaces[req_ifs_name]
-
         # Do not copy VLAN for OpenStack-vNIC
         if requested.get_model() == Constants.OPENSTACK_VNIC_MODEL:
             lab = Labels(bdf=ifs_delegated_labels.bdf[assigned_index], mac=ifs_delegated_labels.mac[assigned_index],

fabric_cf/actor/handlers/no_op_handler.py

@@ -174,6 +174,9 @@ def modify(self, unit: ConfigToken) -> Tuple[dict, ConfigToken]:
                 self.__process_node_sliver_modify(existing=unit.get_sliver(), new=sliver)
 
             elif isinstance(sliver, NetworkServiceSliver):
+                existing = unit.get_sliver()
+                diff = existing.diff(sliver)
+                print(diff)
                 self.__process_ns_sliver(sliver=sliver)
 
             result = {Constants.PROPERTY_TARGET_NAME: Constants.TARGET_MODIFY,

fabric_cf/actor/security/pdp_auth.py

@@ -167,12 +167,28 @@ def check_access(self, *, email: str, project: str, tags: List[str], action_id:
         self.logger.debug("PDP Auth Request: {}".format(pdp_request))
 
         # send request to PDP
-        response = requests.post(url=self.config['url'], headers=self._headers(), json=pdp_request)
-        response_json = response.json()
-
-        if response.status_code == 200 and response_json["Response"][0]["Decision"] == "Permit":
-            self.logger.debug("PDP response: {}".format(response_json))
-        else:
-            self.logger.error("PDP response: {}".format(response_json))
-            msg = response_json["Response"][0]["AssociatedAdvice"][0]["AttributeAssignment"][0]["Value"]
-            raise PdpAuthException(f"PDP Authorization check failed - {msg}")
+        try:
+            response = requests.post(url=self.config['url'], headers=self._headers(), json=pdp_request)
+
+            try:
+                response_json = response.json()
+            except ValueError:
+                # Handle non-JSON response
+                self.logger.error(f"Non-JSON response from PDP: {response.text}")
+                raise PdpAuthException("PDP returned a non-JSON response")
+
+            if response.status_code == 200 and response_json.get("Response", [{}])[0].get("Decision") == "Permit":
+                self.logger.debug("PDP response: {}".format(response_json))
+            else:
+                self.logger.error("PDP response: {}".format(response_json))
+                msg = (
+                    response_json.get("Response", [{}])[0]
+                        .get("AssociatedAdvice", [{}])[0]
+                        .get("AttributeAssignment", [{}])[0]
+                        .get("Value", "Unknown reason")
+                )
+                raise PdpAuthException(f"PDP Authorization check failed - {msg}")
+
+        except Exception as e:
+            self.logger.error(f"Request to PDP failed: {e}")
+            raise PdpAuthException(f"PDP Failure: {e}") from e

fabric_cf/authority/docker-compose.yml

@@ -52,7 +52,7 @@ services:
       network: host
       context: ../../../
       dockerfile: Dockerfile-auth
-    image: authority:1.8.4
+    image: authority:1.8.6
     container_name: site1-am
     restart: always
     depends_on:

fabric_cf/authority/vm_handler_config.yml

@@ -66,6 +66,7 @@ playbooks:
   SmartNIC: worker_pci_provisioning.yml
   SharedNIC: worker_pci_provisioning.yml
   FPGA: fpga_provisioning.yml
+  FPGA_Xilinx-SN1022: sn1022_fpga_provisioning.yml
   NVME: worker_pci_provisioning.yml
   Storage: head_volume_provisioning.yml
   SharedNIC-OpenStack-vNIC: head_port_provisioning.yml

fabric_cf/broker/docker-compose.yml

@@ -53,7 +53,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-broker
-    image: broker:1.8.4
+    image: broker:1.8.6
     container_name: broker
     restart: always
     networks:

fabric_cf/orchestrator/core/orchestrator_slice_wrapper.py

@@ -588,6 +588,35 @@ def modify(self, *, new_slice_graph: ABCASMPropertyGraph) -> Tuple[TopologyDiff,
             reservation_info = x.get_property('reservation_info')
             self.computed_remove_reservations.append(reservation_info.reservation_id)
 
+        # Modified Interfaces
+        for x, flag in topology_diff.modified.interfaces:
+            if not (flag & WhatsModifiedFlag.CAPACITIES):
+                continue
+            sliver, parent_node_id = FimHelper.get_parent_node(graph_model=existing_topology.graph_model, node=x)
+            if not sliver.reservation_info or not sliver.reservation_info.reservation_id:
+                self.logger.warning(f"Skipping modified interface -- possibly the interface on component; "
+                                    f"update on corresponding network service interface would be picked -- {x}")
+                continue
+            rid = sliver.reservation_info.reservation_id
+            # If corresponding sliver also has add operations; it's already in the map
+            # No need to rebuild it
+            if rid not in self.computed_modify_reservations:
+                if x.type == InterfaceType.SubInterface:
+                    new_sliver = new_slice_graph.build_deep_node_sliver(node_id=parent_node_id)
+                    self.computed_modify_reservations[rid] = ModifiedReservation(sliver=new_sliver)
+                else:
+                    new_reservation, dep_update_needed = self.__build_ns_sliver_reservation(
+                        slice_graph=new_slice_graph,
+                        node_id=parent_node_id,
+                        node_res_mapping=node_res_mapping)
+                    self.computed_modify_reservations[rid] = ModifiedReservation(
+                        sliver=new_reservation.get_sliver(),
+                        dependencies=new_reservation.redeem_processors)
+
+                    if dep_update_needed:
+                        ns_peered_reservations.append(new_reservation)
+                    ns_mapping[new_reservation.sliver.node_id] = rid
+
         # Update Dependencies for Peered NS
         self.__update_peered_ns_dependencies(ns_peered_reservations=ns_peered_reservations, ns_mapping=ns_mapping)
 

fabric_cf/orchestrator/docker-compose.yml

@@ -68,7 +68,7 @@ services:
     build:
       context: ../../../
       dockerfile: Dockerfile-orchestrator
-    image: orchestrator:1.8.4
+    image: orchestrator:1.8.6
     container_name: orchestrator
     restart: always
     depends_on: