Merge pull request #221 from Limmen/dev5

network_service.py
Limmen · Aug 17, 2023 · 1ef7eda · 1ef7eda
2 parents d714325 + 58f6447
commit 1ef7eda
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/network_service.py b/simulation-system/libs/csle-common/src/csle_common/dao/emulation_config/network_service.py
@@ -1,4 +1,5 @@
 from typing import Optional, List, Dict, Any
+import random
 import csle_common.constants.constants as constants
 from csle_common.dao.emulation_config.transport_protocol import TransportProtocol
 from csle_common.dao.emulation_config.credential import Credential
@@ -40,7 +41,7 @@ def to_dict(self) -> Dict[str, Any]:
 
         :return: a dict representation of the object
         """
-        d = {}
+        d: Dict[str, Any] = {}
         d["protocol"] = self.protocol
         d["port"] = self.port
         d["name"] = self.name
@@ -102,9 +103,16 @@ def from_credential(credential: Credential) -> "NetworkService":
 
         :return: the network service representation
         """
-        service = NetworkService(protocol=credential.protocol, port=credential.port,
-                                 name=credential.service,
-                                 credentials=[credential])
+        if credential.protocol is None:
+            protocol = TransportProtocol(random.choice([0, 1]))
+        else:
+            protocol = credential.protocol
+        if credential.service is None:
+            name = ""
+        else:
+            name = credential.service
+        service = NetworkService(protocol=protocol, port=credential.port,
+                                 name=name, credentials=[credential])
         return service
 
     @staticmethod