Make sure nothing is named "compute server".

gns3/compute.py

@@ -20,7 +20,7 @@ import uuid
 
 class Compute:
     """
-    An instance of a compute server.
+    An instance of a compute.
     """
 
     def __init__(self, compute_id=None):
@@ -42,7 +42,7 @@ class Compute:
 
     def id(self):
         """
-        Returns the compute server ID.
+        Returns the compute ID.
 
         :returns: compute identifier
         """
@@ -51,7 +51,7 @@ class Compute:
 
     def name(self):
         """
-        Returns the compute server name.
+        Returns the compute name.
 
         :returns: compute name
         """
@@ -60,7 +60,7 @@ class Compute:
 
     def setName(self, name):
         """
-        Sets the compute server name.
+        Sets the compute name.
 
         :param name: compute name
         """
@@ -69,7 +69,7 @@ class Compute:
 
     def connected(self):
         """
-        Returns whether or not there is a connection to the compute server.
+        Returns whether or not there is a connection to the compute.
 
         :returns: boolean
         """
@@ -78,7 +78,7 @@ class Compute:
 
     def setConnected(self, value):
         """
-        Sets whether or not there is a connection to the compute server.
+        Sets whether or not there is a connection to the compute.
 
         :param value: boolean
         """
@@ -87,7 +87,7 @@ class Compute:
 
     def host(self):
         """
-        Returns the compute server host.
+        Returns the compute host.
 
         :returns: host (string)
         """
@@ -96,7 +96,7 @@ class Compute:
 
     def setHost(self, host):
         """
-        Sets the compute server host.
+        Sets the compute host.
 
         :param host: host (string)
         """
@@ -105,7 +105,7 @@ class Compute:
 
     def port(self):
         """
-        Returns the compute server port number.
+        Returns the compute port number.
 
         :returns: port number (integer)
         """
@@ -114,7 +114,7 @@ class Compute:
 
     def setPort(self, port):
         """
-        Sets the compute server port number.
+        Sets the compute port number.
 
         :param port: port number (integer)
         """
@@ -123,7 +123,7 @@ class Compute:
 
     def user(self):
         """
-        Returns the compute server user for HTTP authentication.
+        Returns the compute user for HTTP authentication.
 
         :returns: user (string)
         """
@@ -132,7 +132,7 @@ class Compute:
 
     def setUser(self, user):
         """
-        Sets the compute server user for HTTP authentication.
+        Sets the compute user for HTTP authentication.
 
         :param user: user (string)
         """
@@ -141,7 +141,7 @@ class Compute:
 
     def setPassword(self, password):
         """
-        Returns the compute server password for HTTP authentication.
+        Returns the compute password for HTTP authentication.
 
         :returns: password (string)
         """
@@ -150,7 +150,7 @@ class Compute:
 
     def protocol(self):
         """
-        Returns the compute server protocol.
+        Returns the compute protocol.
 
         :returns: protocol (string)
         """
@@ -159,7 +159,7 @@ class Compute:
 
     def setProtocol(self, protocol):
         """
-        Sets the compute server protocol.
+        Sets the compute protocol.
 
         :param protocol: protocol (string)
         """
@@ -168,7 +168,7 @@ class Compute:
 
     def cpuUsagePercent(self):
         """
-        Returns the compute server CPU usage.
+        Returns the compute CPU usage.
 
         :returns: CPU usage (integer)
         """
@@ -177,7 +177,7 @@ class Compute:
 
     def setCpuUsagePercent(self, usage):
         """
-        Sets the compute server CPU usage.
+        Sets the compute CPU usage.
 
         :param usage: CPU usage (integer)
         """
@@ -186,7 +186,7 @@ class Compute:
 
     def setMemoryUsagePercent(self, usage):
         """
-        Returns the compute server memory usage.
+        Returns the compute memory usage.
 
         :returns: memory usage (integer)
         """
@@ -195,7 +195,7 @@ class Compute:
 
     def memoryUsagePercent(self):
         """
-        Sets the compute server memory usage.
+        Sets the compute memory usage.
 
         :param usage: memory usage (integer)
         """
@@ -204,7 +204,7 @@ class Compute:
 
     def capabilities(self):
         """
-        Returns the compute server capabilities
+        Returns the compute capabilities
 
         :returns: capabilities (dictionary)
         """
@@ -213,7 +213,7 @@ class Compute:
 
     def setCapabilities(self, value):
         """
-        Sets the compute server capabilities
+        Sets the compute capabilities
 
         :param value: capabilities (dictionary)
         """

gns3/compute_manager.py

@@ -31,7 +31,7 @@ log = logging.getLogger(__name__)
 
 class ComputeManager(QtCore.QObject):
     """
-    Manager for compute servers.
+    Manager for computes.
     """
 
     created_signal = QtCore.Signal(str)
@@ -58,7 +58,7 @@ class ComputeManager(QtCore.QObject):
 
     def _refreshComputesSlot(self):
         """
-        Called when compute servers are refreshed.
+        Called when computes are refreshed.
         """
 
         if self._refreshingComputes:
@@ -70,7 +70,7 @@ class ComputeManager(QtCore.QObject):
 
     def _controllerConnectedSlot(self):
         """
-        Called when connected to a compute server.
+        Called when connected to a compute.
         """
 
         if self._controller.connected():
@@ -79,7 +79,7 @@ class ComputeManager(QtCore.QObject):
 
     def _controllerDisconnectedSlot(self):
         """
-        Called when disconnected from a compute server.
+        Called when disconnected from a compute.
         """
 
         for compute_id in list(self._computes):
@@ -88,7 +88,7 @@ class ComputeManager(QtCore.QObject):
 
     def _listComputesCallback(self, result, error=False, **kwargs):
         """
-        Callback to list compute servers.
+        Callback to list computes.
         """
 
         self._refreshingComputes = False
@@ -191,10 +191,10 @@ class ComputeManager(QtCore.QObject):
 
     def getCompute(self, compute_id):
         """
-        Gets a compute server by ID
+        Gets a compute by ID
 
-        :param compute_id: compute server identifier
-        :returns: compute server
+        :param compute_id: compute identifier
+        :returns: compute
         """
 
         if compute_id.startswith("http:") or compute_id.startswith("https:"):
@@ -210,9 +210,9 @@ class ComputeManager(QtCore.QObject):
 
     def deleteCompute(self, compute_id):
         """
-        Deletes a compute server by ID
+        Deletes a compute by ID
 
-        :param compute_id: compute server identifier
+        :param compute_id: compute identifier
         """
 
         if compute_id in self._computes:
@@ -222,7 +222,7 @@ class ComputeManager(QtCore.QObject):
 
     def updateList(self, computes):
         """
-        Sync an array of compute server with remote
+        Sync an array of compute with remote
         """
 
         for compute_id in copy.copy(self._computes):

gns3/dialogs/appliance_wizard.py

@@ -568,7 +568,7 @@ class ApplianceWizard(QtWidgets.QWizard, Ui_ApplianceWizard):
 
     def _uploadImages(self, version):
         """
-        Upload an image the compute server.
+        Upload an image the compute.
         """
 
         appliance_configuration = self._appliance.search_images_for_version(version)