[config/show]: split vlan into separate file

show/bgp_frr_v4.py

@@ -1,5 +1,8 @@
 import click
-from show.main import AliasedGroup, ip, run_command, get_bgp_summary_extended
+
+import utilities_common.cli as clicommon
+
+from show.main import ip, run_command, get_bgp_summary_extended
 
 
 ###############################################################################
@@ -9,7 +12,7 @@
 ###############################################################################
 
 
-@ip.group(cls=AliasedGroup)
+@ip.group(cls=clicommon.AliasedGroup)
 def bgp():
     """Show IPv4 BGP (Border Gateway Protocol) information"""
     pass

show/bgp_frr_v6.py

@@ -1,5 +1,7 @@
 import click
-from show.main import AliasedGroup, ipv6, run_command, get_bgp_summary_extended
+
+import utilities_common.cli as clicommon
+from show.main import ipv6, run_command, get_bgp_summary_extended
 
 
 ###############################################################################
@@ -9,7 +11,7 @@
 ###############################################################################
 
 
-@ipv6.group(cls=AliasedGroup)
+@ipv6.group(cls=clicommon.AliasedGroup)
 def bgp():
     """Show IPv6 BGP (Border Gateway Protocol) information"""
     pass

show/main.py

@@ -32,35 +32,6 @@
 
 VLAN_SUB_INTERFACE_SEPARATOR = '.'
 
-try:
-    # noinspection PyPep8Naming
-    import ConfigParser as configparser
-except ImportError:
-    # noinspection PyUnresolvedReferences
-    import configparser
-
-
-# This is from the aliases example:
-# https://github.com/pallets/click/blob/57c6f09611fc47ca80db0bd010f05998b3c0aa95/examples/aliases/aliases.py
-class Config(object):
-    """Object to hold CLI config"""
-
-    def __init__(self):
-        self.path = os.getcwd()
-        self.aliases = {}
-
-    def read_config(self, filename):
-        parser = configparser.RawConfigParser()
-        parser.read([filename])
-        try:
-            self.aliases.update(parser.items('aliases'))
-        except configparser.NoSectionError:
-            pass
-
-
-# Global Config object
-_config = None
-
 # To be enhanced. Routing-stack information should be collected from a global
 # location (configdb?), so that we prevent the continous execution of this
 # bash oneliner. To be revisited once routing-stack info is tracked somewhere.

tests/conftest.py

@@ -2,7 +2,6 @@
 import sys
 
 import mock
-import click
 import pytest
 
 import mock_tables.dbconnector

tests/vlan_test.py

@@ -107,6 +107,13 @@ def setup_class(cls):
         os.environ['UTILITIES_UNIT_TESTING'] = "1"
         print("SETUP")
 
+    def test_show_vlan(self):
+        runner = CliRunner()
+        result = runner.invoke(show.cli.commands["vlan"], [])
+        print(result.exit_code)
+        print(result.output)
+        assert result.exit_code == 0
+
     def test_show_vlan_brief(self):
         runner = CliRunner()
         result = runner.invoke(show.cli.commands["vlan"].commands["brief"], [])
@@ -260,7 +267,6 @@ def test_config_vlan_del_vlan(self):
 
     def test_config_vlan_del_nonexist_vlan_member(self):
         runner = CliRunner()
-        db = Db()
 
         result = runner.invoke(config.config.commands["vlan"].commands["member"].commands["del"], \
 				["1000", "Ethernet0"])

utilities_common/cli.py

@@ -51,6 +51,33 @@ def get_command(self, ctx, cmd_name):
 
             ctx.fail('Too many matches: %s' % ', '.join(sorted(matches)))
 
+try:
+    # noinspection PyPep8Naming
+    import ConfigParser as configparser
+except ImportError:
+    # noinspection PyUnresolvedReferences
+    import configparser
+
+# This is from the aliases example:
+# https://github.com/pallets/click/blob/57c6f09611fc47ca80db0bd010f05998b3c0aa95/examples/aliases/aliases.py
+class Config(object):
+    """Object to hold CLI config"""
+
+    def __init__(self):
+        self.path = os.getcwd()
+        self.aliases = {}
+
+    def read_config(self, filename):
+        parser = configparser.RawConfigParser()
+        parser.read([filename])
+        try:
+            self.aliases.update(parser.items('aliases'))
+        except configparser.NoSectionError:
+            pass
+
+# Global Config object
+_config = None
+
 class AliasedGroup(click.Group):
     """This subclass of click.Group supports abbreviations and
        looking up aliases in a config file with a bit of magic.