examples: make imports consistent

The examples try to demonstrate how labgrid can be used. So use sane,
consistent imports for this purpose.

Signed-off-by: Bastian Krause <[email protected]>

Author: Bastian-Krause

examples/deditec-relais8/deditec.py

@@ -1,10 +1,10 @@
 import sys
-import labgrid
 import logging
 import time
 
-from labgrid import StepReporter
-from labgrid.driver.deditecrelaisdriver import DeditecRelaisDriver
+from labgrid import Target, StepReporter
+from labgrid.resource.udev import DeditecRelais8
+from labgrid.driver import DeditecRelaisDriver
 
 # enable debug logging
 logging.basicConfig(
@@ -16,8 +16,8 @@
 # show labgrid steps on the console
 StepReporter.start()
 
-t = labgrid.Target('main')
-r = labgrid.resource.udev.DeditecRelais8(t, name=None, index=1)
+t = Target('main')
+r = DeditecRelais8(t, name=None, index=1)
 d = DeditecRelaisDriver(t, name=None)
 
 p = t.get_driver("DigitalOutputProtocol")

examples/deditec-relais8/deditec_remote.py

@@ -1,9 +1,8 @@
 import sys
-import labgrid
 import logging
 import time
 
-from labgrid import StepReporter
+from labgrid import Environment, StepReporter
 
 # enable debug logging
 logging.basicConfig(
@@ -15,7 +14,7 @@
 # show labgrid steps on the console
 StepReporter.start()
 
-e = labgrid.Environment('import-dedicontrol.yaml')
+e = Environment('import-dedicontrol.yaml')
 t = e.get_target()
 
 p = t.get_driver("DigitalOutputProtocol")

examples/networkmanager/nm.py

@@ -1,7 +1,8 @@
-import logging, sys
+import logging
+import sys
 from pprint import pprint
 
-from labgrid import *
+from labgrid import Environment, StepReporter
 
 
 # enable debug logging

examples/strategy/bareboxrebootstrategy.py

@@ -2,11 +2,10 @@
 
 import attr
 
+from labgrid import target_factory, step
 from labgrid.driver import BareboxDriver, ShellDriver
 from labgrid.protocol import PowerProtocol
-from labgrid.factory import target_factory
-from labgrid.step import step
-from labgrid.strategy.common import Strategy
+from labgrid.strategy import Strategy
 
 
 @attr.s(eq=False)

examples/strategy/quartusstrategy.py

@@ -2,11 +2,10 @@
 
 import attr
 
+from labgrid import target_factory, step
 from labgrid.driver import QuartusHPSDriver, SerialDriver
-from labgrid.factory import target_factory
 from labgrid.protocol import PowerProtocol
-from labgrid.step import step
-from labgrid.strategy.common import Strategy
+from labgrid.strategy import Strategy
 
 
 @attr.s(eq=False)

examples/sysfsgpio/sysfsgpio.py

@@ -1,10 +1,10 @@
 import sys
-import labgrid
 import logging
 import time
 
-from labgrid import StepReporter
-from labgrid.driver.gpiodriver import GpioDigitalOutputDriver
+from labgrid import StepReporter, Target
+from labgrid.driver import GpioDigitalOutputDriver
+from labgrid.resource import SysfsGPIO
 
 # enable debug logging
 logging.basicConfig(
@@ -16,8 +16,8 @@
 # show labgrid steps on the console
 StepReporter.start()
 
-t = labgrid.Target('main')
-r = labgrid.resource.base.SysfsGPIO(t, name=None, index=60)
+t = Target('main')
+r = SysfsGPIO(t, name=None, index=60)
 d = GpioDigitalOutputDriver(t, name=None)
 
 p = t.get_driver("DigitalOutputProtocol")

examples/sysfsgpio/sysfsgpio_remote.py

@@ -1,9 +1,8 @@
 import sys
-import labgrid
 import logging
 import time
 
-from labgrid import StepReporter
+from labgrid import StepReporter, Environment
 
 # enable debug logging
 logging.basicConfig(
@@ -15,7 +14,7 @@
 # show labgrid steps on the console
 StepReporter.start()
 
-e = labgrid.Environment('import-gpio.yaml')
+e = Environment('import-gpio.yaml')
 t = e.get_target()
 
 p = t.get_driver("DigitalOutputProtocol")

examples/usbpower/examplestrategy.py

@@ -3,9 +3,8 @@
 import attr
 
 from labgrid.driver import BareboxDriver, ShellDriver, USBSDMuxDriver
-from labgrid.factory import target_factory
+from labgrid import step, target_factory
 from labgrid.protocol import PowerProtocol
-from labgrid.step import step
 from labgrid.strategy import Strategy