Commit 8be5271c authored by Amit Karamchandani Batra's avatar Amit Karamchandani Batra
Browse files

Fixed bugs in CAD service implementation

parent 054a39f3

src/l3_attackmitigator/service/l3_attackmitigatorServiceServicerImpl.py

+3 −1
Original line number Original line Diff line number Diff line
@@ -139,8 +139,10 @@ class l3_attackmitigatorServiceServicerImpl(L3AttackmitigatorServicer): 
        # Add the ACLRuleSet to the list of configured ACLRuleSets

        # Add the ACLRuleSet to the list of configured ACLRuleSets

        self.configured_acl_config_rules.append(acl_config_rule)

        self.configured_acl_config_rules.append(acl_config_rule)

        

        

        LOGGER.info(service_request)



        # Update the Service with the new ACL RuleSet

        # Update the Service with the new ACL RuleSet

        service_reply: ServiceId = self.service_client.UpdateService(service_request)

        service_reply = self.service_client.UpdateService(service_request)





        LOGGER.info(f"Service reply: {grpc_message_to_json_string(service_reply)}")

        LOGGER.info(f"Service reply: {grpc_message_to_json_string(service_reply)}")

src/l3_centralizedattackdetector/service/l3_centralizedattackdetectorServiceServicerImpl.py

+5 −3
Original line number Original line Diff line number Diff line
@@ -175,6 +175,9 @@ class l3_centralizedattackdetectorServiceServicerImpl(L3Centralizedattackdetecto 
        # AM evaluation tests

        # AM evaluation tests

        self.am_notification_times = []

        self.am_notification_times = []

        

        

        # List of attack connections IPs

        self.attack_ips = []



        # List of attack connections

        # List of attack connections

        self.attack_connections = []

        self.attack_connections = []
@@ -275,8 +278,7 @@ class l3_centralizedattackdetectorServiceServicerImpl(L3Centralizedattackdetecto 
            for service_id in monitor_service_ids:

            for service_id in monitor_service_ids:

                LOGGER.debug("service_id: {}".format(service_id))

                LOGGER.debug("service_id: {}".format(service_id))

                

                

                self.monitor_compute_l3_kpi(service_id, monitor_inference_results)

                self.monitor_compute_l3_kpi()



                LOGGER.debug("KPIs sent to monitoring server")

                LOGGER.debug("KPIs sent to monitoring server")

        else:

        else:

            LOGGER.debug("No KPIs sent to monitoring server")

            LOGGER.debug("No KPIs sent to monitoring server")

src/tests/scenario3/l3/deploy_specs.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"

export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"





# Set the list of components, separated by spaces, you want to build images for, and deploy.

# Set the list of components, separated by spaces, you want to build images for, and deploy.

export TFS_COMPONENTS="context device pathcomp service slice compute webui load_generator monitoring automation l3_attackmitigator l3_centralizedattackdetector"

export TFS_COMPONENTS="context device pathcomp service slice compute webui monitoring automation l3_attackmitigator l3_centralizedattackdetector"





# Set the tag you want to use for your images.

# Set the tag you want to use for your images.

export TFS_IMAGE_TAG="dev"

export TFS_IMAGE_TAG="dev"