Make id a required part of BaseInstance (canonical#324)

BaseCloud has a required `get_instance()` method that can return an
instance given an instance id, but BaseInstance had no consistent API
to retrieve such an instance id. This adds it everywhere.

Author: TheRealFalcon

VERSION

@@ -1 +1 @@
-1!5.6.2
+1!5.7.0

pycloudlib/instance.py

@@ -52,6 +52,12 @@ def __exit__(self, _type, _value, _traceback):
         if exceptions:
             raise CleanupError(exceptions)
 
+    @property
+    @abstractmethod
+    def id(self) -> str:
+        """Return instance id."""
+        raise NotImplementedError
+
     @property
     @abstractmethod
     def name(self):

pycloudlib/lxd/instance.py

@@ -16,6 +16,7 @@
 )
 
 
+# pylint: disable=too-many-public-methods
 class LXDInstance(BaseInstance):
     """LXD backed instance."""
 
@@ -119,6 +120,11 @@ def is_vm(self):
 
         return self._is_vm
 
+    @property
+    def id(self) -> str:
+        """Return instance id."""
+        return self.name
+
     @property
     def name(self):
         """Return instance name."""

pycloudlib/oci/instance.py

@@ -58,6 +58,11 @@ def __repr__(self):
             self.compartment_id,
         )
 
+    @property
+    def id(self) -> str:
+        """Return instance id."""
+        return self.instance_id
+
     @property
     def name(self):
         """Return the instance name."""

pycloudlib/openstack/instance.py

@@ -39,6 +39,7 @@ def __init__(
             username: username to use when connecting via SSH
         """
         super().__init__(key_pair, username=username)
+        self.instance_id = instance_id
 
         if not connection:
             connection = openstack.connect()
@@ -84,6 +85,11 @@ def __repr__(self):
             self.__class__.__name__, self.server.id
         )
 
+    @property
+    def id(self) -> str:
+        """Return instance id."""
+        return self.instance_id
+
     @property
     def name(self):
         """Return instance name."""

pycloudlib/vmware/instance.py

@@ -25,6 +25,11 @@ def __init__(self, key_pair: KeyPair, vm_id: str, env: Mapping):
         self._ip: Optional[str] = None
         self.env = env
 
+    @property
+    def id(self) -> str:
+        """Return instance id."""
+        return self.vm_id
+
     @property
     def name(self) -> str:
         """Return VM name."""