From 1ada144423fbbd510d7575af557509d461f32ebe Mon Sep 17 00:00:00 2001 From: Tim Young Date: Thu, 1 Mar 2018 17:13:34 -0600 Subject: [PATCH] Add a lock location test. Not active yet, but can be added to a network --- EduNetworkBuilder/NB.cs | 2 +- EduNetworkBuilder/NetTest.cs | 7 +++++++ EduNetworkBuilder/Resources/languages/edustrings.resx | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/EduNetworkBuilder/NB.cs b/EduNetworkBuilder/NB.cs index 0069102..9612974 100644 --- a/EduNetworkBuilder/NB.cs +++ b/EduNetworkBuilder/NB.cs @@ -47,7 +47,7 @@ namespace EduNetworkBuilder NeedsUntaggedVLAN, NeedsTaggedVLAN, NeedsForbiddenVLAN, SuccessfullyPings, SuccessfullyPingsAgain, SuccessfullyArps, SuccessfullyDHCPs, HelpRequest, ReadContextHelp, FailedPing, DHCPServerEnabled, SuccessfullyTraceroutes, - LockAll, LockIP, LockRoute, LockNic, LockDHCP, LockGateway, + LockAll, LockIP, LockRoute, LockNic, LockDHCP, LockGateway, LockLocation, LockVLANsOnHost, LockNicVLAN, LockInterfaceVLAN, LockVLANNames, DeviceIsFrozen, DeviceBlowsUpWithPower, DeviceNeedsUPS, } diff --git a/EduNetworkBuilder/NetTest.cs b/EduNetworkBuilder/NetTest.cs index be697a6..87f9b00 100644 --- a/EduNetworkBuilder/NetTest.cs +++ b/EduNetworkBuilder/NetTest.cs @@ -209,6 +209,9 @@ namespace EduNetworkBuilder case NetTestType.LockInterfaceVLAN: toreturn = NB.Translate("NT_TstDiscriptLockInterfaceVLAN"); break; + case NetTestType.LockLocation: + toreturn = NB.Translate("NT_TstDiscriptLockLocation"); + break; case NetTestType.NeedsTaggedVLAN: toreturn = NB.Translate("NT_TstDiscriptNeedsTaggedVLAN"); break; @@ -302,6 +305,9 @@ namespace EduNetworkBuilder case NetTestType.LockInterfaceVLAN: toreturn = NB.Translate("NT_TstDiscriptLockInterfaceVLAN") + ":"; break; + case NetTestType.LockLocation: + toreturn = NB.Translate("NT_TstDiscriptLockLocation") + ":"; + break; case NetTestType.NeedsTaggedVLAN: toreturn = NB.Translate("NT_TstDiscriptNeedsTaggedVLAN") + ":"; break; @@ -569,6 +575,7 @@ namespace EduNetworkBuilder case NetTestType.LockNicVLAN: case NetTestType.LockVLANsOnHost: case NetTestType.LockVLANNames: + case NetTestType.LockLocation: return true; //Nothing to solve. We just lock it so it cannot be changed. } return false; diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index adaa011..d4f6c0d 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -2049,6 +2049,10 @@ Cannot place a tree on top of a tree. NB_TreePlacementError = Cannot place a tree on top of a tree. + + Device cannot be moved + NT_TstDiscriptLockLocation = Device cannot be moved + FIll SE_Fill = Fill