Skip to content

Commit 81504f9

Browse files
authored
fix: Update swagger and API to latest alpha version (#47)
1 parent 82ee030 commit 81504f9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+179
-5869
lines changed

CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 1.3.0 [unreleased]
2+
3+
### API
4+
1. [#47](https://github.com/influxdata/influxdb-client-python/pull/47): Updated swagger to latest version
5+
16
## 1.2.0 [2019-12-06]
27

38
### Features

influxdb_client/__init__.py

+2-35
Original file line numberDiff line numberDiff line change
@@ -258,42 +258,9 @@
258258
from influxdb_client.domain.task_update_request import TaskUpdateRequest
259259
from influxdb_client.domain.tasks import Tasks
260260
from influxdb_client.domain.telegraf import Telegraf
261-
from influxdb_client.domain.telegraf_plugin_input_cpu import TelegrafPluginInputCpu
262-
from influxdb_client.domain.telegraf_plugin_input_disk import TelegrafPluginInputDisk
263-
from influxdb_client.domain.telegraf_plugin_input_diskio import TelegrafPluginInputDiskio
264-
from influxdb_client.domain.telegraf_plugin_input_docker import TelegrafPluginInputDocker
265-
from influxdb_client.domain.telegraf_plugin_input_docker_config import TelegrafPluginInputDockerConfig
266-
from influxdb_client.domain.telegraf_plugin_input_file import TelegrafPluginInputFile
267-
from influxdb_client.domain.telegraf_plugin_input_file_config import TelegrafPluginInputFileConfig
268-
from influxdb_client.domain.telegraf_plugin_input_kernel import TelegrafPluginInputKernel
269-
from influxdb_client.domain.telegraf_plugin_input_kubernetes import TelegrafPluginInputKubernetes
270-
from influxdb_client.domain.telegraf_plugin_input_kubernetes_config import TelegrafPluginInputKubernetesConfig
271-
from influxdb_client.domain.telegraf_plugin_input_log_parser import TelegrafPluginInputLogParser
272-
from influxdb_client.domain.telegraf_plugin_input_log_parser_config import TelegrafPluginInputLogParserConfig
273-
from influxdb_client.domain.telegraf_plugin_input_mem import TelegrafPluginInputMem
274-
from influxdb_client.domain.telegraf_plugin_input_net import TelegrafPluginInputNet
275-
from influxdb_client.domain.telegraf_plugin_input_net_response import TelegrafPluginInputNetResponse
276-
from influxdb_client.domain.telegraf_plugin_input_nginx import TelegrafPluginInputNginx
277-
from influxdb_client.domain.telegraf_plugin_input_processes import TelegrafPluginInputProcesses
278-
from influxdb_client.domain.telegraf_plugin_input_procstat import TelegrafPluginInputProcstat
279-
from influxdb_client.domain.telegraf_plugin_input_procstat_config import TelegrafPluginInputProcstatConfig
280-
from influxdb_client.domain.telegraf_plugin_input_prometheus import TelegrafPluginInputPrometheus
281-
from influxdb_client.domain.telegraf_plugin_input_prometheus_config import TelegrafPluginInputPrometheusConfig
282-
from influxdb_client.domain.telegraf_plugin_input_redis import TelegrafPluginInputRedis
283-
from influxdb_client.domain.telegraf_plugin_input_redis_config import TelegrafPluginInputRedisConfig
284-
from influxdb_client.domain.telegraf_plugin_input_swap import TelegrafPluginInputSwap
285-
from influxdb_client.domain.telegraf_plugin_input_syslog import TelegrafPluginInputSyslog
286-
from influxdb_client.domain.telegraf_plugin_input_syslog_config import TelegrafPluginInputSyslogConfig
287-
from influxdb_client.domain.telegraf_plugin_input_system import TelegrafPluginInputSystem
288-
from influxdb_client.domain.telegraf_plugin_input_tail import TelegrafPluginInputTail
289-
from influxdb_client.domain.telegraf_plugin_output_file import TelegrafPluginOutputFile
290-
from influxdb_client.domain.telegraf_plugin_output_file_config import TelegrafPluginOutputFileConfig
291-
from influxdb_client.domain.telegraf_plugin_output_file_config_files import TelegrafPluginOutputFileConfigFiles
292-
from influxdb_client.domain.telegraf_plugin_output_influx_dbv2 import TelegrafPluginOutputInfluxDBV2
293-
from influxdb_client.domain.telegraf_plugin_output_influx_dbv2_config import TelegrafPluginOutputInfluxDBV2Config
261+
from influxdb_client.domain.telegraf_plugin import TelegrafPlugin
294262
from influxdb_client.domain.telegraf_request import TelegrafRequest
295-
from influxdb_client.domain.telegraf_request_agent import TelegrafRequestAgent
296-
from influxdb_client.domain.telegraf_request_plugin import TelegrafRequestPlugin
263+
from influxdb_client.domain.telegraf_request_metadata import TelegrafRequestMetadata
297264
from influxdb_client.domain.telegrafs import Telegrafs
298265
from influxdb_client.domain.test_statement import TestStatement
299266
from influxdb_client.domain.threshold import Threshold

influxdb_client/domain/__init__.py

+2-35
Original file line numberDiff line numberDiff line change
@@ -225,42 +225,9 @@
225225
from influxdb_client.domain.task_update_request import TaskUpdateRequest
226226
from influxdb_client.domain.tasks import Tasks
227227
from influxdb_client.domain.telegraf import Telegraf
228-
from influxdb_client.domain.telegraf_plugin_input_cpu import TelegrafPluginInputCpu
229-
from influxdb_client.domain.telegraf_plugin_input_disk import TelegrafPluginInputDisk
230-
from influxdb_client.domain.telegraf_plugin_input_diskio import TelegrafPluginInputDiskio
231-
from influxdb_client.domain.telegraf_plugin_input_docker import TelegrafPluginInputDocker
232-
from influxdb_client.domain.telegraf_plugin_input_docker_config import TelegrafPluginInputDockerConfig
233-
from influxdb_client.domain.telegraf_plugin_input_file import TelegrafPluginInputFile
234-
from influxdb_client.domain.telegraf_plugin_input_file_config import TelegrafPluginInputFileConfig
235-
from influxdb_client.domain.telegraf_plugin_input_kernel import TelegrafPluginInputKernel
236-
from influxdb_client.domain.telegraf_plugin_input_kubernetes import TelegrafPluginInputKubernetes
237-
from influxdb_client.domain.telegraf_plugin_input_kubernetes_config import TelegrafPluginInputKubernetesConfig
238-
from influxdb_client.domain.telegraf_plugin_input_log_parser import TelegrafPluginInputLogParser
239-
from influxdb_client.domain.telegraf_plugin_input_log_parser_config import TelegrafPluginInputLogParserConfig
240-
from influxdb_client.domain.telegraf_plugin_input_mem import TelegrafPluginInputMem
241-
from influxdb_client.domain.telegraf_plugin_input_net import TelegrafPluginInputNet
242-
from influxdb_client.domain.telegraf_plugin_input_net_response import TelegrafPluginInputNetResponse
243-
from influxdb_client.domain.telegraf_plugin_input_nginx import TelegrafPluginInputNginx
244-
from influxdb_client.domain.telegraf_plugin_input_processes import TelegrafPluginInputProcesses
245-
from influxdb_client.domain.telegraf_plugin_input_procstat import TelegrafPluginInputProcstat
246-
from influxdb_client.domain.telegraf_plugin_input_procstat_config import TelegrafPluginInputProcstatConfig
247-
from influxdb_client.domain.telegraf_plugin_input_prometheus import TelegrafPluginInputPrometheus
248-
from influxdb_client.domain.telegraf_plugin_input_prometheus_config import TelegrafPluginInputPrometheusConfig
249-
from influxdb_client.domain.telegraf_plugin_input_redis import TelegrafPluginInputRedis
250-
from influxdb_client.domain.telegraf_plugin_input_redis_config import TelegrafPluginInputRedisConfig
251-
from influxdb_client.domain.telegraf_plugin_input_swap import TelegrafPluginInputSwap
252-
from influxdb_client.domain.telegraf_plugin_input_syslog import TelegrafPluginInputSyslog
253-
from influxdb_client.domain.telegraf_plugin_input_syslog_config import TelegrafPluginInputSyslogConfig
254-
from influxdb_client.domain.telegraf_plugin_input_system import TelegrafPluginInputSystem
255-
from influxdb_client.domain.telegraf_plugin_input_tail import TelegrafPluginInputTail
256-
from influxdb_client.domain.telegraf_plugin_output_file import TelegrafPluginOutputFile
257-
from influxdb_client.domain.telegraf_plugin_output_file_config import TelegrafPluginOutputFileConfig
258-
from influxdb_client.domain.telegraf_plugin_output_file_config_files import TelegrafPluginOutputFileConfigFiles
259-
from influxdb_client.domain.telegraf_plugin_output_influx_dbv2 import TelegrafPluginOutputInfluxDBV2
260-
from influxdb_client.domain.telegraf_plugin_output_influx_dbv2_config import TelegrafPluginOutputInfluxDBV2Config
228+
from influxdb_client.domain.telegraf_plugin import TelegrafPlugin
261229
from influxdb_client.domain.telegraf_request import TelegrafRequest
262-
from influxdb_client.domain.telegraf_request_agent import TelegrafRequestAgent
263-
from influxdb_client.domain.telegraf_request_plugin import TelegrafRequestPlugin
230+
from influxdb_client.domain.telegraf_request_metadata import TelegrafRequestMetadata
264231
from influxdb_client.domain.telegrafs import Telegrafs
265232
from influxdb_client.domain.test_statement import TestStatement
266233
from influxdb_client.domain.threshold import Threshold

influxdb_client/domain/delete_predicate_request.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def __init__(self, start=None, stop=None, predicate=None): # noqa: E501
5959
def start(self):
6060
"""Gets the start of this DeletePredicateRequest. # noqa: E501
6161
62-
RFC3339Nano. # noqa: E501
62+
RFC3339Nano # noqa: E501
6363
6464
:return: The start of this DeletePredicateRequest. # noqa: E501
6565
:rtype: datetime
@@ -70,7 +70,7 @@ def start(self):
7070
def start(self, start):
7171
"""Sets the start of this DeletePredicateRequest.
7272
73-
RFC3339Nano. # noqa: E501
73+
RFC3339Nano # noqa: E501
7474
7575
:param start: The start of this DeletePredicateRequest. # noqa: E501
7676
:type: datetime
@@ -84,7 +84,7 @@ def start(self, start):
8484
def stop(self):
8585
"""Gets the stop of this DeletePredicateRequest. # noqa: E501
8686
87-
RFC3339Nano. # noqa: E501
87+
RFC3339Nano # noqa: E501
8888
8989
:return: The stop of this DeletePredicateRequest. # noqa: E501
9090
:rtype: datetime
@@ -95,7 +95,7 @@ def stop(self):
9595
def stop(self, stop):
9696
"""Sets the stop of this DeletePredicateRequest.
9797
98-
RFC3339Nano. # noqa: E501
98+
RFC3339Nano # noqa: E501
9999
100100
:param stop: The stop of this DeletePredicateRequest. # noqa: E501
101101
:type: datetime
@@ -109,7 +109,7 @@ def stop(self, stop):
109109
def predicate(self):
110110
"""Gets the predicate of this DeletePredicateRequest. # noqa: E501
111111
112-
sql where like delete statement # noqa: E501
112+
InfluxQL-like delete statement # noqa: E501
113113
114114
:return: The predicate of this DeletePredicateRequest. # noqa: E501
115115
:rtype: str
@@ -120,7 +120,7 @@ def predicate(self):
120120
def predicate(self, predicate):
121121
"""Sets the predicate of this DeletePredicateRequest.
122122
123-
sql where like delete statement # noqa: E501
123+
InfluxQL-like delete statement # noqa: E501
124124
125125
:param predicate: The predicate of this DeletePredicateRequest. # noqa: E501
126126
:type: str

influxdb_client/domain/slack_notification_endpoint.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ def __init__(self, url=None, token=None): # noqa: E501
4949
self._token = None
5050
self.discriminator = None
5151

52-
if url is not None:
53-
self.url = url
52+
self.url = url
5453
if token is not None:
5554
self.token = token
5655

@@ -74,6 +73,8 @@ def url(self, url):
7473
:param url: The url of this SlackNotificationEndpoint. # noqa: E501
7574
:type: str
7675
"""
76+
if url is None:
77+
raise ValueError("Invalid value for `url`, must not be `None`") # noqa: E501
7778

7879
self._url = url
7980

influxdb_client/domain/telegraf.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class Telegraf(TelegrafRequest):
3737
'labels': 'list[Label]',
3838
'name': 'str',
3939
'description': 'str',
40-
'agent': 'TelegrafRequestAgent',
41-
'plugins': 'list[TelegrafRequestPlugin]',
40+
'metadata': 'TelegrafRequestMetadata',
41+
'config': 'str',
4242
'org_id': 'str'
4343
}
4444

@@ -48,14 +48,14 @@ class Telegraf(TelegrafRequest):
4848
'labels': 'labels',
4949
'name': 'name',
5050
'description': 'description',
51-
'agent': 'agent',
52-
'plugins': 'plugins',
51+
'metadata': 'metadata',
52+
'config': 'config',
5353
'org_id': 'orgID'
5454
}
5555

56-
def __init__(self, id=None, links=None, labels=None, name=None, description=None, agent=None, plugins=None, org_id=None): # noqa: E501
56+
def __init__(self, id=None, links=None, labels=None, name=None, description=None, metadata=None, config=None, org_id=None): # noqa: E501
5757
"""Telegraf - a model defined in OpenAPI""" # noqa: E501
58-
TelegrafRequest.__init__(self, name=name, description=description, agent=agent, plugins=plugins, org_id=org_id)
58+
TelegrafRequest.__init__(self, name=name, description=description, metadata=metadata, config=config, org_id=org_id)
5959

6060
self._id = None
6161
self._links = None

influxdb_client/domain/telegraf_plugin_input_file.py influxdb_client/domain/telegraf_plugin.py

+52-55
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import six
1717

1818

19-
class TelegrafPluginInputFile(object):
19+
class TelegrafPlugin(object):
2020
"""NOTE: This class is auto generated by OpenAPI Generator.
2121
Ref: https://openapi-generator.tech
2222
@@ -31,121 +31,118 @@ class TelegrafPluginInputFile(object):
3131
and the value is json key in definition.
3232
"""
3333
openapi_types = {
34-
'name': 'str',
3534
'type': 'str',
36-
'comment': 'str',
37-
'config': 'TelegrafPluginInputFileConfig'
35+
'name': 'str',
36+
'description': 'str',
37+
'config': 'dict(str, object)'
3838
}
3939

4040
attribute_map = {
41-
'name': 'name',
4241
'type': 'type',
43-
'comment': 'comment',
42+
'name': 'name',
43+
'description': 'description',
4444
'config': 'config'
4545
}
4646

47-
def __init__(self, name=None, type=None, comment=None, config=None): # noqa: E501
48-
"""TelegrafPluginInputFile - a model defined in OpenAPI""" # noqa: E501
47+
def __init__(self, type=None, name=None, description=None, config=None): # noqa: E501
48+
"""TelegrafPlugin - a model defined in OpenAPI""" # noqa: E501
4949

50-
self._name = None
5150
self._type = None
52-
self._comment = None
51+
self._name = None
52+
self._description = None
5353
self._config = None
5454
self.discriminator = None
5555

56-
self.name = name
57-
self.type = type
58-
if comment is not None:
59-
self.comment = comment
60-
self.config = config
56+
if type is not None:
57+
self.type = type
58+
if name is not None:
59+
self.name = name
60+
if description is not None:
61+
self.description = description
62+
if config is not None:
63+
self.config = config
6164

6265
@property
63-
def name(self):
64-
"""Gets the name of this TelegrafPluginInputFile. # noqa: E501
66+
def type(self):
67+
"""Gets the type of this TelegrafPlugin. # noqa: E501
6568
6669
67-
:return: The name of this TelegrafPluginInputFile. # noqa: E501
70+
:return: The type of this TelegrafPlugin. # noqa: E501
6871
:rtype: str
6972
"""
70-
return self._name
73+
return self._type
7174

72-
@name.setter
73-
def name(self, name):
74-
"""Sets the name of this TelegrafPluginInputFile.
75+
@type.setter
76+
def type(self, type):
77+
"""Sets the type of this TelegrafPlugin.
7578
7679
77-
:param name: The name of this TelegrafPluginInputFile. # noqa: E501
80+
:param type: The type of this TelegrafPlugin. # noqa: E501
7881
:type: str
7982
"""
80-
if name is None:
81-
raise ValueError("Invalid value for `name`, must not be `None`") # noqa: E501
8283

83-
self._name = name
84+
self._type = type
8485

8586
@property
86-
def type(self):
87-
"""Gets the type of this TelegrafPluginInputFile. # noqa: E501
87+
def name(self):
88+
"""Gets the name of this TelegrafPlugin. # noqa: E501
8889
8990
90-
:return: The type of this TelegrafPluginInputFile. # noqa: E501
91+
:return: The name of this TelegrafPlugin. # noqa: E501
9192
:rtype: str
9293
"""
93-
return self._type
94+
return self._name
9495

95-
@type.setter
96-
def type(self, type):
97-
"""Sets the type of this TelegrafPluginInputFile.
96+
@name.setter
97+
def name(self, name):
98+
"""Sets the name of this TelegrafPlugin.
9899
99100
100-
:param type: The type of this TelegrafPluginInputFile. # noqa: E501
101+
:param name: The name of this TelegrafPlugin. # noqa: E501
101102
:type: str
102103
"""
103-
if type is None:
104-
raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501
105104

106-
self._type = type
105+
self._name = name
107106

108107
@property
109-
def comment(self):
110-
"""Gets the comment of this TelegrafPluginInputFile. # noqa: E501
108+
def description(self):
109+
"""Gets the description of this TelegrafPlugin. # noqa: E501
111110
112111
113-
:return: The comment of this TelegrafPluginInputFile. # noqa: E501
112+
:return: The description of this TelegrafPlugin. # noqa: E501
114113
:rtype: str
115114
"""
116-
return self._comment
115+
return self._description
117116

118-
@comment.setter
119-
def comment(self, comment):
120-
"""Sets the comment of this TelegrafPluginInputFile.
117+
@description.setter
118+
def description(self, description):
119+
"""Sets the description of this TelegrafPlugin.
121120
122121
123-
:param comment: The comment of this TelegrafPluginInputFile. # noqa: E501
122+
:param description: The description of this TelegrafPlugin. # noqa: E501
124123
:type: str
125124
"""
126125

127-
self._comment = comment
126+
self._description = description
128127

129128
@property
130129
def config(self):
131-
"""Gets the config of this TelegrafPluginInputFile. # noqa: E501
130+
"""Gets the config of this TelegrafPlugin. # noqa: E501
132131
133132
134-
:return: The config of this TelegrafPluginInputFile. # noqa: E501
135-
:rtype: TelegrafPluginInputFileConfig
133+
:return: The config of this TelegrafPlugin. # noqa: E501
134+
:rtype: dict(str, object)
136135
"""
137136
return self._config
138137

139138
@config.setter
140139
def config(self, config):
141-
"""Sets the config of this TelegrafPluginInputFile.
140+
"""Sets the config of this TelegrafPlugin.
142141
143142
144-
:param config: The config of this TelegrafPluginInputFile. # noqa: E501
145-
:type: TelegrafPluginInputFileConfig
143+
:param config: The config of this TelegrafPlugin. # noqa: E501
144+
:type: dict(str, object)
146145
"""
147-
if config is None:
148-
raise ValueError("Invalid value for `config`, must not be `None`") # noqa: E501
149146

150147
self._config = config
151148

@@ -183,7 +180,7 @@ def __repr__(self):
183180

184181
def __eq__(self, other):
185182
"""Returns true if both objects are equal"""
186-
if not isinstance(other, TelegrafPluginInputFile):
183+
if not isinstance(other, TelegrafPlugin):
187184
return False
188185

189186
return self.__dict__ == other.__dict__

0 commit comments

Comments
 (0)