Fix the unit tests

Author: IanBoden

.tox.ini.swp

@@ -360,11 +360,11 @@ def __iter__(self, *args, **kwargs):
     def find(self, query_params={}):
         """
         Gets the list of Schemas, they are used to call specific business logic when data in Watson IoT Platform changes.
-        
+
         Parameters:
-        
+
             - queryParams(dict) - Filter the results by the key-value pairs in the dictionary
-        
+
         Throws APIException on failure.
         """
         return self._listToCast(self._apiClient, self._baseUrl, filters=query_params)
@@ -394,7 +394,7 @@ def __delitem__(self, key):
 
     def create(self, item):
         """
-        Create an Item for the organization in the Watson IoT Platform. 
+        Create an Item for the organization in the Watson IoT Platform.
         Parameters:
             - name (string) - Name of the service
             - type - must be webhook

src/wiotp/sdk/api/common.py

@@ -79,16 +79,16 @@ def __init__(self, apiClient):
     def find(self, nameFilter=None, typeFilter=None, enabledFilter=None, serviceId=None):
         """
         Gets the list of Historian connectors, they are used to configure the Watson IoT Platform to store IoT data in compatible services.
-        
+
         Parameters:
-        
+
             - nameFilter(string) -      Filter the results by the specified name
             - typeFilter(string) -      Filter the results by the specified type, Available values : cloudant, eventstreams
-            - enabledFilter(boolean) -  Filter the results by the enabled flag 
+            - enabledFilter(boolean) -  Filter the results by the enabled flag
             - serviceId(string) -       Filter the results by the service id
             - limit(number) -           Max number of results returned, defaults 25
             - bookmark(string) -        used for paging through results
-        
+
         Throws APIException on failure.
         """
 
@@ -106,7 +106,7 @@ def find(self, nameFilter=None, typeFilter=None, enabledFilter=None, serviceId=N
 
     def create(self, name, type, serviceId, timezone=None, description=None, enabled=None, configuration=None):
         """
-        Create a connector for the organization in the Watson IoT Platform. 
+        Create a connector for the organization in the Watson IoT Platform.
         The connector must reference the target service that the Watson IoT Platform will store the IoT data in.
         Parameters:
             - name (string)         - Name of the service

src/wiotp/sdk/api/dsc/connectors.py

@@ -336,36 +336,36 @@ def __init__(self, apiClient, typeId=None):
 
 class Devices(defaultdict):
     """
-    Use the global unique identifier of a device, it's `clientId` to address devices. 
-    
+    Use the global unique identifier of a device, it's `clientId` to address devices.
+
     # Delete
-    
+
     ```python
     del devices["d:orgId:typeId:deviceId"]
     ```
-    
+
     # Get
-    Use the global unique identifier of a device, it's `clientId`. 
-    
+    Use the global unique identifier of a device, it's `clientId`.
+
     ```python
     device = devices["d:orgId:typeId:deviceId"]
     print(device.clientId)
     print(device)
-    
+
     # Is a device registered?
-    
+
     ```python
     if "d:orgId:typeId:deviceId" in devices:
         print("The device exists")
     ```
-    
+
     # Iterate through all registered devices
-    
+
     ```python
     for device in devices:
         print(device)
     ```
-    
+
     """
 
     # https://docs.python.org/2/library/collections.html#defaultdict-objects
@@ -456,9 +456,9 @@ def create(self, devices):
         The response body will contain the generated authentication tokens for all devices.
         You must make sure to record these tokens when processing the response.
         We are not able to retrieve lost authentication tokens
-        
+
         It accepts accepts a list of devices (List of Dictionary of Devices), or a single device
-        
+
         If you provide a list as the parameter it will return a list in response
         If you provide a singular device it will return a singular response
         """

src/wiotp/sdk/api/registry/devices.py

@@ -11,10 +11,11 @@
 import json
 from datetime import datetime
 from collections import defaultdict
+
 try:
-  from collections.abc import MutableSequence
+    from collections.abc import MutableSequence
 except ImportError:
-  from collections import MutableSequence
+    from collections import MutableSequence
 from wiotp.sdk.exceptions import ApiException
 
 

src/wiotp/sdk/api/registry/diag.py

@@ -165,16 +165,16 @@ def __init__(self, apiClient):
 
     def find(self, nameFilter=None, typeFilter=None, bindingModeFilter=None, boundFilter=None):
         """
-        Gets the list of services that the Watson IoT Platform can connect to. 
+        Gets the list of services that the Watson IoT Platform can connect to.
         The list can include a mixture of services that are either bound or unbound.
-        
+
         Parameters:
-        
+
             - nameFilter(string) - Filter the results by the specified name
             - typeFilter(string) - Filter the results by the specified type, Available values : cloudant, eventstreams
             - bindingModeFilter(string) - Filter the results by the specified binding mode, Available values : automatic, manual
