diff --git a/config/miq_expression.yml b/config/miq_expression.yml
index 8cbcc22e667f..6233032c01e8 100644
--- a/config/miq_expression.yml
+++ b/config/miq_expression.yml
@@ -49,6 +49,7 @@
 - MiqWorker
 - OrchestrationStack
 - OrchestrationTemplate
+- PhysicalSwitch
 - PhysicalServer
 - PolicyEvent
 - ResourcePool
diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml
index ed00b68f18f3..c6472bd3bc8a 100644
--- a/db/fixtures/miq_product_features.yml
+++ b/db/fixtures/miq_product_features.yml
@@ -5844,6 +5844,26 @@
       :feature_type: admin
       :identifier: ems_physical_infra_new
 
+# Physical Switches
+- :name: Physical Switches
+  :description: Everything under Physical Switches
+  :feature_type: node
+  :identifier: physical_switch
+  :children:
+  - :name: View
+    :description: View Physical Switch
+    :feature_type: view
+    :identifier: physical_switch_view
+    :children:
+    - :name: List
+      :description: Display Lists of Physical Switches
+      :feature_type: view
+      :identifier: physical_switch_show_list
+    - :name: Show
+      :description: Display Individual Physical Switch
+      :feature_type: view
+      :identifier: physical_switch_show
+
 # Physical Servers
 - :name: Physical Servers
   :description: Everything under Physical Servers
diff --git a/db/fixtures/miq_searches.yml b/db/fixtures/miq_searches.yml
index 9db25fc27d76..ffcdb90b3022 100644
--- a/db/fixtures/miq_searches.yml
+++ b/db/fixtures/miq_searches.yml
@@ -1301,6 +1301,27 @@
           value: "waiting"
     search_type: default
     db: Container
+- attributes:
+    name: default_Status / Running
+    description: Status / Running
+    filter: !ruby/object:MiqExpression
+      exp:
+        INCLUDES:
+          field: PhysicalSwitch-power_state
+          value: "on"
+    search_type: default
+    db: PhysicalSwitch
+- attributes:
+    name: default_Status / Stopped
+    description: Status / Stopped
+    filter: !ruby/object:MiqExpression
+      exp:
+        not:
+          INCLUDES:
+            field: PhysicalSwitch-power_state
+            value: "on"
+    search_type: default
+    db: PhysicalSwitch
 - attributes:
     name: default_Over Sized
     description: Over Sized
diff --git a/db/fixtures/miq_user_roles.yml b/db/fixtures/miq_user_roles.yml
index 858bd26e19ce..0eaa8e577be8 100644
--- a/db/fixtures/miq_user_roles.yml
+++ b/db/fixtures/miq_user_roles.yml
@@ -66,6 +66,7 @@
   - miq_request
   - miq_template
   - orchestration_stack
+  - physical_switch
   - physical_server
   - physical_infra_topology
   - planning
@@ -133,6 +134,7 @@
   - miq_template_tag
   - miq_template_timeline
   - physical_infra_topology_view
+  - physical_switch_view
   - physical_server_view
   - policy_log
   - policy_simulation
@@ -227,6 +229,7 @@
   - miq_template_snapshot_view
   - miq_template_tag
   - physical_infra_topology_view
+  - physical_switch_view
   - physical_server_view
   - planning
   - policy_log
@@ -296,8 +299,10 @@
   - my_settings_default_views
   - my_settings_time_profiles
   - my_settings_visuals
+  - physical_switch
   - physical_server
   - physical_infra_topology
+  - physical_switch_view
   - physical_server_view
   - provider_foreman_explorer
   - vm_clone
@@ -373,6 +378,7 @@
   - ems_physical_infra_refresh
   - ems_physical_infra_tag
   - ems_physical_infra_view
+  - physical_switch_view
   - physical_server_view
   - physical_infra_topology_view
   - host_new
@@ -585,6 +591,7 @@
   - miq_template_tag
   - miq_template_timeline
   - physical_infra_topology_view
+  - physical_switch_view
   - physical_server_view
   - policy_log
   - policy_simulation
@@ -672,6 +679,7 @@
   - miq_template_tag
   - miq_template_timeline
   - physical_infra_topology_view
+  - physical_switch_view
   - physical_server_view
   - resource_pool_show
   - resource_pool_show_list
@@ -1178,6 +1186,7 @@
   - orchestration_templates_view
   - persistent_volume_view
   - physical_infra_topology_view
+  - physical_switch_view
   - physical_server_view
   - planning
   - policy_log