Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update swagger and API to latest alpha version #47

Merged
merged 2 commits into from
Jan 6, 2020
Merged

fix: Update swagger and API to latest alpha version #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e36775
fix: update to latest swagger API
bednar Jan 6, 2020
ceba039
fix: update CHANGELOG.md
bednar Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.3.0 [unreleased]

### API
1. [#47](https://github.com/influxdata/influxdb-client-python/pull/47): Updated swagger to latest version

## 1.2.0 [2019-12-06]

### Features
Expand Down
37 changes: 2 additions & 35 deletions influxdb_client/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,42 +258,9 @@
from influxdb_client.domain.task_update_request import TaskUpdateRequest
from influxdb_client.domain.tasks import Tasks
from influxdb_client.domain.telegraf import Telegraf
from influxdb_client.domain.telegraf_plugin_input_cpu import TelegrafPluginInputCpu
from influxdb_client.domain.telegraf_plugin_input_disk import TelegrafPluginInputDisk
from influxdb_client.domain.telegraf_plugin_input_diskio import TelegrafPluginInputDiskio
from influxdb_client.domain.telegraf_plugin_input_docker import TelegrafPluginInputDocker
from influxdb_client.domain.telegraf_plugin_input_docker_config import TelegrafPluginInputDockerConfig
from influxdb_client.domain.telegraf_plugin_input_file import TelegrafPluginInputFile
from influxdb_client.domain.telegraf_plugin_input_file_config import TelegrafPluginInputFileConfig
from influxdb_client.domain.telegraf_plugin_input_kernel import TelegrafPluginInputKernel
from influxdb_client.domain.telegraf_plugin_input_kubernetes import TelegrafPluginInputKubernetes
from influxdb_client.domain.telegraf_plugin_input_kubernetes_config import TelegrafPluginInputKubernetesConfig
from influxdb_client.domain.telegraf_plugin_input_log_parser import TelegrafPluginInputLogParser
from influxdb_client.domain.telegraf_plugin_input_log_parser_config import TelegrafPluginInputLogParserConfig
from influxdb_client.domain.telegraf_plugin_input_mem import TelegrafPluginInputMem
from influxdb_client.domain.telegraf_plugin_input_net import TelegrafPluginInputNet
from influxdb_client.domain.telegraf_plugin_input_net_response import TelegrafPluginInputNetResponse
from influxdb_client.domain.telegraf_plugin_input_nginx import TelegrafPluginInputNginx
from influxdb_client.domain.telegraf_plugin_input_processes import TelegrafPluginInputProcesses
from influxdb_client.domain.telegraf_plugin_input_procstat import TelegrafPluginInputProcstat
from influxdb_client.domain.telegraf_plugin_input_procstat_config import TelegrafPluginInputProcstatConfig
from influxdb_client.domain.telegraf_plugin_input_prometheus import TelegrafPluginInputPrometheus
from influxdb_client.domain.telegraf_plugin_input_prometheus_config import TelegrafPluginInputPrometheusConfig
from influxdb_client.domain.telegraf_plugin_input_redis import TelegrafPluginInputRedis
from influxdb_client.domain.telegraf_plugin_input_redis_config import TelegrafPluginInputRedisConfig
from influxdb_client.domain.telegraf_plugin_input_swap import TelegrafPluginInputSwap
from influxdb_client.domain.telegraf_plugin_input_syslog import TelegrafPluginInputSyslog
from influxdb_client.domain.telegraf_plugin_input_syslog_config import TelegrafPluginInputSyslogConfig
from influxdb_client.domain.telegraf_plugin_input_system import TelegrafPluginInputSystem
from influxdb_client.domain.telegraf_plugin_input_tail import TelegrafPluginInputTail
from influxdb_client.domain.telegraf_plugin_output_file import TelegrafPluginOutputFile
from influxdb_client.domain.telegraf_plugin_output_file_config import TelegrafPluginOutputFileConfig
from influxdb_client.domain.telegraf_plugin_output_file_config_files import TelegrafPluginOutputFileConfigFiles
from influxdb_client.domain.telegraf_plugin_output_influx_dbv2 import TelegrafPluginOutputInfluxDBV2
from influxdb_client.domain.telegraf_plugin_output_influx_dbv2_config import TelegrafPluginOutputInfluxDBV2Config
from influxdb_client.domain.telegraf_plugin import TelegrafPlugin
from influxdb_client.domain.telegraf_request import TelegrafRequest
from influxdb_client.domain.telegraf_request_agent import TelegrafRequestAgent
from influxdb_client.domain.telegraf_request_plugin import TelegrafRequestPlugin
from influxdb_client.domain.telegraf_request_metadata import TelegrafRequestMetadata
from influxdb_client.domain.telegrafs import Telegrafs
from influxdb_client.domain.test_statement import TestStatement
from influxdb_client.domain.threshold import Threshold
Expand Down
37 changes: 2 additions & 35 deletions influxdb_client/domain/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,42 +225,9 @@
from influxdb_client.domain.task_update_request import TaskUpdateRequest
from influxdb_client.domain.tasks import Tasks
from influxdb_client.domain.telegraf import Telegraf
from influxdb_client.domain.telegraf_plugin_input_cpu import TelegrafPluginInputCpu
from influxdb_client.domain.telegraf_plugin_input_disk import TelegrafPluginInputDisk
from influxdb_client.domain.telegraf_plugin_input_diskio import TelegrafPluginInputDiskio
from influxdb_client.domain.telegraf_plugin_input_docker import TelegrafPluginInputDocker
from influxdb_client.domain.telegraf_plugin_input_docker_config import TelegrafPluginInputDockerConfig
from influxdb_client.domain.telegraf_plugin_input_file import TelegrafPluginInputFile
from influxdb_client.domain.telegraf_plugin_input_file_config import TelegrafPluginInputFileConfig
from influxdb_client.domain.telegraf_plugin_input_kernel import TelegrafPluginInputKernel
from influxdb_client.domain.telegraf_plugin_input_kubernetes import TelegrafPluginInputKubernetes
from influxdb_client.domain.telegraf_plugin_input_kubernetes_config import TelegrafPluginInputKubernetesConfig
from influxdb_client.domain.telegraf_plugin_input_log_parser import TelegrafPluginInputLogParser
from influxdb_client.domain.telegraf_plugin_input_log_parser_config import TelegrafPluginInputLogParserConfig
from influxdb_client.domain.telegraf_plugin_input_mem import TelegrafPluginInputMem
from influxdb_client.domain.telegraf_plugin_input_net import TelegrafPluginInputNet
from influxdb_client.domain.telegraf_plugin_input_net_response import TelegrafPluginInputNetResponse
from influxdb_client.domain.telegraf_plugin_input_nginx import TelegrafPluginInputNginx
from influxdb_client.domain.telegraf_plugin_input_processes import TelegrafPluginInputProcesses
from influxdb_client.domain.telegraf_plugin_input_procstat import TelegrafPluginInputProcstat
from influxdb_client.domain.telegraf_plugin_input_procstat_config import TelegrafPluginInputProcstatConfig
from influxdb_client.domain.telegraf_plugin_input_prometheus import TelegrafPluginInputPrometheus
from influxdb_client.domain.telegraf_plugin_input_prometheus_config import TelegrafPluginInputPrometheusConfig
from influxdb_client.domain.telegraf_plugin_input_redis import TelegrafPluginInputRedis
from influxdb_client.domain.telegraf_plugin_input_redis_config import TelegrafPluginInputRedisConfig
from influxdb_client.domain.telegraf_plugin_input_swap import TelegrafPluginInputSwap
from influxdb_client.domain.telegraf_plugin_input_syslog import TelegrafPluginInputSyslog
from influxdb_client.domain.telegraf_plugin_input_syslog_config import TelegrafPluginInputSyslogConfig
from influxdb_client.domain.telegraf_plugin_input_system import TelegrafPluginInputSystem
from influxdb_client.domain.telegraf_plugin_input_tail import TelegrafPluginInputTail
from influxdb_client.domain.telegraf_plugin_output_file import TelegrafPluginOutputFile
from influxdb_client.domain.telegraf_plugin_output_file_config import TelegrafPluginOutputFileConfig
from influxdb_client.domain.telegraf_plugin_output_file_config_files import TelegrafPluginOutputFileConfigFiles
from influxdb_client.domain.telegraf_plugin_output_influx_dbv2 import TelegrafPluginOutputInfluxDBV2
from influxdb_client.domain.telegraf_plugin_output_influx_dbv2_config import TelegrafPluginOutputInfluxDBV2Config
from influxdb_client.domain.telegraf_plugin import TelegrafPlugin
from influxdb_client.domain.telegraf_request import TelegrafRequest
from influxdb_client.domain.telegraf_request_agent import TelegrafRequestAgent
from influxdb_client.domain.telegraf_request_plugin import TelegrafRequestPlugin
from influxdb_client.domain.telegraf_request_metadata import TelegrafRequestMetadata
from influxdb_client.domain.telegrafs import Telegrafs
from influxdb_client.domain.test_statement import TestStatement
from influxdb_client.domain.threshold import Threshold
Expand Down
12 changes: 6 additions & 6 deletions influxdb_client/domain/delete_predicate_request.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def __init__(self, start=None, stop=None, predicate=None): # noqa: E501
def start(self):
"""Gets the start of this DeletePredicateRequest. # noqa: E501

RFC3339Nano. # noqa: E501
RFC3339Nano # noqa: E501

:return: The start of this DeletePredicateRequest. # noqa: E501
:rtype: datetime
Expand All @@ -70,7 +70,7 @@ def start(self):
def start(self, start):
"""Sets the start of this DeletePredicateRequest.

RFC3339Nano. # noqa: E501
RFC3339Nano # noqa: E501

:param start: The start of this DeletePredicateRequest. # noqa: E501
:type: datetime
Expand All @@ -84,7 +84,7 @@ def start(self, start):
def stop(self):
"""Gets the stop of this DeletePredicateRequest. # noqa: E501

RFC3339Nano. # noqa: E501
RFC3339Nano # noqa: E501

:return: The stop of this DeletePredicateRequest. # noqa: E501
:rtype: datetime
Expand All @@ -95,7 +95,7 @@ def stop(self):
def stop(self, stop):
"""Sets the stop of this DeletePredicateRequest.

RFC3339Nano. # noqa: E501
RFC3339Nano # noqa: E501

:param stop: The stop of this DeletePredicateRequest. # noqa: E501
:type: datetime
Expand All @@ -109,7 +109,7 @@ def stop(self, stop):
def predicate(self):
"""Gets the predicate of this DeletePredicateRequest. # noqa: E501

sql where like delete statement # noqa: E501
InfluxQL-like delete statement # noqa: E501

:return: The predicate of this DeletePredicateRequest. # noqa: E501
:rtype: str
Expand All @@ -120,7 +120,7 @@ def predicate(self):
def predicate(self, predicate):
"""Sets the predicate of this DeletePredicateRequest.

sql where like delete statement # noqa: E501
InfluxQL-like delete statement # noqa: E501

:param predicate: The predicate of this DeletePredicateRequest. # noqa: E501
:type: str
Expand Down
5 changes: 3 additions & 2 deletions influxdb_client/domain/slack_notification_endpoint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ def __init__(self, url=None, token=None): # noqa: E501
self._token = None
self.discriminator = None

if url is not None:
self.url = url
self.url = url
if token is not None:
self.token = token

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

self._url = url

Expand Down
12 changes: 6 additions & 6 deletions influxdb_client/domain/telegraf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ class Telegraf(TelegrafRequest):
'labels': 'list[Label]',
'name': 'str',
'description': 'str',
'agent': 'TelegrafRequestAgent',
'plugins': 'list[TelegrafRequestPlugin]',
'metadata': 'TelegrafRequestMetadata',
'config': 'str',
'org_id': 'str'
}