-            - boundFilter(boolean) - Filter the results by the bound flag 
-        
+            - boundFilter(boolean) - Filter the results by the bound flag
+
         Throws APIException on failure.
         """
 
@@ -192,9 +192,9 @@ def find(self, nameFilter=None, typeFilter=None, bindingModeFilter=None, boundFi
 
     def create(self, serviceBinding):
         """
-        Create a new external service. 
-        The service must include all of the details required to connect 
-        and authenticate to the external service in the credentials property. 
+        Create a new external service.
+        The service must include all of the details required to connect
+        and authenticate to the external service in the credentials property.
         Parameters:
             - serviceName (string) - Name of the service
             - serviceType (string) - must be either eventstreams or cloudant

src/wiotp/sdk/api/services/__init__.py

@@ -21,6 +21,7 @@
 from wiotp.sdk.api.state.logicalInterfaces import BaseLogicalInterface
 from wiotp.sdk.api.state.physicalInterfaces import PhysicalInterface
 
+
 # =========================================================================
 # Physical Interface for the Device Type
 # =========================================================================
@@ -166,6 +167,7 @@ def __init__(self, apiClient, deviceTypeId):
 # Mappings for the Device Type
 # =========================================================================
 
+
 # define the common properties found on most Rest API Items
 class DeviceTypeMapping(defaultdict):
     def __init__(self, **kwargs):

src/wiotp/sdk/api/state/deviceTypes.py

@@ -80,7 +80,6 @@ def __init__(self, apiClient):
         super(DraftSchemas, self).__init__(apiClient, Schema, IterableSchemaList, "api/v0002/draft/schemas")
 
     def create(self, name, schemaFileName, schemaContents, description):
-
         """
         Create a schema for the org.
         Returns: schemaId (string), response (object).

src/wiotp/sdk/api/state/schemas.py

@@ -179,6 +179,7 @@ def __init__(self, apiClient, thingTypeId):
 # Mappings for the Thing Type
 # =========================================================================
 
+
 # define the common properties found on most Rest API Items
 class ThingTypeMapping(defaultdict):
     def __init__(self, **kwargs):

src/wiotp/sdk/api/state/thingTypes.py

@@ -26,17 +26,17 @@
 
 class ApplicationClient(AbstractClient):
     """
-    Extends #wiotp.AbstractClient to implement an application client supporting 
+    Extends #wiotp.AbstractClient to implement an application client supporting
     messaging over MQTT
-        
+
     # Parameters
     options (dict): Configuration options for the client
-    logHandlers (list<logging.Handler>): Log handlers to configure.  Defaults to `None`, 
+    logHandlers (list<logging.Handler>): Log handlers to configure.  Defaults to `None`,
         which will result in a default log handler being created.
-    
+
     # Configuration Options
     The options parameter expects a Python dictionary containing the following keys:
-    
+
     - `auth-key` The API key to to securely connect your application to Watson IoT Platform.
     - `auth-token` An authentication token to securely connect your application to Watson IoT Platform.
     - `clean-session` A boolean value indicating whether to use MQTT clean session.
@@ -71,9 +71,8 @@ def __init__(self, config, logHandlers=None):
         self.client.message_callback_add("iot-2/type/+/id/+/err/data", self._onErrorTopic)
         self.client.message_callback_add("iot-2/thing/type/+/id/+/err/data", self._onThingError)
 
-        # Add handler for commands if not connected to QuickStart
-        if not self._config.isQuickstart():
-            self.client.message_callback_add("iot-2/type/+/id/+/cmd/+/fmt/+", self._onDeviceCommand)
+        # Add handler for commands
+        self.client.message_callback_add("iot-2/type/+/id/+/cmd/+/fmt/+", self._onDeviceCommand)
 
         # Attach fallback handler
         self.client.on_message = self._onUnsupportedMessage
@@ -87,26 +86,22 @@ def __init__(self, config, logHandlers=None):
         self.errorTopicCallback = None
         self.appStatusCallback = None
 
-        # Create an api client if not connected in QuickStart mode
-        if not self._config.isQuickstart():
-            apiClient = ApiClient(self._config, self.logger)
-            self.registry = Registry(apiClient)
-            self.usage = Usage(apiClient)
-            self.dsc = DSC(apiClient)
-            self.lec = LEC(apiClient)
-            self.mgmt = Mgmt(apiClient)
-            self.serviceBindings = ServiceBindings(apiClient)
-            self.actions = Actions(apiClient)
-            self.state = StateMgr(apiClient)
-
-            # We directly expose the get() method via self.serviceStatus()
-            self._serviceStatus = ServiceStatus(apiClient)
+        # Create an api client
+        apiClient = ApiClient(self._config, self.logger)
+        self.registry = Registry(apiClient)
+        self.usage = Usage(apiClient)
+        self.dsc = DSC(apiClient)
+        self.lec = LEC(apiClient)
+        self.mgmt = Mgmt(apiClient)
+        self.serviceBindings = ServiceBindings(apiClient)
+        self.actions = Actions(apiClient)
+        self.state = StateMgr(apiClient)
+
+        # We directly expose the get() method via self.serviceStatus()
+        self._serviceStatus = ServiceStatus(apiClient)
 
     def serviceStatus(self):
