From 762ff62a32a5e648536bb5f5e35f2a74aa3d97c6 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Sat, 24 Mar 2018 08:29:09 -0500 Subject: [PATCH] We can state that a network card (switch port) has a problem. We cannot do anything about it yet. --- EduNetworkBuilder/NB.cs | 2 +- EduNetworkBuilder/NetTest.cs | 8 ++++++++ EduNetworkBuilder/NetTestEditor.cs | 19 ++++++++++++++----- .../Resources/languages/edustrings.resx | 4 ++++ 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs index 011ced4..b6e36ca 100644 --- a/EduNetworkBuilder/NB.cs +++ b/EduNetworkBuilder/NB.cs @@ -49,7 +49,7 @@ namespace EduNetworkBuilder DHCPServerEnabled, SuccessfullyTraceroutes, LockAll, LockIP, LockRoute, LockNic, LockDHCP, LockGateway, LockLocation, LockVLANsOnHost, LockNicVLAN, LockInterfaceVLAN, LockVLANNames, - DeviceIsFrozen, DeviceBlowsUpWithPower, DeviceNeedsUPS, + DeviceIsFrozen, DeviceBlowsUpWithPower, DeviceNeedsUPS, DeviceNICSprays, } public enum AnimationName { Spark1, Fire1, Smoke1, Explo1, Lightning1 } public enum ContextTest { ping, arp, traceroute } diff --git a/EduNetworkBuilder/NetTest.cs b/EduNetworkBuilder/NetTest.cs index 85bb612..5778ba6 100644 --- a/EduNetworkBuilder/NetTest.cs +++ b/EduNetworkBuilder/NetTest.cs @@ -222,6 +222,9 @@ namespace EduNetworkBuilder case NetTestType.NeedsForbiddenVLAN: toreturn = NB.Translate("NT_TstDiscriptNeedsForbiddenVLAN"); break; + case NetTestType.DeviceNICSprays: + toreturn = NB.Translate("NT_TstDeviceNICSprays") + ":"; + break; case NetTestType.ReadContextHelp: toreturn = NB.Translate("_ReadContext"); break; @@ -321,6 +324,9 @@ namespace EduNetworkBuilder case NetTestType.ReadContextHelp: toreturn = NB.Translate("_ReadContext"); break; + case NetTestType.DeviceNICSprays: + toreturn = NB.Translate("NT_TstDeviceNICSprays") + ":"; + break; } break; case NetTestVerbosity.none: @@ -370,6 +376,8 @@ namespace EduNetworkBuilder public bool ColorItemsIfNeeded(bool ChangeColor) { bool WasDone = TaskWasDone; + if (TheTest == NetTestType.DeviceNICSprays) + ChangeColor = false; //we do not show this if(!TestComplete()) { if(TheTest == NetTestType.ReadContextHelp && ChangeColor) diff --git a/EduNetworkBuilder/NetTestEditor.cs b/EduNetworkBuilder/NetTestEditor.cs index dd51b6d..ae1b68c 100644 --- a/EduNetworkBuilder/NetTestEditor.cs +++ b/EduNetworkBuilder/NetTestEditor.cs @@ -253,12 +253,13 @@ namespace EduNetworkBuilder { //return all the dhcp ranges sItem = theNet.GetDeviceFromName(ToEdit.sHost); - foreach (NB_IPAddress ip in sItem.ListRoutes()) - { - cbDest.Items.Add(ip.GetIPString); - } + if(sItem != null) + foreach (NB_IPAddress ip in sItem.ListRoutes()) + { + cbDest.Items.Add(ip.GetIPString); + } } - else if (ToEdit.TheTest == NetTestType.LockNic) + else if (ToEdit.TheTest == NetTestType.LockNic || ToEdit.TheTest == NetTestType.DeviceNICSprays) { //return all the dhcp ranges sItem = theNet.GetDeviceFromName(ToEdit.sHost); @@ -420,6 +421,14 @@ namespace EduNetworkBuilder { return true; } + else if (ntt == NetTestType.DeviceNICSprays) + { + NetworkDevice tstDevice = theNet.GetDeviceFromName(cbSource.SelectedItem.ToString()); + if (tstDevice == null) return false; + NetworkCard tstNIC = tstDevice.NicFromName(cbDest.Text); + if (tstNIC == null) return false; + return true; + } else if (ntt == NetTestType.NeedsUntaggedVLAN || ntt == NetTestType.NeedsTaggedVLAN || ntt == NetTestType.NeedsForbiddenVLAN) { diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index 0983e5a..0e48e84 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -2113,4 +2113,8 @@ Office Bldg Wireless NB_OfficeBldgWireless + + Network Card sprays net when used + NT_TstDeviceNICSprays = Network Card sprays net when used + \ No newline at end of file