Expand All @@ -48,14 +48,14 @@ class Telegraf(TelegrafRequest):
'labels': 'labels',
'name': 'name',
'description': 'description',
'agent': 'agent',
'plugins': 'plugins',
'metadata': 'metadata',
'config': 'config',
'org_id': 'orgID'
}

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

self._id = None
self._links = None
Expand Down
107 changes: 52 additions & 55 deletions ...ient/domain/telegraf_plugin_input_file.py → influxdb_client/domain/telegraf_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import six


class TelegrafPluginInputFile(object):
class TelegrafPlugin(object):
"""NOTE: This class is auto generated by OpenAPI Generator.
Ref: https://openapi-generator.tech

Expand All @@ -31,121 +31,118 @@ class TelegrafPluginInputFile(object):
and the value is json key in definition.
"""
openapi_types = {
'name': 'str',
'type': 'str',
'comment': 'str',
'config': 'TelegrafPluginInputFileConfig'
'name': 'str',
'description': 'str',
'config': 'dict(str, object)'
}

attribute_map = {
'name': 'name',
'type': 'type',
'comment': 'comment',
'name': 'name',
'description': 'description',
'config': 'config'
}

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

self._name = None
self._type = None
self._comment = None
self._name = None
self._description = None
self._config = None
self.discriminator = None

