STAR-322: First tests for cloud output device

plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py

@@ -36,6 +36,11 @@ class CloudApiClient(NetworkClient):
         self._account = account
         self._on_error = on_error
 
+    ## Gets the account used for the API.
+    @property
+    def account(self) -> Account:
+        return self._account
+
     ## Retrieves all the clusters for the user that is currently logged in.
     #  \param on_finished: The function to be called after the result is parsed.
     def getClusters(self, on_finished: Callable[[List[CloudCluster]], any]) -> None:
@@ -46,7 +51,7 @@ class CloudApiClient(NetworkClient):
     #  \param cluster_id: The ID of the cluster.
     #  \param on_finished: The function to be called after the result is parsed.
     def getClusterStatus(self, cluster_id: str, on_finished: Callable[[CloudClusterStatus], any]) -> None:
-        url = "{}/cluster/{}/status".format(self.CLUSTER_API_ROOT, cluster_id)
+        url = "{}/clusters/{}/status".format(self.CLUSTER_API_ROOT, cluster_id)
         self.get(url, on_finished=self._wrapCallback(on_finished, CloudClusterStatus))
 
     ## Requests the cloud to register the upload of a print job mesh.

plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py

@@ -13,7 +13,6 @@ from UM.Logger import Logger
 from UM.Message import Message
 from UM.Qt.Duration import Duration, DurationFormat
 from UM.Scene.SceneNode import SceneNode
-from cura.CuraApplication import CuraApplication
 from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState, NetworkedPrinterOutputDevice
 from cura.PrinterOutput.PrinterOutputModel import PrinterOutputModel
 from plugins.UM3NetworkPrinting.src.Cloud.CloudOutputController import CloudOutputController
@@ -93,7 +92,7 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice):
         self._setInterfaceElements()
 
         self._device_id = device_id
-        self._account = CuraApplication.getInstance().getCuraAPI().account
+        self._account = api_client.account
 
         # We use the Cura Connect monitor tab to get most functionality right away.
         self._monitor_view_qml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
@@ -174,10 +173,6 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice):
         )
         self._api.requestUpload(request, lambda response: self._onPrintJobCreated(mesh_bytes, response))
 
-    ##  Called when the connection to the cluster changes.
-    def connect(self) -> None:
-        super().connect()
-
     ##  Called when the network data should be updated.
     def _update(self) -> None:
         super()._update()

plugins/UM3NetworkPrinting/src/Cloud/Models/CloudClusterPrinterConfiguration.py

@@ -1,8 +1,5 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
-from typing import List, Optional
-
-from cura.PrinterOutput.ConfigurationModel import ConfigurationModel
 from cura.PrinterOutput.ExtruderConfigurationModel import ExtruderConfigurationModel
 from cura.PrinterOutput.ExtruderOutputModel import ExtruderOutputModel
 from .CloudClusterPrinterConfigurationMaterial import CloudClusterPrinterConfigurationMaterial