Resolved merged conflicts

show/interfaces/__init__.py

@@ -462,20 +462,12 @@ def pm(interfacename, namespace, verbose):
         interfacename = try_convert_interfacename_from_alias(
             ctx, interfacename)
 
-@transceiver.command()
-@click.argument('interfacename', required=False)
-@click.option('--namespace', '-n', 'namespace', default=None, show_default=True,
-              type=click.Choice(multi_asic_util.multi_asic_ns_choices()), help='Namespace name or all')
-@click.option('--verbose', is_flag=True, help="Enable verbose output")
-def info(interfacename, namespace, verbose):
-    """Show interface transceiver information"""
-
-    ctx = click.get_current_context()
+        cmd += " -p {}".format(interfacename)
 
-    cmd = "sfpshow info"
+    if namespace is not None:
+        cmd += " -n {}".format(namespace)
 
-    if interfacename is not None:
-        interfacename = try_convert_interfacename_from_alias(ctx, interfacename)
+    clicommon.run_command(cmd, display_cmd=verbose)
 
 @transceiver.command()
 @click.argument('interfacename', required=False)
@@ -491,6 +483,7 @@ def info(interfacename, namespace, verbose):
 
     if interfacename is not None:
         interfacename = try_convert_interfacename_from_alias(ctx, interfacename)
+
         cmd += " -p {}".format(interfacename)
 
     if namespace is not None:

tests/mock_tables/state_db.json

@@ -227,7 +227,6 @@
         "nominal_bit_rate": "Not supported for CMIS cables",
         "application_advertisement": "{1: {'host_electrical_interface_id': '400G CR8', 'module_media_interface_id': 'Copper cable', 'media_lane_count': 8, 'host_lane_count': 8, 'host_lane_assignment_options': 1, 'media_lane_assignment_options': 2}, 2: {'host_electrical_interface_id': '200GBASE-CR4 (Clause 136)'}}"
     },
-
     "TRANSCEIVER_DOM_THRESHOLD|Ethernet44":{
         "temphighalarm": "80.0",
         "templowalarm": "-5.0",
@@ -374,7 +373,6 @@
         "rx_sig_power_min": "-40",
         "rx_sig_power_max": "40"
     },
-
     "TRANSCEIVER_INFO|Ethernet48": {
         "type" : "QSFP-DD Double Density 8X Pluggable Transceiver",
         "hardware_rev" : "1.1",