Merge pull request #3391 from tpurschke/develop

sonar refactoring

Author: tpurschke

roles/importer/files/importer/checkpointR8x/cp_network.py

@@ -6,7 +6,7 @@
 import ipaddress 
 
 
-def normalize_network_objects(full_config, config2import, import_id, mgm_id=0, debug_level=0):
+def normalize_network_objects(full_config, config2import, import_id, mgm_id=0):
     nw_objects = []
     logger = getFwoLogger()
 

roles/lib/files/FWO.DeviceAutoDiscovery/AutoDiscoveryBase.cs

@@ -275,7 +275,7 @@ private void ChangeManagement(Management changedMgmt, List<ActionItem> actions,
                         Supermanager = SuperManagement.Name,
                         ActionType = ActionCode.DeleteGateway.ToString(),
                         ManagementId = changedMgmt.Id,
-                        DeviceId = dev?.Id,
+                        DeviceId = dev.Id,
                         JsonData = null
                     });
                 }

roles/lib/files/FWO.DeviceAutoDiscovery/AutoDiscoveryFortiManager.cs

@@ -38,7 +38,7 @@ private async Task DiscoverySession(List<Management> discoveredDevices)
             FortiManagerClient restClientFM = new(SuperManagement);
 
             RestResponse<SessionAuthInfo> sessionResponse = await restClientFM.AuthenticateUser(SuperManagement.ImportCredential.ImportUser, SuperManagement.ImportCredential.Secret);
-            if (sessionResponse.StatusCode == HttpStatusCode.OK && sessionResponse.IsSuccessful && !string.IsNullOrEmpty(sessionResponse?.Data?.SessionId))
+            if (sessionResponse.StatusCode == HttpStatusCode.OK && sessionResponse.IsSuccessful && !string.IsNullOrEmpty(sessionResponse.Data?.SessionId))
             {
                 string sessionId = sessionResponse.Data.SessionId;
                 Log.WriteDebug(Autodiscovery, $"successful FortiManager login, got SessionID: {sessionId}");
@@ -94,7 +94,7 @@ private async Task GetAdoms(string sessionId, List<Adom> customAdoms, FortiManag
             RestResponse<FmApiTopLevelHelper> adomResponse = await restClientFM.GetAdoms(sessionId);
             if (adomResponse.StatusCode == HttpStatusCode.OK && adomResponse.IsSuccessful)
             {
-                List<Adom>? adomList = adomResponse?.Data?.Result[0]?.AdomList;
+                List<Adom>? adomList = adomResponse.Data?.Result[0]?.AdomList;
                 if (adomList?.Count > 0)
                 {
                     Log.WriteDebug(Autodiscovery, $"found a total of {adomList.Count} adoms");