self.name = name
self.type = type
if comment is not None:
self.comment = comment
self.config = config
if type is not None:
self.type = type
if name is not None:
self.name = name
if description is not None:
self.description = description
if config is not None:
self.config = config

@property
def name(self):
"""Gets the name of this TelegrafPluginInputFile. # noqa: E501
def type(self):
"""Gets the type of this TelegrafPlugin. # noqa: E501


:return: The name of this TelegrafPluginInputFile. # noqa: E501
:return: The type of this TelegrafPlugin. # noqa: E501
:rtype: str
"""
return self._name
return self._type

@name.setter
def name(self, name):
"""Sets the name of this TelegrafPluginInputFile.
@type.setter
def type(self, type):
"""Sets the type of this TelegrafPlugin.


:param name: The name of this TelegrafPluginInputFile. # noqa: E501
:param type: The type of this TelegrafPlugin. # noqa: E501
:type: str
"""
if name is None:
raise ValueError("Invalid value for `name`, must not be `None`") # noqa: E501

self._name = name
self._type = type

@property
def type(self):
"""Gets the type of this TelegrafPluginInputFile. # noqa: E501
def name(self):
"""Gets the name of this TelegrafPlugin. # noqa: E501


:return: The type of this TelegrafPluginInputFile. # noqa: E501
:return: The name of this TelegrafPlugin. # noqa: E501
:rtype: str
"""
return self._type
return self._name

@type.setter
def type(self, type):
"""Sets the type of this TelegrafPluginInputFile.
@name.setter
def name(self, name):
"""Sets the name of this TelegrafPlugin.


:param type: The type of this TelegrafPluginInputFile. # noqa: E501
:param name: The name of this TelegrafPlugin. # noqa: E501
:type: str
"""
if type is None:
raise ValueError("Invalid value for `type`, must not be `None`") # noqa: E501

