Added tests, fixed models and methods

requirements.txt

@@ -3,5 +3,5 @@ six >= 1.10
 python_dateutil >= 2.5.3
 setuptools >= 21.0.0
 urllib3 >= 1.23
-requests==2.26.0
+requests>=2.29.0
 pyjwt==2.6.0

tb_rest_client/models/models_ce/device_profile.py

@@ -45,7 +45,8 @@ class DeviceProfile(object):
         'provision_type': 'str',
         'profile_data': 'DeviceProfileData',
         'type': 'str',
-        'default_edge_rule_chain_id': 'RuleChainId'
+        'default_edge_rule_chain_id': 'RuleChainId',
+        'external_id': 'EntityId'
     }
 
     attribute_map = {
@@ -66,10 +67,11 @@ class DeviceProfile(object):
         'provision_type': 'provisionType',
         'profile_data': 'profileData',
         'type': 'type',
-        'default_edge_rule_chain_id': 'defaultEdgeRuleChainId'
+        'default_edge_rule_chain_id': 'defaultEdgeRuleChainId',
+        'external_id': 'externalId'
     }
 
-    def __init__(self, id=None, created_time=None, tenant_id=None, name=None, default=None, default_dashboard_id=None, default_rule_chain_id=None, default_queue_name=None, firmware_id=None, software_id=None, description=None, image=None, provision_device_key=None, transport_type=None, provision_type=None, profile_data=None, type=None, default_edge_rule_chain_id=None):  # noqa: E501
+    def __init__(self, id=None, external_id=None, created_time=None, tenant_id=None, name=None, default=None, default_dashboard_id=None, default_rule_chain_id=None, default_queue_name=None, firmware_id=None, software_id=None, description=None, image=None, provision_device_key=None, transport_type=None, provision_type=None, profile_data=None, type=None, default_edge_rule_chain_id=None):  # noqa: E501
         """DeviceProfile - a model defined in Swagger"""  # noqa: E501
         self._id = None
         self._created_time = None
