Skip to content

Commit 3340df0

Browse files
authored
Cleanup 'netlab show' directory structure (#3267)
Use approach similar to 'netlab initial' to have the main module code within the command subdirectory.
1 parent 2d854ee commit 3340df0

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
import sys
88
import typing
99

10-
from .. import data
11-
from ..augment import config, main
12-
from ..utils import log
13-
from ..utils import read as _read
14-
from .help import print_usage
15-
from .show_commands import DEVICES_TO_SKIP, show_common_parser
16-
from .show_commands import attributes as _attributes
17-
from .show_commands import defaults as _defaults
18-
from .show_commands import devices as _devices
19-
from .show_commands import images as _images
20-
from .show_commands import module_support as _mod_support
21-
from .show_commands import modules as _modules
22-
from .show_commands import outputs as _outputs
23-
from .show_commands import providers as _providers
24-
from .show_commands import reports as _reports
10+
from ... import data
11+
from ...augment import config, main
12+
from ...utils import log
13+
from ...utils import read as _read
14+
from ..help import print_usage
15+
from . import attributes as _attributes
16+
from . import defaults as _defaults
17+
from . import devices as _devices
18+
from . import images as _images
19+
from . import module_support as _mod_support
20+
from . import modules as _modules
21+
from . import outputs as _outputs
22+
from . import providers as _providers
23+
from . import reports as _reports
24+
from .utils import DEVICES_TO_SKIP, show_common_parser
2525

2626
show_dispatch: dict = {
2727
'images': {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from ... import data
1010
from ...utils import log, strings
11-
from . import parser_add_module, show_common_parser
11+
from .utils import parser_add_module, show_common_parser
1212

1313

1414
def parse() -> argparse.ArgumentParser:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from ... import data
1010
from ...utils import strings
11-
from . import DEVICES_TO_SKIP, parser_add_device, show_common_parser
11+
from .utils import DEVICES_TO_SKIP, parser_add_device, show_common_parser
1212

1313

1414
def parse() -> argparse.ArgumentParser:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from ... import data
1010
from ...utils import strings
1111
from .. import error_and_exit
12-
from . import DEVICES_TO_SKIP, parser_add_device, parser_add_provider, show_common_parser
12+
from .utils import DEVICES_TO_SKIP, parser_add_device, parser_add_provider, show_common_parser
1313

1414

1515
def parse() -> argparse.ArgumentParser:

netsim/cli/show_commands/module_support.py renamed to netsim/cli/show/module_support.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
from ... import data
1111
from ...utils import strings
12-
from . import DEVICES_TO_SKIP, get_modlist, parser_add_device, parser_add_module, show_common_parser
12+
from .utils import DEVICES_TO_SKIP, get_modlist, parser_add_device, parser_add_module, show_common_parser
1313

1414

1515
def parse() -> argparse.ArgumentParser:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from ... import data
1212
from ...utils import strings
1313
from .. import error_and_exit
14-
from . import DEVICES_TO_SKIP, get_modlist, parser_add_module, show_common_parser
14+
from .utils import DEVICES_TO_SKIP, get_modlist, parser_add_module, show_common_parser
1515

1616

1717
def parse() -> argparse.ArgumentParser:

0 commit comments

Comments
 (0)