diff --git a/lf_libs/lf_libs.py b/lf_libs/lf_libs.py
index fcffdedd..6640208d 100644
--- a/lf_libs/lf_libs.py
+++ b/lf_libs/lf_libs.py
@@ -415,15 +415,15 @@ class lf_libs:
             logging.error("Number of stations are not available")
             pytest.exit("Number of stations are not available")
         if mode == "BRIDGE":
-            upstream_port = self.upstream_port()
+            upstream_port = self.wan_upstream_port()
         elif mode == "NAT-WAN":
-            upstream_port = self.upstream_port()
+            upstream_port = self.wan_upstream_port()
         elif mode == "NAT-LAN":
-            upstream_port = self.upstream_port()
+            upstream_port = self.lan_upstream_port()
         elif mode == "VLAN":
             # for vlan mode vlan id should be available
             if vlan_id is not None:
-                upstream_port = self.upstream_port() + "." + str(vlan_id)
+                upstream_port = self.wan_upstream_port() + "." + str(vlan_id)
             else:
                 logging.error("Vlan id is not available for vlan")
                 pytest.exit("Vlan id is not available for vlan")
@@ -695,11 +695,20 @@ class lf_libs:
         else:
             logging.error("Name is not provided")
 
-    def upstream_port(self):
+    def wan_upstream_port(self):
         """finding upstream port"""
         upstream_port = ""
         for i in self.dut_data:
-            upstream_port = i["wan_port"]
+            if dict(i).keys().__contains__("wan_port"):
+                upstream_port = i["wan_port"]
+        return upstream_port
+
+    def lan_upstream_port(self):
+        """finding upstream port"""
+        upstream_port = ""
+        for i in self.dut_data:
+            if dict(i).keys().__contains__("lan_port"):
+                upstream_port = i["lan_port"]
         return upstream_port
 
     def setup_sniffer(self, band=None, station_radio_data=None):
diff --git a/lf_libs/lf_tests.py b/lf_libs/lf_tests.py
index 06076435..f89cdd66 100644
--- a/lf_libs/lf_tests.py
+++ b/lf_libs/lf_tests.py
@@ -75,8 +75,12 @@ class lf_tests(lf_libs):
             obj_sta_connect = StaConnect2(self.manager_ip, self.manager_http_port, outfile="shivam",
                                           _cleanup_on_exit=False)
             obj_sta_connect.sta_mode = 0
-            obj_sta_connect.upstream_resource = data["upstream_port"].split(".")[1]
-            obj_sta_connect.upstream_port = data["upstream_port"].split(".")[2]
+            upstream_data = list(data["upstream_port"].split("."))
+            obj_sta_connect.upstream_resource = upstream_data[1]
+            upstream_data.pop(0)
+            upstream_data.pop(0)
+            upstream_port = ".".join(upstream_data)
+            obj_sta_connect.upstream_port = upstream_port
             self.enable_verbose_debug(radio=radio, enable=False)
             obj_sta_connect.radio = radio
             obj_sta_connect.admin_down(obj_sta_connect.radio)