From a787f46719cda4e4d706d8c0c43d4c982caaf5f2 Mon Sep 17 00:00:00 2001
From: Blake Harnden <32446120+bharnden@users.noreply.github.com>
Date: Mon, 5 Dec 2022 10:26:46 -0800
Subject: [PATCH] daemon: fixed issue when setting default wlan config for a
 wlan node, using the session id instead of the node id

---
 daemon/core/emulator/session.py       | 2 +-
 daemon/core/gui/data/xmls/sample1.xml | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/daemon/core/emulator/session.py b/daemon/core/emulator/session.py
index 436f80c1..68759e26 100644
--- a/daemon/core/emulator/session.py
+++ b/daemon/core/emulator/session.py
@@ -518,7 +518,7 @@ class Session:
             self.set_node_pos(node, position.x, position.y)
         # setup default wlan
         if isinstance(node, WlanNode):
-            self.mobility.set_model_config(self.id, BasicRangeModel.name)
+            self.mobility.set_model_config(node.id, BasicRangeModel.name)
         # boot core nodes after runtime
         is_runtime = self.state == EventTypes.RUNTIME_STATE
         if is_runtime and isinstance(node, CoreNode):
diff --git a/daemon/core/gui/data/xmls/sample1.xml b/daemon/core/gui/data/xmls/sample1.xml
index c4f75c47..64d093a8 100644
--- a/daemon/core/gui/data/xmls/sample1.xml
+++ b/daemon/core/gui/data/xmls/sample1.xml
@@ -95,10 +95,9 @@
         <service name="DefaultRoute"/>
       </services>
     </device>
-    <device id="14" name="n14" icon="" canvas="0" type="host" class="" image="">
+    <device id="14" name="n14" icon="" canvas="0" type="PC" class="" image="">
       <position x="348.0" y="228.0" lat="47.57709392893491" lon="-122.12763501296686" alt="2.0"/>
       <services>
-        <service name="SSH"/>
         <service name="DefaultRoute"/>
       </services>
     </device>
@@ -260,9 +259,5 @@
       <service name="OSPFv3"/>
       <service name="IPForward"/>
     </node>
-    <node type="host">
-      <service name="DefaultRoute"/>
-      <service name="SSH"/>
-    </node>
   </default_services>
 </scenario>