Cleanup of the DAD service implementation

src/l3_distributedattackdetector/service/l3_distributedattackdetector.py

@@ -94,7 +94,7 @@ class l3_distributedattackdetector:
         
         # open known attack ips csv file
         with open("known_attack_ips.csv", "r") as f:
-            known_attack_ips = f.read().splitlines()
+            known_attack_ips = f.read().split(",")
         
         return known_attack_ips
 
@@ -184,18 +184,6 @@ class l3_distributedattackdetector:
             return stub.ListServices(context_id)
 
     def get_service_id(self, context_id):
-        service_id_list = self.get_service_ids(context_id)
-        service_id = None
-        for s_id in service_id_list.service_ids:
-            if (
-                s_id.service_uuid.uuid == "0eaa0752-c7b6-4c2e-97da-317fbfee5112"
-            ):  # TODO: Change this identifier to the L3VPN service identifier with the real router for the demo v2
-                service_id = s_id
-                break
-
-        return service_id
-
-    def get_service_id2(self, context_id):
         service_list = self.get_services(context_id)
         service_id = None
         for s in service_list.services:
@@ -241,7 +229,7 @@ class l3_distributedattackdetector:
             self.connections_dict[self.conn_id]["ip_o"] = self.conn_id[0]
             self.connections_dict[self.conn_id]["port_o"] = self.conn_id[1]
             self.connections_dict[self.conn_id]["flow_id"] = ":".join(self.conn_id)
-            self.connections_dict[self.conn_id]["service_id"] = self.get_service_id2(CONTEXT_ID)
+            self.connections_dict[self.conn_id]["service_id"] = self.get_service_id(CONTEXT_ID)
             self.connections_dict[self.conn_id]["endpoint_id"] = self.get_endpoint_id(CONTEXT_ID)
             self.connections_dict[self.conn_id]["protocol"] = "TCP"
             self.connections_dict[self.conn_id]["ip_d"] = self.conn_id[2]