-        if not self._config.isQuickstart():
-            return self._serviceStatus.get()
-        else:
-            return None
+        return self._serviceStatus.get()
 
     def subscribeToDeviceEvents(self, typeId="+", deviceId="+", eventId="+", msgFormat="+", qos=0):
         """
@@ -125,12 +120,6 @@ def subscribeToDeviceEvents(self, typeId="+", deviceId="+", eventId="+", msgForm
             the mid argument if you register a subscriptionCallback method.
             If the subscription fails then the return value will be `0`
         """
-        if self._config.isQuickstart() and deviceId == "+":
-            self.logger.warning(
-                "QuickStart applications do not support wildcard subscription to events from all devices"
-            )
-            return 0
-
         topic = "iot-2/type/%s/id/%s/evt/%s/fmt/%s" % (typeId, deviceId, eventId, msgFormat)
         return self._subscribe(topic, qos)
 
@@ -148,10 +137,6 @@ def subscribeToDeviceStatus(self, typeId="+", deviceId="+"):
             the mid argument if you register a subscriptionCallback method.
             If the subscription fails then the return value will be `0`
         """
-        if self._config.isQuickstart() and deviceId == "+":
-            self.logger.warning("QuickStart applications do not support wildcard subscription to device status")
-            return 0
-
         topic = "iot-2/type/%s/id/%s/mon" % (typeId, deviceId)
         return self._subscribe(topic, 0)
 
@@ -169,10 +154,6 @@ def subscribeToErrorTopic(self, typeId="+", Id="+"):
             the mid argument if you register a subscriptionCallback method.
             If the subscription fails then the return value will be `0`
         """
-        if self._config.isQuickstart() and Id == "+":
-            self.logger.warning("QuickStart applications do not support wildcard subscription to error topics")
-            return 0
-
         topic = "iot-2/type/%s/id/%s/err/data" % (typeId, Id)
         return self._subscribe(topic, 0)
 
@@ -190,10 +171,6 @@ def subscribeToThingErrors(self, typeId="+", Id="+"):
             the mid argument if you register a subscriptionCallback method.
             If the subscription fails then the return value will be `0`
         """
-        if self._config.isQuickstart() and Id == "+":
-            self.logger.warning("QuickStart applications do not support wildcard subscription to error topics")
-            return 0
-
         topic = "iot-2/thing/type/%s/id/%s/err/data" % (typeId, Id)
         return self._subscribe(topic, 0)
 
@@ -212,10 +189,6 @@ def subscribeToThingState(self, typeId="+", thingId="+", logicalInterfaceId="+")
             the mid argument if you register a subscriptionCallback method.
             If the subscription fails then the return value will be `0`
         """
-        if self._config.isQuickstart():
-            self.logger.warning("QuickStart applications do not support thing state")
-            return 0
-
         topic = "iot-2/thing/type/%s/id/%s/intf/%s/evt/state" % (typeId, thingId, logicalInterfaceId)
         return self._subscribe(topic, 0)
 
@@ -234,10 +207,6 @@ def subscribeToDeviceState(self, typeId="+", deviceId="+", logicalInterfaceId="+
             the mid argument if you register a subscriptionCallback method.
             If the subscription fails then the return value will be `0`
         """
-        if self._config.isQuickstart():
-            self.logger.warning("QuickStart applications do not support device state")
-            return 0
-
         topic = "iot-2/type/%s/id/%s/intf/%s/evt/state" % (typeId, deviceId, logicalInterfaceId)
         return self._subscribe(topic, 0)
 
@@ -258,10 +227,6 @@ def subscribeToDeviceCommands(self, typeId="+", deviceId="+", commandId="+", msg
             the mid argument if you register a subscriptionCallback method.
             If the subscription fails then the return value will be `0`
         """
-        if self._config.isQuickstart():
-            self.logger.warning("QuickStart applications do not support commands")
-            return 0
-
         topic = "iot-2/type/%s/id/%s/cmd/%s/fmt/%s" % (typeId, deviceId, commandId, msgFormat)
         return self._subscribe(topic, 0)
 
@@ -285,9 +250,6 @@ def publishCommand(self, typeId, deviceId, commandId, msgFormat, data=None, qos=
             - qos 0 : the client has asynchronously begun to send the event
             - qos 1 and 2 : the client has confirmation of delivery from WIoTP
         """
-        if self._config.isQuickstart():
-            self.logger.warning("QuickStart applications do not support sending commands")
-            return False
         if not self.connectEvent.wait(timeout=10):
             return False
         else: