Show IPv6 address in the full table

Author: bennuttall

hostedpi/cli/options.py

@@ -23,6 +23,7 @@
     Option("--launchpad", "--lp", help="Launchpad usernames to source SSH keys from"),
 ]
 ipv6 = Annotated[bool, Option(help="Use the IPv6 connection method")]
+numeric = Annotated[bool, Option("-n", help="Use numeric IPv6 address in SSH command")]
 yes = Annotated[bool, Option("--yes", "-y", help="Proceed without confirmation")]
 number = Annotated[Union[int, None], Option(help="Number of Raspberry Pi servers to create", min=1)]
 full_table = Annotated[bool, Option(help="Show full table of Raspberry Pi server info")]

hostedpi/cli/ssh.py

@@ -11,7 +11,9 @@
 
 
 @ssh_app.command("command")
-def do_command(name: arguments.server_name, ipv6: options.ipv6 = False):
+def do_command(
+    name: arguments.server_name, ipv6: options.ipv6 = False, numeric: options.numeric = False
+):
     """
     Get the SSH command to connect to a Raspberry Pi server
     """
@@ -21,7 +23,10 @@ def do_command(name: arguments.server_name, ipv6: options.ipv6 = False):
         raise Exit(1)
     try:
         if ipv6:
-            print(pi.ipv6_ssh_command)
+            if numeric:
+                print(pi.ipv6_ssh_command_numeric)
+            else:
+                print(pi.ipv6_ssh_command)
         else:
             print(pi.ipv4_ssh_command)
     except HostedPiException as exc:
@@ -34,6 +39,7 @@ def do_config(
     names: arguments.server_names = None,
     filter: options.filter_pattern_pi = None,
     ipv6: options.ipv6 = False,
+    numeric: options.numeric = False,
 ):
     """
     Get the SSH config to connect to one or more Raspberry Pi servers
@@ -42,7 +48,10 @@ def do_config(
     for pi in pis:
         try:
             if ipv6:
-                print(pi.ipv6_ssh_config)
+                if numeric:
+                    print(pi.ipv6_ssh_config_numeric)
+                else:
+                    print(pi.ipv6_ssh_config)
             else:
                 print(pi.ipv4_ssh_config)
         except HostedPiException as exc:

hostedpi/cli/utils.py

@@ -89,6 +89,7 @@ def full_pis_table(pis: list[Pi]):
         "Status",
         "Initialised keys",
         "IPv4 SSH port",
+        "IPv6 Address",
     ]
     table = Table(*headers)
 
@@ -104,6 +105,7 @@ def full_pis_table(pis: list[Pi]):
                 pi.status,
                 format.boolean(pi.initialised_keys),
                 str(pi.ipv4_ssh_port),
+                pi.ipv6_address.compressed,
             )
 
 

hostedpi/pi.py

@@ -267,24 +267,32 @@ def ipv4_ssh_hostname(self) -> str:
     @property
     def ipv6_ssh_hostname(self) -> str:
         """
-        The hostname to use when connecting to the Pi over SSH using IPv6
+        The hostname to use when connecting to the Pi using SSH over IPv6
         """
         return self.hostname
 
     @property
     def ipv4_ssh_command(self) -> str:
         """
-        The SSH command required to connect to the Pi over SSH using IPv4
+        The SSH command required to connect to the Pi using SSH over IPv4
         """
         return f"ssh -p {self.ipv4_ssh_port} root@{self.ipv4_ssh_hostname}"
 
     @property
     def ipv6_ssh_command(self) -> str:
         """
-        The SSH command required to connect to the Pi over SSH using IPv6
+        The SSH command required to connect to the Pi using SSH over IPv6
         """
         return f"ssh root@{self.ipv6_ssh_hostname}"
 
+    @property
+    def ipv6_ssh_command_numeric(self) -> str:
+        """
+        The SSH command required to connect to the Pi using SSH over IPv6 (using the IPv6 address
+        rather than hostname)
+        """
+        return f"ssh root@[{self.ipv6_address.compressed}]"
+
     @property
     def ipv4_ssh_config(self) -> str:
         """