diff --git a/astara/debug.py b/astara/debug.py
index 4c76990b..091df646 100644
--- a/astara/debug.py
+++ b/astara/debug.py
@@ -21,6 +21,7 @@ import sys
 
 from oslo_config import cfg
 
+from astara import drivers
 from astara import state
 from astara import worker
 
@@ -68,10 +69,11 @@ def debug_one_router(args=sys.argv[1:]):
     log.debug('Proxy settings: %r', os.getenv('no_proxy'))
 
     context = worker.WorkerContext()
-    router_obj = context.neutron.get_router_detail(cfg.CONF.router_id)
+    driver = drivers.get('router')(context, cfg.CONF.router_id)
     a = state.Automaton(
-        router_id=cfg.CONF.router_id,
-        tenant_id=router_obj.tenant_id,
+        driver=driver,
+        resource_id=cfg.CONF.router_id,
+        tenant_id=driver._router.tenant_id,
         delete_callback=delete_callback,
         bandwidth_callback=bandwidth_callback,
         worker_context=context,
diff --git a/astara/test/unit/test_debug.py b/astara/test/unit/test_debug.py
index 11254259..d70101c2 100644
--- a/astara/test/unit/test_debug.py
+++ b/astara/test/unit/test_debug.py
@@ -31,20 +31,23 @@ class TestDebug(base.RugTestBase):
         cfg.CONF.unregister_opts(debug.DEBUG_OPTS)
         super(TestDebug, self).tearDown()
 
+    @mock.patch('astara.drivers.get')
     @mock.patch('astara.worker.WorkerContext')
     @mock.patch('astara.state.Automaton')
     @mock.patch('pdb.set_trace')
-    def test_debug_one_router(self, set_trace, automaton, ctx):
+    def test_debug_one_router(self, set_trace, automaton, ctx, drivers_get):
         ctx.return_value.neutron.get_router_detail.return_value = mock.Mock(
             tenant_id='123'
         )
         debug.debug_one_router(self.argv + ['--router-id', 'X'])
 
-        ctx.return_value.neutron.get_router_detail.assert_called_once_with('X')
+        mock_router = drivers_get.return_value.return_value._router
+
         assert set_trace.called
         automaton.assert_called_once_with(
-            router_id='X',
-            tenant_id='123',
+            driver=drivers_get.return_value.return_value,
+            resource_id='X',
+            tenant_id=mock_router.tenant_id,
             delete_callback=debug.delete_callback,
             bandwidth_callback=debug.bandwidth_callback,
             worker_context=ctx.return_value,