self._type = type
self._name = name

@property
def comment(self):
"""Gets the comment of this TelegrafPluginInputFile. # noqa: E501
def description(self):
"""Gets the description of this TelegrafPlugin. # noqa: E501


:return: The comment of this TelegrafPluginInputFile. # noqa: E501
:return: The description of this TelegrafPlugin. # noqa: E501
:rtype: str
"""
return self._comment
return self._description

@comment.setter
def comment(self, comment):
"""Sets the comment of this TelegrafPluginInputFile.
@description.setter
def description(self, description):
"""Sets the description of this TelegrafPlugin.


:param comment: The comment of this TelegrafPluginInputFile. # noqa: E501
:param description: The description of this TelegrafPlugin. # noqa: E501
:type: str
"""

self._comment = comment
self._description = description

@property
def config(self):
"""Gets the config of this TelegrafPluginInputFile. # noqa: E501
"""Gets the config of this TelegrafPlugin. # noqa: E501


:return: The config of this TelegrafPluginInputFile. # noqa: E501
:rtype: TelegrafPluginInputFileConfig
:return: The config of this TelegrafPlugin. # noqa: E501
:rtype: dict(str, object)
"""
return self._config

@config.setter
def config(self, config):
"""Sets the config of this TelegrafPluginInputFile.
"""Sets the config of this TelegrafPlugin.


:param config: The config of this TelegrafPluginInputFile. # noqa: E501
:type: TelegrafPluginInputFileConfig
:param config: The config of this TelegrafPlugin. # noqa: E501
:type: dict(str, object)
"""
if config is None:
raise ValueError("Invalid value for `config`, must not be `None`") # noqa: E501

self._config = config

Expand Down Expand Up @@ -183,7 +180,7 @@ def __repr__(self):

def __eq__(self, other):
"""Returns true if both objects are equal"""
if not isinstance(other, TelegrafPluginInputFile):
if not isinstance(other, TelegrafPlugin):
return False

return self.__dict__ == other.__dict__
Expand Down
Loading