@@ -89,7 +91,9 @@ def __init__(self, id=None, created_time=None, tenant_id=None, name=None, defaul
         self._profile_data = None
         self._type = None
         self._default_edge_rule_chain_id = None
+        self._external_id = None
         self.discriminator = None
+        self.external_id = external_id
         if id is not None:
             self.id = id
         if created_time is not None:
@@ -110,16 +114,20 @@ def __init__(self, id=None, created_time=None, tenant_id=None, name=None, defaul
             self.firmware_id = firmware_id
         if software_id is not None:
             self.software_id = software_id
-        self.description = description or ''
+        if description is not None:
+            self.description = description
         if image is not None:
             self.image = image
         if provision_device_key is not None:
             self.provision_device_key = provision_device_key
-        self.transport_type = transport_type or 'DEFAULT'
-        self.provision_type = provision_type or 'DISABLED'
+        if transport_type is not None:
+            self.transport_type = transport_type
+        if provision_type is not None:
+            self.provision_type = provision_type
         if profile_data is not None:
             self.profile_data = profile_data
-        self.type = type or 'DEFAULT'
+        if type is not None:
+            self.type = type
         if default_edge_rule_chain_id is not None:
             self.default_edge_rule_chain_id = default_edge_rule_chain_id
 
@@ -144,6 +152,14 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def external_id(self):
+        return self._external_id
+
+    @external_id.setter
+    def external_id(self, external_id):
+        self._external_id = external_id
+
     @property
     def created_time(self):
         """Gets the created_time of this DeviceProfile.  # noqa: E501

tb_rest_client/models/models_ce/notification_rule_trigger_config.py

@@ -28,16 +28,32 @@ class NotificationRuleTriggerConfig(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'trigger_type': 'str'
+        'trigger_type': 'str',
+        'alarm_severities': 'list[str]',
+        'clear_rule': 'bool',
+        'notify_on': 'list[str]',
+        'alarm_types': 'list[str]'
     }
 
     attribute_map = {
-        'trigger_type': 'triggerType'
+        'trigger_type': 'triggerType',
+        'clear_rule': 'clearRule',
+        'notify_on': 'notifyOn',
+        'alarm_types': 'alarmTypes',
+        'alarm_severities': 'alarmSeverities'
     }
 
-    def __init__(self, trigger_type=None):  # noqa: E501
+    def __init__(self, trigger_type=None, clear_rule=None, notify_on=None, alarm_types=None, alarm_severities=None):  # noqa: E501
         """NotificationRuleTriggerConfig - a model defined in Swagger"""  # noqa: E501
         self._trigger_type = None
+        self._clear_rule = None
+        self._notify_on = None
+        self._alarm_types = None
+        self._alarm_severities = None
+        self.clear_rule = clear_rule
+        self.notify_on = notify_on
+        self.alarm_types = alarm_types
+        self.alarm_severities = alarm_severities
         self.discriminator = None
         if trigger_type is not None:
             self.trigger_type = trigger_type
@@ -69,6 +85,38 @@ def trigger_type(self, trigger_type):
 
         self._trigger_type = trigger_type
 
+    @property
+    def clear_rule(self):
+        return self._clear_rule
+
+    @clear_rule.setter
+    def clear_rule(self, clear_rule):
+        self._clear_rule = clear_rule
+
+    @property
+    def notify_on(self):
+        return self._notify_on
+
+    @notify_on.setter
+    def notify_on(self, notify_on):
+        self._notify_on = notify_on
+
+    @property
+    def alarm_types(self):
+        return self._alarm_types
+
+    @alarm_types.setter
+    def alarm_types(self, alarm_types):
+        self._alarm_types = alarm_types
+
+    @property
+    def alarm_severities(self):
+        return self._alarm_severities
+
+    @alarm_severities.setter
+    def alarm_severities(self, alarm_severities):
+        self._alarm_severities = alarm_severities
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}

tb_rest_client/models/models_ce/notification_target_config.py

@@ -28,20 +28,44 @@ class NotificationTargetConfig(object):
                             and the value is json key in definition.
     """
     swagger_types = {
-        'description': 'str'
+        'description': 'str',
+        'type': 'str',
+        'users_filter': 'JsonNode'
     }
 
     attribute_map = {
-        'description': 'description'
+        'description': 'description',
+        'type': 'type',
+        'users_filter': 'usersFilter'
     }
 
-    def __init__(self, description=None):  # noqa: E501
+    def __init__(self, description=None, type=None, users_filter=None):  # noqa: E501
         """NotificationTargetConfig - a model defined in Swagger"""  # noqa: E501
         self._description = None
+        self._type = None
+        self._users_filter = None
+        self.type = type
+        self.users_filter = users_filter
         self.discriminator = None
         if description is not None:
             self.description = description
 
+    @property
+    def type(self):
+        return self._type
+
+    @type.setter
+    def type(self, type):
+        self._type = type
+
+    @property
+    def users_filter(self):
+        return self._users_filter
+
+    @users_filter.setter
+    def users_filter(self, users_filter):
+        self._users_filter = users_filter
+
     @property
     def description(self):
         """Gets the description of this NotificationTargetConfig.  # noqa: E501

tb_rest_client/models/models_ce/widgets_bundle.py

@@ -35,7 +35,8 @@ class WidgetsBundle(object):
         'alias': 'str',
         'title': 'str',
         'image': 'str',
-        'description': 'str'
+        'description': 'str',
+        'external_id': 'EntityId'
     }
 
     attribute_map = {
@@ -46,10 +47,11 @@ class WidgetsBundle(object):
         'alias': 'alias',
         'title': 'title',
         'image': 'image',
-        'description': 'description'
+        'description': 'description',
+        'external_id': 'externalId'
     }
 
-    def __init__(self, id=None, created_time=None, name=None, tenant_id=None, alias=None, title=None, image=None, description=None):  # noqa: E501
+    def __init__(self, id=None, external_id=None, created_time=None, name=None, tenant_id=None, alias=None, title=None, image=None, description=None):  # noqa: E501
         """WidgetsBundle - a model defined in Swagger"""  # noqa: E501
         self._id = None
         self._created_time = None
@@ -59,6 +61,8 @@ def __init__(self, id=None, created_time=None, name=None, tenant_id=None, alias=
         self._title = None
         self._image = None
         self._description = None
+        self._external_id = None
+        self.external_id = external_id
         self.discriminator = None
         if id is not None:
             self.id = id
@@ -98,6 +102,14 @@ def id(self, id):
 
         self._id = id
 
+    @property
+    def external_id(self):
+        return self._external_id
+
+    @external_id.setter
+    def external_id(self, external_id):
+        self._external_id = external_id
+
     @property
     def created_time(self):
         """Gets the created_time of this WidgetsBundle.  # noqa: E501

tb_rest_client/models/models_pe/__init__.py

@@ -3,13 +3,11 @@
 from .merged_user_permissions import MergedUserPermissions
 from .page_data_edge import PageDataEdge
 from .tenant_solution_template_info import TenantSolutionTemplateInfo
-from .tenant_info import TenantInfo
 from .debug_rule_node_event_filter import DebugRuleNodeEventFilter
 from .admin_settings_id import AdminSettingsId
 from .entity_data import EntityData
 from .server_security_config import ServerSecurityConfig
 from .login_response import LoginResponse
-from .widget_type import WidgetType
 from .event_id import EventId
 from .scheduler_event_info import SchedulerEventInfo
 from .test_sms_request import TestSmsRequest
@@ -39,10 +37,8 @@
 from .device_search_query_filter import DeviceSearchQueryFilter
 from .dashboard_info import DashboardInfo
 from .byte_buffer import ByteBuffer
-from .entity_info import EntityInfo
 from .edge import Edge
 from .scheduler_event_with_customer_info import SchedulerEventWithCustomerInfo
-from .tenant import Tenant
 from .entity_relations_query import EntityRelationsQuery
 from .sms_provider_configuration import SmsProviderConfiguration
 from .entity_relation_info import EntityRelationInfo
@@ -130,7 +126,6 @@
 from .telemetry_mapping_configuration import TelemetryMappingConfiguration
 from .default_device_profile_configuration import DefaultDeviceProfileConfiguration
 from .any_time_schedule import AnyTimeSchedule
-from .page_data_tenant import PageDataTenant
 from .allow_create_new_devices_device_profile_provision_configuration import \
     AllowCreateNewDevicesDeviceProfileProvisionConfiguration
 from .to_device_rpc_request_snmp_communication_config import ToDeviceRpcRequestSnmpCommunicationConfig
@@ -186,13 +181,10 @@
 from .relations_search_parameters import RelationsSearchParameters
 from .thingsboard_credentials_expired_response import ThingsboardCredentialsExpiredResponse
 from .o_auth2_basic_mapper_config import OAuth2BasicMapperConfig
-from .page_data_widgets_bundle import PageDataWidgetsBundle
 from .simple_alarm_condition_spec import SimpleAlarmConditionSpec
 from .rpc import Rpc
 from .group_permission_info import GroupPermissionInfo
-from .widgets_bundle import WidgetsBundle
 from .rpc_id import RpcId
-from .page_data_entity_info import PageDataEntityInfo
 from .page_data_alarm_data import PageDataAlarmData
 from .default_rule_chain_create_request import DefaultRuleChainCreateRequest
 from .transport_payload_type_configuration import TransportPayloadTypeConfiguration
@@ -228,21 +220,17 @@
 from .entity_view_type_filter import EntityViewTypeFilter
 from .page_data_entity_data import PageDataEntityData
 from .dynamic_valueboolean import DynamicValueboolean
-from .page_data_tenant_info import PageDataTenantInfo
-from .page_data_audit_log import PageDataAuditLog
 from .tenant_profile_configuration import TenantProfileConfiguration
 from .customer import Customer
 from .dynamic_valuelong import DynamicValuelong
 from .device_profile_transport_configuration import DeviceProfileTransportConfiguration
 from .tb_resource_info import TbResourceInfo
-from .widget_type_details import WidgetTypeDetails
 from .object_attributes import ObjectAttributes
 from .relation_entity_type_filter import RelationEntityTypeFilter
 from .asset_search_query_filter import AssetSearchQueryFilter
 from .reset_password_email_request import ResetPasswordEmailRequest
 from .tenant_solution_template_details import TenantSolutionTemplateDetails
 from .tenant_profile_id import TenantProfileId
-from .tenant_profile import TenantProfile
 from .blob_entity_id import BlobEntityId
 from .key_filter_predicate import KeyFilterPredicate
 from .o_auth2_mapper_config import OAuth2MapperConfig
@@ -258,7 +246,6 @@
 from .dynamic_valuestring import DynamicValuestring
 from .lw_m2m_instance import LwM2mInstance
 from .repeating_alarm_condition_spec import RepeatingAlarmConditionSpec
-from .page_data_tenant_profile import PageDataTenantProfile
 from .custom_time_schedule_item import CustomTimeScheduleItem
 from .mapping import Mapping
 from .user_password_policy import UserPasswordPolicy
@@ -331,7 +318,6 @@
 from .two_fa_provider_info import TwoFaProviderInfo
 from .entity_load_error import EntityLoadError
 from .array_node import ArrayNode
-from .asset_profile_info import AssetProfileInfo
 from .integration_info import IntegrationInfo
 from .page_data_integration_info import PageDataIntegrationInfo
 from .raw_data_event_filter import RawDataEventFilter
@@ -350,7 +336,6 @@
 from .all_users_filter import AllUsersFilter
 from .api_usage_limit_notification_rule_trigger_config import ApiUsageLimitNotificationRuleTriggerConfig
 from .asset_info import AssetInfo
-from .asset_profile import AssetProfile
 from .asset_profile_id import AssetProfileId
 from .clear_rule import ClearRule
 from .comparison_ts_value import ComparisonTsValue
@@ -359,7 +344,6 @@
 from .delivery_method_notification_template import DeliveryMethodNotificationTemplate
 from .device_activity_notification_rule_trigger_config import DeviceActivityNotificationRuleTriggerConfig
 from .device_info import DeviceInfo
-from .device_profile import DeviceProfile
 from .edge_info import EdgeInfo
 from .edge_install_instructions import EdgeInstallInstructions
 from .email_delivery_method_notification_template import EmailDeliveryMethodNotificationTemplate
@@ -382,34 +366,18 @@
 from .notification_request_config import NotificationRequestConfig
 from .notification_request_id import NotificationRequestId
 from .notification_request_preview import NotificationRequestPreview
-from .notification_request_info import NotificationRequestInfo
 from .notification_request_stats import NotificationRequestStats
-from .notification_rule import NotificationRule
 from .notification_rule_config import NotificationRuleConfig
 from .notification_rule_id import NotificationRuleId
-from .notification_rule_info import NotificationRuleInfo
 from .notification_rule_recipients_config import NotificationRuleRecipientsConfig
-from .notification_rule_trigger_config import NotificationRuleTriggerConfig
-from .notification_settings import NotificationSettings
-from .notification_template import NotificationTemplate
-from .notification_target import NotificationTarget
-from .notification_target_config import NotificationTargetConfig
 from .notification_target_id import NotificationTargetId
 from .notification_template_config import NotificationTemplateConfig
 from .notification_template_id import NotificationTemplateId
 from .originator_entity_owner_users_filter import OriginatorEntityOwnerUsersFilter
-from .page_data_alarm_comment_info import PageDataAlarmCommentInfo
-from .page_data_asset_profile import PageDataAssetProfile
-from .page_data_asset_profile_info import PageDataAssetProfileInfo
 from .page_data_customer_info import PageDataCustomerInfo
 from .page_data_edge_info import PageDataEdgeInfo
 from .page_data_entity_view_info import PageDataEntityViewInfo
 from .page_data_event_info import PageDataEventInfo
-from .page_data_notification import PageDataNotification
-from .page_data_notification_request_info import PageDataNotificationRequestInfo
-from .page_data_notification_rule_info import PageDataNotificationRuleInfo
-from .page_data_notification_target import PageDataNotificationTarget
-from .page_data_notification_template import PageDataNotificationTemplate
 from .page_data_user_email_info import PageDataUserEmailInfo
 from .page_data_user_info import PageDataUserInfo
 from .platform_users_notification_target_config import PlatformUsersNotificationTargetConfig
@@ -428,7 +396,6 @@
 from .system_info import SystemInfo
 from .system_info_data import SystemInfoData
 from .tenant_administrators_filter import TenantAdministratorsFilter
-from .usage_info import UsageInfo
 from .user_dashboards_info import UserDashboardsInfo
 from .user_email_info import UserEmailInfo
 from .user_group_list_filter import UserGroupListFilter