From eb2dfde6940a3d9fafcc7bdf197df7985a21e4a2 Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Tue, 10 Apr 2018 09:03:06 +0300
Subject: [PATCH] Get Level5 Practice 4 in the right spot

---
 .../Resources/Level5_Practice4.enbx           | 268 ++++++------------
 1 file changed, 79 insertions(+), 189 deletions(-)

diff --git a/EduNetworkBuilder/Resources/Level5_Practice4.enbx b/EduNetworkBuilder/Resources/Level5_Practice4.enbx
index 1cb6420..13e7a71 100644
--- a/EduNetworkBuilder/Resources/Level5_Practice4.enbx
+++ b/EduNetworkBuilder/Resources/Level5_Practice4.enbx
@@ -3,15 +3,15 @@
   <!--This is a network file for EduNetworkBuilder.-->
   <Network>
     <en_message />
-    <en_title>Generic Office - Wireless</en_title>
+    <en_title>Practice4</en_title>
     <en_url />
     <height>1024</height>
     <width>1024</width>
     <itemsize>60</itemsize>
     <showlabels>host</showlabels>
     <level>5</level>
-    <sortorder>10</sortorder>
-    <uniqueidentifier>522</uniqueidentifier>
+    <sortorder>24</sortorder>
+    <uniqueidentifier>526</uniqueidentifier>
     <startinghelplevel>none</startinghelplevel>
     <vlansenabled>True</vlansenabled>
     <VLANPacketColors>False</VLANPacketColors>
@@ -41,8 +41,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>176</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -67,8 +65,6 @@
         <nictype>wan</nictype>
         <uniqueidentifier>179</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>wan0</nicname>
           <myip>
@@ -93,8 +89,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>177</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -119,8 +113,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>178</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -160,8 +152,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>191</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -186,8 +176,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>192</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -227,6 +215,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>411</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -251,6 +241,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>412</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -275,6 +267,8 @@
         <nictype>wlan</nictype>
         <uniqueidentifier>413</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>wlan2</nicname>
           <myip>
@@ -314,6 +308,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>437</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -338,6 +334,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>438</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -403,8 +401,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>133</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -429,8 +425,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>134</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -455,8 +449,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>135</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -481,8 +473,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>136</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -507,8 +497,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>137</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -533,8 +521,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>138</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -559,8 +545,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>139</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -585,8 +569,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>140</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -611,8 +593,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>141</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -652,8 +632,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>143</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -678,8 +656,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>144</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -704,8 +680,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>145</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -730,8 +704,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>146</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -756,8 +728,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>147</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -782,8 +752,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>148</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -808,8 +776,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>149</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -834,8 +800,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>150</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -860,8 +824,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>151</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -901,8 +863,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>284</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -927,8 +887,6 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>285</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -953,8 +911,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>286</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -979,8 +935,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>287</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1005,8 +959,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>288</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1031,8 +983,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>289</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1057,8 +1007,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>290</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1083,8 +1031,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>291</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1109,8 +1055,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>292</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1150,6 +1094,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>389</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1174,6 +1120,8 @@
         <nictype>management_interface</nictype>
         <uniqueidentifier>390</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>management_interface0</nicname>
           <myip>
@@ -1198,6 +1146,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>391</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port1</nicname>
           <myip>
@@ -1222,6 +1172,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>392</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -1246,6 +1198,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>393</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -1270,6 +1224,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>394</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -1294,6 +1250,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>395</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -1318,6 +1276,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>396</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port6</nicname>
           <myip>
@@ -1342,6 +1302,8 @@
         <nictype>port</nictype>
         <uniqueidentifier>397</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>port7</nicname>
           <myip>
@@ -1381,8 +1343,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>110</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1407,8 +1367,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>111</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1448,8 +1406,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>113</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1474,8 +1430,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>114</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1515,8 +1469,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>116</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1541,8 +1493,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>117</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1582,8 +1532,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>119</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1608,8 +1556,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>120</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1649,6 +1595,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>399</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1673,6 +1621,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>400</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1712,6 +1662,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>402</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1736,6 +1688,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>403</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1775,6 +1729,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>405</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1799,6 +1755,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>406</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1838,6 +1796,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>408</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1862,6 +1822,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>409</uniqueidentifier>
         <usesdhcp>True</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1901,8 +1863,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>183</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -1927,8 +1887,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>184</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -1953,8 +1911,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>185</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -1994,8 +1950,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>187</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2020,8 +1974,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>188</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2046,8 +1998,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>189</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -2093,8 +2043,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>303</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2119,8 +2067,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>304</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2172,8 +2118,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>473</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2198,8 +2142,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>474</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2239,8 +2181,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>101</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2265,8 +2205,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>102</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2306,8 +2244,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>104</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2332,8 +2268,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>105</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2373,6 +2307,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>362</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2397,6 +2333,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>363</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2436,6 +2374,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>365</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2460,6 +2400,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>366</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2499,6 +2441,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>368</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2523,6 +2467,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>369</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2562,6 +2508,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>371</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2586,6 +2534,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>372</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2625,6 +2575,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>374</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2649,6 +2601,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>375</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2688,6 +2642,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>377</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2712,6 +2668,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>378</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2751,8 +2709,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>107</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2777,8 +2733,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>108</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2818,8 +2772,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>226</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2844,8 +2796,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>227</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2885,8 +2835,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>229</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2911,8 +2859,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>230</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -2952,8 +2898,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>315</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -2978,8 +2922,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>316</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3019,8 +2961,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>318</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3045,8 +2985,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>319</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3086,8 +3024,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>321</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3112,8 +3048,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>322</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3153,8 +3087,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>324</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3179,8 +3111,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>325</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3220,6 +3150,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>359</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3244,6 +3176,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>360</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth0</nicname>
           <myip>
@@ -3283,8 +3217,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>124</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3309,8 +3241,6 @@
         <nictype>eth</nictype>
         <uniqueidentifier>125</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -3506,6 +3436,8 @@
         <nictype>lo</nictype>
         <uniqueidentifier>417</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3530,6 +3462,8 @@
         <nictype>eth</nictype>
         <uniqueidentifier>418</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
+        <encryptionkey />
+        <ssid />
         <interface>
           <nicname>eth1</nicname>
           <myip>
@@ -3725,8 +3659,6 @@
         <nictype>lo</nictype>
         <uniqueidentifier>155</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>lo0</nicname>
           <myip>
@@ -3777,8 +3709,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>157</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port2</nicname>
           <myip>
@@ -3803,8 +3733,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>158</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port3</nicname>
           <myip>
@@ -3829,8 +3757,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>159</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port4</nicname>
           <myip>
@@ -3855,8 +3781,6 @@
         <nictype>port</nictype>
         <uniqueidentifier>160</uniqueidentifier>
         <usesdhcp>False</usesdhcp>
-        <encryptionkey />
-        <ssid />
         <interface>
           <nicname>port5</nicname>
           <myip>
@@ -3921,23 +3845,6 @@
       <linktype>normal</linktype>
       <uniqueidentifier>455</uniqueidentifier>
     </link>
-    <link>
-      <SrcNic>
-        <hostid>436</hostid>
-        <nicid>439</nicid>
-        <hostname>laptop1</hostname>
-        <nicname>wlan2</nicname>
-      </SrcNic>
-      <DstNic>
-        <hostid>414</hostid>
-        <nicid>419</nicid>
-        <hostname>wap1</hostname>
-        <nicname>wport2</nicname>
-      </DstNic>
-      <hostname>laptop1_link_wap1</hostname>
-      <linktype>wireless</linktype>
-      <uniqueidentifier>441</uniqueidentifier>
-    </link>
     <link>
       <SrcNic>
         <hostid>132</hostid>
@@ -4227,23 +4134,6 @@
       <linktype>normal</linktype>
       <uniqueidentifier>476</uniqueidentifier>
     </link>
-    <link>
-      <SrcNic>
-        <hostid>152</hostid>
-        <nicid>156</nicid>
-        <hostname>wbridge0</hostname>
-        <nicname>wlan1</nicname>
-      </SrcNic>
-      <DstNic>
-        <hostid>121</hostid>
-        <nicid>126</nicid>
-        <hostname>wap0</hostname>
-        <nicname>wport2</nicname>
-      </DstNic>
-      <hostname />
-      <linktype>wireless</linktype>
-      <uniqueidentifier>521</uniqueidentifier>
-    </link>
     <nettest>
       <shost>wbridge0</shost>
       <dhost>LeftBldg</dhost>