Merge pull request #428 from fabric-testbed/mcp

Bump cryptography version and improvements to query_resources

Author: kthare10

docker-compose.yaml

@@ -59,7 +59,7 @@ services:
        - POSTGRES_PASSWORD=${POSTGRES_PASSWORD:-fabric}
        - PGDATA=${PGDATA:-/var/lib/postgresql/data}
   neo4j1: &neo4j-base
-      image: kthare10/neo4j-apoc:5.26.19
+      image: fabrictestbed/neo4j-apoc:5.26.19
       restart: always
       container_name: neo4j1
       volumes:

fabric_cf/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.9.1"
+__version__ = "1.9.2"
 __VERSION__ = __version__

fabric_cf/actor/core/apis/abc_mgmt_client_actor.py

@@ -135,6 +135,22 @@ def get_broker_query_model(self, *, broker: ID, id_token: str, level: int, graph
         """
         raise ManageException(Constants.NOT_IMPLEMENTED)
 
+    def get_broker_query_model_summary(self, *, broker: ID, id_token: str, level: int,
+                                        start: datetime = None, end: datetime = None,
+                                        includes: str = None, excludes: str = None) -> BrokerQueryModelAvro:
+        """
+        Obtains a JSON resource summary from the specified broker.
+        @param broker broker
+        @param id_token identity token generated by Credmgr
+        @param level: level of details
+        @param start: start time
+        @param end: end time
+        @param includes: comma separated lists of sites to include
+        @param excludes: comma separated lists of sites to exclude
+        @return BQM (model field contains JSON string)
+        """
+        raise ManageException(Constants.NOT_IMPLEMENTED)
+
     def build_broker_query_model(self, level_0_broker_query_model: str, level: int,
                                  graph_format: GraphFormat = GraphFormat.GRAPHML,
                                  start: datetime = None, end: datetime = None,

fabric_cf/actor/core/common/constants.py

@@ -213,6 +213,7 @@ class Constants:
     ELASTIC_SIZE = "request.elasticSize"
 
     QUERY_ACTION_DISCOVER_BQM = "discover.bqm"
+    QUERY_ACTION_DISCOVER_BQM_SUMMARY = "discover.bqm.summary"
     QUERY_ACTION = "query.action"
     QUERY_RESPONSE = "query.response"
     QUERY_RESPONSE_STATUS = "query.response.status"

fabric_cf/actor/core/core/broker_policy.py

@@ -155,6 +155,30 @@ def get_broker_query_model_query(*, level: int, bqm_format: GraphFormat = GraphF
             properties[Constants.EXCLUDES] = excludes
         return properties
 
+    @staticmethod
+    def get_broker_query_model_summary_query(*, level: int, start: datetime = None, end: datetime = None,
+                                              includes: str = None, excludes: str = None) -> dict:
+        """
+        Return dictionary representing a BQM summary query (JSON dict instead of graph).
+        :param level: Query level
+        :param start: start time
+        :param end: end time
+        :param includes: comma separated lists of sites to include
+        :param excludes: comma separated lists of sites to exclude
+        :return dictionary representing the query
+        """
+        properties = {Constants.QUERY_ACTION: Constants.QUERY_ACTION_DISCOVER_BQM_SUMMARY,
+                      Constants.QUERY_DETAIL_LEVEL: str(level)}
+        if start:
+            properties[Constants.START] = start.strftime(Constants.LEASE_TIME_FORMAT)
+        if end:
+            properties[Constants.END] = end.strftime(Constants.LEASE_TIME_FORMAT)
+        if includes:
+            properties[Constants.INCLUDES] = includes
+        if excludes:
+            properties[Constants.EXCLUDES] = excludes
+        return properties
+
     @staticmethod
     def get_query_action(properties: dict) -> str:
         """

fabric_cf/actor/core/manage/client_actor_management_object_helper.py

@@ -182,6 +182,37 @@ def get_broker_query_model(self, *, broker: ID, caller: AuthToken, id_token: str
 
         return result
 
+    def get_broker_query_model_summary(self, *, broker: ID, caller: AuthToken, id_token: str,
+                                       level: int, start: datetime = None,
+                                       end: datetime = None, includes: str = None,
+                                       excludes: str = None) -> ResultBrokerQueryModelAvro:
+        result = ResultBrokerQueryModelAvro()
+        result.status = ResultAvro()
+
+        if broker is None or caller is None:
+            result.status.set_code(ErrorCodes.ErrorInvalidArguments.value)
+            result.status.set_message(ErrorCodes.ErrorInvalidArguments.interpret())
+            return result
+
+        try:
+            b = self.client.get_broker(guid=broker)
+            if b is not None:
+                request = BrokerPolicy.get_broker_query_model_summary_query(
+                    level=level, start=start, end=end, includes=includes, excludes=excludes
+                )
+                response = ManagementUtils.query(actor=self.client, actor_proxy=b, query=request)
+                result.model = Translate.translate_to_broker_query_model(query_response=response, level=level)
+            else:
+                result.status.set_code(ErrorCodes.ErrorNoSuchBroker.value)
+                result.status.set_message(ErrorCodes.ErrorNoSuchBroker.interpret())
+        except Exception as e:
+            self.logger.error("get_broker_query_model_summary {}".format(e))
+            result.status.set_code(ErrorCodes.ErrorInternalError.value)
+            result.status.set_message(ErrorCodes.ErrorInternalError.interpret(exception=e))
+            result.status = ManagementObject.set_exception_details(result=result.status, e=e)
+
+        return result
+
     def add_reservation_private(self, *, reservation: TicketReservationAvro):
         result = ResultAvro()
         slice_id = ID(uid=reservation.get_slice_id())

fabric_cf/actor/core/manage/controller_management_object.py

@@ -109,6 +109,15 @@ def get_broker_query_model(self, *, broker: ID, caller: AuthToken, id_token: str
                                                          graph_format=graph_format, start=start, end=end,
                                                          includes=includes, excludes=excludes)
 
+    def get_broker_query_model_summary(self, *, broker: ID, caller: AuthToken, id_token: str,
+                                       level: int, start: datetime = None,
+                                       end: datetime = None, includes: str = None,
+                                       excludes: str = None) -> ResultBrokerQueryModelAvro:
+        return self.client_helper.get_broker_query_model_summary(
+            broker=broker, caller=caller, id_token=id_token, level=level,
+            start=start, end=end, includes=includes, excludes=excludes
+        )
+
     def add_reservation(self, *, reservation: TicketReservationAvro, caller: AuthToken) -> ResultStringAvro:
         return self.client_helper.add_reservation(reservation=reservation, caller=caller)
 

fabric_cf/actor/core/manage/local/local_controller.py

@@ -93,6 +93,33 @@ def get_brokers(self, *, broker: ID = None, id_token: str = None) -> List[ProxyA
         except Exception as e:
             self.on_exception(e=e, traceback_str=traceback.format_exc())
 
+    def get_broker_query_model_summary(self, *, broker: ID, id_token: str, level: int,
+                                        start: datetime = None, end: datetime = None,
+                                        includes: str = None, excludes: str = None) -> BrokerQueryModelAvro:
+        """
+        Obtains a JSON resource summary from the specified broker.
+        @param broker broker
+        @param id_token identity token generated by Credmgr
+        @param level: level of details
+        @param start: start time
+        @param end: end time
+        @param includes: comma separated lists of sites to include
+        @param excludes: comma separated lists of sites to exclude
+        @return BQM (model field contains JSON string)
+        """
+        self.clear_last()
+        try:
+            result = self.manager.get_broker_query_model_summary(broker=broker, caller=self.auth, id_token=id_token,
+                                                                level=level, start=start, end=end, excludes=excludes,
+                                                                 includes=includes)
+            self.last_status = result.status
+
+            if result.status.get_code() == 0:
+                return result.model
+        except Exception as e:
+            print(e)
+            self.on_exception(e=e, traceback_str=traceback.format_exc())
+
     def get_broker_query_model(self, *, broker: ID, id_token: str, level: int, graph_format: GraphFormat,
                                start: datetime = None, end: datetime = None,
                                includes: str = None, excludes: str = None) -> BrokerQueryModelAvro:

fabric_cf/actor/core/policy/broker_simpler_units_policy.py

@@ -25,6 +25,7 @@
 # Author: Komal Thareja (kthare10@renci.org)
 from __future__ import annotations
 
+import json
 import random
 import threading
 import traceback
@@ -2234,16 +2235,11 @@ def query(self, *, p: dict) -> dict:
             raise BrokerException(error_code=ExceptionErrorCode.INVALID_ARGUMENT,
                                   msg=f"query_action {query_action}")
 
-        if query_action != Constants.QUERY_ACTION_DISCOVER_BQM:
+        if query_action not in (Constants.QUERY_ACTION_DISCOVER_BQM,
+                                Constants.QUERY_ACTION_DISCOVER_BQM_SUMMARY):
             raise BrokerException(error_code=ExceptionErrorCode.INVALID_ARGUMENT,
                                   msg=f"query_action {query_action}")
 
-        bqm_format = p.get(Constants.BROKER_QUERY_MODEL_FORMAT, None)
-        if bqm_format is not None:
-            bqm_format = GraphFormat(int(bqm_format))
-        else:
-            bqm_format = GraphFormat.GRAPHML
-
         start = p.get(Constants.START, None)
         if start:
             start = datetime.strptime(start, Constants.LEASE_TIME_FORMAT)
@@ -2254,6 +2250,35 @@ def query(self, *, p: dict) -> dict:
         excludes = p.get(Constants.EXCLUDES, None)
         includes = p.get(Constants.INCLUDES, None)
 
+        # Handle JSON summary path — bypasses graph construction entirely
+        if query_action == Constants.QUERY_ACTION_DISCOVER_BQM_SUMMARY:
+            try:
+                if self.query_cbm is not None:
+                    plugin = AggregatedBQMPlugin(actor=self.actor, logger=self.logger)
+                    summary = plugin.plug_produce_bqm_summary(
+                        cbm=self.query_cbm, query_level=query_level,
+                        start=start, end=end, includes=includes, excludes=excludes
+                    )
+                    result[Constants.BROKER_QUERY_MODEL] = json.dumps(summary)
+                    result[Constants.QUERY_RESPONSE_STATUS] = "True"
+                else:
+                    result[Constants.BROKER_QUERY_MODEL] = ""
+                    result[Constants.QUERY_RESPONSE_STATUS] = "False"
+                    result[Constants.QUERY_RESPONSE_MESSAGE] = "Resource(s) not found"
+            except Exception as e:
+                self.logger.error(traceback.format_exc())
+                self.logger.error(e)
+                result[Constants.BROKER_QUERY_MODEL] = ""
+                result[Constants.QUERY_RESPONSE_STATUS] = "False"
+                result[Constants.QUERY_RESPONSE_MESSAGE] = str(e)
+            return result
+
+        bqm_format = p.get(Constants.BROKER_QUERY_MODEL_FORMAT, None)
+        if bqm_format is not None:
+            bqm_format = GraphFormat(int(bqm_format))
+        else:
+            bqm_format = GraphFormat.GRAPHML
+
         try:
             if self.query_cbm is not None:
                 graph = self.query_cbm.get_bqm(query_level=query_level, start=start, end=end, includes=includes,